diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2014-02-23 19:16:16 -0600 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2014-02-23 19:16:16 -0600 |
commit | 3b404fb1a0e21aedcd4597d1683fd251bb9302fa (patch) | |
tree | db762cbff01a5163228a99538e6e1f3d3f3e5ae6 /tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini | |
parent | 7e27860ef4e5016f5a3c907fbe4c7858f83c8100 (diff) | |
download | gem5-3b404fb1a0e21aedcd4597d1683fd251bb9302fa.tar.xz |
stats: updates due to changes to ruby pio access handling
Diffstat (limited to 'tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini')
-rw-r--r-- | tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_Two_Level/config.ini | 43 |
1 files changed, 25 insertions, 18 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 1b99afe98..dfa5f06ff 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 @@ -20,8 +20,9 @@ eventq_index=0 init_param=0 intel_mp_pointer=system.intel_mp_pointer intel_mp_table=system.intel_mp_table -kernel=/dist/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 +load_offset=0 mem_mode=timing mem_ranges=0:134217727 memories=system.physmem @@ -66,6 +67,7 @@ voltage_domain=system.voltage_domain [system.cpu0] type=TimingSimpleCPU children=apic_clk_domain dtb interrupts isa itb tracer +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=0 @@ -123,9 +125,9 @@ int_latency=1000 pio_addr=2305843009213693952 pio_latency=100000 system=system -int_master=system.piobus.slave[3] -int_slave=system.piobus.master[18] -pio=system.piobus.master[17] +int_master=system.ruby.l1_cntrl0.sequencer.slave[4] +int_slave=system.ruby.l1_cntrl0.sequencer.master[1] +pio=system.ruby.l1_cntrl0.sequencer.master[0] [system.cpu0.isa] type=X86ISA @@ -153,6 +155,7 @@ eventq_index=0 [system.cpu1] type=TimingSimpleCPU children=apic_clk_domain dtb interrupts isa itb tracer +branchPred=Null checker=Null clk_domain=system.cpu_clk_domain cpu_id=1 @@ -210,9 +213,9 @@ int_latency=1000 pio_addr=2305843009213693952 pio_latency=100000 system=system -int_master=system.piobus.slave[4] -int_slave=system.piobus.master[20] -pio=system.piobus.master[19] +int_master=system.ruby.l1_cntrl1.sequencer.slave[4] +int_slave=system.ruby.l1_cntrl1.sequencer.master[1] +pio=system.ruby.l1_cntrl1.sequencer.master[0] [system.cpu1.isa] type=X86ISA @@ -968,7 +971,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks0.image.child] type=RawDiskImage eventq_index=0 -image_file=/dist/disks/linux-x86.img +image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img read_only=true [system.pc.south_bridge.ide.disks1] @@ -991,7 +994,7 @@ table_size=65536 [system.pc.south_bridge.ide.disks1.image.child] type=RawDiskImage eventq_index=0 -image_file=/dist/disks/linux-bigswap2.img +image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img read_only=true [system.pc.south_bridge.int_lines0] @@ -1214,7 +1217,7 @@ tXAW=40000 write_buffer_size=32 write_high_thresh_perc=70 write_low_thresh_perc=0 -port=system.piobus.master[21] +port=system.piobus.master[19] [system.piobus] type=NoncoherentBus @@ -1224,8 +1227,8 @@ header_cycles=1 use_default_range=true width=8 default=system.pc.pciconfig.pio -master=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 system.physmem.port -slave=system.pc.south_bridge.io_apic.int_master system.ruby.l1_cntrl0.sequencer.pio_port system.ruby.l1_cntrl1.sequencer.pio_port system.cpu0.interrupts.int_master system.cpu1.interrupts.int_master +master=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.ruby.l1_cntrl0.sequencer.pio_slave_port system.ruby.l1_cntrl1.sequencer.pio_slave_port system.physmem.port +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.ruby] type=RubySystem @@ -1322,7 +1325,6 @@ ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true system=system -using_network_tester=false using_ruby_tester=false version=0 slave=system.pc.south_bridge.ide.dma @@ -1408,8 +1410,11 @@ system=system using_network_tester=false using_ruby_tester=false version=0 -pio_port=system.piobus.slave[1] -slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port +master=system.cpu0.interrupts.pio system.cpu0.interrupts.int_slave +mem_master_port=system.piobus.slave[2] +pio_master_port=system.piobus.slave[1] +pio_slave_port=system.piobus.master[17] +slave=system.cpu0.icache_port system.cpu0.dcache_port system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu0.interrupts.int_master [system.ruby.l1_cntrl1] type=L1Cache_Controller @@ -1492,8 +1497,11 @@ system=system using_network_tester=false using_ruby_tester=false version=1 -pio_port=system.piobus.slave[2] -slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port +master=system.cpu1.interrupts.pio system.cpu1.interrupts.int_slave +mem_master_port=system.piobus.slave[4] +pio_master_port=system.piobus.slave[3] +pio_slave_port=system.piobus.master[18] +slave=system.cpu1.icache_port system.cpu1.dcache_port system.cpu1.itb.walker.port system.cpu1.dtb.walker.port system.cpu1.interrupts.int_master [system.ruby.l2_cntrl0] type=L2Cache_Controller @@ -1724,7 +1732,6 @@ ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true system=system -using_network_tester=false using_ruby_tester=false version=0 slave=system.system_port |