stats: Update to match ARM ISA changes

9 files changed, 40 insertions, 21 deletions

diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini b/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini
index d1a772d56..a48b86389 100644
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/config.ini
@@ -29,6 +29,8 @@ multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
+thermal_components=
+thermal_model=Null
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
@@ -147,8 +149,15 @@ choicePredictorSize=8192
 eventq_index=0
 globalCtrBits=2
 globalPredictorSize=8192
+indirectHashGHR=true
+indirectHashTargets=true
+indirectPathLength=3
+indirectSets=256
+indirectTagSize=16
+indirectWays=2
 instShiftAmt=2
 numThreads=1
+useIndirect=true
 
 [system.cpu.dcache]
 type=Cache
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr
index 0c3e31a9c..613c6a6b7 100755
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simerr
@@ -1,4 +1,5 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
+warn: Sockets disabled, not accepting gdb connections
 getting pixel output filename pixels_out.cook
 opening control file chair.control.cook
 opening camera file chair.camera
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout
index 578b6774f..572268607 100755
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/simout
@@ -16,4 +16,4 @@ info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 info: Increasing stack size by one page.
 OO-style eon Time= 0.110000
-Exiting @ tick 116576497500 because target called exit()
+Exiting @ tick 111753553500 because target called exit()
diff --git a/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
index f9a8145d7..14b00e16f 100644
--- a/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.111754                       # Nu
 sim_ticks                                111753553500                       # Number of ticks simulated
 final_tick                               111753553500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 118120                       # Simulator instruction rate (inst/s)
-host_op_rate                                   141817                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               48346375                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 287716                       # Number of bytes of host memory used
-host_seconds                                  2311.52                       # Real time elapsed on the host
+host_inst_rate                                 210028                       # Simulator instruction rate (inst/s)
+host_op_rate                                   252162                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                               85964130                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 334160                       # Number of bytes of host memory used
+host_seconds                                  1300.00                       # Real time elapsed on the host
 sim_insts                                   273037220                       # Number of instructions simulated
 sim_ops                                     327811602                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -436,7 +436,7 @@ system.cpu.rename.LQFullEvents                7483674                       # Nu
 system.cpu.rename.SQFullEvents               23725025                       # Number of times rename has blocked due to SQ full
 system.cpu.rename.FullRegisterEvents          3279176                       # Number of times there has been no free registers
 system.cpu.rename.RenamedOperands           394880845                       # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups            2465405554                       # Number of register rename lookups that rename has made
+system.cpu.rename.RenameLookups            2218133140                       # Number of register rename lookups that rename has made
 system.cpu.rename.int_rename_lookups        335914250                       # Number of integer rename lookups
 system.cpu.rename.fp_rename_lookups         192916662                       # Number of floating rename lookups
 system.cpu.rename.CommittedMaps             372230051                       # Number of HB maps that are committed
@@ -453,7 +453,7 @@ system.cpu.iq.iqNonSpecInstsAdded               22608                       # Nu
 system.cpu.iq.iqInstsIssued                 339469619                       # Number of instructions issued
 system.cpu.iq.iqSquashedInstsIssued            966789                       # Number of squashed instructions issued
 system.cpu.iq.iqSquashedInstsExamined        15494628                       # Number of squashed instructions iterated over during squash; mainly for profiling
-system.cpu.iq.iqSquashedOperandsExamined     40533427                       # Number of squashed operands that are examined and possibly removed from graph
+system.cpu.iq.iqSquashedOperandsExamined     37288530                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu.iq.iqSquashedNonSpecRemoved            488                       # Number of squashed non-spec instructions that were removed
 system.cpu.iq.issued_per_cycle::samples     222582301                       # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::mean         1.525142                       # Number of insts issued each cycle
@@ -674,7 +674,7 @@ system.cpu.fp_regfile_reads                 186641875                       # nu
 system.cpu.fp_regfile_writes                131668024                       # number of floating regfile writes
 system.cpu.cc_regfile_reads                1279432977                       # number of cc regfile reads
 system.cpu.cc_regfile_writes                 80060950                       # number of cc regfile writes
