regressions: stats update due to stats from ruby prefetcher

3 files changed, 102 insertions, 16 deletions

diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
index eac1bafa5..748354cc7 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
@@ -46,7 +46,7 @@ version=0
 [system.dir_cntrl0.directory]
 type=RubyDirectoryMemory
 map_levels=4
-numa_high_bit=6
+numa_high_bit=5
 size=134217728
 use_map=false
 version=0
@@ -75,15 +75,17 @@ version=0
 
 [system.l1_cntrl0]
 type=L1Cache_Controller
-children=L1DcacheMemory L1IcacheMemory sequencer
+children=L1DcacheMemory L1IcacheMemory prefetcher sequencer
 L1DcacheMemory=system.l1_cntrl0.L1DcacheMemory
 L1IcacheMemory=system.l1_cntrl0.L1IcacheMemory
 buffer_size=0
 cntrl_id=0
+enable_prefetch=false
 l1_request_latency=2
 l1_response_latency=2
 l2_select_num_bits=0
 number_of_TBEs=256
+prefetcher=system.l1_cntrl0.prefetcher
 recycle_latency=10
 ruby_system=system.ruby
 send_evictions=false
@@ -111,7 +113,7 @@ type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
-is_icache=false
+is_icache=true
 latency=3
 replacement_policy=PSEUDO_LRU
 resourceStalls=false
@@ -120,6 +122,16 @@ start_index_bit=6
 tagAccessLatency=1
 tagArrayBanks=1
 
+[system.l1_cntrl0.prefetcher]
+type=Prefetcher
+cross_page=false
+nonunit_filter=8
+num_startup_pfs=1
+num_streams=4
+pf_per_stream=1
+train_misses=4
+unit_filter=8
+
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=false
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
index cd0889639..708a70aaa 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
@@ -1,4 +1,4 @@
-Real time: Sep/01/2012 14:05:06
+Real time: Dec/11/2012 09:10:20
 
 Profiler Stats
 --------------
@@ -7,18 +7,18 @@ Elapsed_time_in_minutes: 0
 Elapsed_time_in_hours: 0
 Elapsed_time_in_days: 0
 
-Virtual_time_in_seconds: 0.52
-Virtual_time_in_minutes: 0.00866667
-Virtual_time_in_hours:   0.000144444
-Virtual_time_in_days:    6.01852e-06
+Virtual_time_in_seconds: 0.56
+Virtual_time_in_minutes: 0.00933333
+Virtual_time_in_hours:   0.000155556
+Virtual_time_in_days:    6.48148e-06
 
 Ruby_current_time: 318321
 Ruby_start_time: 0
 Ruby_cycles: 318321
 
-mbytes_resident: 44.9961
-mbytes_total: 254.652
-resident_ratio: 0.176758
+mbytes_resident: 49.5391
+mbytes_total: 264.797
+resident_ratio: 0.187128
 
 ruby_cycles_executed: [ 318322 ]
 
@@ -83,11 +83,11 @@ Resource Usage
 page_size: 4096
 user_time: 0
 system_time: 0
-page_reclaims: 8497
+page_reclaims: 9268
 page_faults: 0
 swaps: 0
 block_inputs: 0
-block_outputs: 80
+block_outputs: 88
 
 Network Stats
 -------------
@@ -201,6 +201,9 @@ Data_all_Acks [874 ] 874
 Ack [0 ] 0
 Ack_all [1 ] 1
 WB_Ack [755 ] 755
+PF_Load [0 ] 0
+PF_Ifetch [0 ] 0
+PF_Store [0 ] 0
 
  - Transitions -
 NP  Load [42 ] 42
@@ -208,18 +211,26 @@ NP  Ifetch [56 ] 56
 NP  Store [818 ] 818
 NP  Inv [1 ] 1
 NP  L1_Replacement [0 ] 0
+NP  PF_Load [0 ] 0
+NP  PF_Ifetch [0 ] 0
+NP  PF_Store [0 ] 0
 
 I  Load [0 ] 0
 I  Ifetch [0 ] 0
 I  Store [0 ] 0
 I  Inv [0 ] 0
 I  L1_Replacement [145 ] 145
