1 files changed, 24 insertions, 6 deletions
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
index 24fafe7e3..f714521bf 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini
@@ -21,7 +21,7 @@ exit_on_work_items=false
 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=/home/stever/m5/m5_system_2.0b3/binaries/x86_64-vmlinux-2.6.22.9.smp
 kernel_addr_check=true
 load_addr_mask=18446744073709551615
 load_offset=0
@@ -31,7 +31,7 @@ memories=system.mem_ctrls
 mmap_using_noreserve=false
 multi_thread=false
 num_work_ids=16
-readfile=/z/stever/hg/gem5/tests/halt.sh
+readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
 smbios_table=system.smbios_table
 symbolfile=
 work_begin_ckpt_count=0
@@ -710,7 +710,7 @@ response_latency=2
 use_default_range=false
 width=16
 default=system.pc.pci_host.pio
-master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio 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_exist1.pio system.pc.i_dont_exist2.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.ruby.io_controller.dma_sequencer.slave
+master=system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio 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_exist1.pio system.pc.i_dont_exist2.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.ruby.io_controller.dma_sequencer.slave[0]
 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.mem_ctrls]
@@ -1083,7 +1083,7 @@ pci_dev=4
 pci_func=0
 pio_latency=30000
 system=system
-dma=system.ruby.dma_cntrl0.dma_sequencer.slave
+dma=system.ruby.dma_cntrl0.dma_sequencer.slave[0]
 pio=system.iobus.master[2]
 
 [system.pc.south_bridge.ide.disks0]
@@ -1106,7 +1106,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/dist/m5/system/disks/linux-x86.img
+image_file=/home/stever/m5/m5_system_2.0b3/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -1129,7 +1129,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/dist/m5/system/disks/linux-bigswap2.img
+image_file=/home/stever/m5/m5_system_2.0b3/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]
@@ -1423,7 +1423,11 @@ version=0
 type=DMASequencer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
+is_cpu_sequencer=true
+no_retry_on_stall=false
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
 system=system
 using_ruby_tester=false
 version=0
@@ -1475,7 +1479,11 @@ version=1
 type=DMASequencer
 clk_domain=system.ruby.clk_domain
 eventq_index=0
+is_cpu_sequencer=true
+no_retry_on_stall=false
 ruby_system=system.ruby
+support_data_reqs=true
+support_inst_reqs=true
 system=system
 using_ruby_tester=false
 version=1
@@ -1539,6 +1547,7 @@ version=0
 type=RubyCache
 children=replacement_policy
 assoc=2
+block_size=0
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
@@ -1562,6 +1571,7 @@ size=32768
 type=RubyCache
 children=replacement_policy
 assoc=2
+block_size=0
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
@@ -1642,12 +1652,14 @@ slave=system.ruby.network.master[1]
 [system.ruby.l1_cntrl0.sequencer]
 type=RubySequencer
 clk_domain=system.cpu_clk_domain
+coreid=99
 dcache=system.ruby.l1_cntrl0.L1Dcache
 dcache_hit_latency=1
 deadlock_threshold=500000
 eventq_index=0
 icache=system.ruby.l1_cntrl0.L1Icache
 icache_hit_latency=1
+is_cpu_sequencer=true
 max_outstanding_requests=16
 no_retry_on_stall=false
 ruby_system=system.ruby
@@ -1706,6 +1718,7 @@ version=1
 type=RubyCache
 children=replacement_policy
 assoc=2
+block_size=0
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
@@ -1729,6 +1742,7 @@ size=32768
 type=RubyCache
 children=replacement_policy
 assoc=2
+block_size=0
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
@@ -1809,12 +1823,14 @@ slave=system.ruby.network.master[3]
 [system.ruby.l1_cntrl1.sequencer]
 type=RubySequencer
 clk_domain=system.cpu_clk_domain
+coreid=99
 dcache=system.ruby.l1_cntrl1.L1Dcache
 dcache_hit_latency=1
 deadlock_threshold=500000
 eventq_index=0
 icache=system.ruby.l1_cntrl1.L1Icache
 icache_hit_latency=1
+is_cpu_sequencer=true
 max_outstanding_requests=16
 no_retry_on_stall=false
 ruby_system=system.ruby
@@ -1890,6 +1906,7 @@ slave=system.ruby.network.master[5]
 type=RubyCache
 children=replacement_policy
 assoc=2
+block_size=0
 dataAccessLatency=1
 dataArrayBanks=1
 eventq_index=0
@@ -3555,6 +3572,7 @@ version=
 type=RubyPortProxy
 clk_domain=system.clk_domain
 eventq_index=0
+is_cpu_sequencer=true
 no_retry_on_stall=false
 ruby_system=system.ruby
 support_data_reqs=true