-system.cpu.misc_regfile_reads              1175447336                       # number of misc regfile reads
+system.cpu.misc_regfile_reads              1056766060                       # number of misc regfile reads
 system.cpu.misc_regfile_writes               34421755                       # number of misc regfile writes
 system.cpu.dcache.tags.replacements           1542955                       # number of replacements
 system.cpu.dcache.tags.tagsinuse           511.836799                       # Cycle average of tags in use
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini
index 4e3e7fbd7..f27ac4466 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/config.ini
@@ -15,6 +15,7 @@ boot_osflags=a
 cache_line_size=64
 clk_domain=system.clk_domain
 eventq_index=0
+exit_on_work_items=false
 init_param=0
 kernel=
 kernel_addr_check=true
@@ -24,9 +25,12 @@ mem_mode=atomic
 mem_ranges=
 memories=system.physmem
 mmap_using_noreserve=false
+multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
+thermal_components=
+thermal_model=Null
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
@@ -130,6 +134,7 @@ eventq_index=0
 
 [system.cpu.isa]
 type=ArmISA
+decoderFlavour=Generic
 eventq_index=0
 fpsid=1090793632
 id_aa64afr0_el1=0
@@ -248,6 +253,7 @@ clk_domain=system.clk_domain
 eventq_index=0
 forward_latency=4
 frontend_latency=3
+point_of_coherency=true
 response_latency=2
 snoop_filter=Null
 snoop_response_latency=4
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt
index 4a706dd92..ae8086be1 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.201717                       # Nu
 sim_ticks                                201717314000                       # Number of ticks simulated
 final_tick                               201717314000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 686314                       # Simulator instruction rate (inst/s)
-host_op_rate                                   823996                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              507041348                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 264028                       # Number of bytes of host memory used
-host_seconds                                   397.83                       # Real time elapsed on the host
+host_inst_rate                                1495302                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1795276                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1104713261                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 309028                       # Number of bytes of host memory used
+host_seconds                                   182.60                       # Real time elapsed on the host
 sim_insts                                   273037595                       # Number of instructions simulated
 sim_ops                                     327811950                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -164,7 +164,7 @@ system.cpu.num_func_calls                    12448615                       # nu
 system.cpu.num_conditional_control_insts     15799338                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    258331481                       # number of integer instructions
 system.cpu.num_fp_insts                     114216705                       # number of float instructions
-system.cpu.num_int_register_reads          1174407516                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           938030601                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          162499657                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads            180262959                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes           126152315                       # number of times the floating registers were written
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini b/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini
index 2a5bb3732..72dade1ff 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-timing/config.ini
@@ -29,6 +29,8 @@ multi_thread=false
 num_work_ids=16
 readfile=
 symbolfile=
+thermal_components=
+thermal_model=Null
 work_begin_ckpt_count=0
 work_begin_cpu_id_exit=-1
 work_begin_exit_count=0
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-timing/simerr b/tests/long/se/30.eon/ref/arm/linux/simple-timing/simerr
index 7e050de51..a25196116 100755
--- a/tests/long/se/30.eon/ref/arm/linux/simple-timing/simerr
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-timing/simerr
@@ -1,3 +1,4 @@
+warn: Sockets disabled, not accepting gdb connections
 getting pixel output filename pixels_out.cook
 opening control file chair.control.cook
 opening camera file chair.camera
diff --git a/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt b/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt
index 3e9613199..fadffed88 100644
--- a/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/long/se/30.eon/ref/arm/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.517291                       # Nu
 sim_ticks                                517291025500                       # Number of ticks simulated
 final_tick                               517291025500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 454164                       # Simulator instruction rate (inst/s)
-host_op_rate                                   545241                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              861389873                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 274016                       # Number of bytes of host memory used
-host_seconds                                   600.53                       # Real time elapsed on the host
+host_inst_rate                                 977708                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1173775                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1854370201                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 319164                       # Number of bytes of host memory used
+host_seconds                                   278.96                       # Real time elapsed on the host
 sim_insts                                   272739286                       # Number of instructions simulated
 sim_ops                                     327433744                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -158,7 +158,7 @@ system.cpu.num_func_calls                    12448615                       # nu
 system.cpu.num_conditional_control_insts     15799349                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    258331537                       # number of integer instructions
 system.cpu.num_fp_insts                     114216705                       # number of float instructions
-system.cpu.num_int_register_reads          1215888421                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           979511506                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          162499693                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads            180262959                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes           126152315                       # number of times the floating registers were written