changeset 5b6087e0750f in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=5b6087e0750f
description:
        regression test: update a couple of config.ini files

diffstat:

 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini |  187 
+++++----
 tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-timing/config.ini |  193 
+++++----
 2 files changed, 209 insertions(+), 171 deletions(-)

diffs (truncated from 993 to 300 lines):

diff -r 515891d9057a -r 5b6087e0750f 
tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini
--- a/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini    
Thu Dec 06 09:31:06 2012 -0600
+++ b/tests/quick/fs/10.linux-boot/ref/x86/linux/pc-simple-atomic/config.ini    
Thu Dec 06 10:26:12 2012 -0600
@@ -8,10 +8,10 @@
 
 [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 cpu e820_table 
intel_mp_pointer intel_mp_table intrctrl iobus iocache membus pc physmem 
smbios_table
 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
@@ -52,7 +52,7 @@
 
 [system.apicbridge]
 type=Bridge
-clock=1
+clock=1000
 delay=50000
 ranges=11529215046068469760:11529215046068473855
 req_size=16
@@ -62,7 +62,7 @@
 
 [system.bridge]
 type=Bridge
-clock=1
+clock=1000
 delay=50000
 ranges=4273995776:4273999871 9223372036854775808:11529215046068469759 
13835058055282163712:18446744073709551615
 req_size=16
@@ -72,7 +72,7 @@
 
 [system.cpu]
 type=AtomicSimpleCPU
-children=dcache dtb dtb_walker_cache icache interrupts itb itb_walker_cache 
tracer
+children=dcache dtb dtb_walker_cache icache interrupts itb itb_walker_cache 
l2cache toL2Bus tracer
 checker=Null
 clock=500
 cpu_id=0
@@ -107,26 +107,27 @@
 addr_ranges=0:18446744073709551615
 assoc=4
 block_size=64
-clock=1
+clock=500
 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
+tgts_per_mshr=20
 trace_addr=0
 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.dtb]
 type=X86TLB
@@ -136,7 +137,7 @@
 
 [system.cpu.dtb.walker]
 type=X86PagetableWalker
-clock=1
+clock=500
 system=system
 port=system.cpu.dtb_walker_cache.cpu_side
 
@@ -145,17 +146,18 @@
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
-clock=1
+clock=500
 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
@@ -164,37 +166,38 @@
 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.icache]
 type=BaseCache
 addr_ranges=0:18446744073709551615
 assoc=1
 block_size=64
-clock=1
+clock=500
 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
+tgts_per_mshr=20
 trace_addr=0
 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.interrupts]
 type=X86LocalApic
-clock=1
+clock=500
 int_latency=1000
 pio_addr=2305843009213693952
 pio_latency=100000
@@ -211,7 +214,7 @@
 
 [system.cpu.itb.walker]
 type=X86PagetableWalker
-clock=1
+clock=500
 system=system
 port=system.cpu.itb_walker_cache.cpu_side
 
@@ -220,17 +223,18 @@
 addr_ranges=0:18446744073709551615
 assoc=2
 block_size=64
-clock=1
+clock=500
 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
@@ -239,7 +243,44 @@
 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.l2cache]
+type=BaseCache
+addr_ranges=0:18446744073709551615
+assoc=8
+block_size=64
+clock=500
+forward_snoops=true
+hash_delay=1
+hit_latency=20
+is_top_level=false
+max_miss_count=0
+mshrs=20
+prefetch_on_access=false
+prefetcher=Null
+prioritizeRequests=false
+repl=Null
+response_latency=20
+size=4194304
+subblock_size=0
+system=system
+tgts_per_mshr=12
+trace_addr=0
+two_queue=false
+write_buffers=8
+cpu_side=system.cpu.toL2Bus.master[0]
+mem_side=system.membus.slave[3]
+
+[system.cpu.toL2Bus]
+type=CoherentBus
+block_size=64
+clock=500
+header_cycles=1
+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
@@ -623,17 +664,18 @@
 addr_ranges=0:134217727
 assoc=8
 block_size=64
-clock=1
+clock=1000
 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
@@ -644,32 +686,6 @@
 cpu_side=system.iobus.master[18]
 mem_side=system.membus.slave[2]
 
-[system.l2c]
-type=BaseCache
-addr_ranges=0:18446744073709551615
-assoc=8
-block_size=64
-clock=1
-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]
-
 [system.membus]
 type=CoherentBus
 children=badaddr_responder
@@ -680,11 +696,11 @@
 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
+slave=system.apicbridge.master system.system_port system.iocache.mem_side 
system.cpu.l2cache.mem_side system.cpu.interrupts.int_master
 
 [system.membus.badaddr_responder]
 type=IsaFake
-clock=1
+clock=1000
 fake_mem=false
 pio_addr=0
 pio_latency=100000
@@ -707,7 +723,7 @@
 
 [system.pc.behind_pci]
 type=IsaFake
-clock=1
+clock=1000
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to