1 files changed, 49 insertions, 36 deletions
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
index 4414972c3..ab02ce91f 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini
@@ -11,7 +11,7 @@ type=LinuxX86System
 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
+clock=1000
 e820_table=system.e820_table
 init_param=0
 intel_mp_pointer=system.intel_mp_pointer
@@ -86,13 +86,13 @@ walker=system.cpu0.dtb.walker
 
 [system.cpu0.dtb.walker]
 type=X86PagetableWalker
-clock=1
+clock=500
 system=system
 port=system.l1_cntrl0.sequencer.slave[3]
 
 [system.cpu0.interrupts]
 type=X86LocalApic
-clock=1
+clock=500
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
@@ -109,7 +109,7 @@ walker=system.cpu0.itb.walker
 
 [system.cpu0.itb.walker]
 type=X86PagetableWalker
-clock=1
+clock=500
 system=system
 port=system.l1_cntrl0.sequencer.slave[2]
 
@@ -152,13 +152,13 @@ walker=system.cpu1.dtb.walker
 
 [system.cpu1.dtb.walker]
 type=X86PagetableWalker
-clock=1
+clock=500
 system=system
 port=system.l1_cntrl1.sequencer.slave[3]
 
 [system.cpu1.interrupts]
 type=X86LocalApic
-clock=1
+clock=500
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
@@ -175,7 +175,7 @@ walker=system.cpu1.itb.walker
 
 [system.cpu1.itb.walker]
 type=X86PagetableWalker
-clock=1
+clock=500
 system=system
 port=system.l1_cntrl1.sequencer.slave[2]
 
@@ -200,7 +200,7 @@ version=0
 [system.dir_cntrl0.directory]
 type=RubyDirectoryMemory
 map_levels=4
-numa_high_bit=6
+numa_high_bit=5
 size=134217728
 use_map=false
 version=0
@@ -243,7 +243,7 @@ version=0
 [system.dma_cntrl0.dma_sequencer]
 type=DMASequencer
 access_phys_mem=true
-clock=1
+clock=1000
 ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true
@@ -665,7 +665,7 @@ type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
-is_icache=false
+is_icache=true
 latency=3
 replacement_policy=PSEUDO_LRU
 resourceStalls=false
@@ -677,7 +677,7 @@ tagArrayBanks=1
 [system.l1_cntrl0.sequencer]
 type=RubySequencer
 access_phys_mem=true
-clock=1
+clock=1000
 dcache=system.l1_cntrl0.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl0.L1IcacheMemory
@@ -730,7 +730,7 @@ type=RubyCache
 assoc=2
 dataAccessLatency=1
 dataArrayBanks=1
-is_icache=false
+is_icache=true
 latency=3
 replacement_policy=PSEUDO_LRU
 resourceStalls=false
@@ -742,7 +742,7 @@ tagArrayBanks=1
 [system.l1_cntrl1.sequencer]
 type=RubySequencer
 access_phys_mem=true
-clock=1
+clock=1000
 dcache=system.l1_cntrl1.L1DcacheMemory
 deadlock_threshold=500000
 icache=system.l1_cntrl1.L1IcacheMemory
@@ -794,7 +794,7 @@ system=system
 
 [system.pc.behind_pci]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=9223372036854779128
 pio_latency=100000
@@ -812,7 +812,7 @@ pio=system.piobus.master[12]
 [system.pc.com_1]
 type=Uart8250
 children=terminal
-clock=1
+clock=1000
 pio_addr=9223372036854776824
 pio_latency=100000
 platform=system.pc
@@ -836,7 +836,7 @@ port=3456
 
 [system.pc.fake_com_2]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=9223372036854776568
 pio_latency=100000
@@ -853,7 +853,7 @@ pio=system.piobus.master[14]
 
 [system.pc.fake_com_3]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=9223372036854776808
 pio_latency=100000
@@ -870,7 +870,7 @@ pio=system.piobus.master[15]
 
 [system.pc.fake_com_4]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=9223372036854776552
 pio_latency=100000
@@ -887,7 +887,7 @@ pio=system.piobus.master[16]
 
 [system.pc.fake_floppy]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=9223372036854776818
 pio_latency=100000
