changeset ee27d0bf7353 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=ee27d0bf7353
description:
Regression: Updates due to changes to Ruby memory controller
diffstat:
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
| 75 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 533 +++++----
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/simout
| 6 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/stats.txt
| 192 +-
tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/system.pc.com_1.terminal
| 6 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
| 10 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 169 +-
tests/quick/se/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
| 10 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
| 10 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 96 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
| 10 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
| 10 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
| 82 +-
tests/quick/se/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
| 10 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
| 10 +-
tests/quick/se/00.hello/ref/mips/linux/simple-timing-ruby/simout
| 10 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
| 10 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
| 98 +-
tests/quick/se/00.hello/ref/sparc/linux/simple-timing-ruby/simout
| 10 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
| 13 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
| 102 +-
tests/quick/se/00.hello/ref/x86/linux/simple-timing-ruby/simout
| 10 +-
tests/quick/se/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
| 23 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
| 8 +-
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
| 412 +++---
tests/quick/se/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
| 10 +-
26 files changed, 1011 insertions(+), 924 deletions(-)
diffs (truncated from 4263 to 300 lines):
diff -r f6483789d23a -r ee27d0bf7353
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 Sep 10 12:21:01 2012 -0500
+++
b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
Mon Sep 10 12:44:03 2012 -0500
@@ -11,6 +11,7 @@
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
acpi_description_table_pointer=system.acpi_description_table_pointer
boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
+clock=1
e820_table=system.e820_table
init_param=0
intel_mp_pointer=system.intel_mp_pointer
@@ -69,7 +70,6 @@
max_loads_all_threads=0
max_loads_any_thread=0
numThreads=1
-phase=0
profile=0
progress_interval=0
system=system
@@ -86,14 +86,16 @@
[system.cpu0.dtb.walker]
type=X86PagetableWalker
+clock=1
system=system
port=system.l1_cntrl0.sequencer.slave[3]
[system.cpu0.interrupts]
type=X86LocalApic
+clock=1
int_latency=1000
pio_addr=2305843009213693952
-pio_latency=1000
+pio_latency=100000
system=system
int_master=system.piobus.slave[4]
int_slave=system.piobus.master[19]
@@ -107,6 +109,7 @@
[system.cpu0.itb.walker]
type=X86PagetableWalker
+clock=1
system=system
port=system.l1_cntrl0.sequencer.slave[2]
@@ -133,7 +136,6 @@
max_loads_all_threads=0
max_loads_any_thread=0
numThreads=1
-phase=0
profile=0
progress_interval=0
system=system
@@ -150,14 +152,16 @@
[system.cpu1.dtb.walker]
type=X86PagetableWalker
+clock=1
system=system
port=system.l1_cntrl1.sequencer.slave[3]
[system.cpu1.interrupts]
type=X86LocalApic
+clock=1
int_latency=1000
pio_addr=2305843009213693952
-pio_latency=1000
+pio_latency=100000
system=system
int_master=system.piobus.slave[5]
int_slave=system.piobus.master[21]
@@ -171,6 +175,7 @@
[system.cpu1.itb.walker]
type=X86PagetableWalker
+clock=1
system=system
port=system.l1_cntrl1.sequencer.slave[2]
@@ -207,9 +212,9 @@
bank_queue_size=12
banks_per_rank=8
basic_bus_busy_time=2
+clock=2500
dimm_bit_0=12
dimms_per_channel=2
-mem_bus_cycle_multiplier=10
mem_ctl_latency=12
mem_fixed_delay=0
mem_random_arbitrate=0
@@ -218,6 +223,7 @@
ranks_per_dimm=2
read_write_delay=2
refresh_period=1560
+ruby_system=system.ruby
tFaw=0
version=0
@@ -237,6 +243,7 @@
[system.dma_cntrl0.dma_sequencer]
type=DMASequencer
access_phys_mem=true
+clock=1
ruby_system=system.ruby
support_data_reqs=true
support_inst_reqs=true
@@ -670,6 +677,7 @@
[system.l1_cntrl0.sequencer]
type=RubySequencer
access_phys_mem=true
+clock=1
dcache=system.l1_cntrl0.L1DcacheMemory
deadlock_threshold=500000
icache=system.l1_cntrl0.L1IcacheMemory
@@ -734,6 +742,7 @@
[system.l1_cntrl1.sequencer]
type=RubySequencer
access_phys_mem=true
+clock=1
dcache=system.l1_cntrl1.L1DcacheMemory
deadlock_threshold=500000
icache=system.l1_cntrl1.L1IcacheMemory
@@ -785,9 +794,10 @@
[system.pc.behind_pci]
type=IsaFake
+clock=1
fake_mem=false
pio_addr=9223372036854779128
-pio_latency=1000
+pio_latency=100000
pio_size=8
ret_bad_addr=false
ret_data16=65535
@@ -802,8 +812,9 @@
[system.pc.com_1]
type=Uart8250
children=terminal
+clock=1
pio_addr=9223372036854776824
-pio_latency=1000
+pio_latency=100000
platform=system.pc
system=system
terminal=system.pc.com_1.terminal
@@ -825,9 +836,10 @@
[system.pc.fake_com_2]
type=IsaFake
+clock=1
fake_mem=false
pio_addr=9223372036854776568
-pio_latency=1000
+pio_latency=100000
pio_size=8
ret_bad_addr=false
ret_data16=65535
@@ -841,9 +853,10 @@
[system.pc.fake_com_3]
type=IsaFake
+clock=1
fake_mem=false
pio_addr=9223372036854776808
-pio_latency=1000
+pio_latency=100000
pio_size=8
ret_bad_addr=false
ret_data16=65535
@@ -857,9 +870,10 @@
[system.pc.fake_com_4]
type=IsaFake
+clock=1
fake_mem=false
pio_addr=9223372036854776552
-pio_latency=1000
+pio_latency=100000
pio_size=8
ret_bad_addr=false
ret_data16=65535
@@ -873,9 +887,10 @@
[system.pc.fake_floppy]
type=IsaFake
+clock=1
fake_mem=false
pio_addr=9223372036854776818
-pio_latency=1000
+pio_latency=100000
pio_size=2
ret_bad_addr=false
ret_data16=65535
@@ -889,9 +904,10 @@
[system.pc.i_dont_exist]
type=IsaFake
+clock=1
fake_mem=false
pio_addr=9223372036854775936
-pio_latency=1000
+pio_latency=100000
pio_size=1
ret_bad_addr=false
ret_data16=65535
@@ -906,7 +922,8 @@
[system.pc.pciconfig]
type=PciConfigAll
bus=0
-pio_latency=1
+clock=1
+pio_latency=30000
platform=system.pc
size=16777216
system=system
@@ -921,7 +938,6 @@
keyboard=system.pc.south_bridge.keyboard
pic1=system.pc.south_bridge.pic1
pic2=system.pc.south_bridge.pic2
-pio_latency=1000
pit=system.pc.south_bridge.pit
platform=system.pc
speaker=system.pc.south_bridge.speaker
@@ -929,9 +945,10 @@
[system.pc.south_bridge.cmos]
type=Cmos
children=int_pin
+clock=1
int_pin=system.pc.south_bridge.cmos.int_pin
pio_addr=9223372036854775920
-pio_latency=1000
+pio_latency=100000
system=system
time=Sun Jan 1 00:00:00 2012
pio=system.piobus.master[1]
@@ -941,8 +958,9 @@
[system.pc.south_bridge.dma1]
type=I8237
+clock=1
pio_addr=9223372036854775808
-pio_latency=1000
+pio_latency=100000
system=system
pio=system.piobus.master[2]
@@ -987,16 +1005,15 @@
SubsystemID=0
SubsystemVendorID=0
VendorID=32902
+clock=1
config_latency=20000
ctrl_offset=0
disks=system.pc.south_bridge.ide.disks0 system.pc.south_bridge.ide.disks1
io_shift=0
-max_backoff_delay=10000000
-min_backoff_delay=4000
pci_bus=0
pci_dev=4
pci_func=0
-pio_latency=1000
+pio_latency=30000
platform=system.pc
system=system
config=system.piobus.master[4]
@@ -1123,10 +1140,11 @@
[system.pc.south_bridge.io_apic]
type=I82094AA
apic_id=2
+clock=1
external_int_pic=system.pc.south_bridge.pic1
int_latency=1000
pio_addr=4273995776
-pio_latency=1000
+pio_latency=100000
system=system
int_master=system.piobus.slave[1]
pio=system.piobus.master[10]
@@ -1134,12 +1152,13 @@
[system.pc.south_bridge.keyboard]
type=I8042
children=keyboard_int_pin mouse_int_pin
+clock=1
command_port=9223372036854775908
data_port=9223372036854775904
keyboard_int_pin=system.pc.south_bridge.keyboard.keyboard_int_pin
mouse_int_pin=system.pc.south_bridge.keyboard.mouse_int_pin
pio_addr=0
-pio_latency=1000
+pio_latency=100000
system=system
pio=system.piobus.master[5]
@@ -1152,10 +1171,11 @@
[system.pc.south_bridge.pic1]
type=I8259
children=output
+clock=1
mode=I8259Master
output=system.pc.south_bridge.pic1.output
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
