changeset d76312a74915 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=d76312a74915
description:
stats: updates due to changes to ruby pio access handling
diffstat:
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
| 43 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout
| 12 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
| 1541 ++++-----
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/system.pc.com_1.terminal
| 2 +-
4 files changed, 797 insertions(+), 801 deletions(-)
diffs (truncated from 1897 to 300 lines):
diff -r 4eec7bdde5b0 -r d76312a74915
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
Sun Feb 23 19:16:16 2014 -0600
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
Sun Feb 23 19:16:16 2014 -0600
@@ -20,8 +20,9 @@
init_param=0
intel_mp_pointer=system.intel_mp_pointer
intel_mp_table=system.intel_mp_table
-kernel=/dist/binaries/x86_64-vmlinux-2.6.22.9.smp
+kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
load_addr_mask=18446744073709551615
+load_offset=0
mem_mode=timing
mem_ranges=0:134217727
memories=system.physmem
@@ -66,6 +67,7 @@
[system.cpu0]
type=TimingSimpleCPU
children=apic_clk_domain dtb interrupts isa itb tracer
+branchPred=Null
checker=Null
clk_domain=system.cpu_clk_domain
cpu_id=0
@@ -123,9 +125,9 @@
pio_addr=2305843009213693952
pio_latency=100000
system=system
-int_master=system.piobus.slave[3]
-int_slave=system.piobus.master[18]
-pio=system.piobus.master[17]
+int_master=system.ruby.l1_cntrl0.sequencer.slave[4]
+int_slave=system.ruby.l1_cntrl0.sequencer.master[1]
+pio=system.ruby.l1_cntrl0.sequencer.master[0]
[system.cpu0.isa]
type=X86ISA
@@ -153,6 +155,7 @@
[system.cpu1]
type=TimingSimpleCPU
children=apic_clk_domain dtb interrupts isa itb tracer
+branchPred=Null
checker=Null
clk_domain=system.cpu_clk_domain
cpu_id=1
@@ -210,9 +213,9 @@
pio_addr=2305843009213693952
pio_latency=100000
system=system
-int_master=system.piobus.slave[4]
-int_slave=system.piobus.master[20]
-pio=system.piobus.master[19]
+int_master=system.ruby.l1_cntrl1.sequencer.slave[4]
+int_slave=system.ruby.l1_cntrl1.sequencer.master[1]
+pio=system.ruby.l1_cntrl1.sequencer.master[0]
[system.cpu1.isa]
type=X86ISA
@@ -968,7 +971,7 @@
[system.pc.south_bridge.ide.disks0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/dist/disks/linux-x86.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
read_only=true
[system.pc.south_bridge.ide.disks1]
@@ -991,7 +994,7 @@
[system.pc.south_bridge.ide.disks1.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/dist/disks/linux-bigswap2.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
read_only=true
[system.pc.south_bridge.int_lines0]
@@ -1214,7 +1217,7 @@
write_buffer_size=32
write_high_thresh_perc=70
write_low_thresh_perc=0
-port=system.piobus.master[21]
+port=system.piobus.master[19]
[system.piobus]
type=NoncoherentBus
@@ -1224,8 +1227,8 @@
use_default_range=true
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.cpu0.interrupts.pio
system.cpu0.interrupts.int_slave system.cpu1.interrupts.pio
system.cpu1.interrupts.int_slave system.physmem.port
-slave=system.pc.south_bridge.io_apic.int_master
system.ruby.l1_cntrl0.sequencer.pio_port
system.ruby.l1_cntrl1.sequencer.pio_port system.cpu0.interrupts.int_master
system.cpu1.interrupts.int_master
+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
+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.ruby]
type=RubySystem
@@ -1322,7 +1325,6 @@
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
@@ -1408,8 +1410,11 @@
using_network_tester=false
using_ruby_tester=false
version=0
-pio_port=system.piobus.slave[1]
-slave=system.cpu0.icache_port system.cpu0.dcache_port
system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
+master=system.cpu0.interrupts.pio system.cpu0.interrupts.int_slave
+mem_master_port=system.piobus.slave[2]
+pio_master_port=system.piobus.slave[1]
+pio_slave_port=system.piobus.master[17]
+slave=system.cpu0.icache_port system.cpu0.dcache_port
system.cpu0.itb.walker.port system.cpu0.dtb.walker.port
system.cpu0.interrupts.int_master
[system.ruby.l1_cntrl1]
type=L1Cache_Controller
@@ -1492,8 +1497,11 @@
using_network_tester=false
using_ruby_tester=false
version=1
-pio_port=system.piobus.slave[2]
-slave=system.cpu1.icache_port system.cpu1.dcache_port
system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
+master=system.cpu1.interrupts.pio system.cpu1.interrupts.int_slave
+mem_master_port=system.piobus.slave[4]
+pio_master_port=system.piobus.slave[3]
+pio_slave_port=system.piobus.master[18]
+slave=system.cpu1.icache_port system.cpu1.dcache_port
system.cpu1.itb.walker.port system.cpu1.dtb.walker.port
system.cpu1.interrupts.int_master
[system.ruby.l2_cntrl0]
type=L2Cache_Controller
@@ -1724,7 +1732,6 @@
support_data_reqs=true
support_inst_reqs=true
system=system
-using_network_tester=false
using_ruby_tester=false
version=0
slave=system.system_port
diff -r 4eec7bdde5b0 -r d76312a74915
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout
---
a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout
Sun Feb 23 19:16:16 2014 -0600
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout
Sun Feb 23 19:16:16 2014 -0600
@@ -1,12 +1,14 @@
+Redirecting stdout to
build/X86_MESI_Two_Level/tests/opt/long/fs/10.linux-boot/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simout
+Redirecting stderr to
build/X86_MESI_Two_Level/tests/opt/long/fs/10.linux-boot/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/simerr
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Jan 22 2014 17:16:50
-gem5 started Jan 22 2014 22:26:32
-gem5 executing on u200540-lin
+gem5 compiled Feb 23 2014 18:53:44
+gem5 started Feb 23 2014 18:53:57
+gem5 executing on ribera.cs.wisc.edu
command line: build/X86_MESI_Two_Level/gem5.opt -d
build/X86_MESI_Two_Level/tests/opt/long/fs/10.linux-boot/x86/linux/pc-simple-timing-ruby-MESI_Two_Level
-re tests/run.py
build/X86_MESI_Two_Level/tests/opt/long/fs/10.linux-boot/x86/linux/pc-simple-timing-ruby-MESI_Two_Level
Global frequency set at 1000000000000 ticks per second
-info: kernel located at: /dist/binaries/x86_64-vmlinux-2.6.22.9.smp
+info: kernel located at:
/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9.smp
0: rtc: Real-time clock set to Sun Jan 1 00:00:00 2012
info: Entering event queue @ 0. Starting simulation...
-Exiting @ tick 5300435735500 because m5_exit instruction encountered
+Exiting @ tick 5304496750000 because m5_exit instruction encountered
diff -r 4eec7bdde5b0 -r d76312a74915
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
---
a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
Sun Feb 23 19:16:16 2014 -0600
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/stats.txt
Sun Feb 23 19:16:16 2014 -0600
@@ -1,79 +1,79 @@
---------- Begin Simulation Statistics ----------
-sim_seconds 5.300436 #
Number of seconds simulated
-sim_ticks 5300435735500 #
Number of ticks simulated
-final_tick 5300435735500 #
Number of ticks from beginning of simulation (restored from checkpoints and
never reset)
+sim_seconds 5.304497 #
Number of seconds simulated
+sim_ticks 5304496750000 #
Number of ticks simulated
+final_tick 5304496750000 #
Number of ticks from beginning of simulation (restored from checkpoints and
never reset)
sim_freq 1000000000000 #
Frequency of simulated ticks
-host_inst_rate 165870 #
Simulator instruction rate (inst/s)
-host_op_rate 318050 #
Simulator op (including micro ops) rate (op/s)
-host_tick_rate 8229583651 #
Simulator tick rate (ticks/s)
-host_mem_usage 786300 #
Number of bytes of host memory used
-host_seconds 644.07 #
Real time elapsed on the host
-sim_insts 106831806 #
Number of instructions simulated
-sim_ops 204847037 #
Number of ops (including micro ops) simulated
+host_inst_rate 125034 #
Simulator instruction rate (inst/s)
+host_op_rate 239740 #
Simulator op (including micro ops) rate (op/s)
+host_tick_rate 6206530470 #
Simulator tick rate (ticks/s)
+host_mem_usage 832476 #
Number of bytes of host memory used
+host_seconds 854.66 #
Real time elapsed on the host
+sim_insts 106862058 #
Number of instructions simulated
+sim_ops 204897478 #
Number of ops (including micro ops) simulated
system.voltage_domain.voltage 1 #
Voltage in Volts
system.clk_domain.clock 1000 #
Clock period in ticks
-system.physmem.bytes_read::pc.south_bridge.ide 35184
# Number of bytes read from this memory
-system.physmem.bytes_read::cpu0.dtb.walker 121960
# Number of bytes read from this memory
-system.physmem.bytes_read::cpu0.itb.walker 61480
# Number of bytes read from this memory
-system.physmem.bytes_read::cpu0.inst 542427168 #
Number of bytes read from this memory
-system.physmem.bytes_read::cpu0.data 38705697 #
Number of bytes read from this memory
-system.physmem.bytes_read::cpu1.dtb.walker 101016
# Number of bytes read from this memory
-system.physmem.bytes_read::cpu1.itb.walker 45856
# Number of bytes read from this memory
-system.physmem.bytes_read::cpu1.inst 470385848 #
Number of bytes read from this memory
-system.physmem.bytes_read::cpu1.data 54943175 #
Number of bytes read from this memory
-system.physmem.bytes_read::total 1106827384 #
Number of bytes read from this memory
-system.physmem.bytes_inst_read::cpu0.inst 542427168 #
Number of instructions bytes read from this memory
-system.physmem.bytes_inst_read::cpu1.inst 470385848 #
Number of instructions bytes read from this memory
-system.physmem.bytes_inst_read::total 1012813016 #
Number of instructions bytes read from this memory
+system.physmem.bytes_read::pc.south_bridge.ide 35160
# Number of bytes read from this memory
+system.physmem.bytes_read::cpu0.dtb.walker 168624
# Number of bytes read from this memory
+system.physmem.bytes_read::cpu0.itb.walker 87432
# Number of bytes read from this memory
+system.physmem.bytes_read::cpu0.inst 563266144 #
Number of bytes read from this memory
+system.physmem.bytes_read::cpu0.data 42058413 #
Number of bytes read from this memory
+system.physmem.bytes_read::cpu1.dtb.walker 54624
# Number of bytes read from this memory
+system.physmem.bytes_read::cpu1.itb.walker 20152
# Number of bytes read from this memory
+system.physmem.bytes_read::cpu1.inst 449844528 #
Number of bytes read from this memory
+system.physmem.bytes_read::cpu1.data 51716224 #
Number of bytes read from this memory
+system.physmem.bytes_read::total 1107251301 #
Number of bytes read from this memory
+system.physmem.bytes_inst_read::cpu0.inst 563266144 #
Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::cpu1.inst 449844528 #
Number of instructions bytes read from this memory
+system.physmem.bytes_inst_read::total 1013110672 #
Number of instructions bytes read from this memory
system.physmem.bytes_written::pc.south_bridge.ide 2991104
# Number of bytes written to this memory
system.physmem.bytes_written::cpu0.itb.walker 16
# Number of bytes written to this memory
-system.physmem.bytes_written::cpu0.data 31534134 #
Number of bytes written to this memory
-system.physmem.bytes_written::cpu1.data 36447890 #
Number of bytes written to this memory
-system.physmem.bytes_written::total 70973144 #
Number of bytes written to this memory
-system.physmem.num_reads::pc.south_bridge.ide 814
# Number of read requests responded to by this memory
-system.physmem.num_reads::cpu0.dtb.walker 15245 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu0.itb.walker 7685 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu0.inst 67803396 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu0.data 6494255 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu1.dtb.walker 12627 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu1.itb.walker 5732 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu1.inst 58798231 #
Number of read requests responded to by this memory
-system.physmem.num_reads::cpu1.data 9219516 #
Number of read requests responded to by this memory
-system.physmem.num_reads::total 142357501 #
Number of read requests responded to by this memory
+system.physmem.bytes_written::cpu0.data 34107443 #
Number of bytes written to this memory
+system.physmem.bytes_written::cpu1.data 33949582 #
Number of bytes written to this memory
+system.physmem.bytes_written::total 71048145 #
Number of bytes written to this memory
+system.physmem.num_reads::pc.south_bridge.ide 811
# Number of read requests responded to by this memory
+system.physmem.num_reads::cpu0.dtb.walker 21078 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu0.itb.walker 10929 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu0.inst 70408268 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu0.data 7008799 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu1.dtb.walker 6828 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu1.itb.walker 2519 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu1.inst 56230566 #
Number of read requests responded to by this memory
+system.physmem.num_reads::cpu1.data 8723011 #
Number of read requests responded to by this memory
+system.physmem.num_reads::total 142412809 #
Number of read requests responded to by this memory
system.physmem.num_writes::pc.south_bridge.ide 46736
# Number of write requests responded to by this memory
system.physmem.num_writes::cpu0.itb.walker 2
# Number of write requests responded to by this memory
-system.physmem.num_writes::cpu0.data 4739560 #
Number of write requests responded to by this memory
-system.physmem.num_writes::cpu1.data 5091370 #
Number of write requests responded to by this memory
-system.physmem.num_writes::total 9877668 #
Number of write requests responded to by this memory
-system.physmem.bw_read::pc.south_bridge.ide 6638
# Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu0.dtb.walker 23009 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu0.itb.walker 11599 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu0.inst 102336335 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu0.data 7302361 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu1.dtb.walker 19058 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu1.itb.walker 8651 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu1.inst 88744751 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::cpu1.data 10365785 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_read::total 208818188 #
Total read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read::cpu0.inst 102336335 #
Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read::cpu1.inst 88744751 #
Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_inst_read::total 191081086 #
Instruction read bandwidth from this memory (bytes/s)
-system.physmem.bw_write::pc.south_bridge.ide 564313
# Write bandwidth from this memory (bytes/s)
+system.physmem.num_writes::cpu0.data 5095297 #
Number of write requests responded to by this memory
+system.physmem.num_writes::cpu1.data 4745855 #
Number of write requests responded to by this memory
+system.physmem.num_writes::total 9887890 #
Number of write requests responded to by this memory
+system.physmem.bw_read::pc.south_bridge.ide 6628
# Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu0.dtb.walker 31789 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu0.itb.walker 16483 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu0.inst 106186538 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu0.data 7928822 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu1.dtb.walker 10298 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu1.itb.walker 3799 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu1.inst 84804374 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::cpu1.data 9749506 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_read::total 208738237 #
Total read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu0.inst 106186538 #
Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::cpu1.inst 84804374 #
Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_inst_read::total 190990912 #
Instruction read bandwidth from this memory (bytes/s)
+system.physmem.bw_write::pc.south_bridge.ide 563881
# Write bandwidth from this memory (bytes/s)
system.physmem.bw_write::cpu0.itb.walker 3 #
Write bandwidth from this memory (bytes/s)
-system.physmem.bw_write::cpu0.data 5949347 #
Write bandwidth from this memory (bytes/s)
-system.physmem.bw_write::cpu1.data 6876395 #
Write bandwidth from this memory (bytes/s)
-system.physmem.bw_write::total 13390058 #
Write bandwidth from this memory (bytes/s)
-system.physmem.bw_total::pc.south_bridge.ide 570951
# Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu0.dtb.walker 23009 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu0.itb.walker 11602 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu0.inst 102336335 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu0.data 13251709 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu1.dtb.walker 19058 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu1.itb.walker 8651 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu1.inst 88744751 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::cpu1.data 17242180 #
Total bandwidth to/from this memory (bytes/s)
-system.physmem.bw_total::total 222208246 #
Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_write::cpu0.data 6429911 #
Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::cpu1.data 6400151 #
Write bandwidth from this memory (bytes/s)
+system.physmem.bw_write::total 13393946 #
Write bandwidth from this memory (bytes/s)
+system.physmem.bw_total::pc.south_bridge.ide 570509
# Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu0.dtb.walker 31789 #
Total bandwidth to/from this memory (bytes/s)
+system.physmem.bw_total::cpu0.itb.walker 16486 #
Total bandwidth to/from this memory (bytes/s)
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
