changeset d75f37065089 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=d75f37065089
description:
        stats: update ruby.stats, config.ini files for x86 fs test

diffstat:

 
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
 |  207 +++++---
 
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
 |  224 +++++-----
 2 files changed, 237 insertions(+), 194 deletions(-)

diffs (truncated from 985 to 300 lines):

diff -r 69c158420c51 -r d75f37065089 
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
     Tue Aug 20 11:32:31 2013 -0500
+++ 
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
     Tue Aug 20 11:32:33 2013 -0500
@@ -8,10 +8,11 @@
 
 [system]
 type=LinuxX86System
-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
+children=acpi_description_table_pointer clk_domain cpu0 cpu1 cpu_clk_domain 
e820_table intel_mp_pointer intel_mp_table intrctrl pc physmem piobus 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
-clock=1000
+cache_line_size=64
+clk_domain=system.clk_domain
 e820_table=system.e820_table
 init_param=0
 intel_mp_pointer=system.intel_mp_pointer
@@ -51,12 +52,17 @@
 oem_revision=0
 oem_table_id=
 
+[system.clk_domain]
+type=SrcClockDomain
+clock=1000
+voltage_domain=system.voltage_domain
+
 [system.cpu0]
 type=TimingSimpleCPU
-children=dtb interrupts isa itb tracer
+children=apic_clk_domain dtb interrupts isa itb tracer
 branchPred=Null
 checker=Null
-clock=500
+clk_domain=system.cpu_clk_domain
 cpu_id=0
 do_checkpoint_insts=true
 do_quiesce=true
@@ -82,6 +88,11 @@
 dcache_port=system.ruby.l1_cntrl0.sequencer.slave[1]
 icache_port=system.ruby.l1_cntrl0.sequencer.slave[0]
 
+[system.cpu0.apic_clk_domain]
+type=DerivedClockDomain
+clk_divider=16
+clk_domain=system.cpu_clk_domain
+
 [system.cpu0.dtb]
 type=X86TLB
 children=walker
@@ -90,20 +101,21 @@
 
 [system.cpu0.dtb.walker]
 type=X86PagetableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.ruby.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu0.interrupts]
 type=X86LocalApic
-clock=8000
+clk_domain=system.cpu0.apic_clk_domain
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
 system=system
 int_master=system.piobus.slave[4]
-int_slave=system.piobus.master[19]
-pio=system.piobus.master[18]
+int_slave=system.piobus.master[18]
+pio=system.piobus.master[17]
 
 [system.cpu0.isa]
 type=X86ISA
@@ -116,7 +128,8 @@
 
 [system.cpu0.itb.walker]
 type=X86PagetableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.ruby.l1_cntrl0.sequencer.slave[2]
 
@@ -125,10 +138,10 @@
 
 [system.cpu1]
 type=TimingSimpleCPU
-children=dtb interrupts isa itb tracer
+children=apic_clk_domain dtb interrupts isa itb tracer
 branchPred=Null
 checker=Null
-clock=500
+clk_domain=system.cpu_clk_domain
 cpu_id=1
 do_checkpoint_insts=true
 do_quiesce=true
@@ -154,6 +167,11 @@
 dcache_port=system.ruby.l1_cntrl1.sequencer.slave[1]
 icache_port=system.ruby.l1_cntrl1.sequencer.slave[0]
 
+[system.cpu1.apic_clk_domain]
+type=DerivedClockDomain
+clk_divider=16
+clk_domain=system.cpu_clk_domain
+
 [system.cpu1.dtb]
 type=X86TLB
 children=walker
@@ -162,20 +180,21 @@
 
 [system.cpu1.dtb.walker]
 type=X86PagetableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.ruby.l1_cntrl1.sequencer.slave[3]
 
 [system.cpu1.interrupts]
 type=X86LocalApic
-clock=8000
+clk_domain=system.cpu1.apic_clk_domain
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
 system=system
 int_master=system.piobus.slave[5]
-int_slave=system.piobus.master[21]
-pio=system.piobus.master[20]
+int_slave=system.piobus.master[20]
+pio=system.piobus.master[19]
 
 [system.cpu1.isa]
 type=X86ISA
@@ -188,13 +207,19 @@
 
 [system.cpu1.itb.walker]
 type=X86PagetableWalker
-clock=500
+clk_domain=system.cpu_clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.ruby.l1_cntrl1.sequencer.slave[2]
 
 [system.cpu1.tracer]
 type=ExeTracer
 
+[system.cpu_clk_domain]
+type=SrcClockDomain
+clock=500
+voltage_domain=system.voltage_domain
+
 [system.e820_table]
 type=X86E820Table
 children=entries0 entries1 entries2
@@ -583,7 +608,7 @@
 
 [system.pc.behind_pci]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854779128
 pio_latency=100000
@@ -596,18 +621,18 @@
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[12]
+pio=system.piobus.master[11]
 
 [system.pc.com_1]
 type=Uart8250
 children=terminal
-clock=1000
+clk_domain=system.clk_domain
 pio_addr=9223372036854776824
 pio_latency=100000
 platform=system.pc
 system=system
 terminal=system.pc.com_1.terminal
-pio=system.piobus.master[13]
+pio=system.piobus.master[12]
 
 [system.pc.com_1.terminal]
 type=Terminal
@@ -625,7 +650,7 @@
 
 [system.pc.fake_com_2]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776568
 pio_latency=100000
@@ -638,11 +663,11 @@
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[14]
+pio=system.piobus.master[13]
 
 [system.pc.fake_com_3]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776808
 pio_latency=100000
@@ -655,11 +680,11 @@
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[15]
+pio=system.piobus.master[14]
 
 [system.pc.fake_com_4]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776552
 pio_latency=100000
@@ -672,11 +697,11 @@
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[16]
+pio=system.piobus.master[15]
 
 [system.pc.fake_floppy]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776818
 pio_latency=100000
@@ -689,11 +714,11 @@
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[17]
+pio=system.piobus.master[16]
 
 [system.pc.i_dont_exist]
 type=IsaFake
-clock=1000
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854775936
 pio_latency=100000
@@ -706,12 +731,13 @@
 system=system
 update_data=false
 warn_access=
-pio=system.piobus.master[11]
+pio=system.piobus.master[10]
 
 [system.pc.pciconfig]
 type=PciConfigAll
 bus=0
-clock=1000
+clk_domain=system.clk_domain
+pio_addr=0
 pio_latency=30000
 platform=system.pc
 size=16777216
@@ -734,24 +760,24 @@
 [system.pc.south_bridge.cmos]
 type=Cmos
 children=int_pin
-clock=1000
+clk_domain=system.clk_domain
 int_pin=system.pc.south_bridge.cmos.int_pin
 pio_addr=9223372036854775920
 pio_latency=100000
 system=system
 time=Sun Jan  1 00:00:00 2012
-pio=system.piobus.master[1]
+pio=system.piobus.master[0]
 
 [system.pc.south_bridge.cmos.int_pin]
 type=X86IntSourcePin
 
 [system.pc.south_bridge.dma1]
 type=I8237
-clock=1000
+clk_domain=system.clk_domain
 pio_addr=9223372036854775808
 pio_latency=100000
 system=system
-pio=system.piobus.master[2]
+pio=system.piobus.master[1]
 
 [system.pc.south_bridge.ide]
 type=IdeController
@@ -794,7 +820,7 @@
 SubsystemID=0
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to