@@ -904,7 +904,7 @@ pio=system.piobus.master[17]
 
 [system.pc.i_dont_exist]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=9223372036854775936
 pio_latency=100000
@@ -922,7 +922,7 @@ pio=system.piobus.master[11]
 [system.pc.pciconfig]
 type=PciConfigAll
 bus=0
-clock=1
+clock=1000
 pio_latency=30000
 platform=system.pc
 size=16777216
@@ -945,7 +945,7 @@ speaker=system.pc.south_bridge.speaker
 [system.pc.south_bridge.cmos]
 type=Cmos
 children=int_pin
-clock=1
+clock=1000
 int_pin=system.pc.south_bridge.cmos.int_pin
 pio_addr=9223372036854775920
 pio_latency=100000
@@ -958,7 +958,7 @@ type=X86IntSourcePin
 
 [system.pc.south_bridge.dma1]
 type=I8237
-clock=1
+clock=1000
 pio_addr=9223372036854775808
 pio_latency=100000
 system=system
@@ -1005,7 +1005,7 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
-clock=1
+clock=1000
 config_latency=20000
 ctrl_offset=0
 disks=system.pc.south_bridge.ide.disks0 system.pc.south_bridge.ide.disks1
@@ -1140,7 +1140,7 @@ number=12
 [system.pc.south_bridge.io_apic]
 type=I82094AA
 apic_id=2
-clock=1
+clock=1000
 external_int_pic=system.pc.south_bridge.pic1
 int_latency=1000
 pio_addr=4273995776
@@ -1152,7 +1152,7 @@ pio=system.piobus.master[10]
 [system.pc.south_bridge.keyboard]
 type=I8042
 children=keyboard_int_pin mouse_int_pin
-clock=1
+clock=1000
 command_port=9223372036854775908
 data_port=9223372036854775904
 keyboard_int_pin=system.pc.south_bridge.keyboard.keyboard_int_pin
@@ -1171,7 +1171,7 @@ type=X86IntSourcePin
 [system.pc.south_bridge.pic1]
 type=I8259
 children=output
-clock=1
+clock=1000
 mode=I8259Master
 output=system.pc.south_bridge.pic1.output
 pio_addr=9223372036854775840
@@ -1186,7 +1186,7 @@ type=X86IntSourcePin
 [system.pc.south_bridge.pic2]
 type=I8259
 children=output
-clock=1
+clock=1000
 mode=I8259Slave
 output=system.pc.south_bridge.pic2.output
 pio_addr=9223372036854775968
@@ -1201,7 +1201,7 @@ type=X86IntSourcePin
 [system.pc.south_bridge.pit]
 type=I8254
 children=int_pin
-clock=1
+clock=1000
 int_pin=system.pc.south_bridge.pit.int_pin
 pio_addr=9223372036854775872
 pio_latency=100000
@@ -1213,7 +1213,7 @@ type=X86IntSourcePin
 
 [system.pc.south_bridge.speaker]
 type=PcSpeaker
-clock=1
+clock=1000
 i8254=system.pc.south_bridge.pit
 pio_addr=9223372036854775905
 pio_latency=100000
@@ -1221,15 +1221,28 @@ system=system
 pio=system.piobus.master[9]
 
 [system.physmem]
-type=SimpleMemory
-bandwidth=73.000000
-clock=1
+type=SimpleDRAM
+addr_mapping=openmap
+banks_per_rank=8
+clock=1000
 conf_table_reported=false
 in_addr_map=true
-latency=30000
-latency_var=0
+lines_per_rowbuffer=64
+mem_sched_policy=fcfs
 null=false
+page_policy=open
 range=0:134217727
+ranks_per_channel=2
+read_buffer_size=32
+tBURST=4000
+tCL=14000
+tRCD=14000
+tREFI=7800000
+tRFC=300000
+tRP=14000
+tWTR=1000
+write_buffer_size=32
+write_thresh_perc=70
 zero=false
 port=system.piobus.master[0]
 
@@ -1432,7 +1445,7 @@ version=
 [system.sys_port_proxy]
 type=RubyPortProxy
 access_phys_mem=true
-clock=1
+clock=1000
 ruby_system=system.ruby
 support_data_reqs=true
 support_inst_reqs=true