stats: Update to match ARM ISA changes

10 files changed, 37 insertions, 21 deletions

diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini b/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini
index 85cb6a033..5bb4589de 100644
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/config.ini
+++ b/tests/long/se/20.parser/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/20.parser/ref/arm/linux/o3-timing/simerr b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr
index eeb19437b..be90b0340 100755
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simerr
@@ -1,2 +1,3 @@
 warn: DRAM device capacity (8192 Mbytes) does not match the address range assigned (128 Mbytes)
+warn: Sockets disabled, not accepting gdb connections
 warn: CP14 unimplemented crn[8], opc1[2], crm[9], opc2[4]
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout
index a4234efc5..b1e4c3523 100755
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/simout
@@ -70,4 +70,4 @@ info: Increasing stack size by one page.
   about 2 million people attended 
   the five best costumes got prizes 
 No errors!
-Exiting @ tick 234067145000 because target called exit()
+Exiting @ tick 232864525000 because target called exit()
diff --git a/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt b/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
index af9a3042a..b5fc0a42a 100644
--- a/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/o3-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.232865                       # Nu
 sim_ticks                                232864525000                       # Number of ticks simulated
 final_tick                               232864525000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 141001                       # Simulator instruction rate (inst/s)
-host_op_rate                                   152754                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                               64987909                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 295860                       # Number of bytes of host memory used
-host_seconds                                  3583.20                       # Real time elapsed on the host
+host_inst_rate                                 230904                       # Simulator instruction rate (inst/s)
+host_op_rate                                   250150                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                              106424359                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 342436                       # Number of bytes of host memory used
+host_seconds                                  2188.08                       # Real time elapsed on the host
 sim_insts                                   505234934                       # Number of instructions simulated
 sim_ops                                     547348155                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -474,7 +474,7 @@ system.cpu.rename.IQFullEvents                2510705                       # Nu
 system.cpu.rename.LQFullEvents                1794472                       # Number of times rename has blocked due to LQ full
 system.cpu.rename.SQFullEvents                1920747                       # Number of times rename has blocked due to SQ full
 system.cpu.rename.RenamedOperands           827509638                       # Number of destination operands rename has renamed
-system.cpu.rename.RenameLookups            3000483863                       # Number of register rename lookups that rename has made
+system.cpu.rename.RenameLookups            3000483792                       # Number of register rename lookups that rename has made
 system.cpu.rename.int_rename_lookups        718633951                       # Number of integer rename lookups
 system.cpu.rename.fp_rename_lookups                88                       # Number of floating rename lookups
 system.cpu.rename.CommittedMaps             654095674                       # Number of HB maps that are committed
@@ -491,7 +491,7 @@ system.cpu.iq.iqNonSpecInstsAdded             2979350                       # Nu
 system.cpu.iq.iqInstsIssued                 608926727                       # Number of instructions issued
 system.cpu.iq.iqSquashedInstsIssued           5749477                       # Number of squashed instructions issued
 system.cpu.iq.iqSquashedInstsExamined       120399705                       # Number of squashed instructions iterated over during squash; mainly for profiling
-system.cpu.iq.iqSquashedOperandsExamined    306541360                       # Number of squashed operands that are examined and possibly removed from graph
+system.cpu.iq.iqSquashedOperandsExamined    306541324                       # Number of squashed operands that are examined and possibly removed from graph
 system.cpu.iq.iqSquashedNonSpecRemoved           1718                       # Number of squashed non-spec instructions that were removed
 system.cpu.iq.issued_per_cycle::samples     465093244                       # Number of insts issued each cycle
 system.cpu.iq.issued_per_cycle::mean         1.309257                       # Number of insts issued each cycle
@@ -711,7 +711,7 @@ system.cpu.int_regfile_writes               327337405                       # nu
 system.cpu.fp_regfile_reads                        16                       # number of floating regfile reads
 system.cpu.cc_regfile_reads                2166261838                       # number of cc regfile reads
 system.cpu.cc_regfile_writes                376539611                       # number of cc regfile writes
