191,196d190
< if options.fastmem:
< if TestCPUClass != 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!")
<
198,200c192,193
< 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 generation should be done with atomic cpu")
205,206d197
< if options.fastmem:
< test_sys.cpu[i].fastmem = True
272,273d262
< if options.fastmem:
< drive_sys.cpu.fastmem = True