diff options
| author | Daniel R. Carvalho <odanrc@yahoo.com.br> | 2019-10-03 22:39:41 +0200 |
|---|---|---|
| committer | Daniel Carvalho <odanrc@yahoo.com.br> | 2019-10-07 13:08:22 +0000 |
| commit | d241429e6077965417a5794eb301936926ba03fc (patch) | |
| tree | 7b14824fc9e9d03428a7d6613c29a822d5711061 /configs | |
| parent | a00953c0a7c80ac68003546a50b6556975720235 (diff) | |
| download | gem5-d241429e6077965417a5794eb301936926ba03fc.tar.xz | |
configs: Isolate ISA related object lists
Some objects are not compiled when using NULL ISA, and therefore
their object lists cannot exist.
Change-Id: I93ec576229916c892de50bb6c73cd602e18a3654
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21439
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/ObjectList.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/configs/common/ObjectList.py b/configs/common/ObjectList.py index c197439c5..8b3233fb5 100644 --- a/configs/common/ObjectList.py +++ b/configs/common/ObjectList.py @@ -153,11 +153,11 @@ class CPUList(ObjectList): self._is_obj_class): self._sub_classes[name] = cls -bp_list = ObjectList(m5.objects.BranchPredictor) -cpu_list = CPUList(m5.objects.BaseCPU) -hwp_list = ObjectList(m5.objects.BasePrefetcher) -indirect_bp_list = ObjectList(m5.objects.IndirectPredictor) -mem_list = ObjectList(m5.objects.AbstractMemory) +bp_list = ObjectList(getattr(m5.objects, 'BranchPredictor', None)) +cpu_list = CPUList(getattr(m5.objects, 'BaseCPU', None)) +hwp_list = ObjectList(getattr(m5.objects, 'BasePrefetcher', None)) +indirect_bp_list = ObjectList(getattr(m5.objects, 'IndirectPredictor', None)) +mem_list = ObjectList(getattr(m5.objects, 'AbstractMemory', None)) # Platform aliases. The platforms listed here might not be compiled, # we make sure they exist before we add them to the platform list. @@ -165,7 +165,8 @@ _platform_aliases_all = [ ("RealView_PBX", "RealViewPBX"), ("VExpress_GEM5", "VExpress_GEM5_V1"), ] -platform_list = ObjectList(m5.objects.Platform, _platform_aliases_all) +platform_list = ObjectList(getattr(m5.objects, 'Platform', None), \ + _platform_aliases_all) def _subclass_tester(name): sub_class = getattr(m5.objects, name, None) |