+I  PF_Load [0 ] 0
+I  PF_Ifetch [0 ] 0
+I  PF_Store [0 ] 0
 
 S  Load [0 ] 0
 S  Ifetch [0 ] 0
 S  Store [1 ] 1
 S  Inv [31 ] 31
 S  L1_Replacement [11 ] 11
+S  PF_Load [0 ] 0
+S  PF_Store [0 ] 0
 
 E  Load [0 ] 0
 E  Ifetch [0 ] 0
@@ -229,6 +240,8 @@ E  L1_Replacement [34 ] 34
 E  Fwd_GETX [0 ] 0
 E  Fwd_GETS [0 ] 0
 E  Fwd_GET_INSTR [0 ] 0
+E  PF_Load [0 ] 0
+E  PF_Store [0 ] 0
 
 M  Load [2 ] 2
 M  Ifetch [0 ] 0
@@ -238,6 +251,8 @@ M  L1_Replacement [722 ] 722
 M  Fwd_GETX [0 ] 0
 M  Fwd_GETS [0 ] 0
 M  Fwd_GET_INSTR [0 ] 0
+M  PF_Load [0 ] 0
+M  PF_Store [0 ] 0
 
 IS  Load [0 ] 0
 IS  Ifetch [0 ] 0
@@ -247,6 +262,8 @@ IS  L1_Replacement [374 ] 374
 IS  Data_Exclusive [41 ] 41
 IS  DataS_fromL1 [0 ] 0
 IS  Data_all_Acks [43 ] 43
+IS  PF_Load [0 ] 0
+IS  PF_Store [0 ] 0
 
 IM  Load [0 ] 0
 IM  Ifetch [0 ] 0
@@ -256,6 +273,8 @@ IM  L1_Replacement [9112 ] 9112
 IM  Data [0 ] 0
 IM  Data_all_Acks [817 ] 817
 IM  Ack [0 ] 0
+IM  PF_Load [0 ] 0
+IM  PF_Store [0 ] 0
 
 SM  Load [0 ] 0
 SM  Ifetch [0 ] 0
@@ -264,6 +283,8 @@ SM  Inv [0 ] 0
 SM  L1_Replacement [0 ] 0
 SM  Ack [0 ] 0
 SM  Ack_all [1 ] 1
+SM  PF_Load [0 ] 0
+SM  PF_Store [0 ] 0
 
 IS_I  Load [0 ] 0
 IS_I  Ifetch [0 ] 0
@@ -273,6 +294,8 @@ IS_I  L1_Replacement [0 ] 0
 IS_I  Data_Exclusive [0 ] 0
 IS_I  DataS_fromL1 [0 ] 0
 IS_I  Data_all_Acks [14 ] 14
+IS_I  PF_Load [0 ] 0
+IS_I  PF_Store [0 ] 0
 
 M_I  Load [0 ] 0
 M_I  Ifetch [10 ] 10
@@ -283,6 +306,8 @@ M_I  Fwd_GETX [0 ] 0
 M_I  Fwd_GETS [0 ] 0
 M_I  Fwd_GET_INSTR [0 ] 0
 M_I  WB_Ack [340 ] 340
+M_I  PF_Load [0 ] 0
+M_I  PF_Store [0 ] 0
 
 SINK_WB_ACK  Load [0 ] 0
 SINK_WB_ACK  Ifetch [1 ] 1
@@ -290,6 +315,46 @@ SINK_WB_ACK  Store [0 ] 0
 SINK_WB_ACK  Inv [0 ] 0
 SINK_WB_ACK  L1_Replacement [0 ] 0
 SINK_WB_ACK  WB_Ack [415 ] 415