-system.cpu.misc_regfile_reads               217603205                       # number of misc regfile reads
+system.cpu.misc_regfile_reads               217603177                       # number of misc regfile reads
 system.cpu.misc_regfile_writes                2977084                       # number of misc regfile writes
 system.cpu.dcache.tags.replacements           2817145                       # number of replacements
 system.cpu.dcache.tags.tagsinuse           511.627957                       # Cycle average of tags in use
diff --git a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/config.ini b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/config.ini
index 7cd34eb9f..6807fa19b 100644
--- a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/config.ini
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/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/20.parser/ref/arm/linux/simple-atomic/simerr b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/simerr
index e69de29bb..1a4f96712 100755
--- a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/simerr
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/simerr
@@ -0,0 +1 @@
+warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt
index e4f30df65..cec661f19 100644
--- a/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-atomic/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.279361                       # Nu
 sim_ticks                                279360903000                       # Number of ticks simulated
 final_tick                               279360903000                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                1080925                       # Simulator instruction rate (inst/s)
-host_op_rate                                  1170785                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              596093333                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 259884                       # Number of bytes of host memory used
-host_seconds                                   468.65                       # Real time elapsed on the host
+host_inst_rate                                2212896                       # Simulator instruction rate (inst/s)
+host_op_rate                                  2396859                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             1220336248                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 304900                       # Number of bytes of host memory used
+host_seconds                                   228.92                       # Real time elapsed on the host
 sim_insts                                   506578818                       # Number of instructions simulated
 sim_ops                                     548692039                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -164,7 +164,7 @@ system.cpu.num_func_calls                    19311615                       # nu
 system.cpu.num_conditional_control_insts     90670594                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    448447005                       # number of integer instructions
 system.cpu.num_fp_insts                            16                       # number of float instructions
-system.cpu.num_int_register_reads           749023756                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           749023721                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          289993515                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads                   16                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes                   0                       # number of times the floating registers were written
diff --git a/tests/long/se/20.parser/ref/arm/linux/simple-timing/config.ini b/tests/long/se/20.parser/ref/arm/linux/simple-timing/config.ini
index 46644e2cb..f7f42e194 100644
--- a/tests/long/se/20.parser/ref/arm/linux/simple-timing/config.ini
+++ b/tests/long/se/20.parser/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/20.parser/ref/arm/linux/simple-timing/simerr b/tests/long/se/20.parser/ref/arm/linux/simple-timing/simerr
index e69de29bb..1a4f96712 100755
--- a/tests/long/se/20.parser/ref/arm/linux/simple-timing/simerr
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-timing/simerr
@@ -0,0 +1 @@
+warn: Sockets disabled, not accepting gdb connections
diff --git a/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt b/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt
index b0856dd07..925783e41 100644
--- a/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt
+++ b/tests/long/se/20.parser/ref/arm/linux/simple-timing/stats.txt
@@ -4,11 +4,11 @@ sim_seconds                                  0.708539                       # Nu
 sim_ticks                                708539449500                       # Number of ticks simulated
 final_tick                               708539449500                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                 1000000000000                       # Frequency of simulated ticks
-host_inst_rate                                 670051                       # Simulator instruction rate (inst/s)
-host_op_rate                                   725636                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                              940143705                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 269876                       # Number of bytes of host memory used
-host_seconds                                   753.65                       # Real time elapsed on the host
+host_inst_rate                                1440714                       # Simulator instruction rate (inst/s)
+host_op_rate                                  1560229                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                             2021455048                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 314896                       # Number of bytes of host memory used
+host_seconds                                   350.51                       # Real time elapsed on the host
 sim_insts                                   504984064                       # Number of instructions simulated
 sim_ops                                     546875315                       # Number of ops (including micro ops) simulated
 system.voltage_domain.voltage                       1                       # Voltage in Volts
@@ -165,7 +165,7 @@ system.cpu.num_func_calls                    19311615                       # nu
 system.cpu.num_conditional_control_insts     90670594                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    448447005                       # number of integer instructions
 system.cpu.num_fp_insts                            16                       # number of float instructions
-system.cpu.num_int_register_reads           748339662                       # number of times the integer registers were read
+system.cpu.num_int_register_reads           748339627                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          289993515                       # number of times the integer registers were written
 system.cpu.num_fp_register_reads                   16                       # number of times the floating registers were read
 system.cpu.num_fp_register_writes                   0                       # number of times the floating registers were written