configs: simpoint-profile usable with NonCachingCPUs only

NonCachingCPU is replacing the Atomic+fastmem option.

Change-Id: I66f5c8a880d1b3fd1331871d89e8d6a229938e57
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15935
Reviewed-by: Daniel Carvalho <odanrc@yahoo.com.br>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>

diff --git a/configs/common/CpuConfig.py b/configs/common/CpuConfig.py
index f0d009e956f7e83944eb3c74e616fbb6660287e1..1524b16466bbf28d55bf2ae2cfcb842b1dfa69f8 100644 (file)
--- a/configs/common/CpuConfig.py
+++ b/configs/common/CpuConfig.py
@@ -70,6 +70,7 @@ def _cpu_subclass_tester(name):
 
 is_kvm_cpu = _cpu_subclass_tester("BaseKvmCPU")
 is_atomic_cpu = _cpu_subclass_tester("AtomicSimpleCPU")
+is_noncaching_cpu = _cpu_subclass_tester("NonCachingSimpleCPU")
 
 def get(name):
     """Get a CPU class from a user provided class name or alias."""

diff --git a/configs/example/fs.py b/configs/example/fs.py
index 05eca87fb4cfddc66965690bcbb49103222d73ce..6be9ba2c26fb027ba588c77026a4854d1fad816d 100644 (file)
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -189,7 +189,7 @@ def build_test_system(np):
 
         # Sanity check
         if options.simpoint_profile:
-            if not CpuConfig.is_atomic_cpu(TestCPUClass):
+            if not CpuConfig.is_noncaching_cpu(TestCPUClass):
                 fatal("SimPoint generation should be done with atomic cpu")
             if np > 1:
                 fatal("SimPoint generation not supported with more than one CPUs")

diff --git a/configs/example/se.py b/configs/example/se.py
index 8403066f0fcb35380a68793091b7889adf4925bf..fa9e897453457d2436b6c79b724191a82f78fbb4 100644 (file)
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -215,7 +215,7 @@ if CpuConfig.is_kvm_cpu(CPUClass) or CpuConfig.is_kvm_cpu(FutureClass):
 
 # Sanity check
 if options.simpoint_profile:
-    if not CpuConfig.is_atomic_cpu(CPUClass):
+    if not CpuConfig.is_noncaching_cpu(CPUClass):
         fatal("SimPoint/BPProbe should be done with an atomic cpu")
     if np > 1:
         fatal("SimPoint generation not supported with more than one CPUs")