+SINK_WB_ACK  PF_Load [0 ] 0
+SINK_WB_ACK  PF_Store [0 ] 0
+
+PF_IS  Load [0 ] 0
+PF_IS  Ifetch [0 ] 0
+PF_IS  Store [0 ] 0
+PF_IS  Inv [0 ] 0
+PF_IS  L1_Replacement [0 ] 0
+PF_IS  Data_Exclusive [0 ] 0
+PF_IS  DataS_fromL1 [0 ] 0
+PF_IS  Data_all_Acks [0 ] 0
+PF_IS  PF_Load [0 ] 0
+PF_IS  PF_Store [0 ] 0
+
+PF_IM  Load [0 ] 0
+PF_IM  Ifetch [0 ] 0
+PF_IM  Store [0 ] 0
+PF_IM  Inv [0 ] 0
+PF_IM  L1_Replacement [0 ] 0
+PF_IM  Data [0 ] 0
+PF_IM  Data_all_Acks [0 ] 0
+PF_IM  Ack [0 ] 0
+PF_IM  PF_Load [0 ] 0
+PF_IM  PF_Store [0 ] 0
+
+PF_SM  Load [0 ] 0
+PF_SM  Ifetch [0 ] 0
+PF_SM  Store [0 ] 0
+PF_SM  Inv [0 ] 0
+PF_SM  L1_Replacement [0 ] 0
+PF_SM  Ack [0 ] 0
+PF_SM  Ack_all [0 ] 0
+
+PF_IS_I  Load [0 ] 0
+PF_IS_I  Store [0 ] 0
+PF_IS_I  Inv [0 ] 0
+PF_IS_I  L1_Replacement [0 ] 0
+PF_IS_I  Data_Exclusive [0 ] 0
+PF_IS_I  DataS_fromL1 [0 ] 0
+PF_IS_I  Data_all_Acks [0 ] 0
 
 Cache Stats: system.l2_cntrl0.L2cacheMemory
   system.l2_cntrl0.L2cacheMemory_total_misses: 874
diff --git a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
index 618fbf540..4ea61ad84 100644
--- a/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
+++ b/tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
@@ -4,9 +4,9 @@ sim_seconds                                  0.000318                       # Nu
 sim_ticks                                      318321                       # Number of ticks simulated
 final_tick                                     318321                       # Number of ticks from beginning of simulation (restored from checkpoints and never reset)
 sim_freq                                   1000000000                       # Frequency of simulated ticks
-host_tick_rate                                1505639                       # Simulator tick rate (ticks/s)
-host_mem_usage                                 260768                       # Number of bytes of host memory used
-host_seconds                                     0.21                       # Real time elapsed on the host
+host_tick_rate                                1374742                       # Simulator tick rate (ticks/s)
+host_mem_usage                                 271156                       # Number of bytes of host memory used
+host_seconds                                     0.23                       # Real time elapsed on the host
 system.l1_cntrl0.L1DcacheMemory.num_data_array_reads            0                       # number of data array reads
 system.l1_cntrl0.L1DcacheMemory.num_data_array_writes            0                       # number of data array writes
 system.l1_cntrl0.L1DcacheMemory.num_tag_array_reads            0                       # number of tag array reads
@@ -19,6 +19,15 @@ system.l1_cntrl0.L1IcacheMemory.num_tag_array_reads            0
 system.l1_cntrl0.L1IcacheMemory.num_tag_array_writes            0                       # number of tag array writes
 system.l1_cntrl0.L1IcacheMemory.num_tag_array_stalls            0                       # number of stalls caused by tag array
 system.l1_cntrl0.L1IcacheMemory.num_data_array_stalls            0                       # number of stalls caused by data array
+system.l1_cntrl0.prefetcher.miss_observed            0                       # number of misses observed
+system.l1_cntrl0.prefetcher.allocated_streams            0                       # number of streams allocated for prefetching
+system.l1_cntrl0.prefetcher.prefetches_requested            0                       # number of prefetch requests made
+system.l1_cntrl0.prefetcher.prefetches_accepted            0                       # number of prefetch requests accepted
+system.l1_cntrl0.prefetcher.dropped_prefetches            0                       # number of prefetch requests dropped
+system.l1_cntrl0.prefetcher.hits                    0                       # number of prefetched blocks accessed
+system.l1_cntrl0.prefetcher.partial_hits            0                       # number of misses observed for a block being prefetched
+system.l1_cntrl0.prefetcher.pages_crossed            0                       # number of prefetches across pages
+system.l1_cntrl0.prefetcher.misses_on_prefetched_blocks            0                       # number of misses for blocks that were prefetched, yet missed
 system.l2_cntrl0.L2cacheMemory.num_data_array_reads            0                       # number of data array reads
 system.l2_cntrl0.L2cacheMemory.num_data_array_writes            0                       # number of data array writes
 system.l2_cntrl0.L2cacheMemory.num_tag_array_reads            0                       # number of tag array reads