scons: Do not build the InOrderCPU

One step closer to shifting focus to the MinorCPU.

diff --git a/build_opts/MIPS b/build_opts/MIPS
index 82a9d6243abc4a8ed566c2b22153fdc3e52680d1..ecb2b0972522d999154bb149d2ec25613bf89903 100644 (file)
--- a/build_opts/MIPS
+++ b/build_opts/MIPS
@@ -1,3 +1,3 @@
 TARGET_ISA = 'mips'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
 PROTOCOL = 'MI_example'

diff --git a/build_opts/SPARC b/build_opts/SPARC
index e992b8cd9188044d9ebda49605218ea6216f28c5..63ec7cbaff1724e2bf62ff0c9bda63a2eb934d7f 100644 (file)
--- a/build_opts/SPARC
+++ b/build_opts/SPARC
@@ -1,3 +1,3 @@
 TARGET_ISA = 'sparc'
-CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU'
 PROTOCOL = 'MI_example'

diff --git a/configs/common/CpuConfig.py b/configs/common/CpuConfig.py
index c2663ee980e2c3650e16ccb89285060232e3a8b7..f30e282468c1d076447b63d30f95e60da92a81b7 100644 (file)
--- a/configs/common/CpuConfig.py
+++ b/configs/common/CpuConfig.py
@@ -50,7 +50,6 @@ _cpu_classes = {}
 _cpu_aliases_all = [
     ("timing", "TimingSimpleCPU"),
     ("atomic", "AtomicSimpleCPU"),
-    ("inorder", "InOrderCPU"),
     ("minor", "MinorCPU"),
     ("detailed", "DerivO3CPU"),
     ("kvm", ("ArmKvmCPU", "X86KvmCPU")),

diff --git a/configs/example/se.py b/configs/example/se.py
index eb84482704ef5355711b1ac2d88901ad66b51cd0..3f51acdeb3fd049e161be59a7b46407b82b83419 100644 (file)
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -110,7 +110,7 @@ def get_processes(options):
         idx += 1
 
     if options.smt:
-        assert(options.cpu_type == "detailed" or options.cpu_type == "inorder")
+        assert(options.cpu_type == "detailed")
         return multiprocesses, idx
     else:
         return multiprocesses, 1