commit 636fc855abdf8d5cff1810f2b78b8af94f514a22
author Bobby R. Bruce <bbruce@ucdavis.edu> Wed Jul 08 13:10:31 2020 -0700
committer Bobby R. Bruce <bbruce@ucdavis.edu> Wed Jul 08 20:11:25 2020 +0000
tree 3fc5a59376e0a66e6848b506d8efeaa244997350
parent 287c0968b657e56cc9e4bce8f0b7cb4115883b8f

resources: Upgrade gem5 configs of boot-tests to python3

Signed-off-by: Hoa Nguyen <hoanguyen@ucdavis.edu>
Change-Id: Ibf18ba4d9f35552ff4573679cafcebc33d4b6001
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/30754
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby R. Bruce <bbruce@ucdavis.edu>

src/boot-exit/configs/system/__init__.py

diff --git a/src/boot-exit/configs/system/__init__.py b/src/boot-exit/configs/system/__init__.py
index e90832c..1bce258 100755
--- a/src/boot-exit/configs/system/__init__.py
+++ b/src/boot-exit/configs/system/__init__.py
@@ -27,5 +27,6 @@
 #
 # Authors: Jason Lowe-Power
 
-from system import MySystem
-from ruby_system import MyRubySystem
\ No newline at end of file
+from .system import MySystem
+from .ruby_system import MyRubySystem
+

src/boot-exit/configs/system/ruby_system.py

diff --git a/src/boot-exit/configs/system/ruby_system.py b/src/boot-exit/configs/system/ruby_system.py
index ac9c15f..cd25d8d 100755
--- a/src/boot-exit/configs/system/ruby_system.py
+++ b/src/boot-exit/configs/system/ruby_system.py
@@ -30,7 +30,7 @@
 import m5
 from m5.objects import *
 from m5.util import convert
-from fs_tools import *
+from .fs_tools import *
 
 
 class MyRubySystem(System):
@@ -72,13 +72,13 @@
 
         # Create the cache hierarchy for the system.
         if mem_sys == 'MI_example':
-            from MI_example_caches import MIExampleSystem
+            from .MI_example_caches import MIExampleSystem
             self.caches = MIExampleSystem()
         elif mem_sys == 'MESI_Two_Level':
-            from MESI_Two_Level import MESITwoLevelCache
+            from .MESI_Two_Level import MESITwoLevelCache
             self.caches = MESITwoLevelCache()
         elif mem_sys == 'MOESI_CMP_directory':
-            from MOESI_CMP_directory import MOESICMPDirCache
+            from .MOESI_CMP_directory import MOESICMPDirCache
             self.caches = MOESICMPDirCache()
         self.caches.setup(self, self.cpu, self.mem_cntrls,
                           [self.pc.south_bridge.ide.dma, self.iobus.master],
@@ -120,8 +120,9 @@
         else:
             m5.fatal("No CPU type {}".format(cpu_type))
 
-        map(lambda c: c.createThreads(), self.cpu)
-        map(lambda c: c.createInterruptController(), self.cpu)
+        for cpu in self.cpu:
+            cpu.createThreads()
+            cpu.createInterruptController()
 
     def setDiskImages(self, img_path_1, img_path_2):
         disk0 = CowDisk(img_path_1)

src/boot-exit/configs/system/system.py

diff --git a/src/boot-exit/configs/system/system.py b/src/boot-exit/configs/system/system.py
index f42ef87..909859c 100755
--- a/src/boot-exit/configs/system/system.py
+++ b/src/boot-exit/configs/system/system.py
@@ -30,8 +30,8 @@
 import m5
 from m5.objects import *
 from m5.util import convert
-from fs_tools import *
-from caches import *
+from .fs_tools import *
+from .caches import *
 
 class MySystem(System):
 
@@ -121,7 +121,8 @@
         else:
             m5.fatal("No CPU type {}".format(cpu_type))
 
-        map(lambda c: c.createThreads(), self.cpu)
+        for cpu in self.cpu:
+            cpu.createThreads()
 
     def setDiskImages(self, img_path_1, img_path_2):
         disk0 = CowDisk(img_path_1)