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 <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15981
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
Andreas Sandberg
2019-01-25 14:26:21 +00:00
parent 9fbfb45e51
commit ef71a987c1
131 changed files with 300 additions and 267 deletions

View File

@@ -45,8 +45,8 @@ from m5.defines import buildEnv
from m5.params import *
from m5.proxy import *
from DVFSHandler import *
from SimpleMemory import *
from m5.objects.DVFSHandler import *
from m5.objects.SimpleMemory import *
class MemoryMode(Enum): vals = ['invalid', 'atomic', 'timing',
'atomic_noncaching']

View File

@@ -35,7 +35,7 @@
#
# Authors: Andrew Bardsley
from ClockedObject import ClockedObject
from m5.objects.ClockedObject import ClockedObject
class TickedObject(ClockedObject):
type = 'TickedObject'

View File

@@ -37,7 +37,7 @@
from m5.SimObject import SimObject
from m5.params import *
from PowerModelState import PowerModelState
from m5.objects.PowerModelState import PowerModelState
# Represents a power model for a simobj
class MathExprPowerModel(PowerModelState):

View File

@@ -36,7 +36,7 @@
# Authors: David Guillen Fandos
from m5.SimObject import *
from ClockedObject import ClockedObject
from m5.objects.ClockedObject import ClockedObject
from m5.params import *
from m5.objects import ThermalDomain