From 66941163e50abceaa86c5eb6a18de6bbc2ec4ef8 Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Sun, 30 Aug 2015 12:24:19 -0500 Subject: stats: updates due to recent changes. --- .../ref/alpha/eio/simple-timing/config.ini | 19 ++++---- .../ref/alpha/eio/simple-timing/config.json | 55 ++++++++++------------ 2 files changed, 34 insertions(+), 40 deletions(-) (limited to 'tests/quick/se/20.eio-short') diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.ini b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.ini index eeb68edec..b51e505ae 100644 --- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.ini +++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.ini @@ -78,7 +78,7 @@ dcache_port=system.cpu.dcache.cpu_side icache_port=system.cpu.icache.cpu_side [system.cpu.dcache] -type=BaseCache +type=Cache children=tags addr_ranges=0:18446744073709551615 assoc=2 @@ -87,7 +87,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=2 -is_top_level=true +is_read_only=false max_miss_count=0 mshrs=4 prefetch_on_access=false @@ -98,7 +98,6 @@ size=262144 system=system tags=system.cpu.dcache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] @@ -119,7 +118,7 @@ eventq_index=0 size=64 [system.cpu.icache] -type=BaseCache +type=Cache children=tags addr_ranges=0:18446744073709551615 assoc=2 @@ -128,7 +127,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=2 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=4 prefetch_on_access=false @@ -139,7 +138,6 @@ size=131072 system=system tags=system.cpu.icache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] @@ -169,7 +167,7 @@ eventq_index=0 size=48 [system.cpu.l2cache] -type=BaseCache +type=Cache children=tags addr_ranges=0:18446744073709551615 assoc=8 @@ -178,7 +176,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=20 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=20 prefetch_on_access=false @@ -189,7 +187,6 @@ size=2097152 system=system tags=system.cpu.l2cache.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.cpu.toL2Bus.master[0] mem_side=system.membus.slave[1] @@ -228,8 +225,8 @@ type=EioProcess chkpt= errout=cerr eventq_index=0 -file=/dist/m5/regression/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz -input=None +file=/scratch/nilay/GEM5/gem5/tests/test-progs/anagram/bin/alpha/eio/anagram-vshort.eio.gz +input=cin kvmInSE=false max_stack_size=67108864 output=cout diff --git a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.json b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.json index 787ac7aeb..414b0db49 100644 --- a/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.json +++ b/tests/quick/se/20.eio-short/ref/alpha/eio/simple-timing/config.json @@ -185,12 +185,15 @@ "role": "MASTER" }, "icache": { - "is_top_level": true, + "cpu_side": { + "peer": "system.cpu.icache_port", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.cpu_clk_domain", "write_buffers": 8, "response_latency": 2, - "cxx_class": "BaseCache", + "cxx_class": "Cache", "size": 131072, "tags": { "name": "tags", @@ -220,17 +223,13 @@ "addr_ranges": [ "0:18446744073709551615" ], - "assoc": 2, + "is_read_only": true, "prefetch_on_access": false, "path": "system.cpu.icache", "name": "icache", - "type": "BaseCache", + "type": "Cache", "sequential_access": false, - "cpu_side": { - "peer": "system.cpu.icache_port", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 2 }, "interrupts": { "eventq_index": 0, @@ -246,12 +245,15 @@ "socket_id": 0, "max_insts_all_threads": 0, "l2cache": { - "is_top_level": false, + "cpu_side": { + "peer": "system.cpu.toL2Bus.master[0]", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.cpu_clk_domain", "write_buffers": 8, "response_latency": 20, - "cxx_class": "BaseCache", + "cxx_class": "Cache", "size": 2097152, "tags": { "name": "tags", @@ -281,17 +283,13 @@ "addr_ranges": [ "0:18446744073709551615" ], - "assoc": 8, + "is_read_only": false, "prefetch_on_access": false, "path": "system.cpu.l2cache", "name": "l2cache", - "type": "BaseCache", + "type": "Cache", "sequential_access": false, - "cpu_side": { - "peer": "system.cpu.toL2Bus.master[0]", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 8 }, "path": "system.cpu", "max_loads_any_thread": 0, @@ -306,12 +304,12 @@ "system": "system", "useArchPT": false, "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", "cxx_class": "EioProcess", "path": "system.cpu.workload", "max_stack_size": 67108864, "type": "EioProcess", - "input": "None" + "input": "cin" } ], "name": "cpu", @@ -328,12 +326,15 @@ "progress_interval": 0, "branchPred": null, "dcache": { - "is_top_level": true, + "cpu_side": { + "peer": "system.cpu.dcache_port", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.cpu_clk_domain", "write_buffers": 8, "response_latency": 2, - "cxx_class": "BaseCache", + "cxx_class": "Cache", "size": 262144, "tags": { "name": "tags", @@ -363,17 +364,13 @@ "addr_ranges": [ "0:18446744073709551615" ], - "assoc": 2, + "is_read_only": false, "prefetch_on_access": false, "path": "system.cpu.dcache", "name": "dcache", - "type": "BaseCache", + "type": "Cache", "sequential_access": false, - "cpu_side": { - "peer": "system.cpu.dcache_port", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 2 }, "isa": [ { -- cgit v1.2.3