diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2015-08-07 15:39:17 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2015-08-07 15:39:17 +0100 |
| commit | 023f6eb0f2093ea8ccd706353db6c3afa34c3a4d (patch) | |
| tree | d9f4f8d660d6d9fafa730222ab66d01ff625f7cb /tests/quick | |
| parent | bbb3abc16711e14858094b64a2eb1eb53204dded (diff) | |
| download | gem5-023f6eb0f2093ea8ccd706353db6c3afa34c3a4d.tar.xz | |
stats: Update ARM stats to include programmable oscillators
Diffstat (limited to 'tests/quick')
28 files changed, 1262 insertions, 304 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 ---------- diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini index 77c9ca9fd..bf070ce25 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/config.ini @@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +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=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -44,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -87,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -147,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=6 prefetch_on_access=false @@ -158,7 +156,6 @@ size=32768 system=system tags=system.cpu0.dcache.tags tgts_per_mshr=8 -two_queue=false write_buffers=16 cpu_side=system.cpu0.dcache_port mem_side=system.cpu0.toL2Bus.slave[1] @@ -222,9 +219,9 @@ assoc=2 clk_domain=system.cpu_clk_domain demand_mshr_reserve=1 eventq_index=0 -forward_snoops=true +forward_snoops=false hit_latency=1 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=2 prefetch_on_access=false @@ -235,7 +232,6 @@ size=32768 system=system tags=system.cpu0.icache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port mem_side=system.cpu0.toL2Bus.slave[0] @@ -335,7 +331,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=12 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=16 prefetch_on_access=true @@ -346,7 +342,6 @@ size=1048576 system=system tags=system.cpu0.l2cache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu0.toL2Bus.master[0] mem_side=system.toL2Bus.slave[0] @@ -454,7 +449,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=6 prefetch_on_access=false @@ -465,7 +460,6 @@ size=32768 system=system tags=system.cpu1.dcache.tags tgts_per_mshr=8 -two_queue=false write_buffers=16 cpu_side=system.cpu1.dcache_port mem_side=system.cpu1.toL2Bus.slave[1] @@ -529,9 +523,9 @@ assoc=2 clk_domain=system.cpu_clk_domain demand_mshr_reserve=1 eventq_index=0 -forward_snoops=true +forward_snoops=false hit_latency=1 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=2 prefetch_on_access=false @@ -542,7 +536,6 @@ size=32768 system=system tags=system.cpu1.icache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu1.icache_port mem_side=system.cpu1.toL2Bus.slave[0] @@ -642,7 +635,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=12 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=16 prefetch_on_access=true @@ -653,7 +646,6 @@ size=1048576 system=system tags=system.cpu1.l2cache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu1.toL2Bus.master[0] mem_side=system.toL2Bus.slave[1] @@ -756,7 +748,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 @@ -767,7 +759,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] @@ -792,7 +783,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 @@ -803,7 +794,6 @@ size=4194304 system=system tags=system.l2c.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[2] @@ -832,7 +822,7 @@ system=system use_default_range=false width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -1107,7 +1097,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -1120,7 +1111,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -1138,6 +1128,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] @@ -1307,7 +1298,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -1347,6 +1338,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 @@ -1357,6 +1349,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 @@ -1489,7 +1591,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout index 62e4f1a91..af95aaebb 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/simout @@ -1,19 +1,17 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:25:21 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:13:40 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic-dual + Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 - 0: system.cpu0.isa: ISA system set to: 0x53ff680 0x53ff680 - 0: system.cpu1.isa: ISA system set to: 0x53ff680 0x53ff680 +info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 info: Using bootloader at address 0x10 info: Using kernel entry physical address at 0x80008000 -info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000 +info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000 info: Entering event queue @ 0. Starting simulation... -info: Read CNTFREQ_EL0 frequency info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 @@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 -Exiting @ tick 2802882713500 because m5_exit instruction encountered +Exiting @ tick 2802894699500 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt index d1669be2b..b13c4e56a 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.802895 # Nu sim_ticks 2802894699500 # Number of ticks simulated final_tick 2802894699500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 1692608 # Simulator instruction rate (inst/s) -host_op_rate 2062417 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 32311218818 # Simulator tick rate (ticks/s) -host_mem_usage 579900 # Number of bytes of host memory used -host_seconds 86.75 # Real time elapsed on the host +host_inst_rate 1155692 # Simulator instruction rate (inst/s) +host_op_rate 1408193 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 22061708570 # Simulator tick rate (ticks/s) +host_mem_usage 584036 # Number of bytes of host memory used +host_seconds 127.05 # Real time elapsed on the host sim_insts 146828240 # Number of instructions simulated sim_ops 178908039 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -1455,6 +1455,16 @@ 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 system.toL2Bus.trans_dist::ReadReq 44000 # Transaction distribution system.toL2Bus.trans_dist::ReadResp 305308 # Transaction distribution system.toL2Bus.trans_dist::WriteReq 30846 # Transaction distribution diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal index 89f9e916a..d38aec98b 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/system.terminal @@ -199,7 +199,7 @@ oprofile: using timer interrupt. TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -209,6 +209,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 680, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini index 089dbf6ee..92530cc80 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/config.ini @@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +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=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -44,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -87,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -147,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 @@ -158,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] @@ -224,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 @@ -235,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] @@ -335,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 @@ -346,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] @@ -424,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 @@ -435,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] @@ -464,7 +458,7 @@ system=system use_default_range=false width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -739,7 +733,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -752,7 +747,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -770,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] @@ -939,7 +934,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -979,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 @@ -989,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 @@ -1121,7 +1227,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout index f25d6db4c..cc8e1e24f 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/simout @@ -1,18 +1,17 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:25:21 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:13:29 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-atomic + Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 - 0: system.cpu.isa: ISA system set to: 0x5299680 0x5299680 +info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 info: Using bootloader at address 0x10 info: Using kernel entry physical address at 0x80008000 -info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000 +info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000 info: Entering event queue @ 0. Starting simulation... -info: Read CNTFREQ_EL0 frequency info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 @@ -28,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 -Exiting @ tick 2783854177000 because m5_exit instruction encountered +Exiting @ tick 2783867052000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt index 19a0730a6..33ede6cdf 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/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 1280569 # Simulator instruction rate (inst/s) -host_op_rate 1558887 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 24969250003 # Simulator tick rate (ticks/s) -host_mem_usage 621096 # Number of bytes of host memory used -host_seconds 111.49 # Real time elapsed on the host +host_inst_rate 1188421 # Simulator instruction rate (inst/s) +host_op_rate 1446712 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 23172506899 # Simulator tick rate (ticks/s) +host_mem_usage 571472 # Number of bytes of host memory used +host_seconds 120.14 # 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 ---------- diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal index b3be0ec54..ad91d76dd 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/system.terminal @@ -193,7 +193,7 @@ oprofile: using timer interrupt. TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini index bb8aa99f6..8cc96dcc1 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/config.ini @@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +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=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -44,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -87,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -143,7 +141,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=6 prefetch_on_access=false @@ -154,7 +152,6 @@ size=32768 system=system tags=system.cpu0.dcache.tags tgts_per_mshr=8 -two_queue=false write_buffers=16 cpu_side=system.cpu0.dcache_port mem_side=system.cpu0.toL2Bus.slave[1] @@ -218,9 +215,9 @@ assoc=2 clk_domain=system.cpu_clk_domain demand_mshr_reserve=1 eventq_index=0 -forward_snoops=true +forward_snoops=false hit_latency=1 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=2 prefetch_on_access=false @@ -231,7 +228,6 @@ size=32768 system=system tags=system.cpu0.icache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port mem_side=system.cpu0.toL2Bus.slave[0] @@ -331,7 +327,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=12 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=16 prefetch_on_access=true @@ -342,7 +338,6 @@ size=1048576 system=system tags=system.cpu0.l2cache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu0.toL2Bus.master[0] mem_side=system.toL2Bus.slave[0] @@ -446,7 +441,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=6 prefetch_on_access=false @@ -457,7 +452,6 @@ size=32768 system=system tags=system.cpu1.dcache.tags tgts_per_mshr=8 -two_queue=false write_buffers=16 cpu_side=system.cpu1.dcache_port mem_side=system.cpu1.toL2Bus.slave[1] @@ -521,9 +515,9 @@ assoc=2 clk_domain=system.cpu_clk_domain demand_mshr_reserve=1 eventq_index=0 -forward_snoops=true +forward_snoops=false hit_latency=1 -is_top_level=true +is_read_only=true max_miss_count=0 mshrs=2 prefetch_on_access=false @@ -534,7 +528,6 @@ size=32768 system=system tags=system.cpu1.icache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu1.icache_port mem_side=system.cpu1.toL2Bus.slave[0] @@ -634,7 +627,7 @@ demand_mshr_reserve=1 eventq_index=0 forward_snoops=true hit_latency=12 -is_top_level=false +is_read_only=false max_miss_count=0 mshrs=16 prefetch_on_access=true @@ -645,7 +638,6 @@ size=1048576 system=system tags=system.cpu1.l2cache.tags tgts_per_mshr=8 -two_queue=false write_buffers=8 cpu_side=system.cpu1.toL2Bus.master[0] mem_side=system.toL2Bus.slave[1] @@ -748,7 +740,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 @@ -759,7 +751,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] @@ -784,7 +775,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 @@ -795,7 +786,6 @@ size=4194304 system=system tags=system.l2c.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[2] @@ -824,7 +814,7 @@ system=system use_default_range=false width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -1163,7 +1153,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -1176,7 +1167,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -1194,6 +1184,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] @@ -1363,7 +1354,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -1403,6 +1394,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 @@ -1413,6 +1405,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 @@ -1545,7 +1647,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout index f808cc158..79f6ab7f9 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/simout @@ -1,19 +1,17 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:25:21 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:13:30 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing-dual + Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 - 0: system.cpu0.isa: ISA system set to: 0x4f96680 0x4f96680 - 0: system.cpu1.isa: ISA system set to: 0x4f96680 0x4f96680 +info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 info: Using bootloader at address 0x10 info: Using kernel entry physical address at 0x80008000 -info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000 +info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.2cpu.dtb at address 0x88000000 info: Entering event queue @ 0. Starting simulation... -info: Read CNTFREQ_EL0 frequency info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 @@ -29,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 -Exiting @ tick 2866923142000 because m5_exit instruction encountered +Exiting @ tick 2868748596000 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt index 3792a44c9..2deca7899 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.868749 # Nu sim_ticks 2868748596000 # Number of ticks simulated final_tick 2868748596000 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 811357 # Simulator instruction rate (inst/s) -host_op_rate 981408 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 17699889488 # Simulator tick rate (ticks/s) -host_mem_usage 595428 # Number of bytes of host memory used -host_seconds 162.08 # Real time elapsed on the host +host_inst_rate 740337 # Simulator instruction rate (inst/s) +host_op_rate 895502 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 16150564794 # Simulator tick rate (ticks/s) +host_mem_usage 599396 # Number of bytes of host memory used +host_seconds 177.63 # Real time elapsed on the host sim_insts 131502488 # Number of instructions simulated sim_ops 159063828 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -2973,6 +2973,16 @@ 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 system.toL2Bus.trans_dist::ReadReq 44042 # Transaction distribution system.toL2Bus.trans_dist::ReadResp 480570 # Transaction distribution system.toL2Bus.trans_dist::WriteReq 30874 # Transaction distribution diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal index cc9c3e898..d38aec98b 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/system.terminal @@ -159,9 +159,9 @@ ata1.00: configured for UDMA/33 scsi 0:0:0:0: Direct-Access ATA M5 IDE Disk n/a PQ: 0 ANSI: 5
sd 0:0:0:0: [sda] 1048320 512-byte logical blocks: (536 MB/511 MiB)
sd 0:0:0:0: [sda] Write Protect is off
-sd 0:0:0:0: Attached scsi generic sg0 type 0
sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00
sd 0:0:0:0: [sda] Write cache: disabled, read cache: enabled, doesn't support DPO or FUA
+sd 0:0:0:0: Attached scsi generic sg0 type 0
sda: sda1
sd 0:0:0:0: [sda] Attached SCSI disk
e1000 0000:00:00.0 eth0: (PCI:33MHz:32-bit) 00:90:00:00:00:01
@@ -199,7 +199,7 @@ oprofile: using timer interrupt. TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -209,6 +209,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 680, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini index 3447337f9..8b289555b 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/config.ini @@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu cpu_clk_domain dvfs_handler intrctrl iobus iocache membus physmem realview terminal vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +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=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -44,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -87,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -143,7 +141,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 @@ -154,7 +152,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] @@ -220,7 +217,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 @@ -231,7 +228,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] @@ -331,7 +327,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 @@ -342,7 +338,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] @@ -420,7 +415,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 @@ -431,7 +426,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] @@ -460,7 +454,7 @@ system=system use_default_range=false width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.cpu.l2cache.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -799,7 +793,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -812,7 +807,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -830,6 +824,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] @@ -999,7 +994,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -1039,6 +1034,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 @@ -1049,6 +1045,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 @@ -1181,7 +1287,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout index ce3f5bea6..4dcbeb2f2 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/simout @@ -1,18 +1,17 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:25:21 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:15:48 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-simple-timing + Global frequency set at 1000000000000 ticks per second -info: kernel located at: /dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 - 0: system.cpu.isa: ISA system set to: 0x44d4680 0x44d4680 +info: kernel located at: /work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 info: Using bootloader at address 0x10 info: Using kernel entry physical address at 0x80008000 -info: Loading DTB file: /dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000 +info: Loading DTB file: /work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb at address 0x88000000 info: Entering event queue @ 0. Starting simulation... -info: Read CNTFREQ_EL0 frequency info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 @@ -28,4 +27,4 @@ info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 info: trap check M:0 N:0 1:0 2:0 hdcr 0, hcptr 3fff, hstr 0 -Exiting @ tick 2902619131000 because m5_exit instruction encountered +Exiting @ tick 2903467553500 because m5_exit instruction encountered diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt index 21bc80649..2f0ebe667 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.903468 # Nu sim_ticks 2903467553500 # Number of ticks simulated final_tick 2903467553500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 736333 # Simulator instruction rate (inst/s) -host_op_rate 887789 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 19005878440 # Simulator tick rate (ticks/s) -host_mem_usage 619548 # Number of bytes of host memory used -host_seconds 152.77 # Real time elapsed on the host +host_inst_rate 455888 # Simulator instruction rate (inst/s) +host_op_rate 549660 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 11767164312 # Simulator tick rate (ticks/s) +host_mem_usage 571472 # Number of bytes of host memory used +host_seconds 246.74 # Real time elapsed on the host sim_insts 112487279 # Number of instructions simulated sim_ops 135624752 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -1469,5 +1469,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 ---------- diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal index b3be0ec54..ad91d76dd 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/system.terminal @@ -193,7 +193,7 @@ oprofile: using timer interrupt. TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini index 8c83d4cbb..d3065f7a2 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/config.ini @@ -12,25 +12,23 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain atags_addr=134217728 -boot_loader=/scratch/nilay/GEM5/system/binaries/boot_emm.arm +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=/scratch/nilay/GEM5/system/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/scratch/nilay/GEM5/system/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 @@ -44,7 +42,7 @@ num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -87,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/scratch/nilay/GEM5/system/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -147,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 @@ -158,7 +156,6 @@ size=32768 system=system tags=system.cpu0.dcache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu0.dcache_port mem_side=system.toL2Bus.slave[1] @@ -224,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 @@ -235,7 +232,6 @@ size=32768 system=system tags=system.cpu0.icache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port mem_side=system.toL2Bus.slave[0] @@ -524,7 +520,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 @@ -535,7 +531,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] @@ -560,7 +555,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 @@ -571,7 +566,6 @@ size=4194304 system=system tags=system.l2c.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[2] @@ -600,7 +594,7 @@ system=system use_default_range=false width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -875,7 +869,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -888,7 +883,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -906,6 +900,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] @@ -1075,7 +1070,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -1115,6 +1110,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 @@ -1125,6 +1121,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 @@ -1257,7 +1363,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout index 4a0c68df7..29cd0645f 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/simout @@ -1,10 +1,9 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:27:15 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:14:37 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-atomic + Global frequency set at 1000000000000 ticks per second - 0: system.cpu0.isa: ISA system set to: 0x4171680 0x4171680 - 0: system.cpu1.isa: ISA system set to: 0x4171680 0x4171680 diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt index 948865e8c..86f263873 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/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 1197854 # Simulator instruction rate (inst/s) -host_op_rate 1458195 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 23356431621 # Simulator tick rate (ticks/s) -host_mem_usage 621348 # Number of bytes of host memory used -host_seconds 119.19 # Real time elapsed on the host +host_inst_rate 1097147 # Simulator instruction rate (inst/s) +host_op_rate 1335600 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 21392785088 # Simulator tick rate (ticks/s) +host_mem_usage 571732 # Number of bytes of host memory used +host_seconds 130.13 # 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 @@ -1024,6 +1024,16 @@ 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 system.toL2Bus.trans_dist::ReadReq 71244 # Transaction distribution system.toL2Bus.trans_dist::ReadResp 2291984 # Transaction distribution system.toL2Bus.trans_dist::WriteReq 27546 # Transaction distribution diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal index b3be0ec54..ad91d76dd 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-atomic/system.terminal @@ -193,7 +193,7 @@ oprofile: using timer interrupt. TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini index 8c1381ed5..c837f36d0 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/config.ini @@ -12,38 +12,37 @@ time_sync_spin_threshold=100000000 type=LinuxArmSystem children=bridge cf0 clk_domain cpu0 cpu1 cpu_clk_domain dvfs_handler intrctrl iobus iocache l2c membus physmem realview terminal toL2Bus vncserver voltage_domain atags_addr=134217728 -boot_loader=/dist/binaries/boot_emm.arm +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=/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb +dtb_filename=/work/gem5/dist/binaries/vexpress.aarch32.ll_20131205.0-gem5.1cpu.dtb early_kernel_symbols=false enable_context_switch_stats_dump=false eventq_index=0 flags_addr=469827632 gic_cpu_addr=738205696 -have_generic_timer=false have_large_asid_64=false have_lpae=false have_security=false have_virtualization=false highest_el_is_64=false init_param=0 -kernel=/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 +kernel=/work/gem5/dist/binaries/vmlinux.aarch32.ll_20131205.0-gem5 kernel_addr_check=true load_addr_mask=268435455 load_offset=2147483648 machine_type=VExpress_EMM mem_mode=timing mem_ranges=2147483648:2415919103 -memories=system.realview.nvmem system.physmem system.realview.vram +memories=system.physmem system.realview.nvmem system.realview.vram +mmap_using_noreserve=false multi_proc=true num_work_ids=16 panic_on_oops=true panic_on_panic=true phys_addr_range_64=40 -readfile=/work/gem5.ext/tests/halt.sh +readfile=/work/gem5/outgoing/gem5/tests/halt.sh reset_addr_64=0 symbolfile= work_begin_ckpt_count=0 @@ -86,7 +85,7 @@ table_size=65536 [system.cf0.image.child] type=RawDiskImage eventq_index=0 -image_file=/dist/disks/linux-aarch32-ael.img +image_file=/work/gem5/dist/disks/linux-aarch32-ael.img read_only=true [system.clk_domain] @@ -138,10 +137,11 @@ children=tags addr_ranges=0:18446744073709551615 assoc=4 clk_domain=system.cpu_clk_domain +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 @@ -152,7 +152,6 @@ size=32768 system=system tags=system.cpu0.dcache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu0.dcache_port mem_side=system.toL2Bus.slave[1] @@ -172,6 +171,7 @@ type=ArmStage2MMU children=stage2_tlb eventq_index=0 stage2_tlb=system.cpu0.dstage2_mmu.stage2_tlb +sys=system tlb=system.cpu0.dtb [system.cpu0.dstage2_mmu.stage2_tlb] @@ -189,7 +189,6 @@ eventq_index=0 is_stage2=true num_squash_per_cycle=2 sys=system -port=system.toL2Bus.slave[5] [system.cpu0.dtb] type=ArmTLB @@ -214,10 +213,11 @@ children=tags addr_ranges=0:18446744073709551615 assoc=1 clk_domain=system.cpu_clk_domain +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 @@ -228,7 +228,6 @@ size=32768 system=system tags=system.cpu0.icache.tags tgts_per_mshr=20 -two_queue=false write_buffers=8 cpu_side=system.cpu0.icache_port mem_side=system.toL2Bus.slave[0] @@ -282,6 +281,7 @@ type=ArmStage2MMU children=stage2_tlb eventq_index=0 stage2_tlb=system.cpu0.istage2_mmu.stage2_tlb +sys=system tlb=system.cpu0.itb [system.cpu0.istage2_mmu.stage2_tlb] @@ -299,7 +299,6 @@ eventq_index=0 is_stage2=true num_squash_per_cycle=2 sys=system -port=system.toL2Bus.slave[4] [system.cpu0.itb] type=ArmTLB @@ -360,6 +359,7 @@ type=ArmStage2MMU children=stage2_tlb eventq_index=0 stage2_tlb=system.cpu1.dstage2_mmu.stage2_tlb +sys=system tlb=system.cpu1.dtb [system.cpu1.dstage2_mmu.stage2_tlb] @@ -429,6 +429,7 @@ type=ArmStage2MMU children=stage2_tlb eventq_index=0 stage2_tlb=system.cpu1.istage2_mmu.stage2_tlb +sys=system tlb=system.cpu1.itb [system.cpu1.istage2_mmu.stage2_tlb] @@ -492,9 +493,11 @@ sys=system type=NoncoherentXBar clk_domain=system.clk_domain eventq_index=0 -header_cycles=1 +forward_latency=1 +frontend_latency=2 +response_latency=2 use_default_range=true -width=8 +width=16 default=system.realview.pciconfig.pio master=system.realview.uart.pio system.realview.realview_io.pio system.realview.timer0.pio system.realview.timer1.pio system.realview.clcd.pio system.realview.hdlcd.pio system.realview.kmi0.pio system.realview.kmi1.pio system.realview.cf_ctrl.pio system.realview.cf_ctrl.config system.realview.rtc.pio system.realview.vram.port system.realview.l2x0_fake.pio system.realview.uart1_fake.pio system.realview.uart2_fake.pio system.realview.uart3_fake.pio system.realview.sp810_fake.pio system.realview.watchdog_fake.pio system.realview.aaci_fake.pio system.realview.lan_fake.pio system.realview.usb_fake.pio system.realview.mmc_fake.pio system.realview.energy_ctrl.pio system.realview.ide.pio system.realview.ide.config system.realview.ethernet.pio system.realview.ethernet.config system.iocache.cpu_side slave=system.bridge.master system.realview.clcd.dma system.realview.cf_ctrl.dma system.realview.ide.dma system.realview.ethernet.dma @@ -505,10 +508,11 @@ children=tags addr_ranges=2147483648:2415919103 assoc=8 clk_domain=system.clk_domain +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 @@ -519,7 +523,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] @@ -540,10 +543,11 @@ children=tags addr_ranges=0:18446744073709551615 assoc=8 clk_domain=system.cpu_clk_domain +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 @@ -554,7 +558,6 @@ size=4194304 system=system tags=system.l2c.tags tgts_per_mshr=12 -two_queue=false write_buffers=8 cpu_side=system.toL2Bus.master[0] mem_side=system.membus.slave[2] @@ -574,13 +577,16 @@ type=CoherentXBar children=badaddr_responder clk_domain=system.clk_domain eventq_index=0 -header_cycles=1 +forward_latency=4 +frontend_latency=3 +response_latency=2 snoop_filter=Null +snoop_response_latency=4 system=system use_default_range=false -width=8 +width=16 default=system.membus.badaddr_responder.pio -master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.local_cpu_timer.pio system.realview.vgic.pio system.physmem.port +master=system.bridge.slave system.realview.nvmem.port system.realview.gic.pio system.realview.vgic.pio system.realview.local_cpu_timer.pio system.physmem.port slave=system.realview.hdlcd.dma system.system_port system.l2c.mem_side system.iocache.mem_side [system.membus.badaddr_responder] @@ -628,7 +634,7 @@ IDD62=0.000000 VDD=1.500000 VDD2=0.000000 activation_limit=4 -addr_mapping=RoRaBaChCo +addr_mapping=RoRaBaCoCh bank_groups_per_rank=0 banks_per_rank=8 burst_length=8 @@ -919,7 +925,8 @@ pio=system.iobus.master[25] type=GenericTimer eventq_index=0 gic=system.realview.gic -int_num=29 +int_phys=29 +int_virt=27 system=system [system.realview.gic] @@ -932,7 +939,6 @@ dist_pio_delay=10000 eventq_index=0 int_latency=10000 it_lines=128 -msix_addr=0 platform=system.realview system=system pio=system.membus.master[2] @@ -950,6 +956,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] @@ -1119,7 +1126,7 @@ int_num_watchdog=30 pio_addr=738721792 pio_latency=100000 system=system -pio=system.membus.master[3] +pio=system.membus.master[4] [system.realview.mmc_fake] type=AmbaFake @@ -1159,6 +1166,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 @@ -1169,6 +1177,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 @@ -1301,7 +1419,7 @@ platform=system.realview ppint=25 system=system vcpu_addr=738222080 -pio=system.membus.master[4] +pio=system.membus.master[3] [system.realview.vram] type=SimpleMemory @@ -1339,13 +1457,16 @@ port=3456 type=CoherentXBar clk_domain=system.cpu_clk_domain eventq_index=0 -header_cycles=1 +forward_latency=0 +frontend_latency=1 +response_latency=1 snoop_filter=Null +snoop_response_latency=1 system=system use_default_range=false -width=8 +width=32 master=system.l2c.cpu_side -slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port system.cpu0.istage2_mmu.stage2_tlb.walker.port system.cpu0.dstage2_mmu.stage2_tlb.walker.port +slave=system.cpu0.icache.mem_side system.cpu0.dcache.mem_side system.cpu0.itb.walker.port system.cpu0.dtb.walker.port [system.vncserver] type=VncServer diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr index 067647ddd..d2f2052ec 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simerr @@ -67,3 +67,15 @@ warn: User mode does not have SPSR warn: User mode does not have SPSR warn: User mode does not have SPSR warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR +warn: User mode does not have SPSR diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout index 28734ef64..0920e5399 100755 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/simout @@ -1,10 +1,9 @@ gem5 Simulator System. http://gem5.org gem5 is copyrighted software; use the --copyright option for details. -gem5 compiled Oct 31 2014 10:01:44 -gem5 started Oct 31 2014 11:48:18 -gem5 executing on u200540-lin -command line: build/ARM/gem5.opt -d build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-timing -re /work/gem5.ext/tests/run.py build/ARM/tests/opt/long/fs/10.linux-boot/arm/linux/realview-switcheroo-timing +gem5 compiled Aug 7 2015 10:13:08 +gem5 started Aug 7 2015 10:13:41 +gem5 executing on e104799-lin +command line: build/ARM/gem5.opt -d build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing -re /work/gem5/outgoing/gem5/tests/run.py build/ARM/tests/opt/quick/fs/10.linux-boot/arm/linux/realview-switcheroo-timing + Global frequency set at 1000000000000 ticks per second - 0: system.cpu0.isa: ISA system set to: 0x4989680 0x4989680 - 0: system.cpu1.isa: ISA system set to: 0x4989680 0x4989680 diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt index 505a1af3b..cda6fdde5 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/stats.txt @@ -4,11 +4,11 @@ sim_seconds 2.903518 # Nu sim_ticks 2903517798500 # Number of ticks simulated final_tick 2903517798500 # Number of ticks from beginning of simulation (restored from checkpoints and never reset) sim_freq 1000000000000 # Frequency of simulated ticks -host_inst_rate 707460 # Simulator instruction rate (inst/s) -host_op_rate 852978 # Simulator op (including micro ops) rate (op/s) -host_tick_rate 18263496849 # Simulator tick rate (ticks/s) -host_mem_usage 621100 # Number of bytes of host memory used -host_seconds 158.98 # Real time elapsed on the host +host_inst_rate 703123 # Simulator instruction rate (inst/s) +host_op_rate 847748 # Simulator op (including micro ops) rate (op/s) +host_tick_rate 18151522616 # Simulator tick rate (ticks/s) +host_mem_usage 572756 # Number of bytes of host memory used +host_seconds 159.96 # Real time elapsed on the host sim_insts 112471533 # Number of instructions simulated sim_ops 135605825 # Number of ops (including micro ops) simulated system.voltage_domain.voltage 1 # Voltage in Volts @@ -1910,6 +1910,16 @@ 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 system.toL2Bus.trans_dist::ReadReq 74970 # Transaction distribution system.toL2Bus.trans_dist::ReadResp 2298377 # Transaction distribution system.toL2Bus.trans_dist::WriteReq 27589 # Transaction distribution diff --git a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal index b3be0ec54..ad91d76dd 100644 --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-switcheroo-timing/system.terminal @@ -193,7 +193,7 @@ oprofile: using timer interrupt. TCP: cubic registered
NET: Registered protocol family 10
NET: Registered protocol family 17
-rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 12:00:00 UTC (1230811200)
+rtc-pl031 1c170000.rtc: setting system clock to 2009-01-01 00:00:00 UTC (1230768000)
ALSA device list:
No soundcards found.
@@ -203,6 +203,6 @@ Freeing unused kernel memory: 292K (806aa000 - 806f3000)
init started: BusyBox v1.15.3 (2010-05-07 01:27:07 BST)
starting pid 673, tty '': '/etc/rc.d/rc.local'
warning: can't open /etc/mtab: No such file or directory
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
S: devpts
-Thu Jan 1 12:00:02 UTC 2009
+Thu Jan 1 00:00:02 UTC 2009
|