stats: Update x86 stats after x87 fixes

[gem5.git] / tests / quick / fs / 10.linux-boot / ref / x86 / linux / pc-simple-atomic / config.ini

diff --git a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
index 725aa519b5bb4144c37d42f4edaba41be11de466..371241c9a232d5c37c0cf5c4f156f641affb24c6 100644 (file)
--- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
+++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
@@ -8,16 +8,19 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxX86System
-children=acpi_description_table_pointer apicbridge bridge cpu e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus
+children=acpi_description_table_pointer apicbridge bridge clk_domain cpu cpu_clk_domain e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache membus pc physmem smbios_table voltage_domain
 acpi_description_table_pointer=system.acpi_description_table_pointer
 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
+cache_line_size=64
+clk_domain=system.clk_domain
 e820_table=system.e820_table
 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
+kernel=/scratch/andreas/m5/binaries/x86_64-vmlinux-2.6.22.9
 load_addr_mask=18446744073709551615
 mem_mode=atomic
+mem_ranges=0:134217727
 memories=system.physmem
 num_work_ids=16
 readfile=tests/halt.sh
@@ -51,33 +54,35 @@ oem_table_id=
 
 [system.apicbridge]
 type=Bridge
+clk_domain=system.clk_domain
 delay=50000
-nack_delay=4000
 ranges=11529215046068469760:11529215046068473855
 req_size=16
 resp_size=16
-write_ack=false
 master=system.membus.slave[0]
 slave=system.iobus.master[0]
 
 [system.bridge]
 type=Bridge
+clk_domain=system.clk_domain
 delay=50000
-nack_delay=4000
 ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 13835058055282163712:18446744073709551615
 req_size=16
 resp_size=16
-write_ack=false
 master=system.iobus.slave[0]
-slave=system.membus.master[1]
+slave=system.membus.master[0]
+
+[system.clk_domain]
+type=SrcClockDomain
+clock=1000
+voltage_domain=system.voltage_domain
 
 [system.cpu]
 type=AtomicSimpleCPU
-children=dcache dtb dtb_walker_cache icache interrupts itb itb_walker_cache tracer
+children=apic_clk_domain dcache dtb dtb_walker_cache icache interrupts isa itb itb_walker_cache l2cache toL2Bus tracer
 checker=Null
-clock=500
+clk_domain=system.cpu_clk_domain
 cpu_id=0
-defer_registration=false
 do_checkpoint_insts=true
 do_quiesce=true
 do_statistics_insts=true
@@ -86,17 +91,22 @@ fastmem=false
 function_trace=false
 function_trace_start=0
 interrupts=system.cpu.interrupts
+isa=system.cpu.isa
 itb=system.cpu.itb
 max_insts_all_threads=0
 max_insts_any_thread=0
 max_loads_all_threads=0
 max_loads_any_thread=0
 numThreads=1
-phase=0
 profile=0
 progress_interval=0
+simpoint_interval=100000000
+simpoint_profile=false
+simpoint_profile_file=simpoint.bb.gz
+simpoint_start_insts=
 simulate_data_stalls=false
 simulate_inst_stalls=false
+switched_out=false
 system=system
 tracer=system.cpu.tracer
 width=1
@@ -104,30 +114,41 @@ workload=
 dcache_port=system.cpu.dcache.cpu_side
 icache_port=system.cpu.icache.cpu_side
 
+[system.cpu.apic_clk_domain]
+type=DerivedClockDomain
+clk_divider=16
+clk_domain=system.cpu_clk_domain
+
 [system.cpu.dcache]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=4
-block_size=64
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
-hash_delay=1
+hit_latency=2
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
+response_latency=2
 size=32768
-subblock_size=0
 system=system
-tgts_per_mshr=8
-trace_addr=0
+tags=system.cpu.dcache.tags
+tgts_per_mshr=20
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dcache_port
-mem_side=system.toL2Bus.slave[1]
+mem_side=system.cpu.toL2Bus.slave[1]
+
+[system.cpu.dcache.tags]
+type=LRU
+assoc=4
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
 
 [system.cpu.dtb]
 type=X86TLB
@@ -137,68 +158,86 @@ walker=system.cpu.dtb.walker
 
 [system.cpu.dtb.walker]
 type=X86PagetableWalker
+clk_domain=system.cpu_clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.cpu.dtb_walker_cache.cpu_side
 
 [system.cpu.dtb_walker_cache]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
-block_size=64
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
-hash_delay=1
+hit_latency=2
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
+response_latency=2
 size=1024
-subblock_size=0
 system=system
