Merge yet again with the main repository.

1 files changed, 19 insertions, 19 deletions

diff --git a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stats.txt b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stats.txt
index ed3183ec3..0cce68f38 100644
--- a/tests/long/10.mcf/ref/x86/linux/simple-atomic/stats.txt
+++ b/tests/long/10.mcf/ref/x86/linux/simple-atomic/stats.txt
@@ -1,34 +1,34 @@
 
 ---------- Begin Simulation Statistics ----------
-host_inst_rate                                3107267                       # Simulator instruction rate (inst/s)
-host_mem_usage                                 337076                       # Number of bytes of host memory used
-host_seconds                                    89.53                       # Real time elapsed on the host
-host_tick_rate                             1887081425                       # Simulator tick rate (ticks/s)
-sim_freq                                 1000000000000                       # Frequency of simulated ticks
-sim_insts                                   278192520                       # Number of instructions simulated
 sim_seconds                                  0.168950                       # Number of seconds simulated
 sim_ticks                                168950072000                       # Number of ticks simulated
-system.cpu.idle_fraction                            0                       # Percentage of idle cycles
-system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
+sim_freq                                 1000000000000                       # Frequency of simulated ticks
+host_inst_rate                                1147935                       # Simulator instruction rate (inst/s)
+host_tick_rate                              697156581                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 368676                       # Number of bytes of host memory used
+host_seconds                                   242.34                       # Real time elapsed on the host
+sim_insts                                   278192520                       # Number of instructions simulated
+system.cpu.workload.num_syscalls                  444                       # Number of system calls
 system.cpu.numCycles                        337900145                       # number of cpu cycles simulated
-system.cpu.numWorkItemsCompleted                    0                       # number of work items this cpu completed
 system.cpu.numWorkItemsStarted                      0                       # number of work items this cpu started
-system.cpu.num_busy_cycles                  337900145                       # Number of busy cycles
-system.cpu.num_conditional_control_insts     18628012                       # number of instructions that are conditional controls
-system.cpu.num_fp_alu_accesses                     40                       # Number of float alu accesses
-system.cpu.num_fp_insts                            40                       # number of float instructions
-system.cpu.num_fp_register_reads                   40                       # number of times the floating registers were read
-system.cpu.num_fp_register_writes                  26                       # number of times the floating registers were written
-system.cpu.num_func_calls                           0                       # number of times a function call or return occured
-system.cpu.num_idle_cycles                          0                       # Number of idle cycles
+system.cpu.numWorkItemsCompleted                    0                       # number of work items this cpu completed
 system.cpu.num_insts                        278192520                       # Number of instructions executed
 system.cpu.num_int_alu_accesses             278186228                       # Number of integer alu accesses
+system.cpu.num_fp_alu_accesses                     40                       # Number of float alu accesses
+system.cpu.num_func_calls                           0                       # number of times a function call or return occured
+system.cpu.num_conditional_control_insts     18628012                       # number of instructions that are conditional controls
 system.cpu.num_int_insts                    278186228                       # number of integer instructions
+system.cpu.num_fp_insts                            40                       # number of float instructions
 system.cpu.num_int_register_reads           685043114                       # number of times the integer registers were read
 system.cpu.num_int_register_writes          248344166                       # number of times the integer registers were written
-system.cpu.num_load_insts                    90779388                       # Number of load instructions
+system.cpu.num_fp_register_reads                   40                       # number of times the floating registers were read
+system.cpu.num_fp_register_writes                  26                       # number of times the floating registers were written
 system.cpu.num_mem_refs                     122219139                       # number of memory refs
+system.cpu.num_load_insts                    90779388                       # Number of load instructions
 system.cpu.num_store_insts                   31439751                       # Number of store instructions
-system.cpu.workload.num_syscalls                  444                       # Number of system calls
+system.cpu.num_idle_cycles                          0                       # Number of idle cycles
+system.cpu.num_busy_cycles                  337900145                       # Number of busy cycles
+system.cpu.not_idle_fraction                        1                       # Percentage of non-idle cycles
+system.cpu.idle_fraction                            0                       # Percentage of idle cycles
 
 ---------- End Simulation Statistics   ----------