diff options
author | Nilay Vaish <nilay@cs.wisc.edu> | 2012-09-10 12:44:03 -0500 |
---|---|---|
committer | Nilay Vaish <nilay@cs.wisc.edu> | 2012-09-10 12:44:03 -0500 |
commit | 5cdf221d8ce3f5b983672f26346aefc21b37a752 (patch) | |
tree | ac039244b78f69bee1d0dea82e48827fba97fe3c /tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini | |
parent | c5bf1390aa129fefa7102e2de2998c0e6b09b5b0 (diff) | |
download | gem5-5cdf221d8ce3f5b983672f26346aefc21b37a752.tar.xz |
Regression: Updates due to changes to Ruby memory controller
Diffstat (limited to 'tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini')
-rw-r--r-- | tests/long/fs/10.linux-boot/ref/x86/linux/pc-simple-timing-ruby-MESI_CMP_directory/config.ini | 75 |
1 files changed, 50 insertions, 25 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 7b9ea05e8..d4842c1ef 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,6 +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 e820_table=system.e820_table init_param=0 intel_mp_pointer=system.intel_mp_pointer @@ -69,7 +70,6 @@ max_insts_any_thread=0 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 @@ walker=system.cpu0.dtb.walker [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 @@ walker=system.cpu0.itb.walker [system.cpu0.itb.walker] type=X86PagetableWalker +clock=1 system=system port=system.l1_cntrl0.sequencer.slave[2] @@ -133,7 +136,6 @@ max_insts_any_thread=0 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 @@ walker=system.cpu1.dtb.walker [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 @@ walker=system.cpu1.itb.walker [system.cpu1.itb.walker] type=X86PagetableWalker +clock=1 system=system port=system.l1_cntrl1.sequencer.slave[2] @@ -207,9 +212,9 @@ bank_busy_time=11 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 @@ rank_rank_delay=1 ranks_per_dimm=2 read_write_delay=2 refresh_period=1560 +ruby_system=system.ruby tFaw=0 version=0 @@ -237,6 +243,7 @@ version=0 [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 @@ tagArrayBanks=1 [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 @@ tagArrayBanks=1 [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=system [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 @@ pio=system.piobus.master[12] [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 @@ port=3456 [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 @@ pio=system.piobus.master[14] [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 @@ pio=system.piobus.master[15] [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 @@ pio=system.piobus.master[16] [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 @@ pio=system.piobus.master[17] [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 @@ pio=system.piobus.master[11] [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 @@ io_apic=system.pc.south_bridge.io_apic 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 @@ speaker=system.pc.south_bridge.speaker [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 @@ type=X86IntSourcePin [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 @@ SubClassCode=1 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 @@ number=12 [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 @@ pio=system.piobus.master[10] [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 @@ type=X86IntSourcePin [system.pc.south_bridge.pic1] type=I8259 children=output +clock=1 mode=I8259Master output=system.pc.south_bridge.pic1.output pio_addr=9223372036854775840 -pio_latency=1000 +pio_latency=100000 slave=system.pc.south_bridge.pic2 system=system pio=system.piobus.master[6] @@ -1166,10 +1186,11 @@ type=X86IntSourcePin [system.pc.south_bridge.pic2] type=I8259 children=output +clock=1 mode=I8259Slave output=system.pc.south_bridge.pic2.output pio_addr=9223372036854775968 -pio_latency=1000 +pio_latency=100000 slave=Null system=system pio=system.piobus.master[7] @@ -1180,9 +1201,10 @@ type=X86IntSourcePin [system.pc.south_bridge.pit] type=I8254 children=int_pin +clock=1 int_pin=system.pc.south_bridge.pit.int_pin pio_addr=9223372036854775872 -pio_latency=1000 +pio_latency=100000 system=system pio=system.piobus.master[8] @@ -1191,14 +1213,16 @@ type=X86IntSourcePin [system.pc.south_bridge.speaker] type=PcSpeaker +clock=1 i8254=system.pc.south_bridge.pit pio_addr=9223372036854775905 -pio_latency=1000 +pio_latency=100000 system=system pio=system.piobus.master[9] [system.physmem] type=SimpleMemory +clock=1 conf_table_reported=false file= in_addr_map=true @@ -1402,6 +1426,7 @@ version= [system.sys_port_proxy] type=RubyPortProxy access_phys_mem=true +clock=1 ruby_system=system.ruby support_data_reqs=true support_inst_reqs=true |