From 60e6e785f970578eba6dbee9330eaecf514b23c8 Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 27 Feb 2017 13:17:51 +0000 Subject: python: Use PyBind11 instead of SWIG for Python wrappers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the PyBind11 wrapping infrastructure instead of SWIG to generate wrappers for functionality that needs to be exported to Python. This has several benefits: * PyBind11 can be redistributed with gem5, which means that we have full control of the version used. This avoid a large number of hard-to-debug SWIG issues we have seen in the past. * PyBind11 doesn't rely on a custom C++ parser, instead it relies on wrappers being explicitly declared in C++. The leads to slightly more boiler-plate code in manually created wrappers, but doesn't doesn't increase the overall code size. A big benefit is that this avoids strange compilation errors when SWIG doesn't understand modern language features. * Unlike SWIG, there is no risk that the wrapper code incorporates incorrect type casts (this has happened on numerous occasions in the past) since these will result in compile-time errors. As a part of this change, the mechanism to define exported methods has been redesigned slightly. New methods can be exported either by declaring them in the SimObject declaration and decorating them with the cxxMethod decorator or by adding an instance of PyBindMethod/PyBindProperty to the cxx_exports class variable. The decorator has the added benefit of making it possible to add a docstring and naming the method's parameters. The new wrappers have the following known issues: * Global events can't be memory managed correctly. This was the case in SWIG as well. Change-Id: I88c5a95b6cf6c32fa9e1ad31dfc08b2e8199a763 Signed-off-by: Andreas Sandberg Reviewed-by: Andreas Hansson Reviewed-by: Andrew Bardsley Reviewed-on: https://gem5-review.googlesource.com/2231 Reviewed-by: Tony Gutierrez Reviewed-by: Pierre-Yves Péneau Reviewed-by: Jason Lowe-Power --- src/arch/arm/ArmPMU.py | 11 ++++------- src/arch/arm/ArmSystem.py | 8 +++++--- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'src/arch') diff --git a/src/arch/arm/ArmPMU.py b/src/arch/arm/ArmPMU.py index 3baa39bc9..3802e49bc 100644 --- a/src/arch/arm/ArmPMU.py +++ b/src/arch/arm/ArmPMU.py @@ -38,7 +38,7 @@ # Andreas Sandberg from m5.defines import buildEnv -from m5.SimObject import SimObject +from m5.SimObject import * from m5.params import * from m5.params import isNullPointer from m5.proxy import * @@ -48,12 +48,9 @@ class ArmPMU(SimObject): cxx_class = 'ArmISA::PMU' cxx_header = 'arch/arm/pmu.hh' - @classmethod - def export_methods(cls, code): - code(''' - void addEventProbe(unsigned int id, - SimObject *obj, const char *name); -''') + cxx_exports = [ + PyBindMethod("addEventProbe"), + ] # To prevent cycles in the configuration hierarchy, we don't keep # a list of supported events as a configuration param. Instead, we diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py index 9100db09a..41f6b9d79 100644 --- a/src/arch/arm/ArmSystem.py +++ b/src/arch/arm/ArmSystem.py @@ -36,6 +36,7 @@ # Authors: Ali Saidi from m5.params import * +from m5.SimObject import * from System import System @@ -98,9 +99,10 @@ class LinuxArmSystem(GenericArmSystem): type = 'LinuxArmSystem' cxx_header = "arch/arm/linux/system.hh" - @classmethod - def export_methods(cls, code): - code('''void dumpDmesg();''') + @cxxMethod + def dumpDmesg(self): + """Dump dmesg from the simulated kernel to standard out""" + pass class FreebsdArmSystem(GenericArmSystem): type = 'FreebsdArmSystem' -- cgit v1.2.3