diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-01-25 14:26:21 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-12 09:43:00 +0000 |
| commit | ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa (patch) | |
| tree | c672aa096c0088820c7ffa341b2d603cef6f66d6 /src/mem/ruby/structures | |
| parent | 9fbfb45e51e657b364334a1c96ba23698d181edb (diff) | |
| download | gem5-ef71a987c1987f7543d3bf76ed9e5ce62f4d1daa.tar.xz | |
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>
Diffstat (limited to 'src/mem/ruby/structures')
| -rw-r--r-- | src/mem/ruby/structures/LRUReplacementPolicy.py | 2 | ||||
| -rw-r--r-- | src/mem/ruby/structures/PseudoLRUReplacementPolicy.py | 2 | ||||
| -rw-r--r-- | src/mem/ruby/structures/RubyCache.py | 2 | ||||
| -rw-r--r-- | src/mem/ruby/structures/RubyPrefetcher.py | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/mem/ruby/structures/LRUReplacementPolicy.py b/src/mem/ruby/structures/LRUReplacementPolicy.py index 2b4a263b7..9c36b5f51 100644 --- a/src/mem/ruby/structures/LRUReplacementPolicy.py +++ b/src/mem/ruby/structures/LRUReplacementPolicy.py @@ -31,7 +31,7 @@ from m5.params import * from m5.SimObject import SimObject -from ReplacementPolicy import ReplacementPolicy +from m5.objects.ReplacementPolicy import ReplacementPolicy class LRUReplacementPolicy(ReplacementPolicy): type = 'LRUReplacementPolicy' diff --git a/src/mem/ruby/structures/PseudoLRUReplacementPolicy.py b/src/mem/ruby/structures/PseudoLRUReplacementPolicy.py index d922007f5..2b892d47a 100644 --- a/src/mem/ruby/structures/PseudoLRUReplacementPolicy.py +++ b/src/mem/ruby/structures/PseudoLRUReplacementPolicy.py @@ -27,7 +27,7 @@ # # Author: Derek Hower -from ReplacementPolicy import ReplacementPolicy +from m5.objects.ReplacementPolicy import ReplacementPolicy class PseudoLRUReplacementPolicy(ReplacementPolicy): type = 'PseudoLRUReplacementPolicy' diff --git a/src/mem/ruby/structures/RubyCache.py b/src/mem/ruby/structures/RubyCache.py index 9fc4726b0..cf8410c6d 100644 --- a/src/mem/ruby/structures/RubyCache.py +++ b/src/mem/ruby/structures/RubyCache.py @@ -29,7 +29,7 @@ from m5.params import * from m5.proxy import * -from PseudoLRUReplacementPolicy import PseudoLRUReplacementPolicy +from m5.objects.PseudoLRUReplacementPolicy import PseudoLRUReplacementPolicy from m5.SimObject import SimObject class RubyCache(SimObject): diff --git a/src/mem/ruby/structures/RubyPrefetcher.py b/src/mem/ruby/structures/RubyPrefetcher.py index 18bb3dc69..00a933d8c 100644 --- a/src/mem/ruby/structures/RubyPrefetcher.py +++ b/src/mem/ruby/structures/RubyPrefetcher.py @@ -27,10 +27,11 @@ # Authors: Nilay Vaish from m5.SimObject import SimObject -from System import System from m5.params import * from m5.proxy import * +from m5.objects.System import System + class Prefetcher(SimObject): type = 'Prefetcher' cxx_class = 'Prefetcher' |