tests: config.out no longer exists, eliminate ref copy.

--HG--
extra : convert_revision : e2d6aa61aa2ffd1a9d16260244512eeb1fe4d5a3

51 files changed, 1 insertions, 13221 deletions

diff --git a/tests/SConscript b/tests/SConscript
index 472fa3f4c..812ce8c11 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -114,7 +114,7 @@ def update_test(target, source, env):
     src_dir = str(source[1].get_dir())
     dest_files = os.listdir(dest_dir)
     src_files = os.listdir(src_dir)
-    for f in ('stdout', 'stderr', 'm5stats.txt', 'config.ini', 'config.out'):
+    for f in ('stdout', 'stderr', 'm5stats.txt', 'config.ini'):
         if f in dest_files:
             print "  Replacing file", f
             dest_files.remove(f)
diff --git a/tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.out b/tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.out
deleted file mode 100644
index 24d41aaa7..000000000
--- a/tests/long/00.gzip/ref/alpha/tru64/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=gzip input.log 1
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/gzip
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/00.gzip/alpha/tru64/o3-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config.out b/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index 589507187..000000000
--- a/tests/long/00.gzip/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=gzip input.log 1
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/gzip
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/00.gzip/alpha/tru64/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/00.gzip/ref/alpha/tru64/simple-timing/config.out b/tests/long/00.gzip/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index 5cab10662..000000000
--- a/tests/long/00.gzip/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=gzip input.log 1
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/gzip
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/00.gzip/alpha/tru64/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.out b/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.out
deleted file mode 100644
index b8a2728b3..000000000
--- a/tests/long/00.gzip/ref/sparc/linux/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=gzip input.log 1
-executable=/dist/m5/cpu2000/binaries/sparc/linux/gzip
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/o3-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.out b/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.out
deleted file mode 100644
index 9c608a7e6..000000000
--- a/tests/long/00.gzip/ref/sparc/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=gzip input.log 1
-executable=/dist/m5/cpu2000/binaries/sparc/linux/gzip
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.out b/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.out
deleted file mode 100644
index d8a055b90..000000000
--- a/tests/long/00.gzip/ref/sparc/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=gzip input.log 1
-executable=/dist/m5/cpu2000/binaries/sparc/linux/gzip
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/00.gzip/sparc/linux/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.out b/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.out
deleted file mode 100644
index b84a9d780..000000000
--- a/tests/long/10.mcf/ref/sparc/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=mcf mcf.in
-executable=/dist/m5/cpu2000/binaries/sparc/linux/mcf
-input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.out b/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.out
deleted file mode 100644
index 81e06c995..000000000
--- a/tests/long/10.mcf/ref/sparc/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=mcf mcf.in
-executable=/dist/m5/cpu2000/binaries/sparc/linux/mcf
-input=/dist/m5/cpu2000/data/mcf/smred/input/mcf.in
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/10.mcf/sparc/linux/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/30.eon/ref/alpha/tru64/o3-timing/config.out b/tests/long/30.eon/ref/alpha/tru64/o3-timing/config.out
deleted file mode 100644
index cea0c0402..000000000
--- a/tests/long/30.eon/ref/alpha/tru64/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=eon chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm pixels_out.cook
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/eon
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/30.eon/alpha/tru64/o3-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/long/30.eon/ref/alpha/tru64/simple-atomic/config.out b/tests/long/30.eon/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index b7319250f..000000000
--- a/tests/long/30.eon/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=eon chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm pixels_out.cook
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/eon
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/30.eon/alpha/tru64/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/30.eon/ref/alpha/tru64/simple-timing/config.out b/tests/long/30.eon/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index c3af4f4b3..000000000
--- a/tests/long/30.eon/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=eon chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm pixels_out.cook
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/eon
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/30.eon/alpha/tru64/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config.out b/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index 0e4ea1cb5..000000000
--- a/tests/long/40.perlbmk/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=perlbmk -I. -I lib lgred.makerand.pl
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/perlbmk
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/40.perlbmk/alpha/tru64/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config.out b/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index 676b65128..000000000
--- a/tests/long/40.perlbmk/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=perlbmk -I. -I lib lgred.makerand.pl
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/perlbmk
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/40.perlbmk/alpha/tru64/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.out b/tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.out
deleted file mode 100644
index 071b401c0..000000000
--- a/tests/long/50.vortex/ref/alpha/tru64/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=vortex lendian.raw
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/vortex
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/50.vortex/alpha/tru64/o3-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config.out b/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index bf2c5c795..000000000
--- a/tests/long/50.vortex/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=vortex lendian.raw
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/vortex
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/50.vortex/alpha/tru64/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/50.vortex/ref/alpha/tru64/simple-timing/config.out b/tests/long/50.vortex/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index c0cb264bc..000000000
--- a/tests/long/50.vortex/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=vortex lendian.raw
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/vortex
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/50.vortex/alpha/tru64/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.out b/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.out
deleted file mode 100644
index 4d97fe26f..000000000
--- a/tests/long/50.vortex/ref/sparc/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=vortex bendian.raw
-executable=/dist/m5/cpu2000/binaries/sparc/linux/vortex
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.out b/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.out
deleted file mode 100644
index c2fb507ae..000000000
--- a/tests/long/50.vortex/ref/sparc/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=vortex bendian.raw
-executable=/dist/m5/cpu2000/binaries/sparc/linux/vortex
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/50.vortex/sparc/linux/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.out b/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.out
deleted file mode 100644
index ea4848b9b..000000000
--- a/tests/long/60.bzip2/ref/alpha/tru64/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=bzip2 input.source 1
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/bzip2
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/60.bzip2/alpha/tru64/o3-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config.out b/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index fc081bf5e..000000000
--- a/tests/long/60.bzip2/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=bzip2 input.source 1
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/bzip2
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/60.bzip2/alpha/tru64/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config.out b/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index 55a09db2b..000000000
--- a/tests/long/60.bzip2/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=bzip2 input.source 1
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/bzip2
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/60.bzip2/alpha/tru64/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.out b/tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.out
deleted file mode 100644
index e3bf50f10..000000000
--- a/tests/long/70.twolf/ref/alpha/tru64/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=twolf smred
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/twolf
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/70.twolf/alpha/tru64/o3-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config.out b/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index 47defa937..000000000
--- a/tests/long/70.twolf/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=twolf smred
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/twolf
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/70.twolf/alpha/tru64/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/70.twolf/ref/alpha/tru64/simple-timing/config.out b/tests/long/70.twolf/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index 3ed492885..000000000
--- a/tests/long/70.twolf/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=twolf smred
-executable=/dist/m5/cpu2000/binaries/alpha/tru64/twolf
-input=cin
-output=cout
-env=
-cwd=build/ALPHA_SE/tests/fast/long/70.twolf/alpha/tru64/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.out b/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.out
deleted file mode 100644
index d448056f4..000000000
--- a/tests/long/70.twolf/ref/sparc/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=twolf smred
-executable=/dist/m5/cpu2000/binaries/sparc/linux/twolf
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-atomic
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.out b/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.out
deleted file mode 100644
index f79151c21..000000000
--- a/tests/long/70.twolf/ref/sparc/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=twolf smred
-executable=/dist/m5/cpu2000/binaries/sparc/linux/twolf
-input=cin
-output=cout
-env=
-cwd=build/SPARC_SE/tests/fast/long/70.twolf/sparc/linux/simple-timing
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.out b/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.out
deleted file mode 100644
index bc35fc4e7..000000000
--- a/tests/long/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.out
+++ /dev/null
@@ -1,417 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[1048576,68157439]
-latency=1
-zero=true
-
-[system.rom]
-type=PhysicalMemory
-file=
-range=[1099243192320,1099251580927]
-latency=1
-zero=false
-
-[system.nvram]
-type=PhysicalMemory
-file=
-range=[133429198848,133429207039]
-latency=1
-zero=false
-
-[system.hypervisor_desc]
-type=PhysicalMemory
-file=
-range=[133446500352,133446508543]
-latency=1
-zero=false
-
-[system.partition_desc]
-type=PhysicalMemory
-file=
-range=[133445976064,133445984255]
-latency=1
-zero=false
-
-[system]
-type=SparcSystem
-physmem=system.physmem
-rom=system.rom
-nvram=system.nvram
-hypervisor_desc=system.hypervisor_desc
-partition_desc=system.partition_desc
-mem_mode=atomic
-reset_addr=1099243192320
-hypervisor_addr=1099243257856
-openboot_addr=1099243716608
-nvram_addr=133429198848
-hypervisor_desc_addr=133446500352
-partition_desc_addr=133445976064
-kernel=
-reset_bin=/dist/m5/system/binaries/reset_new.bin
-hypervisor_bin=/dist/m5/system/binaries/q_new.bin
-openboot_bin=/dist/m5/system/binaries/openboot_new.bin
-nvram_bin=/dist/m5/system/binaries/nvram1
-hypervisor_desc_bin=/dist/m5/system/binaries/1up-hv.bin
-partition_desc_bin=/dist/m5/system/binaries/1up-md.bin
-boot_cpu_frequency=1
-boot_osflags=a
-readfile=tests/halt.sh
-init_param=0
-
-[system.membus]
-type=Bus
-bus_id=1
-clock=2
-width=64
-responder_set=false
-block_size=64
-
-[system.intrctrl]
-type=IntrControl
-sys=system
-
-[system.t1000]
-type=T1000
-system=system
-intrctrl=system.intrctrl
-
-[system.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=0
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.t1000
-system=system
-
-[system.physmem2]
-type=PhysicalMemory
-file=
-range=[2147483648,2415919103]
-latency=1
-zero=true
-
-[system.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=100
-nack_delay=8
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[system.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/disk.s10hw2
-read_only=true
-
-[system.disk0.image]
-type=CowDiskImage
-child=system.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk0]
-type=MmDisk
-pio_addr=134217728000
-pio_latency=2
-// pio_size not specified
-platform=system.t1000
-system=system
-image=system.disk0.image
-
-[system.t1000.hconsole]
-type=SimConsole
-intr_control=system.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[system.t1000.hvuart]
-type=Uart8250
-pio_addr=1099255955456
-pio_latency=2
-platform=system.t1000
-sim_console=system.t1000.hconsole
-system=system
-
-[system.t1000.htod]
-type=DumbTOD
-pio_addr=1099255906296
-pio_latency=2
-platform=system.t1000
-system=system
-time=2009 1 1 0 0 0 3 1
-
-[system.t1000.pconsole]
-type=SimConsole
-intr_control=system.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[system.t1000.puart0]
-type=Uart8250
-pio_addr=133412421632
-pio_latency=2
-platform=system.t1000
-sim_console=system.t1000.pconsole
-system=system
-
-[system.t1000.fake_membnks]
-type=IsaFake
-pio_addr=648540061696
-pio_latency=2
-pio_size=16384
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=0
-platform=system.t1000
-system=system
-
-[system.t1000.fake_ssi]
-type=IsaFake
-pio_addr=1095216660480
-pio_latency=2
-pio_size=268435456
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2_4]
-type=IsaFake
-pio_addr=725849473216
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=1
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2_1]
-type=IsaFake
-pio_addr=725849473024
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=1
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2_2]
-type=IsaFake
-pio_addr=725849473088
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=1
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2_3]
-type=IsaFake
-pio_addr=725849473152
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=1
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2esr_3]
-type=IsaFake
-pio_addr=734439407744
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=0
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2esr_2]
-type=IsaFake
-pio_addr=734439407680
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=0
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2esr_1]
-type=IsaFake
-pio_addr=734439407616
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=0
-platform=system.t1000
-system=system
-
-[system.t1000.fake_l2esr_4]
-type=IsaFake
-pio_addr=734439407808
-pio_latency=2
-pio_size=8
-ret_bad_addr=false
-update_data=true
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=0
-platform=system.t1000
-system=system
-
-[system.t1000.iob]
-type=Iob
-pio_latency=2
-platform=system.t1000
-system=system
-
-[system.t1000.fake_clk]
-type=IsaFake
-pio_addr=644245094400
-pio_latency=2
-pio_size=4294967296
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.t1000
-system=system
-
-[system.t1000.fake_jbi]
-type=IsaFake
-pio_addr=549755813888
-pio_latency=2
-pio_size=4294967296
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.t1000
-system=system
-
-[system.iobus]
-type=Bus
-bus_id=0
-clock=2
-width=64
-responder_set=false
-block_size=64
-
-[system.iobus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=0
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.t1000
-system=system
-
-[system.cpu.itb]
-type=SparcITB
-size=64
-
-[system.cpu.dtb]
-type=SparcDTB
-size=64
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-itb=system.cpu.itb
-dtb=system.cpu.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=1
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/00.hello/ref/alpha/linux/o3-timing/config.out b/tests/quick/00.hello/ref/alpha/linux/o3-timing/config.out
deleted file mode 100644
index 7cb2e7d7d..000000000
--- a/tests/quick/00.hello/ref/alpha/linux/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.out b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.out
deleted file mode 100644
index 117159126..000000000
--- a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-timing/config.out b/tests/quick/00.hello/ref/alpha/linux/simple-timing/config.out
deleted file mode 100644
index f7852a616..000000000
--- a/tests/quick/00.hello/ref/alpha/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.out b/tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.out
deleted file mode 100644
index 0cb6591c8..000000000
--- a/tests/quick/00.hello/ref/alpha/tru64/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.out b/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.out
deleted file mode 100644
index acc734991..000000000
--- a/tests/quick/00.hello/ref/alpha/tru64/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.out b/tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.out
deleted file mode 100644
index 241630ead..000000000
--- a/tests/quick/00.hello/ref/alpha/tru64/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/tru64/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.out b/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.out
deleted file mode 100644
index 06a3d271d..000000000
--- a/tests/quick/00.hello/ref/mips/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/mips/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/00.hello/ref/mips/linux/simple-timing/config.out b/tests/quick/00.hello/ref/mips/linux/simple-timing/config.out
deleted file mode 100644
index 3f8a51cf4..000000000
--- a/tests/quick/00.hello/ref/mips/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/mips/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.out b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.out
deleted file mode 100644
index 1666790d0..000000000
--- a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/sparc/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-timing/config.out b/tests/quick/00.hello/ref/sparc/linux/simple-timing/config.out
deleted file mode 100644
index 89910d3c9..000000000
--- a/tests/quick/00.hello/ref/sparc/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/sparc/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.out b/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.out
deleted file mode 100644
index 45b063eb3..000000000
--- a/tests/quick/01.hello-2T-smt/ref/alpha/linux/o3-timing/config.out
+++ /dev/null
@@ -1,382 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload0]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.workload1]
-type=LiveProcess
-cmd=hello
-executable=tests/test-progs/hello/bin/alpha/linux/hello
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload0 system.cpu.workload1
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.out b/tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.out
deleted file mode 100644
index bdf29a72a..000000000
--- a/tests/quick/02.insttest/ref/sparc/linux/o3-timing/config.out
+++ /dev/null
@@ -1,366 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=insttest
-executable=tests/test-progs/insttest/bin/sparc/linux/insttest
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=500
-phase=0
-numThreads=1
-cpu_id=0
-activity=0
-workload=system.cpu.workload
-checker=null
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=20
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
diff --git a/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.out b/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.out
deleted file mode 100644
index c1a77ba0d..000000000
--- a/tests/quick/02.insttest/ref/sparc/linux/simple-atomic/config.out
+++ /dev/null
@@ -1,58 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=insttest
-executable=tests/test-progs/insttest/bin/sparc/linux/insttest
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.out b/tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.out
deleted file mode 100644
index df1a9c852..000000000
--- a/tests/quick/02.insttest/ref/sparc/linux/simple-timing/config.out
+++ /dev/null
@@ -1,177 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=LiveProcess
-cmd=insttest
-executable=tests/test-progs/insttest/bin/sparc/linux/insttest
-input=cin
-output=cout
-env=
-cwd=
-system=system
-uid=100
-euid=100
-gid=100
-egid=100
-pid=100
-ppid=99
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
deleted file mode 100644
index 1461f2550..000000000
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/config.out
+++ /dev/null
@@ -1,888 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=LinuxAlphaSystem
-boot_cpu_frequency=500
-physmem=system.physmem
-mem_mode=atomic
-kernel=/dist/m5/system/binaries/vmlinux
-console=/dist/m5/system/binaries/console
-pal=/dist/m5/system/binaries/ts_osfpal
-boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=tests/halt.sh
-symbolfile=
-init_param=0
-system_type=34
-system_rev=1024
-
-[system.membus]
-type=Bus
-bus_id=1
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.intrctrl]
-type=IntrControl
-sys=system
-
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
-[system.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.l2c]
-type=BaseCache
-size=4194304
-assoc=8
-block_size=64
-latency=10000
-mshrs=92
-tgts_per_mshr=16
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=50000
-nack_delay=4000
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[system.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.disk0.image]
-type=CowDiskImage
-child=system.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk0]
-type=IdeDisk
-image=system.disk0.image
-driveID=master
-delay=1000000
-
-[system.disk2.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
-read_only=true
-
-[system.disk2.image]
-type=CowDiskImage
-child=system.disk2.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk2]
-type=IdeDisk
-image=system.disk2.image
-driveID=master
-delay=1000000
-
-[system.cpu0.itb]
-type=AlphaITB
-size=48
-
-[system.cpu0.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu0]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-itb=system.cpu0.itb
-dtb=system.cpu0.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
-[system.cpu0.icache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu0.icache]
-type=BaseCache
-size=32768
-assoc=1
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu0.icache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu0.dcache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu0.dcache]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu0.dcache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu1.itb]
-type=AlphaITB
-size=48
-
-[system.cpu1.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu1]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=1
-itb=system.cpu1.itb
-dtb=system.cpu1.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
-[system.cpu1.icache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu1.icache]
-type=BaseCache
-size=32768
-assoc=1
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu1.icache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu1.dcache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu1.dcache]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu1.dcache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.simple_disk.disk]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.simple_disk]
-type=SimpleDisk
-system=system
-disk=system.simple_disk.disk
-
-[system.tsunami.fake_uart1]
-type=IsaFake
-pio_addr=8804615848696
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart2]
-type=IsaFake
-pio_addr=8804615848936
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart3]
-type=IsaFake
-pio_addr=8804615848680
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart4]
-type=IsaFake
-pio_addr=8804615848944
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ppc]
-type=IsaFake
-pio_addr=8804615848891
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.cchip]
-type=TsunamiCChip
-pio_addr=8803072344064
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.io]
-type=TsunamiIO
-pio_addr=8804615847936
-pio_latency=1000
-frequency=976562500
-platform=system.tsunami
-system=system
-time=2009 1 1 0 0 0 3 1
-year_is_bcd=false
-tsunami=system.tsunami
-
-[]
-type=PciConfigAll
-pio_latency=1
-bus=0
-size=16777216
-platform=system.tsunami
-system=system
-
-[system.sim_console]
-type=SimConsole
-intr_control=system.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[system.tsunami.console]
-type=AlphaConsole
-sim_console=system.sim_console
-disk=system.simple_disk
-pio_addr=8804682956800
-system=system
-cpu=system.cpu0
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.fake_ata1]
-type=IsaFake
-pio_addr=8804615848304
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ata0]
-type=IsaFake
-pio_addr=8804615848432
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.pchip]
-type=TsunamiPChip
-pio_addr=8802535473152
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.fake_pnp_read3]
-type=IsaFake
-pio_addr=8804615848643
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read2]
-type=IsaFake
-pio_addr=8804615848579
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read1]
-type=IsaFake
-pio_addr=8804615848515
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read0]
-type=IsaFake
-pio_addr=8804615848451
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read7]
-type=IsaFake
-pio_addr=8804615848899
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read6]
-type=IsaFake
-pio_addr=8804615848835
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read5]
-type=IsaFake
-pio_addr=8804615848771
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read4]
-type=IsaFake
-pio_addr=8804615848707
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_write]
-type=IsaFake
-pio_addr=8804615850617
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fb]
-type=BadDevice
-devicename=FrameBuffer
-pio_addr=8804615848912
-system=system
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.ethernet.configdata]
-type=PciConfigData
-VendorID=4107
-DeviceID=34
-Command=0
-Status=656
-Revision=0
-ProgIF=0
-SubClassCode=0
-ClassCode=2
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=0
-BAR2=0
-BAR3=0
-BAR4=0
-BAR5=0
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=30
-InterruptPin=1
-MinimumGrant=176
-MaximumLatency=52
-BAR0Size=256
-BAR1Size=4096
-BAR2Size=0
-BAR3Size=0
-BAR4Size=0
-BAR5Size=0
-
-[system.tsunami.ethernet]
-type=NSGigE
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ethernet.configdata
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-config_latency=20000
-clock=0
-dma_desc_free=false
-dma_data_free=false
-dma_read_delay=0
-dma_write_delay=0
-dma_read_factor=0
-dma_write_factor=0
-dma_no_allocate=true
-intr_delay=10000000
-rx_delay=1000000
-tx_delay=1000000
-rx_fifo_size=524288
-tx_fifo_size=524288
-rx_filter=true
-hardware_address=00:90:00:00:00:01
-rx_thread=false
-tx_thread=false
-rss=false
-
-[system.tsunami.etherint]
-type=NSGigEInt
-peer=null
-device=system.tsunami.ethernet
-
-[system.tsunami.fake_OROM]
-type=IsaFake
-pio_addr=8796093677568
-pio_latency=1000
-pio_size=393216
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.uart]
-type=Uart8250
-pio_addr=8804615848952
-pio_latency=1000
-platform=system.tsunami
-sim_console=system.sim_console
-system=system
-
-[system.tsunami.fake_sm_chip]
-type=IsaFake
-pio_addr=8804615848816
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_addr]
-type=IsaFake
-pio_addr=8804615848569
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.ide.configdata]
-type=PciConfigData
-VendorID=32902
-DeviceID=28945
-Command=0
-Status=640
-Revision=0
-ProgIF=133
-SubClassCode=1
-ClassCode=1
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=1
-BAR2=1
-BAR3=1
-BAR4=1
-BAR5=1
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=31
-InterruptPin=1
-MinimumGrant=0
-MaximumLatency=0
-BAR0Size=8
-BAR1Size=4
-BAR2Size=8
-BAR3Size=4
-BAR4Size=16
-BAR5Size=0
-
-[system.tsunami.ide]
-type=IdeController
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ide.configdata
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-config_latency=20000
-disks=system.disk0 system.disk2
-
-[system.iobus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=true
-block_size=64
-
-[system.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.toL2Bus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
deleted file mode 100644
index a196b7dc6..000000000
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/config.out
+++ /dev/null
@@ -1,773 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=LinuxAlphaSystem
-boot_cpu_frequency=500
-physmem=system.physmem
-mem_mode=atomic
-kernel=/dist/m5/system/binaries/vmlinux
-console=/dist/m5/system/binaries/console
-pal=/dist/m5/system/binaries/ts_osfpal
-boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=tests/halt.sh
-symbolfile=
-init_param=0
-system_type=34
-system_rev=1024
-
-[system.membus]
-type=Bus
-bus_id=1
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.intrctrl]
-type=IntrControl
-sys=system
-
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
-[system.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.l2c]
-type=BaseCache
-size=4194304
-assoc=8
-block_size=64
-latency=10000
-mshrs=92
-tgts_per_mshr=16
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=50000
-nack_delay=4000
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[system.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.disk0.image]
-type=CowDiskImage
-child=system.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk0]
-type=IdeDisk
-image=system.disk0.image
-driveID=master
-delay=1000000
-
-[system.disk2.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
-read_only=true
-
-[system.disk2.image]
-type=CowDiskImage
-child=system.disk2.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk2]
-type=IdeDisk
-image=system.disk2.image
-driveID=master
-delay=1000000
-
-[system.simple_disk.disk]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.simple_disk]
-type=SimpleDisk
-system=system
-disk=system.simple_disk.disk
-
-[system.tsunami.fake_uart1]
-type=IsaFake
-pio_addr=8804615848696
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart2]
-type=IsaFake
-pio_addr=8804615848936
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart3]
-type=IsaFake
-pio_addr=8804615848680
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart4]
-type=IsaFake
-pio_addr=8804615848944
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ppc]
-type=IsaFake
-pio_addr=8804615848891
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.cchip]
-type=TsunamiCChip
-pio_addr=8803072344064
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.io]
-type=TsunamiIO
-pio_addr=8804615847936
-pio_latency=1000
-frequency=976562500
-platform=system.tsunami
-system=system
-time=2009 1 1 0 0 0 3 1
-year_is_bcd=false
-tsunami=system.tsunami
-
-[]
-type=PciConfigAll
-pio_latency=1
-bus=0
-size=16777216
-platform=system.tsunami
-system=system
-
-[system.sim_console]
-type=SimConsole
-intr_control=system.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[system.cpu.itb]
-type=AlphaITB
-size=48
-
-[system.cpu.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-itb=system.cpu.itb
-dtb=system.cpu.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
-[system.tsunami.console]
-type=AlphaConsole
-sim_console=system.sim_console
-disk=system.simple_disk
-pio_addr=8804682956800
-system=system
-cpu=system.cpu
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.fake_ata1]
-type=IsaFake
-pio_addr=8804615848304
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ata0]
-type=IsaFake
-pio_addr=8804615848432
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.pchip]
-type=TsunamiPChip
-pio_addr=8802535473152
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.fake_pnp_read3]
-type=IsaFake
-pio_addr=8804615848643
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read2]
-type=IsaFake
-pio_addr=8804615848579
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read1]
-type=IsaFake
-pio_addr=8804615848515
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read0]
-type=IsaFake
-pio_addr=8804615848451
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read7]
-type=IsaFake
-pio_addr=8804615848899
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read6]
-type=IsaFake
-pio_addr=8804615848835
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read5]
-type=IsaFake
-pio_addr=8804615848771
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read4]
-type=IsaFake
-pio_addr=8804615848707
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_write]
-type=IsaFake
-pio_addr=8804615850617
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fb]
-type=BadDevice
-devicename=FrameBuffer
-pio_addr=8804615848912
-system=system
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.ethernet.configdata]
-type=PciConfigData
-VendorID=4107
-DeviceID=34
-Command=0
-Status=656
-Revision=0
-ProgIF=0
-SubClassCode=0
-ClassCode=2
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=0
-BAR2=0
-BAR3=0
-BAR4=0
-BAR5=0
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=30
-InterruptPin=1
-MinimumGrant=176
-MaximumLatency=52
-BAR0Size=256
-BAR1Size=4096
-BAR2Size=0
-BAR3Size=0
-BAR4Size=0
-BAR5Size=0
-
-[system.tsunami.ethernet]
-type=NSGigE
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ethernet.configdata
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-config_latency=20000
-clock=0
-dma_desc_free=false
-dma_data_free=false
-dma_read_delay=0
-dma_write_delay=0
-dma_read_factor=0
-dma_write_factor=0
-dma_no_allocate=true
-intr_delay=10000000
-rx_delay=1000000
-tx_delay=1000000
-rx_fifo_size=524288
-tx_fifo_size=524288
-rx_filter=true
-hardware_address=00:90:00:00:00:01
-rx_thread=false
-tx_thread=false
-rss=false
-
-[system.tsunami.etherint]
-type=NSGigEInt
-peer=null
-device=system.tsunami.ethernet
-
-[system.tsunami.fake_OROM]
-type=IsaFake
-pio_addr=8796093677568
-pio_latency=1000
-pio_size=393216
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.uart]
-type=Uart8250
-pio_addr=8804615848952
-pio_latency=1000
-platform=system.tsunami
-sim_console=system.sim_console
-system=system
-
-[system.tsunami.fake_sm_chip]
-type=IsaFake
-pio_addr=8804615848816
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_addr]
-type=IsaFake
-pio_addr=8804615848569
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.ide.configdata]
-type=PciConfigData
-VendorID=32902
-DeviceID=28945
-Command=0
-Status=640
-Revision=0
-ProgIF=133
-SubClassCode=1
-ClassCode=1
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=1
-BAR2=1
-BAR3=1
-BAR4=1
-BAR5=1
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=31
-InterruptPin=1
-MinimumGrant=0
-MaximumLatency=0
-BAR0Size=8
-BAR1Size=4
-BAR2Size=8
-BAR3Size=4
-BAR4Size=16
-BAR5Size=0
-
-[system.tsunami.ide]
-type=IdeController
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ide.configdata
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-config_latency=20000
-disks=system.disk0 system.disk2
-
-[system.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.toL2Bus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.iobus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=true
-block_size=64
-
-[system.cpu.icache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu.icache]
-type=BaseCache
-size=32768
-assoc=1
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu.icache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu.dcache]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu.dcache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
deleted file mode 100644
index bb98fee3e..000000000
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/config.out
+++ /dev/null
@@ -1,888 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=LinuxAlphaSystem
-boot_cpu_frequency=500
-physmem=system.physmem
-mem_mode=timing
-kernel=/dist/m5/system/binaries/vmlinux
-console=/dist/m5/system/binaries/console
-pal=/dist/m5/system/binaries/ts_osfpal
-boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=tests/halt.sh
-symbolfile=
-init_param=0
-system_type=34
-system_rev=1024
-
-[system.membus]
-type=Bus
-bus_id=1
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.intrctrl]
-type=IntrControl
-sys=system
-
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
-[system.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.l2c]
-type=BaseCache
-size=4194304
-assoc=8
-block_size=64
-latency=10000
-mshrs=92
-tgts_per_mshr=16
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=50000
-nack_delay=4000
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[system.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.disk0.image]
-type=CowDiskImage
-child=system.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk0]
-type=IdeDisk
-image=system.disk0.image
-driveID=master
-delay=1000000
-
-[system.disk2.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
-read_only=true
-
-[system.disk2.image]
-type=CowDiskImage
-child=system.disk2.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk2]
-type=IdeDisk
-image=system.disk2.image
-driveID=master
-delay=1000000
-
-[system.cpu0.itb]
-type=AlphaITB
-size=48
-
-[system.cpu0.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu0]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-itb=system.cpu0.itb
-dtb=system.cpu0.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu0.icache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu0.icache]
-type=BaseCache
-size=32768
-assoc=1
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu0.icache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu0.dcache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu0.dcache]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu0.dcache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu1.itb]
-type=AlphaITB
-size=48
-
-[system.cpu1.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu1]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=1
-itb=system.cpu1.itb
-dtb=system.cpu1.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu1.icache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu1.icache]
-type=BaseCache
-size=32768
-assoc=1
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu1.icache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu1.dcache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu1.dcache]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu1.dcache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.simple_disk.disk]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.simple_disk]
-type=SimpleDisk
-system=system
-disk=system.simple_disk.disk
-
-[system.tsunami.fake_uart1]
-type=IsaFake
-pio_addr=8804615848696
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart2]
-type=IsaFake
-pio_addr=8804615848936
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart3]
-type=IsaFake
-pio_addr=8804615848680
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart4]
-type=IsaFake
-pio_addr=8804615848944
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ppc]
-type=IsaFake
-pio_addr=8804615848891
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.cchip]
-type=TsunamiCChip
-pio_addr=8803072344064
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.io]
-type=TsunamiIO
-pio_addr=8804615847936
-pio_latency=1000
-frequency=976562500
-platform=system.tsunami
-system=system
-time=2009 1 1 0 0 0 3 1
-year_is_bcd=false
-tsunami=system.tsunami
-
-[]
-type=PciConfigAll
-pio_latency=1
-bus=0
-size=16777216
-platform=system.tsunami
-system=system
-
-[system.sim_console]
-type=SimConsole
-intr_control=system.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[system.tsunami.console]
-type=AlphaConsole
-sim_console=system.sim_console
-disk=system.simple_disk
-pio_addr=8804682956800
-system=system
-cpu=system.cpu0
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.fake_ata1]
-type=IsaFake
-pio_addr=8804615848304
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ata0]
-type=IsaFake
-pio_addr=8804615848432
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.pchip]
-type=TsunamiPChip
-pio_addr=8802535473152
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.fake_pnp_read3]
-type=IsaFake
-pio_addr=8804615848643
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read2]
-type=IsaFake
-pio_addr=8804615848579
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read1]
-type=IsaFake
-pio_addr=8804615848515
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read0]
-type=IsaFake
-pio_addr=8804615848451
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read7]
-type=IsaFake
-pio_addr=8804615848899
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read6]
-type=IsaFake
-pio_addr=8804615848835
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read5]
-type=IsaFake
-pio_addr=8804615848771
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read4]
-type=IsaFake
-pio_addr=8804615848707
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_write]
-type=IsaFake
-pio_addr=8804615850617
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fb]
-type=BadDevice
-devicename=FrameBuffer
-pio_addr=8804615848912
-system=system
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.ethernet.configdata]
-type=PciConfigData
-VendorID=4107
-DeviceID=34
-Command=0
-Status=656
-Revision=0
-ProgIF=0
-SubClassCode=0
-ClassCode=2
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=0
-BAR2=0
-BAR3=0
-BAR4=0
-BAR5=0
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=30
-InterruptPin=1
-MinimumGrant=176
-MaximumLatency=52
-BAR0Size=256
-BAR1Size=4096
-BAR2Size=0
-BAR3Size=0
-BAR4Size=0
-BAR5Size=0
-
-[system.tsunami.ethernet]
-type=NSGigE
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ethernet.configdata
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-config_latency=20000
-clock=0
-dma_desc_free=false
-dma_data_free=false
-dma_read_delay=0
-dma_write_delay=0
-dma_read_factor=0
-dma_write_factor=0
-dma_no_allocate=true
-intr_delay=10000000
-rx_delay=1000000
-tx_delay=1000000
-rx_fifo_size=524288
-tx_fifo_size=524288
-rx_filter=true
-hardware_address=00:90:00:00:00:01
-rx_thread=false
-tx_thread=false
-rss=false
-
-[system.tsunami.etherint]
-type=NSGigEInt
-peer=null
-device=system.tsunami.ethernet
-
-[system.tsunami.fake_OROM]
-type=IsaFake
-pio_addr=8796093677568
-pio_latency=1000
-pio_size=393216
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.uart]
-type=Uart8250
-pio_addr=8804615848952
-pio_latency=1000
-platform=system.tsunami
-sim_console=system.sim_console
-system=system
-
-[system.tsunami.fake_sm_chip]
-type=IsaFake
-pio_addr=8804615848816
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_addr]
-type=IsaFake
-pio_addr=8804615848569
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.ide.configdata]
-type=PciConfigData
-VendorID=32902
-DeviceID=28945
-Command=0
-Status=640
-Revision=0
-ProgIF=133
-SubClassCode=1
-ClassCode=1
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=1
-BAR2=1
-BAR3=1
-BAR4=1
-BAR5=1
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=31
-InterruptPin=1
-MinimumGrant=0
-MaximumLatency=0
-BAR0Size=8
-BAR1Size=4
-BAR2Size=8
-BAR3Size=4
-BAR4Size=16
-BAR5Size=0
-
-[system.tsunami.ide]
-type=IdeController
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ide.configdata
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-config_latency=20000
-disks=system.disk0 system.disk2
-
-[system.iobus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=true
-block_size=64
-
-[system.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.toL2Bus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
diff --git a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out b/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
deleted file mode 100644
index e0e32bce4..000000000
--- a/tests/quick/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/config.out
+++ /dev/null
@@ -1,773 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=LinuxAlphaSystem
-boot_cpu_frequency=500
-physmem=system.physmem
-mem_mode=timing
-kernel=/dist/m5/system/binaries/vmlinux
-console=/dist/m5/system/binaries/console
-pal=/dist/m5/system/binaries/ts_osfpal
-boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=tests/halt.sh
-symbolfile=
-init_param=0
-system_type=34
-system_rev=1024
-
-[system.membus]
-type=Bus
-bus_id=1
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.intrctrl]
-type=IntrControl
-sys=system
-
-[system.tsunami]
-type=Tsunami
-system=system
-intrctrl=system.intrctrl
-
-[system.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.l2c]
-type=BaseCache
-size=4194304
-assoc=8
-block_size=64
-latency=10000
-mshrs=92
-tgts_per_mshr=16
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=50000
-nack_delay=4000
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[system.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.disk0.image]
-type=CowDiskImage
-child=system.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk0]
-type=IdeDisk
-image=system.disk0.image
-driveID=master
-delay=1000000
-
-[system.disk2.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
-read_only=true
-
-[system.disk2.image]
-type=CowDiskImage
-child=system.disk2.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[system.disk2]
-type=IdeDisk
-image=system.disk2.image
-driveID=master
-delay=1000000
-
-[system.simple_disk.disk]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[system.simple_disk]
-type=SimpleDisk
-system=system
-disk=system.simple_disk.disk
-
-[system.tsunami.fake_uart1]
-type=IsaFake
-pio_addr=8804615848696
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart2]
-type=IsaFake
-pio_addr=8804615848936
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart3]
-type=IsaFake
-pio_addr=8804615848680
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_uart4]
-type=IsaFake
-pio_addr=8804615848944
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ppc]
-type=IsaFake
-pio_addr=8804615848891
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.cchip]
-type=TsunamiCChip
-pio_addr=8803072344064
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.io]
-type=TsunamiIO
-pio_addr=8804615847936
-pio_latency=1000
-frequency=976562500
-platform=system.tsunami
-system=system
-time=2009 1 1 0 0 0 3 1
-year_is_bcd=false
-tsunami=system.tsunami
-
-[]
-type=PciConfigAll
-pio_latency=1
-bus=0
-size=16777216
-platform=system.tsunami
-system=system
-
-[system.sim_console]
-type=SimConsole
-intr_control=system.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[system.cpu.itb]
-type=AlphaITB
-size=48
-
-[system.cpu.dtb]
-type=AlphaDTB
-size=64
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-itb=system.cpu.itb
-dtb=system.cpu.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.tsunami.console]
-type=AlphaConsole
-sim_console=system.sim_console
-disk=system.simple_disk
-pio_addr=8804682956800
-system=system
-cpu=system.cpu
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.fake_ata1]
-type=IsaFake
-pio_addr=8804615848304
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_ata0]
-type=IsaFake
-pio_addr=8804615848432
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.pchip]
-type=TsunamiPChip
-pio_addr=8802535473152
-pio_latency=1000
-platform=system.tsunami
-system=system
-tsunami=system.tsunami
-
-[system.tsunami.fake_pnp_read3]
-type=IsaFake
-pio_addr=8804615848643
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read2]
-type=IsaFake
-pio_addr=8804615848579
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read1]
-type=IsaFake
-pio_addr=8804615848515
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read0]
-type=IsaFake
-pio_addr=8804615848451
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read7]
-type=IsaFake
-pio_addr=8804615848899
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read6]
-type=IsaFake
-pio_addr=8804615848835
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read5]
-type=IsaFake
-pio_addr=8804615848771
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_read4]
-type=IsaFake
-pio_addr=8804615848707
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_write]
-type=IsaFake
-pio_addr=8804615850617
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fb]
-type=BadDevice
-devicename=FrameBuffer
-pio_addr=8804615848912
-system=system
-platform=system.tsunami
-pio_latency=1000
-
-[system.tsunami.ethernet.configdata]
-type=PciConfigData
-VendorID=4107
-DeviceID=34
-Command=0
-Status=656
-Revision=0
-ProgIF=0
-SubClassCode=0
-ClassCode=2
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=0
-BAR2=0
-BAR3=0
-BAR4=0
-BAR5=0
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=30
-InterruptPin=1
-MinimumGrant=176
-MaximumLatency=52
-BAR0Size=256
-BAR1Size=4096
-BAR2Size=0
-BAR3Size=0
-BAR4Size=0
-BAR5Size=0
-
-[system.tsunami.ethernet]
-type=NSGigE
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ethernet.configdata
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-config_latency=20000
-clock=0
-dma_desc_free=false
-dma_data_free=false
-dma_read_delay=0
-dma_write_delay=0
-dma_read_factor=0
-dma_write_factor=0
-dma_no_allocate=true
-intr_delay=10000000
-rx_delay=1000000
-tx_delay=1000000
-rx_fifo_size=524288
-tx_fifo_size=524288
-rx_filter=true
-hardware_address=00:90:00:00:00:01
-rx_thread=false
-tx_thread=false
-rss=false
-
-[system.tsunami.etherint]
-type=NSGigEInt
-peer=null
-device=system.tsunami.ethernet
-
-[system.tsunami.fake_OROM]
-type=IsaFake
-pio_addr=8796093677568
-pio_latency=1000
-pio_size=393216
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.uart]
-type=Uart8250
-pio_addr=8804615848952
-pio_latency=1000
-platform=system.tsunami
-sim_console=system.sim_console
-system=system
-
-[system.tsunami.fake_sm_chip]
-type=IsaFake
-pio_addr=8804615848816
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.fake_pnp_addr]
-type=IsaFake
-pio_addr=8804615848569
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.tsunami.ide.configdata]
-type=PciConfigData
-VendorID=32902
-DeviceID=28945
-Command=0
-Status=640
-Revision=0
-ProgIF=133
-SubClassCode=1
-ClassCode=1
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=1
-BAR2=1
-BAR3=1
-BAR4=1
-BAR5=1
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=31
-InterruptPin=1
-MinimumGrant=0
-MaximumLatency=0
-BAR0Size=8
-BAR1Size=4
-BAR2Size=8
-BAR3Size=4
-BAR4Size=16
-BAR5Size=0
-
-[system.tsunami.ide]
-type=IdeController
-system=system
-platform=system.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=system.tsunami.ide.configdata
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-config_latency=20000
-disks=system.disk0 system.disk2
-
-[system.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.toL2Bus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=system.tsunami
-system=system
-
-[system.iobus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=true
-block_size=64
-
-[system.cpu.icache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu.icache]
-type=BaseCache
-size=32768
-assoc=1
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu.icache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu.dcache]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=4
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu.dcache.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out b/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out
deleted file mode 100644
index c92557696..000000000
--- a/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out
+++ /dev/null
@@ -1,279 +0,0 @@
-[root]
-type=Root
-clock=1000000000000
-max_tick=0
-progress_interval=0
-output_file=cout
-
-[system.physmem]
-type=PhysicalMemory
-file=
-// range not specified
-latency=1
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.workload]
-type=EioProcess
-file=/z/ktlim2/clean/newmem-merge/tests/test-progs/anagram/bin/anagram-vshort.eio.gz
-chkpt=
-output=cout
-system=system
-
-[system.cpu.mem]
-type=Bus
-bus_id=0
-
-[system.cpu.fuPool.FUList0.opList0]
-type=OpDesc
-opClass=IntAlu
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList0]
-type=FUDesc
-opList=system.cpu.fuPool.FUList0.opList0
-count=6
-
-[system.cpu.fuPool.FUList1.opList0]
-type=OpDesc
-opClass=IntMult
-opLat=3
-issueLat=1
-
-[system.cpu.fuPool.FUList1.opList1]
-type=OpDesc
-opClass=IntDiv
-opLat=20
-issueLat=19
-
-[system.cpu.fuPool.FUList1]
-type=FUDesc
-opList=system.cpu.fuPool.FUList1.opList0 system.cpu.fuPool.FUList1.opList1
-count=2
-
-[system.cpu.fuPool.FUList2.opList0]
-type=OpDesc
-opClass=FloatAdd
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList1]
-type=OpDesc
-opClass=FloatCmp
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2.opList2]
-type=OpDesc
-opClass=FloatCvt
-opLat=2
-issueLat=1
-
-[system.cpu.fuPool.FUList2]
-type=FUDesc
-opList=system.cpu.fuPool.FUList2.opList0 system.cpu.fuPool.FUList2.opList1 system.cpu.fuPool.FUList2.opList2
-count=4
-
-[system.cpu.fuPool.FUList3.opList0]
-type=OpDesc
-opClass=FloatMult
-opLat=4
-issueLat=1
-
-[system.cpu.fuPool.FUList3.opList1]
-type=OpDesc
-opClass=FloatDiv
-opLat=12
-issueLat=12
-
-[system.cpu.fuPool.FUList3.opList2]
-type=OpDesc
-opClass=FloatSqrt
-opLat=24
-issueLat=24
-
-[system.cpu.fuPool.FUList3]
-type=FUDesc
-opList=system.cpu.fuPool.FUList3.opList0 system.cpu.fuPool.FUList3.opList1 system.cpu.fuPool.FUList3.opList2
-count=2
-
-[system.cpu.fuPool.FUList4.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList4]
-type=FUDesc
-opList=system.cpu.fuPool.FUList4.opList0
-count=0
-
-[system.cpu.fuPool.FUList5.opList0]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList5]
-type=FUDesc
-opList=system.cpu.fuPool.FUList5.opList0
-count=0
-
-[system.cpu.fuPool.FUList6.opList0]
-type=OpDesc
-opClass=MemRead
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6.opList1]
-type=OpDesc
-opClass=MemWrite
-opLat=1
-issueLat=1
-
-[system.cpu.fuPool.FUList6]
-type=FUDesc
-opList=system.cpu.fuPool.FUList6.opList0 system.cpu.fuPool.FUList6.opList1
-count=4
-
-[system.cpu.fuPool.FUList7.opList0]
-type=OpDesc
-opClass=IprAccess
-opLat=3
-issueLat=3
-
-[system.cpu.fuPool.FUList7]
-type=FUDesc
-opList=system.cpu.fuPool.FUList7.opList0
-count=1
-
-[system.cpu.fuPool]
-type=FUPool
-FUList=system.cpu.fuPool.FUList0 system.cpu.fuPool.FUList1 system.cpu.fuPool.FUList2 system.cpu.fuPool.FUList3 system.cpu.fuPool.FUList4 system.cpu.fuPool.FUList5 system.cpu.fuPool.FUList6 system.cpu.fuPool.FUList7
-
-[system.cpu]
-type=DerivO3CPU
-clock=1
-numThreads=1
-activity=0
-workload=system.workload
-mem=system.cpu.mem
-checker=null
-max_insts_any_thread=500000
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-cachePorts=200
-decodeToFetchDelay=1
-renameToFetchDelay=1
-iewToFetchDelay=1
-commitToFetchDelay=1
-fetchWidth=8
-renameToDecodeDelay=1
-iewToDecodeDelay=1
-commitToDecodeDelay=1
-fetchToDecodeDelay=1
-decodeWidth=8
-iewToRenameDelay=1
-commitToRenameDelay=1
-decodeToRenameDelay=1
-renameWidth=8
-commitToIEWDelay=1
-renameToIEWDelay=2
-issueToExecuteDelay=1
-dispatchWidth=8
-issueWidth=8
-wbWidth=8
-wbDepth=1
-fuPool=system.cpu.fuPool
-iewToCommitDelay=1
-renameToROBDelay=1
-commitWidth=8
-squashWidth=8
-trapLatency=13
-backComSize=5
-forwardComSize=5
-predType=tournament
-localPredictorSize=2048
-localCtrBits=2
-localHistoryTableSize=2048
-localHistoryBits=11
-globalPredictorSize=8192
-globalCtrBits=2
-globalHistoryBits=13
-choicePredictorSize=8192
-choiceCtrBits=2
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
-LQEntries=32
-SQEntries=32
-LFSTSize=1024
-SSITSize=1024
-numPhysIntRegs=256
-numPhysFloatRegs=256
-numIQEntries=64
-numROBEntries=192
-smtNumFetchingThreads=1
-smtFetchPolicy=SingleThread
-smtLSQPolicy=Partitioned
-smtLSQThreshold=100
-smtIQPolicy=Partitioned
-smtIQThreshold=100
-smtROBPolicy=Partitioned
-smtROBThreshold=100
-smtCommitPolicy=RoundRobin
-instShiftAmt=2
-defer_registration=false
-function_trace=false
-function_trace_start=0
-
-[trace]
-flags=
-start=0
-bufsize=0
-file=cout
-dump_on_exit=false
-ignore=
-
-[stats]
-descriptions=true
-project_name=test
-simulation_name=test
-simulation_sample=0
-text_file=m5stats.txt
-text_compat=true
-mysql_db=
-mysql_user=
-mysql_password=
-mysql_host=
-events_start=-1
-dump_reset=false
-dump_cycle=0
-dump_period=0
-ignore_events=
-
-[random]
-seed=1
-
-[exetrace]
-speculative=true
-print_cycle=true
-print_opclass=true
-print_thread=true
-print_effaddr=true
-print_data=true
-print_iregs=false
-print_fetchseq=false
-print_cpseq=false
-pc_symbol=true
-intel_format=false
-trace_system=client
-
-[debug]
-break_cycles=
-
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out
deleted file mode 100644
index 73c363bc4..000000000
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out
+++ /dev/null
@@ -1,49 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=EioProcess
-file=tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
-chkpt=
-output=cout
-system=system
-
-[system.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=500000
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
diff --git a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
deleted file mode 100644
index e85a0bee1..000000000
--- a/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out
+++ /dev/null
@@ -1,168 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=atomic
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.workload]
-type=EioProcess
-file=tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz
-chkpt=
-output=cout
-system=system
-
-[system.cpu]
-type=TimingSimpleCPU
-max_insts_any_thread=500000
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=system
-cpu_id=0
-workload=system.cpu.workload
-clock=500
-phase=0
-defer_registration=false
-// width not specified
-function_trace=false
-function_trace_start=0
-// simulate_stalls not specified
-
-[system.cpu.toL2Bus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[system.cpu.icache]
-type=BaseCache
-size=131072
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.dcache]
-type=BaseCache
-size=262144
-assoc=2
-block_size=64
-latency=1000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu.l2cache]
-type=BaseCache
-size=2097152
-assoc=2
-block_size=64
-latency=10000
-mshrs=10
-tgts_per_mshr=5
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
diff --git a/tests/quick/50.memtest/ref/alpha/linux/memtest/config.out b/tests/quick/50.memtest/ref/alpha/linux/memtest/config.out
deleted file mode 100644
index 6bf1f2712..000000000
--- a/tests/quick/50.memtest/ref/alpha/linux/memtest/config.out
+++ /dev/null
@@ -1,516 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[system.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system]
-type=System
-physmem=system.physmem
-mem_mode=timing
-
-[system.membus]
-type=Bus
-bus_id=0
-clock=2
-width=16
-responder_set=false
-block_size=64
-
-[system.l2c]
-type=BaseCache
-size=65536
-assoc=8
-block_size=64
-latency=10000
-mshrs=92
-tgts_per_mshr=16
-write_buffers=8
-prioritizeRequests=false
-protocol=null
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=100000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu6]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu6.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu6.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu6.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu4]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu4.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu4.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu4.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu5]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu5.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu5.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu5.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu2]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu2.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu2.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu2.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu3]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu3.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu3.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu3.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu0]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu0.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu0.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu0.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.cpu1]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu1.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu1.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu1.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.funcmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[system.cpu7]
-type=MemTest
-memory_size=65536
-percent_reads=65
-percent_functional=50
-percent_uncacheable=10
-progress_interval=10000
-percent_source_unaligned=50
-percent_dest_unaligned=50
-trace_addr=0
-max_loads=100000
-atomic=false
-
-[system.cpu7.l1c.protocol]
-type=CoherenceProtocol
-protocol=moesi
-do_upgrades=true
-
-[system.cpu7.l1c]
-type=BaseCache
-size=32768
-assoc=4
-block_size=64
-latency=1000
-mshrs=12
-tgts_per_mshr=8
-write_buffers=8
-prioritizeRequests=false
-protocol=system.cpu7.l1c.protocol
-trace_addr=0
-hash_delay=1
-repl=null
-compressed_bus=false
-store_compressed=false
-adaptive_compression=false
-compression_latency=0
-block_size=64
-max_miss_count=0
-addr_range=[0,18446744073709551615]
-split=false
-split_size=0
-lifo=false
-two_queue=false
-prefetch_miss=false
-prefetch_access=false
-prefetcher_size=100
-prefetch_past_page=false
-prefetch_serial_squash=false
-prefetch_latency=10000
-prefetch_degree=1
-prefetch_policy=none
-prefetch_cache_check_push=true
-prefetch_use_cpu_id=true
-prefetch_data_accesses_only=false
-
-[system.toL2Bus]
-type=Bus
-bus_id=0
-clock=2
-width=16
-responder_set=false
-block_size=64
-
diff --git a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out b/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out
deleted file mode 100644
index 1ed581be9..000000000
--- a/tests/quick/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.out
+++ /dev/null
@@ -1,1268 +0,0 @@
-[root]
-type=Root
-dummy=0
-
-[testsys.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[testsys]
-type=LinuxAlphaSystem
-boot_cpu_frequency=1
-physmem=testsys.physmem
-mem_mode=atomic
-kernel=/dist/m5/system/binaries/vmlinux
-console=/dist/m5/system/binaries/console
-pal=/dist/m5/system/binaries/ts_osfpal
-boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=/Users/nate/work/m5/outgoing/configs/boot/netperf-stream-client.rcS
-symbolfile=
-init_param=0
-system_type=34
-system_rev=1024
-
-[testsys.membus]
-type=Bus
-bus_id=1
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[testsys.intrctrl]
-type=IntrControl
-sys=testsys
-
-[testsys.tsunami]
-type=Tsunami
-system=testsys
-intrctrl=testsys.intrctrl
-
-[testsys.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=50000
-nack_delay=4000
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[testsys.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[testsys.disk0.image]
-type=CowDiskImage
-child=testsys.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[testsys.disk0]
-type=IdeDisk
-image=testsys.disk0.image
-driveID=master
-delay=1000000
-
-[testsys.disk2.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
-read_only=true
-
-[testsys.disk2.image]
-type=CowDiskImage
-child=testsys.disk2.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[testsys.disk2]
-type=IdeDisk
-image=testsys.disk2.image
-driveID=master
-delay=1000000
-
-[testsys.simple_disk.disk]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[testsys.simple_disk]
-type=SimpleDisk
-system=testsys
-disk=testsys.simple_disk.disk
-
-[testsys.tsunami.fake_uart1]
-type=IsaFake
-pio_addr=8804615848696
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_uart2]
-type=IsaFake
-pio_addr=8804615848936
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_uart3]
-type=IsaFake
-pio_addr=8804615848680
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_uart4]
-type=IsaFake
-pio_addr=8804615848944
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_ppc]
-type=IsaFake
-pio_addr=8804615848891
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.cchip]
-type=TsunamiCChip
-pio_addr=8803072344064
-pio_latency=1000
-platform=testsys.tsunami
-system=testsys
-tsunami=testsys.tsunami
-
-[testsys.tsunami.io]
-type=TsunamiIO
-pio_addr=8804615847936
-pio_latency=1000
-frequency=976562500
-platform=testsys.tsunami
-system=testsys
-time=2009 1 1 0 0 0 3 1
-year_is_bcd=false
-tsunami=testsys.tsunami
-
-[]
-type=PciConfigAll
-pio_latency=1
-bus=0
-size=16777216
-platform=testsys.tsunami
-system=testsys
-
-[testsys.sim_console]
-type=SimConsole
-intr_control=testsys.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[testsys.cpu.itb]
-type=AlphaITB
-size=48
-
-[testsys.cpu.dtb]
-type=AlphaDTB
-size=64
-
-[testsys.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=testsys
-cpu_id=0
-itb=testsys.cpu.itb
-dtb=testsys.cpu.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=1
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
-[testsys.tsunami.console]
-type=AlphaConsole
-sim_console=testsys.sim_console
-disk=testsys.simple_disk
-pio_addr=8804682956800
-system=testsys
-cpu=testsys.cpu
-platform=testsys.tsunami
-pio_latency=1000
-
-[testsys.tsunami.fake_ata1]
-type=IsaFake
-pio_addr=8804615848304
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_ata0]
-type=IsaFake
-pio_addr=8804615848432
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.pchip]
-type=TsunamiPChip
-pio_addr=8802535473152
-pio_latency=1000
-platform=testsys.tsunami
-system=testsys
-tsunami=testsys.tsunami
-
-[testsys.tsunami.fake_pnp_read3]
-type=IsaFake
-pio_addr=8804615848643
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read2]
-type=IsaFake
-pio_addr=8804615848579
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read1]
-type=IsaFake
-pio_addr=8804615848515
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read0]
-type=IsaFake
-pio_addr=8804615848451
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read7]
-type=IsaFake
-pio_addr=8804615848899
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read6]
-type=IsaFake
-pio_addr=8804615848835
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read5]
-type=IsaFake
-pio_addr=8804615848771
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_read4]
-type=IsaFake
-pio_addr=8804615848707
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_write]
-type=IsaFake
-pio_addr=8804615850617
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fb]
-type=BadDevice
-devicename=FrameBuffer
-pio_addr=8804615848912
-system=testsys
-platform=testsys.tsunami
-pio_latency=1000
-
-[testsys.tsunami.ethernet.configdata]
-type=PciConfigData
-VendorID=4107
-DeviceID=34
-Command=0
-Status=656
-Revision=0
-ProgIF=0
-SubClassCode=0
-ClassCode=2
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=0
-BAR2=0
-BAR3=0
-BAR4=0
-BAR5=0
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=30
-InterruptPin=1
-MinimumGrant=176
-MaximumLatency=52
-BAR0Size=256
-BAR1Size=4096
-BAR2Size=0
-BAR3Size=0
-BAR4Size=0
-BAR5Size=0
-
-[testsys.tsunami.ethernet]
-type=NSGigE
-system=testsys
-platform=testsys.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=testsys.tsunami.ethernet.configdata
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-config_latency=20000
-clock=0
-dma_desc_free=false
-dma_data_free=false
-dma_read_delay=0
-dma_write_delay=0
-dma_read_factor=0
-dma_write_factor=0
-dma_no_allocate=true
-intr_delay=10000000
-rx_delay=1000000
-tx_delay=1000000
-rx_fifo_size=524288
-tx_fifo_size=524288
-rx_filter=true
-hardware_address=00:90:00:00:00:02
-rx_thread=false
-tx_thread=false
-rss=false
-
-[testsys.tsunami.etherint]
-type=NSGigEInt
-peer=null
-device=testsys.tsunami.ethernet
-
-[testsys.tsunami.fake_OROM]
-type=IsaFake
-pio_addr=8796093677568
-pio_latency=1000
-pio_size=393216
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.uart]
-type=Uart8250
-pio_addr=8804615848952
-pio_latency=1000
-platform=testsys.tsunami
-sim_console=testsys.sim_console
-system=testsys
-
-[testsys.tsunami.fake_sm_chip]
-type=IsaFake
-pio_addr=8804615848816
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.fake_pnp_addr]
-type=IsaFake
-pio_addr=8804615848569
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=testsys.tsunami
-system=testsys
-
-[testsys.tsunami.ide.configdata]
-type=PciConfigData
-VendorID=32902
-DeviceID=28945
-Command=0
-Status=640
-Revision=0
-ProgIF=133
-SubClassCode=1
-ClassCode=1
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=1
-BAR2=1
-BAR3=1
-BAR4=1
-BAR5=1
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=31
-InterruptPin=1
-MinimumGrant=0
-MaximumLatency=0
-BAR0Size=8
-BAR1Size=4
-BAR2Size=8
-BAR3Size=4
-BAR4Size=16
-BAR5Size=0
-
-[testsys.tsunami.ide]
-type=IdeController
-system=testsys
-platform=testsys.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=testsys.tsunami.ide.configdata
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-config_latency=20000
-disks=testsys.disk0 testsys.disk2
-
-[testsys.iobus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=true
-block_size=64
-
-[drivesys.physmem]
-type=PhysicalMemory
-file=
-range=[0,134217727]
-latency=1
-zero=false
-
-[drivesys]
-type=LinuxAlphaSystem
-boot_cpu_frequency=1
-physmem=drivesys.physmem
-mem_mode=atomic
-kernel=/dist/m5/system/binaries/vmlinux
-console=/dist/m5/system/binaries/console
-pal=/dist/m5/system/binaries/ts_osfpal
-boot_osflags=root=/dev/hda1 console=ttyS0
-readfile=/Users/nate/work/m5/outgoing/configs/boot/netperf-server.rcS
-symbolfile=
-init_param=0
-system_type=34
-system_rev=1024
-
-[drivesys.intrctrl]
-type=IntrControl
-sys=drivesys
-
-[drivesys.tsunami]
-type=Tsunami
-system=drivesys
-intrctrl=drivesys.intrctrl
-
-[drivesys.tsunami.ethernet.configdata]
-type=PciConfigData
-VendorID=4107
-DeviceID=34
-Command=0
-Status=656
-Revision=0
-ProgIF=0
-SubClassCode=0
-ClassCode=2
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=0
-BAR2=0
-BAR3=0
-BAR4=0
-BAR5=0
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=30
-InterruptPin=1
-MinimumGrant=176
-MaximumLatency=52
-BAR0Size=256
-BAR1Size=4096
-BAR2Size=0
-BAR3Size=0
-BAR4Size=0
-BAR5Size=0
-
-[drivesys.tsunami.ethernet]
-type=NSGigE
-system=drivesys
-platform=drivesys.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=drivesys.tsunami.ethernet.configdata
-pci_bus=0
-pci_dev=1
-pci_func=0
-pio_latency=1000
-config_latency=20000
-clock=0
-dma_desc_free=false
-dma_data_free=false
-dma_read_delay=0
-dma_write_delay=0
-dma_read_factor=0
-dma_write_factor=0
-dma_no_allocate=true
-intr_delay=10000000
-rx_delay=1000000
-tx_delay=1000000
-rx_fifo_size=524288
-tx_fifo_size=524288
-rx_filter=true
-hardware_address=00:90:00:00:00:01
-rx_thread=false
-tx_thread=false
-rss=false
-
-[drivesys.tsunami.etherint]
-type=NSGigEInt
-peer=null
-device=drivesys.tsunami.ethernet
-
-[etherdump]
-type=EtherDump
-file=ethertrace
-maxlen=96
-
-[etherlink]
-type=EtherLink
-int1=testsys.tsunami.etherint
-int2=drivesys.tsunami.etherint
-speed=8000
-delay=0
-delay_var=0
-dump=etherdump
-
-[drivesys.membus]
-type=Bus
-bus_id=1
-clock=1000
-width=64
-responder_set=false
-block_size=64
-
-[drivesys.membus.responder]
-type=IsaFake
-pio_addr=0
-pio_latency=1
-pio_size=8
-ret_bad_addr=true
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.bridge]
-type=Bridge
-req_size_a=16
-req_size_b=16
-resp_size_a=16
-resp_size_b=16
-delay=50000
-nack_delay=4000
-write_ack=false
-fix_partial_write_a=false
-fix_partial_write_b=true
-
-[drivesys.disk0.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[drivesys.disk0.image]
-type=CowDiskImage
-child=drivesys.disk0.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[drivesys.disk0]
-type=IdeDisk
-image=drivesys.disk0.image
-driveID=master
-delay=1000000
-
-[drivesys.disk2.image.child]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
-read_only=true
-
-[drivesys.disk2.image]
-type=CowDiskImage
-child=drivesys.disk2.image.child
-image_file=
-table_size=65536
-read_only=false
-
-[drivesys.disk2]
-type=IdeDisk
-image=drivesys.disk2.image
-driveID=master
-delay=1000000
-
-[drivesys.simple_disk.disk]
-type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-latest.img
-read_only=true
-
-[drivesys.simple_disk]
-type=SimpleDisk
-system=drivesys
-disk=drivesys.simple_disk.disk
-
-[drivesys.tsunami.fake_uart1]
-type=IsaFake
-pio_addr=8804615848696
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_uart2]
-type=IsaFake
-pio_addr=8804615848936
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_uart3]
-type=IsaFake
-pio_addr=8804615848680
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_uart4]
-type=IsaFake
-pio_addr=8804615848944
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_ppc]
-type=IsaFake
-pio_addr=8804615848891
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.cchip]
-type=TsunamiCChip
-pio_addr=8803072344064
-pio_latency=1000
-platform=drivesys.tsunami
-system=drivesys
-tsunami=drivesys.tsunami
-
-[drivesys.tsunami.io]
-type=TsunamiIO
-pio_addr=8804615847936
-pio_latency=1000
-frequency=976562500
-platform=drivesys.tsunami
-system=drivesys
-time=2009 1 1 0 0 0 3 1
-year_is_bcd=false
-tsunami=drivesys.tsunami
-
-[]
-type=PciConfigAll
-pio_latency=1
-bus=0
-size=16777216
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.sim_console]
-type=SimConsole
-intr_control=drivesys.intrctrl
-output=console
-port=3456
-append_name=true
-number=0
-
-[drivesys.cpu.itb]
-type=AlphaITB
-size=48
-
-[drivesys.cpu.dtb]
-type=AlphaDTB
-size=64
-
-[drivesys.cpu]
-type=AtomicSimpleCPU
-max_insts_any_thread=0
-max_insts_all_threads=0
-max_loads_any_thread=0
-max_loads_all_threads=0
-progress_interval=0
-system=drivesys
-cpu_id=0
-itb=drivesys.cpu.itb
-dtb=drivesys.cpu.dtb
-profile=0
-do_quiesce=true
-do_checkpoint_insts=true
-do_statistics_insts=true
-clock=1
-phase=0
-defer_registration=false
-width=1
-function_trace=false
-function_trace_start=0
-simulate_stalls=false
-
-[drivesys.tsunami.console]
-type=AlphaConsole
-sim_console=drivesys.sim_console
-disk=drivesys.simple_disk
-pio_addr=8804682956800
-system=drivesys
-cpu=drivesys.cpu
-platform=drivesys.tsunami
-pio_latency=1000
-
-[drivesys.tsunami.fake_ata1]
-type=IsaFake
-pio_addr=8804615848304
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_ata0]
-type=IsaFake
-pio_addr=8804615848432
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.pchip]
-type=TsunamiPChip
-pio_addr=8802535473152
-pio_latency=1000
-platform=drivesys.tsunami
-system=drivesys
-tsunami=drivesys.tsunami
-
-[drivesys.tsunami.fake_pnp_read3]
-type=IsaFake
-pio_addr=8804615848643
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read2]
-type=IsaFake
-pio_addr=8804615848579
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read1]
-type=IsaFake
-pio_addr=8804615848515
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read0]
-type=IsaFake
-pio_addr=8804615848451
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read7]
-type=IsaFake
-pio_addr=8804615848899
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read6]
-type=IsaFake
-pio_addr=8804615848835
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read5]
-type=IsaFake
-pio_addr=8804615848771
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_read4]
-type=IsaFake
-pio_addr=8804615848707
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_write]
-type=IsaFake
-pio_addr=8804615850617
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fb]
-type=BadDevice
-devicename=FrameBuffer
-pio_addr=8804615848912
-system=drivesys
-platform=drivesys.tsunami
-pio_latency=1000
-
-[drivesys.tsunami.fake_OROM]
-type=IsaFake
-pio_addr=8796093677568
-pio_latency=1000
-pio_size=393216
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.uart]
-type=Uart8250
-pio_addr=8804615848952
-pio_latency=1000
-platform=drivesys.tsunami
-sim_console=drivesys.sim_console
-system=drivesys
-
-[drivesys.tsunami.fake_sm_chip]
-type=IsaFake
-pio_addr=8804615848816
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.fake_pnp_addr]
-type=IsaFake
-pio_addr=8804615848569
-pio_latency=1000
-pio_size=8
-ret_bad_addr=false
-update_data=false
-warn_access=
-ret_data8=255
-ret_data16=65535
-ret_data32=4294967295
-ret_data64=18446744073709551615
-platform=drivesys.tsunami
-system=drivesys
-
-[drivesys.tsunami.ide.configdata]
-type=PciConfigData
-VendorID=32902
-DeviceID=28945
-Command=0
-Status=640
-Revision=0
-ProgIF=133
-SubClassCode=1
-ClassCode=1
-CacheLineSize=0
-LatencyTimer=0
-HeaderType=0
-BIST=0
-BAR0=1
-BAR1=1
-BAR2=1
-BAR3=1
-BAR4=1
-BAR5=1
-CardbusCIS=0
-SubsystemVendorID=0
-SubsystemID=0
-ExpansionROM=0
-InterruptLine=31
-InterruptPin=1
-MinimumGrant=0
-MaximumLatency=0
-BAR0Size=8
-BAR1Size=4
-BAR2Size=8
-BAR3Size=4
-BAR4Size=16
-BAR5Size=0
-
-[drivesys.tsunami.ide]
-type=IdeController
-system=drivesys
-platform=drivesys.tsunami
-min_backoff_delay=4000
-max_backoff_delay=10000000
-configdata=drivesys.tsunami.ide.configdata
-pci_bus=0
-pci_dev=0
-pci_func=0
-pio_latency=1000
-config_latency=20000
-disks=drivesys.disk0 drivesys.disk2
-
-[drivesys.iobus]
-type=Bus
-bus_id=0
-clock=1000
-width=64
-responder_set=true
-block_size=64
-