changeset d164268bc35c in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=d164268bc35c
description:
stats: revert pc-simple-timing-ruby-MESI_CMP_directory to before last
update
diffstat:
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
| 123 +++--
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr
| 2 +
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simout
| 12 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
| 222 +++++----
4 files changed, 212 insertions(+), 147 deletions(-)
diffs (truncated from 594 to 300 lines):
diff -r 2481b3ef5385 -r d164268bc35c
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
Sat Jul 28 13:48:04 2012 -0400
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
Mon Jul 30 12:11:25 2012 -0400
@@ -15,7 +15,7 @@
init_param=0
intel_mp_pointer=system.intel_mp_pointer
intel_mp_table=system.intel_mp_table
-kernel=/dist/m5/system/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
mem_mode=timing
memories=system.physmem
@@ -642,20 +642,30 @@
[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=false
latency=3
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=32768
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.l1_cntrl0.sequencer]
type=RubySequencer
@@ -696,20 +706,30 @@
[system.l1_cntrl1.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_cntrl1.L1IcacheMemory]
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_cntrl1.sequencer]
type=RubySequencer
@@ -746,11 +766,16 @@
[system.l2_cntrl0.L2cacheMemory]
type=RubyCache
assoc=2
+dataAccessLatency=1
+dataArrayBanks=1
is_icache=false
latency=15
replacement_policy=PSEUDO_LRU
+resourceStalls=false
size=4194304
start_index_bit=6
+tagAccessLatency=1
+tagArrayBanks=1
[system.pc]
type=Pc
@@ -995,7 +1020,7 @@
[system.pc.south_bridge.ide.disks0.image.child]
type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-x86.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
read_only=true
[system.pc.south_bridge.ide.disks1]
@@ -1015,7 +1040,7 @@
[system.pc.south_bridge.ide.disks1.image.child]
type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
read_only=true
[system.pc.south_bridge.int_lines0]
@@ -1190,9 +1215,9 @@
clock=1000
header_cycles=1
use_default_range=true
-width=64
+width=8
default=system.pc.pciconfig.pio
-master=system.physmem.port[0] 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
+master=system.physmem.port 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
slave=system.pc.south_bridge.ide.dma system.pc.south_bridge.io_apic.int_master
system.l1_cntrl0.sequencer.pio_port system.l1_cntrl1.sequencer.pio_port
system.cpu0.interrupts.int_master system.cpu1.interrupts.int_master
[system.ruby]
@@ -1219,74 +1244,104 @@
[system.ruby.network.topology]
type=Topology
-children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 int_links0
int_links1 int_links2 int_links3 int_links4 routers0 routers1 routers2 routers3
routers4 routers5
+children=ext_links0 ext_links1 ext_links2 ext_links3 ext_links4 int_links0
int_links1 int_links2 int_links3 int_links4
description=Crossbar
ext_links=system.ruby.network.topology.ext_links0
system.ruby.network.topology.ext_links1 system.ruby.network.topology.ext_links2
system.ruby.network.topology.ext_links3 system.ruby.network.topology.ext_links4
int_links=system.ruby.network.topology.int_links0
system.ruby.network.topology.int_links1 system.ruby.network.topology.int_links2
system.ruby.network.topology.int_links3 system.ruby.network.topology.int_links4
print_config=false
-routers=system.ruby.network.topology.routers0
system.ruby.network.topology.routers1 system.ruby.network.topology.routers2
system.ruby.network.topology.routers3 system.ruby.network.topology.routers4
system.ruby.network.topology.routers5
+routers=system.ruby.network.topology.ext_links0.int_node
system.ruby.network.topology.ext_links1.int_node
system.ruby.network.topology.ext_links2.int_node
system.ruby.network.topology.ext_links3.int_node
system.ruby.network.topology.ext_links4.int_node
system.ruby.network.topology.int_links0.node_b
[system.ruby.network.topology.ext_links0]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl0
-int_node=system.ruby.network.topology.routers0
+int_node=system.ruby.network.topology.ext_links0.int_node
latency=1
link_id=0
weight=1
+[system.ruby.network.topology.ext_links0.int_node]
+type=BasicRouter
+router_id=0
+
[system.ruby.network.topology.ext_links1]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l1_cntrl1
-int_node=system.ruby.network.topology.routers1
+int_node=system.ruby.network.topology.ext_links1.int_node
latency=1
link_id=1
weight=1
+[system.ruby.network.topology.ext_links1.int_node]
+type=BasicRouter
+router_id=1
+
[system.ruby.network.topology.ext_links2]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.l2_cntrl0
-int_node=system.ruby.network.topology.routers2
+int_node=system.ruby.network.topology.ext_links2.int_node
latency=1
link_id=2
weight=1
+[system.ruby.network.topology.ext_links2.int_node]
+type=BasicRouter
+router_id=2
+
[system.ruby.network.topology.ext_links3]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dir_cntrl0
-int_node=system.ruby.network.topology.routers3
+int_node=system.ruby.network.topology.ext_links3.int_node
latency=1
link_id=3
weight=1
+[system.ruby.network.topology.ext_links3.int_node]
+type=BasicRouter
+router_id=3
+
[system.ruby.network.topology.ext_links4]
type=SimpleExtLink
+children=int_node
bandwidth_factor=16
ext_node=system.dma_cntrl0
-int_node=system.ruby.network.topology.routers4
+int_node=system.ruby.network.topology.ext_links4.int_node
latency=1
link_id=4
weight=1
+[system.ruby.network.topology.ext_links4.int_node]
+type=BasicRouter
+router_id=4
+
[system.ruby.network.topology.int_links0]
type=SimpleIntLink
+children=node_b
bandwidth_factor=16
latency=1
link_id=5
-node_a=system.ruby.network.topology.routers0
-node_b=system.ruby.network.topology.routers5
+node_a=system.ruby.network.topology.ext_links0.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
+[system.ruby.network.topology.int_links0.node_b]
+type=BasicRouter
+router_id=5
+
[system.ruby.network.topology.int_links1]
type=SimpleIntLink
bandwidth_factor=16
latency=1
link_id=6
-node_a=system.ruby.network.topology.routers1
-node_b=system.ruby.network.topology.routers5
+node_a=system.ruby.network.topology.ext_links1.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links2]
@@ -1294,8 +1349,8 @@
bandwidth_factor=16
latency=1
link_id=7
-node_a=system.ruby.network.topology.routers2
-node_b=system.ruby.network.topology.routers5
+node_a=system.ruby.network.topology.ext_links2.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links3]
@@ -1303,8 +1358,8 @@
bandwidth_factor=16
latency=1
link_id=8
-node_a=system.ruby.network.topology.routers3
-node_b=system.ruby.network.topology.routers5
+node_a=system.ruby.network.topology.ext_links3.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
[system.ruby.network.topology.int_links4]
@@ -1312,34 +1367,10 @@
bandwidth_factor=16
latency=1
link_id=9
-node_a=system.ruby.network.topology.routers4
-node_b=system.ruby.network.topology.routers5
+node_a=system.ruby.network.topology.ext_links4.int_node
+node_b=system.ruby.network.topology.int_links0.node_b
weight=1
-[system.ruby.network.topology.routers0]
-type=BasicRouter
-router_id=0
-
-[system.ruby.network.topology.routers1]
-type=BasicRouter
-router_id=1
-
-[system.ruby.network.topology.routers2]
-type=BasicRouter
-router_id=2
-
-[system.ruby.network.topology.routers3]
-type=BasicRouter
-router_id=3
-
-[system.ruby.network.topology.routers4]
-type=BasicRouter
-router_id=4
-
-[system.ruby.network.topology.routers5]
-type=BasicRouter
-router_id=5
-
[system.ruby.profiler]
type=RubyProfiler
all_instructions=false
diff -r 2481b3ef5385 -r d164268bc35c
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr
---
a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr
Sat Jul 28 13:48:04 2012 -0400
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simerr
Mon Jul 30 12:11:25 2012 -0400
@@ -3,8 +3,10 @@
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
