diff options
Diffstat (limited to 'tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint')
3 files changed, 305 insertions, 54 deletions
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini index cc3750142..92530cc80 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.ini @@ -14,7 +14,6 @@ children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus io atags_addr=134217728 boot_loader=/work/gem5/dist/binaries/boot_emm.arm boot_osflags=earlyprintk=pl011,0x1c090000 console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=256MB root=/dev/sda1 -boot_release_addr=65528 cache_line_size=64 clk_domain=system.clk_domain dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb @@ -43,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/work/gem5/scratch1/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -146,7 +145,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=2 -is_top_level=true +is_read_only=false max_miss_count=0 mshrs=4 prefetch_on_access=false @@ -157,7 +156,6 @@ size=32768 system=system tags=system.cpu.dcache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu.dcache_port mem_side=system.cpu.toL2Bus.slave[1] @@ -223,7 +221,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=2 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=4 prefetch_on_access=false @@ -234,7 +232,6 @@ size=32768 system=system tags=system.cpu.icache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu.icache_port mem_side=system.cpu.toL2Bus.slave[0] @@ -334,7 +331,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=20 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=20 prefetch_on_access=false @@ -345,7 +342,6 @@ 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] @@ -423,7 +419,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=false hit_latency=50 -is_top_level=true +is_read_only=false max_miss_count=0 mshrs=20 prefetch_on_access=false @@ -434,7 +430,6 @@ size=1024 system=system tags=system.iocache.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.iobus.master[27] mem_side=system.membus.slave[3] @@ -769,6 +764,7 @@ pio_latency=10000 pixel_clock=7299 system=system vnc=system.vncserver +workaround_swap_rb=true dma=system.membus.slave[0] pio=system.iobus.master[5] @@ -978,6 +974,7 @@ pio=system.iobus.default [system.realview.realview_io] type=RealViewCtrl +children=osc_clcd osc_cpu osc_ddr osc_hsbm osc_mcc osc_peripheral osc_pxl osc_smb osc_sys osc_system_bus clk_domain=system.clk_domain eventq_index=0 idreg=35979264 @@ -988,6 +985,116 @@ proc_id1=335544320 system=system pio=system.iobus.master[1] +[system.realview.realview_io.osc_clcd] +type=RealViewOsc +dcc=0 +device=1 +eventq_index=0 +freq=42105 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_cpu] +type=RealViewOsc +dcc=0 +device=0 +eventq_index=0 +freq=16667 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_ddr] +type=RealViewOsc +dcc=0 +device=8 +eventq_index=0 +freq=25000 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_hsbm] +type=RealViewOsc +dcc=0 +device=4 +eventq_index=0 +freq=25000 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_mcc] +type=RealViewOsc +dcc=0 +device=0 +eventq_index=0 +freq=20000 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_peripheral] +type=RealViewOsc +dcc=0 +device=2 +eventq_index=0 +freq=41667 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_pxl] +type=RealViewOsc +dcc=0 +device=5 +eventq_index=0 +freq=42105 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_smb] +type=RealViewOsc +dcc=0 +device=6 +eventq_index=0 +freq=20000 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_sys] +type=RealViewOsc +dcc=0 +device=7 +eventq_index=0 +freq=16667 +parent=system.realview.realview_io +position=0 +site=1 +voltage_domain=system.voltage_domain + +[system.realview.realview_io.osc_system_bus] +type=RealViewOsc +dcc=0 +device=4 +eventq_index=0 +freq=41667 +parent=system.realview.realview_io +position=0 +site=0 +voltage_domain=system.voltage_domain + [system.realview.rtc] type=PL031 amba_id=3412017 @@ -1156,7 +1263,6 @@ port=3456 [system.vncserver] type=VncServer -capture_exit_frame=-1 eventq_index=0 frame_capture=false number=0 diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json index 6d896ac50..72353edee 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/config.json @@ -68,9 +68,8 @@ "frontend_latency": 2 }, "symbolfile": "", - "readfile": "/work/gem5/scratch1/gem5/tests/halt.sh", + "readfile": "/work/gem5/outgoing/gem5/tests/halt.sh", "have_large_asid_64": false, - "work_end_ckpt_count": 0, "phys_addr_range_64": 40, "have_lpae": false, "cxx_class": "LinuxArmSystem", @@ -80,7 +79,6 @@ "number": 0, "frame_capture": false, "eventq_index": 0, - "capture_exit_frame": -1, "cxx_class": "VncServer", "path": "system.vncserver", "type": "VncServer", @@ -132,6 +130,7 @@ "enable_capture": true, "path": "system.realview.hdlcd", "pio_addr": 721420288, + "workaround_swap_rb": true, "type": "HDLcd" }, "mmc_fake": { @@ -210,22 +209,162 @@ "type": "AmbaFake" }, "realview_io": { - "proc_id1": 335544320, - "name": "realview_io", "pio": { "peer": "system.iobus.master[1]", "role": "SLAVE" }, + "system": "system", + "cxx_class": "RealViewCtrl", + "pio_addr": 469827584, "pio_latency": 100000, "clk_domain": "system.clk_domain", - "system": "system", + "osc_sys": { + "position": 0, + "name": "osc_sys", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 1, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 7, + "path": "system.realview.realview_io.osc_sys", + "freq": 16667, + "type": "RealViewOsc" + }, "eventq_index": 0, - "cxx_class": "RealViewCtrl", "proc_id0": 335544320, + "proc_id1": 335544320, + "osc_clcd": { + "position": 0, + "name": "osc_clcd", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 0, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 1, + "path": "system.realview.realview_io.osc_clcd", + "freq": 42105, + "type": "RealViewOsc" + }, + "osc_peripheral": { + "position": 0, + "name": "osc_peripheral", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 0, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 2, + "path": "system.realview.realview_io.osc_peripheral", + "freq": 41667, + "type": "RealViewOsc" + }, + "osc_hsbm": { + "position": 0, + "name": "osc_hsbm", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 1, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 4, + "path": "system.realview.realview_io.osc_hsbm", + "freq": 25000, + "type": "RealViewOsc" + }, + "osc_mcc": { + "position": 0, + "name": "osc_mcc", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 0, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 0, + "path": "system.realview.realview_io.osc_mcc", + "freq": 20000, + "type": "RealViewOsc" + }, "path": "system.realview.realview_io", "idreg": 35979264, + "osc_system_bus": { + "position": 0, + "name": "osc_system_bus", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 0, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 4, + "path": "system.realview.realview_io.osc_system_bus", + "freq": 41667, + "type": "RealViewOsc" + }, + "osc_smb": { + "position": 0, + "name": "osc_smb", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 1, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 6, + "path": "system.realview.realview_io.osc_smb", + "freq": 20000, + "type": "RealViewOsc" + }, + "name": "realview_io", "type": "RealViewCtrl", - "pio_addr": 469827584 + "osc_ddr": { + "position": 0, + "name": "osc_ddr", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 1, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 8, + "path": "system.realview.realview_io.osc_ddr", + "freq": 25000, + "type": "RealViewOsc" + }, + "osc_cpu": { + "position": 0, + "name": "osc_cpu", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 1, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 0, + "path": "system.realview.realview_io.osc_cpu", + "freq": 16667, + "type": "RealViewOsc" + }, + "osc_pxl": { + "position": 0, + "name": "osc_pxl", + "parent": "system.realview.realview_io", + "voltage_domain": "system.voltage_domain", + "dcc": 0, + "site": 1, + "eventq_index": 0, + "cxx_class": "RealViewOsc", + "device": 5, + "path": "system.realview.realview_io.osc_pxl", + "freq": 42105, + "type": "RealViewOsc" + } }, "l2x0_fake": { "system": "system", @@ -754,7 +893,7 @@ "MSIXCAPNextCapability": 0, "PXCAPLinkCtrl": 0, "Revision": 0, - "hardware_address": "<m5.params.EthernetAddr object at 0x5692fd0>", + "hardware_address": "<m5.params.EthernetAddr object at 0x7f90678a01d0>", "LegacyIOBase": 0, "pio_latency": 30000, "platform": "system.realview", @@ -1029,7 +1168,10 @@ "panic_on_panic": true, "eventq_index": 0, "iocache": { - "is_top_level": true, + "cpu_side": { + "peer": "system.iobus.master[27]", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.clk_domain", "write_buffers": 8, @@ -1064,17 +1206,13 @@ "addr_ranges": [ "2147483648:2415919103" ], - "assoc": 8, + "is_read_only": false, "prefetch_on_access": false, "path": "system.iocache", "name": "iocache", "type": "BaseCache", "sequential_access": false, - "cpu_side": { - "peer": "system.iobus.master[27]", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 8 }, "dvfs_handler": { "enable": false, @@ -1270,7 +1408,10 @@ "role": "MASTER" }, "icache": { - "is_top_level": true, + "cpu_side": { + "peer": "system.cpu.icache_port", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.cpu_clk_domain", "write_buffers": 8, @@ -1305,17 +1446,13 @@ "addr_ranges": [ "0:18446744073709551615" ], - "assoc": 1, + "is_read_only": true, "prefetch_on_access": false, "path": "system.cpu.icache", "name": "icache", "type": "BaseCache", "sequential_access": false, - "cpu_side": { - "peer": "system.cpu.icache_port", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 1 }, "interrupts": { "eventq_index": 0, @@ -1360,7 +1497,10 @@ "type": "ArmStage2MMU" }, "l2cache": { - "is_top_level": false, + "cpu_side": { + "peer": "system.cpu.toL2Bus.master[0]", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.cpu_clk_domain", "write_buffers": 8, @@ -1395,17 +1535,13 @@ "addr_ranges": [ "0:18446744073709551615" ], - "assoc": 8, + "is_read_only": false, "prefetch_on_access": false, "path": "system.cpu.l2cache", "name": "l2cache", "type": "BaseCache", "sequential_access": false, - "cpu_side": { - "peer": "system.cpu.toL2Bus.master[0]", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 8 }, "path": "system.cpu", "max_loads_any_thread": 0, @@ -1442,7 +1578,10 @@ "progress_interval": 0, "branchPred": null, "dcache": { - "is_top_level": true, + "cpu_side": { + "peer": "system.cpu.dcache_port", + "role": "SLAVE" + }, "prefetcher": null, "clk_domain": "system.cpu_clk_domain", "write_buffers": 8, @@ -1477,17 +1616,13 @@ "addr_ranges": [ "0:18446744073709551615" ], - "assoc": 4, + "is_read_only": false, "prefetch_on_access": false, "path": "system.cpu.dcache", "name": "dcache", "type": "BaseCache", "sequential_access": false, - "cpu_side": { - "peer": "system.cpu.dcache_port", - "role": "SLAVE" - }, - "two_queue": false + "assoc": 4 }, "isa": [ { @@ -1580,7 +1715,7 @@ "path": "system.cf0", "type": "IdeDisk" }, - "boot_release_addr": 65528, + "work_end_ckpt_count": 0, "mem_mode": "atomic", "name": "system", "init_param": 0, diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt index 52cc263b3..80deda855 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-checkpoint/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.783867 # Nu sim_ticks 2783867052000 # Number of ticks simulated final_tick 2783867052000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1269332 # Simulator instruction rate (inst/s) -host_op_rate 1545209 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 24750158617 # Simulator tick rate (ticks/s) -host_mem_usage 625572 # Number of bytes of host memory used -host_seconds 112.48 # Real time elapsed on the host +host_inst_rate 714694 # Simulator instruction rate (inst/s) +host_op_rate 870026 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 13935517761 # Simulator tick rate (ticks/s) +host_mem_usage 573808 # Number of bytes of host memory used +host_seconds 199.77 # Real time elapsed on the host sim_insts 142772879 # Number of instructions simulated sim_ops 173803124 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -746,5 +746,15 @@ system.realview.ethernet.totalRxOrn 0 # to system.realview.ethernet.coalescedTotal nan # average number of interrupts coalesced into each post system.realview.ethernet.postedInterrupts 0 # number of posts to CPU system.realview.ethernet.droppedPackets 0 # number of packets dropped +system.realview.realview_io.osc_clcd.clock 42105 # Clock period in ticks +system.realview.realview_io.osc_cpu.clock 16667 # Clock period in ticks +system.realview.realview_io.osc_ddr.clock 25000 # Clock period in ticks +system.realview.realview_io.osc_hsbm.clock 25000 # Clock period in ticks +system.realview.realview_io.osc_mcc.clock 20000 # Clock period in ticks +system.realview.realview_io.osc_peripheral.clock 41667 # Clock period in ticks +system.realview.realview_io.osc_pxl.clock 42105 # Clock period in ticks +system.realview.realview_io.osc_smb.clock 20000 # Clock period in ticks +system.realview.realview_io.osc_sys.clock 16667 # Clock period in ticks +system.realview.realview_io.osc_system_bus.clock 41667 # Clock period in ticks ---------- End Simulation Statistics ---------- |