diff --git a/configs/common/CpuConfig.py b/configs/common/CpuConfig.py
index f0d009e956..1524b16466 100644
--- 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 05eca87fb4..6be9ba2c26 100644
--- 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 8403066f0f..fa9e897453 100644
--- 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")