From 9bc132e4738c53be2dd9c2fdf5e4dd8e73d8970b Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Thu, 24 Jan 2013 12:29:00 -0600
Subject: regressions: update stats due to branch predictor changes The actual
 statistical values are being updated for only two tests belonging to sparc
 architecture and inorder cpu: 00.hello and 02.insttest. For others the patch
 updates config.ini and name changes to statistical variables.

---
 .../ref/sparc/linux/inorder-timing/config.ini      | 61 ++++++++++------------
 1 file changed, 28 insertions(+), 33 deletions(-)

(limited to 'tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini')

diff --git a/tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini b/tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini
index b0053eeff..18f84cb91 100644
--- a/tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini
+++ b/tests/quick/se/02.insttest/ref/sparc/linux/inorder-timing/config.ini
@@ -14,7 +14,8 @@ clock=1000
 init_param=0
 kernel=
 load_addr_mask=1099511627775
-mem_mode=atomic
+mem_mode=timing
+mem_ranges=
 memories=system.physmem
 num_work_ids=16
 readfile=
@@ -30,18 +31,13 @@ system_port=system.membus.slave[0]
 
 [system.cpu]
 type=InOrderCPU
-children=dcache dtb icache interrupts itb l2cache toL2Bus tracer workload
-BTBEntries=4096
-BTBTagSize=16
-RASSize=16
+children=branchPred dcache dtb icache interrupts isa itb l2cache toL2Bus tracer workload
 activity=0
+branchPred=system.cpu.branchPred
 cachePorts=2
 checker=Null
-choiceCtrBits=2
-choicePredictorSize=8192
 clock=500
 cpu_id=0
-defer_registration=false
 div16Latency=1
 div16RepeatRate=1
 div24Latency=1
@@ -57,16 +53,9 @@ dtb=system.cpu.dtb
 fetchBuffSize=4
 function_trace=false
 function_trace_start=0
-globalCtrBits=2
-globalHistoryBits=13
-globalPredictorSize=8192
-instShiftAmt=2
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
-localCtrBits=2
-localHistoryBits=11
-localHistoryTableSize=2048
-localPredictorSize=2048
 max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
@@ -75,11 +64,11 @@ memBlockSize=64
 multLatency=1
 multRepeatRate=1
 numThreads=1
-predType=tournament
 profile=0
 progress_interval=0
 stageTracing=false
 stageWidth=4
+switched_out=false
 system=system
 threadModel=SMT
 tracer=system.cpu.tracer
@@ -87,6 +76,24 @@ workload=system.cpu.workload
 dcache_port=system.cpu.dcache.cpu_side
 icache_port=system.cpu.icache.cpu_side
 
+[system.cpu.branchPred]
+type=BranchPredictor
+BTBEntries=4096
+BTBTagSize=16
+RASSize=16
+choiceCtrBits=2
+choicePredictorSize=8192
+globalCtrBits=2
+globalHistoryBits=13
+globalPredictorSize=8192
+instShiftAmt=2
+localCtrBits=2
+localHistoryBits=11
+localHistoryTableSize=2048
+localPredictorSize=2048
+numThreads=1
+predType=tournament
+
 [system.cpu.dcache]
 type=BaseCache
 addr_ranges=0:18446744073709551615
@@ -94,21 +101,16 @@ assoc=2
 block_size=64
 clock=500
 forward_snoops=true
-hash_delay=1
 hit_latency=2
 is_top_level=true
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
 response_latency=2
 size=262144
-subblock_size=0
 system=system
 tgts_per_mshr=20
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
@@ -125,21 +127,16 @@ assoc=2
 block_size=64
 clock=500
 forward_snoops=true
-hash_delay=1
 hit_latency=2
 is_top_level=true
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
 response_latency=2
 size=131072
-subblock_size=0
 system=system
 tgts_per_mshr=20
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
@@ -148,6 +145,9 @@ mem_side=system.cpu.toL2Bus.slave[0]
 [system.cpu.interrupts]
 type=SparcInterrupts
 
+[system.cpu.isa]
+type=SparcISA
+
 [system.cpu.itb]
 type=SparcTLB
 size=64
@@ -159,21 +159,16 @@ assoc=8
 block_size=64
 clock=500
 forward_snoops=true
-hash_delay=1
 hit_latency=20
 is_top_level=false
 max_miss_count=0
 mshrs=20
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
 response_latency=20
 size=2097152
-subblock_size=0
 system=system
 tgts_per_mshr=12
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.toL2Bus.master[0]
@@ -200,7 +195,7 @@ egid=100
 env=
 errout=cerr
 euid=100
-executable=/projects/pd/randd/dist/test-progs/insttest/bin/sparc/linux/insttest
+executable=tests/test-progs/insttest/bin/sparc/linux/insttest
 gid=100
 input=cin
 max_stack_size=67108864
-- 
cgit v1.2.3