regressions: stats updates due to no physmem in ruby

3 files changed, 21 insertions, 38 deletions

diff --git a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
index f7966bf07..aae98d141 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
@@ -452,7 +452,7 @@ mem_side=system.cpu.toL2Bus.slave[0]
 
 [system.cpu.interrupts]
 type=X86LocalApic
-clock=500
+clock=8000
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
@@ -503,6 +503,7 @@ type=CoherentBus
 block_size=64
 clock=500
 header_cycles=1
+system=system
 use_default_range=false
 width=32
 master=system.cpu.l2cache.cpu_side
@@ -535,6 +536,7 @@ type=CoherentBus
 block_size=64
 clock=1000
 header_cycles=1
+system=system
 use_default_range=false
 width=8
 master=system.physmem.port system.cpu.interrupts.pio system.cpu.interrupts.int_slave
@@ -542,25 +544,28 @@ slave=system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_m
 
 [system.physmem]
 type=SimpleDRAM
+activation_limit=4
 addr_mapping=openmap
 banks_per_rank=8
+channels=1
 clock=1000
 conf_table_reported=false
 in_addr_map=true
-lines_per_rowbuffer=64
-mem_sched_policy=fcfs
+lines_per_rowbuffer=32
+mem_sched_policy=frfcfs
 null=false
 page_policy=open
 range=0:134217727
 ranks_per_channel=2
 read_buffer_size=32
-tBURST=4000
-tCL=14000
-tRCD=14000
+tBURST=5000
+tCL=13750
+tRCD=13750
 tREFI=7800000
 tRFC=300000
-tRP=14000
-tWTR=1000
+tRP=13750
+tWTR=7500
+tXAW=40000
 write_buffer_size=32
 write_thresh_perc=70
 zero=false
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
index 1d6c5844f..4e09173f3 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
@@ -73,7 +73,7 @@ port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu.interrupts]
 type=X86LocalApic
-clock=1
+clock=16
 int_latency=1
 pio_addr=2305843009213693952
 pio_latency=100
@@ -127,7 +127,7 @@ conf_table_reported=false
 in_addr_map=true
 latency=30
 latency_var=0
-null=false
+null=true
 range=0:134217727
 zero=false
 
@@ -220,7 +220,7 @@ tagArrayBanks=1
 
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
-access_phys_mem=true
+access_phys_mem=false
 clock=1
 dcache=system.ruby.l1_cntrl0.cacheMemory
 deadlock_threshold=500000
diff --git a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
index ab8211afd..4a0d16755 100644
--- a/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
+++ b/tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
@@ -4,35 +4,13 @@ sim_seconds                                  0.000122                       # Nu
 sim_ticks                                      121759                       # Number of ticks simulated
 final_tick                                     121759                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_inst_rate                                  27688                       # Simulator instruction rate (inst/s)
-host_op_rate                                    50147                       # Simulator op (including micro ops) rate (op/s)
-host_tick_rate                                 626365                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 297628                       # Number of bytes of host memory used
-host_seconds                                     0.19                       # Real time elapsed on the host
+host_inst_rate                                  20307                       # Simulator instruction rate (inst/s)
+host_op_rate                                    36781                       # Simulator op (including micro ops) rate (op/s)
+host_tick_rate                                 459428                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 167176                       # Number of bytes of host memory used
+host_seconds                                     0.27                       # Real time elapsed on the host
 sim_insts                                        5381                       # Number of instructions simulated
 sim_ops                                          9747                       # Number of ops (including micro ops) simulated
-system.physmem.bytes_read::cpu.inst             54912                       # Number of bytes read from this memory
-system.physmem.bytes_read::cpu.data              7064                       # Number of bytes read from this memory
-system.physmem.bytes_read::total                61976                       # Number of bytes read from this memory
-system.physmem.bytes_inst_read::cpu.inst        54912                       # Number of instructions bytes read from this memory
-system.physmem.bytes_inst_read::total           54912                       # Number of instructions bytes read from this memory
-system.physmem.bytes_written::cpu.data           7112                       # Number of bytes written to this memory
-system.physmem.bytes_written::total              7112                       # Number of bytes written to this memory
-system.physmem.num_reads::cpu.inst               6864                       # Number of read requests responded to by this memory
-system.physmem.num_reads::cpu.data               1052                       # Number of read requests responded to by this memory
-system.physmem.num_reads::total                  7916                       # Number of read requests responded to by this memory
-system.physmem.num_writes::cpu.data               935                       # Number of write requests responded to by this memory
-system.physmem.num_writes::total                  935                       # Number of write requests responded to by this memory
-system.physmem.bw_read::cpu.inst            450989249                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu.data             58016245                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::total               509005494                       # Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read::cpu.inst       450989249                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read::total          450989249                       # Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write::cpu.data            58410467                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_write::total               58410467                       # Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total::cpu.inst           450989249                       # Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu.data           116426712                       # Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::total              567415961                       # Total bandwidth to/from this memory (bytes/s)
 system.ruby.l1_cntrl0.cacheMemory.num_data_array_reads            0                       # number of data array reads
 system.ruby.l1_cntrl0.cacheMemory.num_data_array_writes            0                       # number of data array writes
 system.ruby.l1_cntrl0.cacheMemory.num_tag_array_reads            0                       # number of tag array reads