changeset d2eeba87c4a8 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=d2eeba87c4a8
description:
regressions: update stats due to changes in ruby obj hierarchy
diffstat:
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
| 569 ++-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 126 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
| 106 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
| 113 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 74 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
| 64 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 113 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
| 62 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 46 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
| 111 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 74 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 46 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
| 109 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
| 92 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
| 58 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
| 97 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
| 42 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
| 22 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
| 113 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 66 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
| 64 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 113 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
| 58 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 46 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
| 111 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 74 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 44 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
| 109 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
| 88 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
| 58 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
| 97 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
| 42 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
| 22 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
| 99 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
| 22 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
| 97 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
| 42 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
| 22 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
| 105 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
| 46 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
| 22 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
| 1429 +++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
| 290 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
| 354 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
| 1199 ++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
| 240 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
| 210 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
| 1307 ++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
| 294 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
| 210 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
| 1447 +++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
| 432 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
| 306 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
| 901 +++---
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
| 172 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
| 102 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
| 105 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
| 68 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
| 60 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
| 105 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
| 64 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
| 42 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
| 103 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
| 72 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
| 42 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
| 101 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
| 90 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
| 54 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
| 89 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
| 40 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
| 18 +-
71 files changed, 6880 insertions(+), 6550 deletions(-)
diffs (truncated from 19600 to 300 lines):
diff -r 721718c62859 -r d2eeba87c4a8
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
---
a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
Mon Jan 14 10:05:14 2013 -0600
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
Mon Jan 14 10:20:16 2013 -0600
@@ -8,7 +8,7 @@
[system]
type=LinuxX86System
-children=acpi_description_table_pointer cpu0 cpu1 dir_cntrl0 dma_cntrl0
e820_table intel_mp_pointer intel_mp_table intrctrl l1_cntrl0 l1_cntrl1
l2_cntrl0 pc physmem piobus ruby smbios_table sys_port_proxy
+children=acpi_description_table_pointer cpu0 cpu1 e820_table intel_mp_pointer
intel_mp_table intrctrl pc physmem piobus ruby smbios_table sys_port_proxy
acpi_description_table_pointer=system.acpi_description_table_pointer
boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
clock=1000
@@ -19,6 +19,7 @@
kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
load_addr_mask=18446744073709551615
mem_mode=timing
+mem_ranges=0:134217727
memories=system.physmem
num_work_ids=16
readfile=tests/halt.sh
@@ -52,11 +53,10 @@
[system.cpu0]
type=TimingSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
checker=Null
clock=500
cpu_id=0
-defer_registration=false
do_checkpoint_insts=true
do_quiesce=true
do_statistics_insts=true
@@ -64,6 +64,7 @@
function_trace=false
function_trace_start=0
interrupts=system.cpu0.interrupts
+isa=system.cpu0.isa
itb=system.cpu0.itb
max_insts_all_threads=0
max_insts_any_thread=0
@@ -72,11 +73,12 @@
numThreads=1
profile=0
progress_interval=0
+switched_out=false
system=system
tracer=system.cpu0.tracer
workload=
-dcache_port=system.l1_cntrl0.sequencer.slave[1]
-icache_port=system.l1_cntrl0.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
[system.cpu0.dtb]
type=X86TLB
@@ -88,7 +90,7 @@
type=X86PagetableWalker
clock=500
system=system
-port=system.l1_cntrl0.sequencer.slave[3]
+port=system.ruby.l1_cntrl0.sequencer.slave[3]
[system.cpu0.interrupts]
type=X86LocalApic
@@ -101,6 +103,9 @@
int_slave=system.piobus.master[19]
pio=system.piobus.master[18]
+[system.cpu0.isa]
+type=X86ISA
+
[system.cpu0.itb]
type=X86TLB
children=walker
@@ -111,18 +116,17 @@
type=X86PagetableWalker
clock=500
system=system
-port=system.l1_cntrl0.sequencer.slave[2]
+port=system.ruby.l1_cntrl0.sequencer.slave[2]
[system.cpu0.tracer]
type=ExeTracer
[system.cpu1]
type=TimingSimpleCPU
-children=dtb interrupts itb tracer
+children=dtb interrupts isa itb tracer
checker=Null
clock=500
cpu_id=1
-defer_registration=false
do_checkpoint_insts=true
do_quiesce=true
do_statistics_insts=true
@@ -130,6 +134,7 @@
function_trace=false
function_trace_start=0
interrupts=system.cpu1.interrupts
+isa=system.cpu1.isa
itb=system.cpu1.itb
max_insts_all_threads=0
max_insts_any_thread=0
@@ -138,11 +143,12 @@
numThreads=1
profile=0
progress_interval=0
+switched_out=false
system=system
tracer=system.cpu1.tracer
workload=
-dcache_port=system.l1_cntrl1.sequencer.slave[1]
-icache_port=system.l1_cntrl1.sequencer.slave[0]
+dcache_port=system.ruby.l1_cntrl1.sequencer.slave[1]
+icache_port=system.ruby.l1_cntrl1.sequencer.slave[0]
[system.cpu1.dtb]
type=X86TLB
@@ -154,7 +160,7 @@
type=X86PagetableWalker
clock=500
system=system
-port=system.l1_cntrl1.sequencer.slave[3]
+port=system.ruby.l1_cntrl1.sequencer.slave[3]
[system.cpu1.interrupts]
type=X86LocalApic
@@ -167,6 +173,9 @@
int_slave=system.piobus.master[21]
pio=system.piobus.master[20]
+[system.cpu1.isa]
+type=X86ISA
+
[system.cpu1.itb]
type=X86TLB
children=walker
@@ -177,82 +186,11 @@
type=X86PagetableWalker
clock=500
system=system
-port=system.l1_cntrl1.sequencer.slave[2]
+port=system.ruby.l1_cntrl1.sequencer.slave[2]
[system.cpu1.tracer]
type=ExeTracer
-[system.dir_cntrl0]
-type=Directory_Controller
-children=directory memBuffer
-buffer_size=0
-cntrl_id=3
-directory=system.dir_cntrl0.directory
-directory_latency=6
-memBuffer=system.dir_cntrl0.memBuffer
-number_of_TBEs=256
-recycle_latency=10
-ruby_system=system.ruby
-to_mem_ctrl_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.dir_cntrl0.directory]
-type=RubyDirectoryMemory
-map_levels=4
-numa_high_bit=5
-size=134217728
-use_map=false
-version=0
-
-[system.dir_cntrl0.memBuffer]
-type=RubyMemoryControl
-bank_bit_0=8
-bank_busy_time=11
-bank_queue_size=12
-banks_per_rank=8
-basic_bus_busy_time=2
-clock=2500
-dimm_bit_0=12
-dimms_per_channel=2
-mem_ctl_latency=12
-mem_fixed_delay=0
-mem_random_arbitrate=0
-rank_bit_0=11
-rank_rank_delay=1
-ranks_per_dimm=2
-read_write_delay=2
-refresh_period=1560
-ruby_system=system.ruby
-tFaw=0
-version=0
-
-[system.dma_cntrl0]
-type=DMA_Controller
-children=dma_sequencer
-buffer_size=0
-cntrl_id=4
-dma_sequencer=system.dma_cntrl0.dma_sequencer
-number_of_TBEs=256
-recycle_latency=10
-request_latency=6
-ruby_system=system.ruby
-transitions_per_cycle=32
-version=0
-
-[system.dma_cntrl0.dma_sequencer]
-type=DMASequencer
-access_phys_mem=true
-clock=1000
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=0
-slave=system.pc.south_bridge.ide.dma
-
[system.e820_table]
type=X86E820Table
children=entries0 entries1
@@ -627,189 +565,6 @@
type=IntrControl
sys=system
-[system.l1_cntrl0]
-type=L1Cache_Controller
-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
-sequencer=system.l1_cntrl0.sequencer
-to_l2_latency=1
-transitions_per_cycle=32
-version=0
-
-[system.l1_cntrl0.L1DcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=false
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-start_index_bit=6
-tagAccessLatency=1
-tagArrayBanks=1
-
-[system.l1_cntrl0.L1IcacheMemory]
-type=RubyCache
-assoc=2
-dataAccessLatency=1
-dataArrayBanks=1
-is_icache=true
-latency=3
-replacement_policy=PSEUDO_LRU
-resourceStalls=false
-size=32768
-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=true
-clock=1000
-dcache=system.l1_cntrl0.L1DcacheMemory
-deadlock_threshold=500000
-icache=system.l1_cntrl0.L1IcacheMemory
-max_outstanding_requests=16
-ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
-system=system
-using_network_tester=false
-using_ruby_tester=false
-version=0
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
