216,221d215
< if options.fastmem:
< if CPUClass != AtomicSimpleCPU:
< fatal("Fastmem can only be used with atomic CPU!")
< if (options.caches or options.l2cache):
< fatal("You cannot use fastmem in combination with caches!")
<
223,225c217,218
< if not options.fastmem:
< # Atomic CPU checked with fastmem option already
< fatal("SimPoint generation should be done with atomic cpu and fastmem")
---
> if not CpuConfig.is_atomic_cpu(TestCPUClass):
> fatal("SimPoint/BPProbe should be done with an atomic cpu")
237,239d229
< if options.fastmem:
< system.cpu[i].fastmem = True
<