From ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Fri, 25 Jan 2019 14:26:21 +0000 Subject: python: Don't assume SimObjects live in the global namespace The importer in Python 3 doesn't like the way we import SimObjects from the global namespace. Convert the existing SimObject declarations to import from m5.objects. As a side-effect, this makes these files consistent with configuration files. Change-Id: I11153502b430822130722839e1fa767b82a027aa Signed-off-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/15981 Reviewed-by: Jason Lowe-Power Reviewed-by: Giacomo Travaglini --- src/cpu/testers/directedtest/RubyDirectedTester.py | 3 ++- src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.py | 2 +- src/cpu/testers/memtest/MemTest.py | 4 ++-- src/cpu/testers/rubytest/RubyTester.py | 4 ++-- src/cpu/testers/traffic_gen/BaseTrafficGen.py | 2 +- src/cpu/testers/traffic_gen/PyTrafficGen.py | 3 ++- src/cpu/testers/traffic_gen/TrafficGen.py | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/cpu/testers') diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.py b/src/cpu/testers/directedtest/RubyDirectedTester.py index df1205659..9f90c9b41 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.py +++ b/src/cpu/testers/directedtest/RubyDirectedTester.py @@ -27,10 +27,11 @@ # Authors: Brad Beckmann from m5.SimObject import SimObject -from MemObject import MemObject from m5.params import * from m5.proxy import * +from m5.objects.MemObject import MemObject + class DirectedGenerator(SimObject): type = 'DirectedGenerator' abstract = True diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.py b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.py index 261e643c1..4c7772348 100644 --- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.py +++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.py @@ -26,7 +26,7 @@ # # Authors: Tushar Krishna -from MemObject import MemObject +from m5.objects.MemObject import MemObject from m5.params import * from m5.proxy import * diff --git a/src/cpu/testers/memtest/MemTest.py b/src/cpu/testers/memtest/MemTest.py index d09537639..5585b1f70 100644 --- a/src/cpu/testers/memtest/MemTest.py +++ b/src/cpu/testers/memtest/MemTest.py @@ -38,11 +38,11 @@ # # Authors: Nathan Binkert # Andreas Hansson - -from MemObject import MemObject from m5.params import * from m5.proxy import * +from m5.objects.MemObject import MemObject + class MemTest(MemObject): type = 'MemTest' cxx_header = "cpu/testers/memtest/memtest.hh" diff --git a/src/cpu/testers/rubytest/RubyTester.py b/src/cpu/testers/rubytest/RubyTester.py index f12485566..2ac1697fd 100644 --- a/src/cpu/testers/rubytest/RubyTester.py +++ b/src/cpu/testers/rubytest/RubyTester.py @@ -25,11 +25,11 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # - -from MemObject import MemObject from m5.params import * from m5.proxy import * +from m5.objects.MemObject import MemObject + class RubyTester(MemObject): type = 'RubyTester' cxx_header = "cpu/testers/rubytest/RubyTester.hh" diff --git a/src/cpu/testers/traffic_gen/BaseTrafficGen.py b/src/cpu/testers/traffic_gen/BaseTrafficGen.py index dbe0c848b..94e3319d5 100644 --- a/src/cpu/testers/traffic_gen/BaseTrafficGen.py +++ b/src/cpu/testers/traffic_gen/BaseTrafficGen.py @@ -39,7 +39,7 @@ from m5.params import * from m5.proxy import * -from MemObject import MemObject +from m5.objects.MemObject import MemObject # Types of Stream Generators. # Those are orthogonal to the other generators in the TrafficGen diff --git a/src/cpu/testers/traffic_gen/PyTrafficGen.py b/src/cpu/testers/traffic_gen/PyTrafficGen.py index c29ad0a3b..c8829ecc8 100644 --- a/src/cpu/testers/traffic_gen/PyTrafficGen.py +++ b/src/cpu/testers/traffic_gen/PyTrafficGen.py @@ -37,7 +37,8 @@ from m5.defines import buildEnv from m5.SimObject import * -from BaseTrafficGen import * + +from m5.objects.BaseTrafficGen import * class PyTrafficGen(BaseTrafficGen): type = 'PyTrafficGen' diff --git a/src/cpu/testers/traffic_gen/TrafficGen.py b/src/cpu/testers/traffic_gen/TrafficGen.py index f1e094821..af6c4902c 100644 --- a/src/cpu/testers/traffic_gen/TrafficGen.py +++ b/src/cpu/testers/traffic_gen/TrafficGen.py @@ -38,7 +38,7 @@ # Sascha Bischoff from m5.params import * -from BaseTrafficGen import * +from m5.objects.BaseTrafficGen import * # The behaviour of this traffic generator is specified in a # configuration file, and this file describes a state transition graph -- cgit v1.2.3