changeset 0068ad93a67e in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=0068ad93a67e
description:
stats: updates due to changes to ruby
diffstat:
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
| 304 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
| 2086 +++---
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal
| 6 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_Two_Level/stats.txt
| 414 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 840 ++-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 873 ++-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
| 446 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
| 125 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
| 452 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_Two_Level/stats.txt
| 408 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 844 ++-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 517 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
| 127 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
| 449 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
| 125 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
| 451 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
| 125 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
| 452 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
| 125 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
| 459 +-
tests/quick/se/00.hello/ref/x86/linux/o3-timing/config.ini
| 1 +
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
| 125 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
| 484 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/config.ini
| 162 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MESI_Two_Level/stats.txt
| 1912 ++++---
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
| 155 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
| 2434 +++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
| 155 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
| 2687 +++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
| 155 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
| 2600 +++++----
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
| 153 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
| 1158 ++-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/config.ini
| 127 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_Two_Level/stats.txt
| 967 ++-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
| 127 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
| 979 ++-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
| 127 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
| 1086 ++-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
| 127 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
| 1014 ++-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
| 125 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
| 705 +-
50 files changed, 17303 insertions(+), 10779 deletions(-)
diffs (truncated from 34344 to 300 lines):
diff -r 77787650cbbc -r 0068ad93a67e
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
---
a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
Thu Nov 06 05:42:21 2014 -0600
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
Thu Nov 06 05:42:21 2014 -0600
@@ -10,7 +10,7 @@
[system]
type=LinuxX86System
-children=acpi_description_table_pointer clk_domain cpu0 cpu1 cpu_clk_domain
dvfs_handler e820_table intel_mp_pointer intel_mp_table intrctrl iobus pc
physmem ruby smbios_table sys_port_proxy voltage_domain
+children=acpi_description_table_pointer clk_domain cpu0 cpu1 cpu_clk_domain
dvfs_handler e820_table intel_mp_pointer intel_mp_table intrctrl iobus
mem_ctrls pc ruby smbios_table sys_port_proxy voltage_domain
acpi_description_table_pointer=system.acpi_description_table_pointer
boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
cache_line_size=64
@@ -26,7 +26,7 @@
load_offset=0
mem_mode=timing
mem_ranges=0:134217727
-memories=system.physmem
+memories=system.mem_ctrls
num_work_ids=16
readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
smbios_table=system.smbios_table
@@ -705,9 +705,86 @@
use_default_range=false
width=8
default=system.pc.pciconfig.pio
-master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio
system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config
system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio
system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio
system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio
system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio
system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio
system.pc.fake_floppy.pio system.ruby.l1_cntrl0.sequencer.pio_slave_port
system.ruby.l1_cntrl1.sequencer.pio_slave_port system.physmem.port
+master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio
system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config
system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio
system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio
system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio
system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio
system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio
system.pc.fake_floppy.pio system.ruby.l1_cntrl0.sequencer.pio_slave_port
system.ruby.l1_cntrl1.sequencer.pio_slave_port
system.ruby.io_controller.dma_sequencer.slave
slave=system.pc.south_bridge.io_apic.int_master
system.ruby.l1_cntrl0.sequencer.pio_master_port
system.ruby.l1_cntrl0.sequencer.mem_master_port
system.ruby.l1_cntrl1.sequencer.pio_master_port
system.ruby.l1_cntrl1.sequencer.mem_master_port
+[system.mem_ctrls]
+type=DRAMCtrl
+IDD0=0.075000
+IDD02=0.000000
+IDD2N=0.050000
+IDD2N2=0.000000
+IDD2P0=0.000000
+IDD2P02=0.000000
+IDD2P1=0.000000
+IDD2P12=0.000000
+IDD3N=0.057000
+IDD3N2=0.000000
+IDD3P0=0.000000
+IDD3P02=0.000000
+IDD3P1=0.000000
+IDD3P12=0.000000
+IDD4R=0.187000
+IDD4R2=0.000000
+IDD4W=0.165000
+IDD4W2=0.000000
+IDD5=0.220000
+IDD52=0.000000
+IDD6=0.000000
+IDD62=0.000000
+VDD=1.500000
+VDD2=0.000000
+activation_limit=4
+addr_mapping=RoRaBaChCo
+bank_groups_per_rank=0
+banks_per_rank=8
+burst_length=8
+channels=1
+clk_domain=system.clk_domain
+conf_table_reported=true
+device_bus_width=8
+device_rowbuffer_size=1024
+device_size=536870912
+devices_per_rank=8
+dll=true
+eventq_index=0
+in_addr_map=true
+max_accesses_per_row=16
+mem_sched_policy=frfcfs
+min_writes_per_switch=16
+null=false
+page_policy=open_adaptive
+range=0:134217727
+ranks_per_channel=2
+read_buffer_size=32
+static_backend_latency=10000
+static_frontend_latency=10000
+tBURST=5000
+tCCD_L=0
+tCK=1250
+tCL=13750
+tCS=2500
+tRAS=35000
+tRCD=13750
+tREFI=7800000
+tRFC=260000
+tRP=13750
+tRRD=6000
+tRRD_L=0
+tRTP=7500
+tRTW=2500
+tWR=15000
+tWTR=7500
+tXAW=30000
+tXP=0
+tXPDLL=0
+tXS=0
+tXSDLL=0
+write_buffer_size=64
+write_high_thresh_perc=85
+write_low_thresh_perc=50
+port=system.ruby.dir_cntrl0.memory
+
[system.pc]
type=Pc
children=behind_pci com_1 fake_com_2 fake_com_3 fake_com_4 fake_floppy
i_dont_exist pciconfig south_bridge
@@ -982,7 +1059,7 @@
platform=system.pc
system=system
config=system.iobus.master[3]
-dma=system.ruby.dma_cntrl0.dma_sequencer.slave[0]
+dma=system.ruby.dma_cntrl0.dma_sequencer.slave
pio=system.iobus.master[2]
[system.pc.south_bridge.ide.disks0]
@@ -1216,93 +1293,17 @@
system=system
pio=system.iobus.master[8]
-[system.physmem]
-type=DRAMCtrl
-IDD0=0.075000
-IDD02=0.000000
-IDD2N=0.050000
-IDD2N2=0.000000
-IDD2P0=0.000000
-IDD2P02=0.000000
-IDD2P1=0.000000
-IDD2P12=0.000000
-IDD3N=0.057000
-IDD3N2=0.000000
-IDD3P0=0.000000
-IDD3P02=0.000000
-IDD3P1=0.000000
-IDD3P12=0.000000
-IDD4R=0.187000
-IDD4R2=0.000000
-IDD4W=0.165000
-IDD4W2=0.000000
-IDD5=0.220000
-IDD52=0.000000
-IDD6=0.000000
-IDD62=0.000000
-VDD=1.500000
-VDD2=0.000000
-activation_limit=4
-addr_mapping=RoRaBaChCo
-bank_groups_per_rank=0
-banks_per_rank=8
-burst_length=8
-channels=1
-clk_domain=system.clk_domain
-conf_table_reported=true
-device_bus_width=8
-device_rowbuffer_size=1024
-devices_per_rank=8
-dll=true
-eventq_index=0
-in_addr_map=true
-max_accesses_per_row=16
-mem_sched_policy=frfcfs
-min_writes_per_switch=16
-null=false
-page_policy=open_adaptive
-range=0:134217727
-ranks_per_channel=2
-read_buffer_size=32
-static_backend_latency=10000
-static_frontend_latency=10000
-tBURST=5000
-tCCD_L=0
-tCK=1250
-tCL=13750
-tCS=2500
-tRAS=35000
-tRCD=13750
-tREFI=7800000
-tRFC=260000
-tRP=13750
-tRRD=6000
-tRRD_L=0
-tRTP=7500
-tRTW=2500
-tWR=15000
-tWTR=7500
-tXAW=30000
-tXP=0
-tXPDLL=0
-tXS=0
-tXSDLL=0
-write_buffer_size=64
-write_high_thresh_perc=85
-write_low_thresh_perc=50
-port=system.iobus.master[19]
-
[system.ruby]
type=RubySystem
-children=clk_domain dir_cntrl0 dma_cntrl0 l1_cntrl0 l1_cntrl1 l2_cntrl0
memctrl_clk_domain network
+children=clk_domain dir_cntrl0 dma_cntrl0 io_controller l1_cntrl0 l1_cntrl1
l2_cntrl0 memctrl_clk_domain network
all_instructions=false
block_size_bytes=64
clk_domain=system.ruby.clk_domain
eventq_index=0
hot_lines=false
-mem_size=134217728
-no_mem_vec=false
+memory_size_bits=48
num_of_sequencers=2
+phys_mem=Null
random_seed=1234
randomization=false
@@ -1316,21 +1317,21 @@
[system.ruby.dir_cntrl0]
type=Directory_Controller
-children=directory memBuffer
+children=directory
buffer_size=0
clk_domain=system.ruby.clk_domain
cluster_id=0
directory=system.ruby.dir_cntrl0.directory
directory_latency=6
eventq_index=0
-memBuffer=system.ruby.dir_cntrl0.memBuffer
number_of_TBEs=256
-peer=Null
recycle_latency=10
ruby_system=system.ruby
+system=system
to_mem_ctrl_latency=1
transitions_per_cycle=4
version=0
+memory=system.mem_ctrls.port
requestToDir=system.ruby.network.master[7]
responseFromDir=system.ruby.network.slave[9]
responseToDir=system.ruby.network.master[8]
@@ -1338,33 +1339,8 @@
[system.ruby.dir_cntrl0.directory]
type=RubyDirectoryMemory
eventq_index=0
-map_levels=4
numa_high_bit=5
size=134217728
-use_map=false
-version=0
-
-[system.ruby.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
-clk_domain=system.ruby.memctrl_clk_domain
-dimm_bit_0=12
-dimms_per_channel=2
-eventq_index=0
-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.ruby.dma_cntrl0]
@@ -1376,10 +1352,10 @@
dma_sequencer=system.ruby.dma_cntrl0.dma_sequencer
eventq_index=0
number_of_TBEs=256
-peer=Null
recycle_latency=10
request_latency=6
ruby_system=system.ruby
+system=system
transitions_per_cycle=4
version=0
requestToDir=system.ruby.network.slave[10]
@@ -1387,17 +1363,42 @@
[system.ruby.dma_cntrl0.dma_sequencer]
type=DMASequencer
-access_phys_mem=true
clk_domain=system.ruby.clk_domain
eventq_index=0
ruby_system=system.ruby
-support_data_reqs=true
-support_inst_reqs=true
system=system
using_ruby_tester=false
version=0
slave=system.pc.south_bridge.ide.dma
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
