From fa1fbcf020ee9aacdd4a7a09e81a633e09bad97a Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 1 Sep 2014 16:55:52 -0500 Subject: stats: updates due to recent ruby and x86 changes Also updates many out of date config files. --- .../ref/alpha/eio/simple-atomic-mp/config.ini | 23 +++++++-- .../ref/alpha/eio/simple-atomic-mp/config.json | 58 +++++++++++++--------- .../ref/alpha/eio/simple-atomic-mp/simerr | 3 +- .../ref/alpha/eio/simple-timing-mp/config.ini | 23 +++++++-- .../ref/alpha/eio/simple-timing-mp/config.json | 58 +++++++++++++--------- 5 files changed, 108 insertions(+), 57 deletions(-) (limited to 'tests/quick/se/30.eio-mp') diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini index 1a2af15a4..cb6974d16 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu_clk_domain l2c membus physmem toL2Bus voltage_domain +children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=atomic @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu0] @@ -178,7 +181,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -322,7 +325,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -466,7 +469,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -610,7 +613,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -619,9 +622,19 @@ system=system [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.l2c] type=BaseCache children=tags diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json index b534dacc6..43749dee9 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/config.json @@ -65,13 +65,7 @@ "forward_snoops": true, "size": 4194304 }, - "voltage_domain": { - "eventq_index": 0, - "path": "system.voltage_domain", - "type": "VoltageDomain", - "name": "voltage_domain", - "cxx_class": "VoltageDomain" - }, + "kernel_addr_check": true, "physmem": { "latency": 3.0000000000000004e-08, "name": "physmem", @@ -94,13 +88,45 @@ "work_begin_ckpt_count": 0, "clk_domain": { "name": "clk_domain", - "clock": 1e-09, + "init_perf_level": 0, "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.clk_domain", - "type": "SrcClockDomain" + "type": "SrcClockDomain", + "domain_id": -1 }, "eventq_index": 0, + "dvfs_handler": { + "enable": false, + "name": "dvfs_handler", + "transition_latency": 9.999999999999999e-05, + "eventq_index": 0, + "cxx_class": "DVFSHandler", + "path": "system.dvfs_handler", + "type": "DVFSHandler" + }, + "work_end_exit_count": 0, + "type": "System", + "voltage_domain": { + "eventq_index": 0, + "path": "system.voltage_domain", + "type": "VoltageDomain", + "name": "voltage_domain", + "cxx_class": "VoltageDomain" + }, + "cache_line_size": 64, + "work_cpus_ckpt_count": 0, + "work_begin_exit_count": 0, + "path": "system", + "cpu_clk_domain": { + "name": "cpu_clk_domain", + "init_perf_level": 0, + "eventq_index": 0, + "cxx_class": "SrcClockDomain", + "path": "system.cpu_clk_domain", + "type": "SrcClockDomain", + "domain_id": -1 + }, "toL2Bus": { "slave": { "peer": [ @@ -130,20 +156,6 @@ "type": "CoherentBus", "use_default_range": false }, - "work_end_exit_count": 0, - "type": "System", - "cache_line_size": 64, - "work_cpus_ckpt_count": 0, - "work_begin_exit_count": 0, - "path": "system", - "cpu_clk_domain": { - "name": "cpu_clk_domain", - "clock": 5e-10, - "eventq_index": 0, - "cxx_class": "SrcClockDomain", - "path": "system.cpu_clk_domain", - "type": "SrcClockDomain" - }, "mem_mode": "atomic", "name": "system", "init_param": 0, diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr index 9205d04ab..7bec60132 100755 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-atomic-mp/simerr @@ -5,6 +5,7 @@ warn: Prefetch instructions in Alpha do not do anything gzip: stdout: Broken pipe gzip: stdout: Broken pipe -stdout: Broken pipe + +gzip: stdout: Broken pipe gzip: stdout: Broken pipe diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini index b4705255d..e4dca8242 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.ini @@ -10,13 +10,14 @@ time_sync_spin_threshold=100000000 [system] type=System -children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu_clk_domain l2c membus physmem toL2Bus voltage_domain +children=clk_domain cpu0 cpu1 cpu2 cpu3 cpu_clk_domain dvfs_handler l2c membus physmem toL2Bus voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=timing @@ -37,7 +38,9 @@ system_port=system.membus.slave[0] [system.clk_domain] type=SrcClockDomain clock=1000 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu0] @@ -171,7 +174,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -308,7 +311,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -445,7 +448,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -582,7 +585,7 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz input=None max_stack_size=67108864 output=cout @@ -591,9 +594,19 @@ system=system [system.cpu_clk_domain] type=SrcClockDomain clock=500 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=100000000 + [system.l2c] type=BaseCache children=tags diff --git a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json index c960fde35..81af59151 100644 --- a/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json +++ b/tests/quick/se/30.eio-mp/ref/alpha/eio/simple-timing-mp/config.json @@ -65,13 +65,7 @@ "forward_snoops": true, "size": 4194304 }, - "voltage_domain": { - "eventq_index": 0, - "path": "system.voltage_domain", - "type": "VoltageDomain", - "name": "voltage_domain", - "cxx_class": "VoltageDomain" - }, + "kernel_addr_check": true, "physmem": { "latency": 3.0000000000000004e-08, "name": "physmem", @@ -94,13 +88,45 @@ "work_begin_ckpt_count": 0, "clk_domain": { "name": "clk_domain", - "clock": 1e-09, + "init_perf_level": 0, "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.clk_domain", - "type": "SrcClockDomain" + "type": "SrcClockDomain", + "domain_id": -1 }, "eventq_index": 0, + "dvfs_handler": { + "enable": false, + "name": "dvfs_handler", + "transition_latency": 9.999999999999999e-05, + "eventq_index": 0, + "cxx_class": "DVFSHandler", + "path": "system.dvfs_handler", + "type": "DVFSHandler" + }, + "work_end_exit_count": 0, + "type": "System", + "voltage_domain": { + "eventq_index": 0, + "path": "system.voltage_domain", + "type": "VoltageDomain", + "name": "voltage_domain", + "cxx_class": "VoltageDomain" + }, + "cache_line_size": 64, + "work_cpus_ckpt_count": 0, + "work_begin_exit_count": 0, + "path": "system", + "cpu_clk_domain": { + "name": "cpu_clk_domain", + "init_perf_level": 0, + "eventq_index": 0, + "cxx_class": "SrcClockDomain", + "path": "system.cpu_clk_domain", + "type": "SrcClockDomain", + "domain_id": -1 + }, "toL2Bus": { "slave": { "peer": [ @@ -130,20 +156,6 @@ "type": "CoherentBus", "use_default_range": false }, - "work_end_exit_count": 0, - "type": "System", - "cache_line_size": 64, - "work_cpus_ckpt_count": 0, - "work_begin_exit_count": 0, - "path": "system", - "cpu_clk_domain": { - "name": "cpu_clk_domain", - "clock": 5e-10, - "eventq_index": 0, - "cxx_class": "SrcClockDomain", - "path": "system.cpu_clk_domain", - "type": "SrcClockDomain" - }, "mem_mode": "timing", "name": "system", "init_param": 0, -- cgit v1.2.3