+tags=system.cpu.dtb_walker_cache.tags
 tgts_per_mshr=12
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.dtb.walker.port
-mem_side=system.toL2Bus.slave[3]
+mem_side=system.cpu.toL2Bus.slave[3]
+
+[system.cpu.dtb_walker_cache.tags]
+type=LRU
+assoc=2
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=1024
 
 [system.cpu.icache]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=1
-block_size=64
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
-hash_delay=1
+hit_latency=2
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=4
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
+response_latency=2
 size=32768
-subblock_size=0
 system=system
-tgts_per_mshr=8
-trace_addr=0
+tags=system.cpu.icache.tags
+tgts_per_mshr=20
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.icache_port
-mem_side=system.toL2Bus.slave[0]
+mem_side=system.cpu.toL2Bus.slave[0]
+
+[system.cpu.icache.tags]
+type=LRU
+assoc=1
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=32768
 
 [system.cpu.interrupts]
 type=X86LocalApic
+clk_domain=system.cpu.apic_clk_domain
 int_latency=1000
 pio_addr=2305843009213693952
-pio_latency=1000
+pio_latency=100000
 system=system
-int_master=system.membus.slave[4]
-int_slave=system.membus.master[3]
-pio=system.membus.master[2]
+int_master=system.membus.slave[3]
+int_slave=system.membus.master[2]
+pio=system.membus.master[1]
+
+[system.cpu.isa]
+type=X86ISA
 
 [system.cpu.itb]
 type=X86TLB
@@ -208,54 +247,120 @@ walker=system.cpu.itb.walker
 
 [system.cpu.itb.walker]
 type=X86PagetableWalker
+clk_domain=system.cpu_clk_domain
+num_squash_per_cycle=4
 system=system
 port=system.cpu.itb_walker_cache.cpu_side
 
 [system.cpu.itb_walker_cache]
 type=BaseCache
+children=tags
 addr_ranges=0:18446744073709551615
 assoc=2
-block_size=64
+clk_domain=system.cpu_clk_domain
 forward_snoops=true
-hash_delay=1
+hit_latency=2
 is_top_level=true
-latency=1000
 max_miss_count=0
 mshrs=10
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
+response_latency=2
 size=1024
-subblock_size=0
 system=system
+tags=system.cpu.itb_walker_cache.tags
 tgts_per_mshr=12
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.cpu.itb.walker.port
-mem_side=system.toL2Bus.slave[2]
+mem_side=system.cpu.toL2Bus.slave[2]
+
+[system.cpu.itb_walker_cache.tags]
+type=LRU
+assoc=2
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=2
+size=1024
+
+[system.cpu.l2cache]
+type=BaseCache
+children=tags
+addr_ranges=0:18446744073709551615
+assoc=8
+clk_domain=system.cpu_clk_domain
+forward_snoops=true
+hit_latency=20
+is_top_level=false
+max_miss_count=0
+mshrs=20
+prefetch_on_access=false
+prefetcher=Null
+response_latency=20
+size=4194304
+system=system
+tags=system.cpu.l2cache.tags
+tgts_per_mshr=12
+two_queue=false
+write_buffers=8
+cpu_side=system.cpu.toL2Bus.master[0]
+mem_side=system.membus.slave[2]
+
+[system.cpu.l2cache.tags]
+type=LRU
+assoc=8
+block_size=64
+clk_domain=system.cpu_clk_domain
+hit_latency=20
+size=4194304
+
+[system.cpu.toL2Bus]
+type=CoherentBus
+clk_domain=system.cpu_clk_domain
+header_cycles=1
+system=system
+use_default_range=false
+width=32
+master=system.cpu.l2cache.cpu_side
+slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb_walker_cache.mem_side system.cpu.dtb_walker_cache.mem_side
 
 [system.cpu.tracer]
 type=ExeTracer
 
+[system.cpu_clk_domain]
+type=SrcClockDomain
+clock=500
+voltage_domain=system.voltage_domain
+
 [system.e820_table]
 type=X86E820Table
-children=entries0 entries1
-entries=system.e820_table.entries0 system.e820_table.entries1
+children=entries0 entries1 entries2 entries3
+entries=system.e820_table.entries0 system.e820_table.entries1 system.e820_table.entries2 system.e820_table.entries3
 
 [system.e820_table.entries0]
 type=X86E820Entry
 addr=0
-range_type=2
-size=1048576
+range_type=1
+size=654336
 
 [system.e820_table.entries1]
 type=X86E820Entry
+addr=654336
+range_type=2
+size=394240
+
+[system.e820_table.entries2]
+type=X86E820Entry
 addr=1048576
 range_type=1
 size=133169152
 
