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/gpu-compute/GPU.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/gpu-compute/GPU.py') diff --git a/src/gpu-compute/GPU.py b/src/gpu-compute/GPU.py index 0cb9e76a4..9eb662abc 100644 --- a/src/gpu-compute/GPU.py +++ b/src/gpu-compute/GPU.py @@ -33,16 +33,17 @@ # Author: Steve Reinhardt # -from ClockedObject import ClockedObject -from Device import DmaDevice from m5.defines import buildEnv from m5.params import * from m5.proxy import * from m5.SimObject import SimObject -from MemObject import MemObject -from Process import EmulatedDriver -from Bridge import Bridge -from LdsState import LdsState + +from m5.objects.ClockedObject import ClockedObject +from m5.objects.Device import DmaDevice +from m5.objects.MemObject import MemObject +from m5.objects.Process import EmulatedDriver +from m5.objects.Bridge import Bridge +from m5.objects.LdsState import LdsState class PrefetchType(Enum): vals = [ 'PF_CU', -- cgit v1.2.3