+[system.e820_table.entries3]
+type=X86E820Entry
+addr=4294901760
+range_type=2
+size=65536
+
 [system.intel_mp_pointer]
 type=X86IntelMPFloatingPointer
 default_config=0
@@ -604,8 +709,7 @@ sys=system
 
 [system.iobus]
 type=NoncoherentBus
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
 header_cycles=1
 use_default_range=true
 width=8
@@ -615,71 +719,53 @@ slave=system.bridge.master system.pc.south_bridge.ide.dma system.pc.south_bridge
 
 [system.iocache]
 type=BaseCache
+children=tags
 addr_ranges=0:134217727
 assoc=8
-block_size=64
+clk_domain=system.clk_domain
 forward_snoops=false
-hash_delay=1
+hit_latency=50
 is_top_level=true
-latency=50000
 max_miss_count=0
 mshrs=20
 prefetch_on_access=false
 prefetcher=Null
-prioritizeRequests=false
-repl=Null
+response_latency=50
 size=1024
-subblock_size=0
 system=system
+tags=system.iocache.tags
 tgts_per_mshr=12
-trace_addr=0
 two_queue=false
 write_buffers=8
 cpu_side=system.iobus.master[18]
-mem_side=system.membus.slave[2]
+mem_side=system.membus.slave[4]
 
-[system.l2c]
-type=BaseCache
-addr_ranges=0:18446744073709551615
+[system.iocache.tags]
+type=LRU
 assoc=8
 block_size=64
-forward_snoops=true
-hash_delay=1
-is_top_level=false
-latency=10000
-max_miss_count=0
-mshrs=92
-prefetch_on_access=false
-prefetcher=Null
-prioritizeRequests=false
-repl=Null
-size=4194304
-subblock_size=0
-system=system
-tgts_per_mshr=16
-trace_addr=0
-two_queue=false
-write_buffers=8
-cpu_side=system.toL2Bus.master[0]
-mem_side=system.membus.slave[3]
+clk_domain=system.clk_domain
+hit_latency=50
+size=1024
 
 [system.membus]
 type=CoherentBus
 children=badaddr_responder
-block_size=64
-clock=1000
+clk_domain=system.clk_domain
 header_cycles=1
+system=system
 use_default_range=false
 width=8
 default=system.membus.badaddr_responder.pio
-master=system.physmem.port system.bridge.slave system.cpu.interrupts.pio system.cpu.interrupts.int_slave
-slave=system.apicbridge.master system.system_port system.iocache.mem_side system.l2c.mem_side system.cpu.interrupts.int_master
+master=system.bridge.slave system.cpu.interrupts.pio system.cpu.interrupts.int_slave system.physmem.port
+slave=system.apicbridge.master system.system_port system.cpu.l2cache.mem_side system.cpu.interrupts.int_master system.iocache.mem_side
 
 [system.membus.badaddr_responder]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=0
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=true
 ret_data16=65535
@@ -699,9 +785,10 @@ system=system
 
 [system.pc.behind_pci]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854779128
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -716,8 +803,9 @@ pio=system.iobus.master[12]
 [system.pc.com_1]
 type=Uart8250
 children=terminal
+clk_domain=system.clk_domain
 pio_addr=9223372036854776824
-pio_latency=1000
+pio_latency=100000
 platform=system.pc
 system=system
 terminal=system.pc.com_1.terminal
@@ -739,9 +827,10 @@ port=3456
 
 [system.pc.fake_com_2]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776568
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -755,9 +844,10 @@ pio=system.iobus.master[14]
 
 [system.pc.fake_com_3]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776808
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -771,9 +861,10 @@ pio=system.iobus.master[15]
 
 [system.pc.fake_com_4]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776552
-pio_latency=1000
+pio_latency=100000
 pio_size=8
 ret_bad_addr=false
 ret_data16=65535
@@ -787,9 +878,10 @@ pio=system.iobus.master[16]
 
 [system.pc.fake_floppy]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854776818
-pio_latency=1000
+pio_latency=100000
 pio_size=2
 ret_bad_addr=false
 ret_data16=65535
@@ -803,9 +895,10 @@ pio=system.iobus.master[17]
 
 [system.pc.i_dont_exist]
 type=IsaFake
+clk_domain=system.clk_domain
 fake_mem=false
 pio_addr=9223372036854775936
-pio_latency=1000
+pio_latency=100000
 pio_size=1
 ret_bad_addr=false
 ret_data16=65535
@@ -820,7 +913,9 @@ pio=system.iobus.master[11]
 [system.pc.pciconfig]
 type=PciConfigAll
 bus=0
-pio_latency=1
+clk_domain=system.clk_domain
+pio_addr=0
+pio_latency=30000
 platform=system.pc
 size=16777216
 system=system
@@ -835,7 +930,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
@@ -843,9 +937,10 @@ speaker=system.pc.south_bridge.speaker
 [system.pc.south_bridge.cmos]
 type=Cmos
 children=int_pin
+clk_domain=system.clk_domain
 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.iobus.master[1]
@@ -855,8 +950,9 @@ type=X86IntSourcePin
 
 [system.pc.south_bridge.dma1]
 type=I8237
+clk_domain=system.clk_domain
 pio_addr=9223372036854775808
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[2]
 
@@ -901,16 +997,15 @@ SubClassCode=1
 SubsystemID=0
 SubsystemVendorID=0
 VendorID=32902
+clk_domain=system.clk_domain
 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.iobus.master[4]
@@ -934,7 +1029,7 @@ table_size=65536
 
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-x86.img
+image_file=/scratch/andreas/m5/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -954,7 +1049,7 @@ table_size=65536
 
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
-image_file=/dist/m5/system/disks/linux-bigswap2.img
+image_file=/scratch/andreas/m5/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]
@@ -1037,10 +1132,11 @@ number=12
 [system.pc.south_bridge.io_apic]
 type=I82094AA
 apic_id=1
+clk_domain=system.clk_domain
 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.iobus.slave[2]
 pio=system.iobus.master[10]
@@ -1048,12 +1144,13 @@ pio=system.iobus.master[10]
 [system.pc.south_bridge.keyboard]
 type=I8042
 children=keyboard_int_pin mouse_int_pin
+clk_domain=system.clk_domain
 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.iobus.master[5]
 
@@ -1066,10 +1163,11 @@ type=X86IntSourcePin
 [system.pc.south_bridge.pic1]
 type=I8259
 children=output
+clk_domain=system.clk_domain
 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.iobus.master[6]
@@ -1080,10 +1178,11 @@ type=X86IntSourcePin
 [system.pc.south_bridge.pic2]
 type=I8259
 children=output
+clk_domain=system.clk_domain
 mode=I8259Slave
 output=system.pc.south_bridge.pic2.output
 pio_addr=9223372036854775968
-pio_latency=1000
+pio_latency=100000
 slave=Null
 system=system
 pio=system.iobus.master[7]
@@ -1094,9 +1193,10 @@ type=X86IntSourcePin
 [system.pc.south_bridge.pit]
 type=I8254
 children=int_pin
+clk_domain=system.clk_domain
 int_pin=system.pc.south_bridge.pit.int_pin
 pio_addr=9223372036854775872
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[8]
 
@@ -1105,23 +1205,45 @@ type=X86IntSourcePin
 
 [system.pc.south_bridge.speaker]
 type=PcSpeaker
+clk_domain=system.clk_domain
 i8254=system.pc.south_bridge.pit
 pio_addr=9223372036854775905
-pio_latency=1000
+pio_latency=100000
 system=system
 pio=system.iobus.master[9]
 
 [system.physmem]
-type=SimpleMemory
-conf_table_reported=false
-file=
+type=SimpleDRAM
+activation_limit=4
+addr_mapping=RaBaChCo
+banks_per_rank=8
+burst_length=8
+channels=1
+clk_domain=system.clk_domain
+conf_table_reported=true
+device_bus_width=8
+device_rowbuffer_size=1024
+devices_per_rank=8
 in_addr_map=true
-latency=30000
-latency_var=0
+mem_sched_policy=frfcfs
 null=false
+page_policy=open
 range=0:134217727
-zero=false
-port=system.membus.master[0]
+ranks_per_channel=2
+read_buffer_size=32
+static_backend_latency=10000
+static_frontend_latency=10000
+tBURST=5000
+tCL=13750
+tRCD=13750
+tREFI=7800000
+tRFC=300000
+tRP=13750
+tWTR=7500
+tXAW=40000
+write_buffer_size=32
+write_thresh_perc=70
+port=system.membus.master[3]
 
 [system.smbios_table]
 type=X86SMBiosSMBiosTable
@@ -1144,13 +1266,7 @@ starting_addr_segment=0
 vendor=
 version=
 
-[system.toL2Bus]
-type=CoherentBus
-block_size=64
-clock=1000
-header_cycles=1
-use_default_range=false
-width=8
-master=system.l2c.cpu_side
-slave=system.cpu.icache.mem_side system.cpu.dcache.mem_side system.cpu.itb_walker_cache.mem_side system.cpu.dtb_walker_cache.mem_side
+[system.voltage_domain]
+type=VoltageDomain
+voltage=1.000000