changeset e535b95573c0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=e535b95573c0
description:
stats: update SPARC FS stats
The fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic test was
broken for so long that, now that it's working again, the stats
output is out of date. This changeset updates the outputs, on
the assumption that the stats changes are all valid differences
due to other changes made while it was broken.
diffstat:
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
| 18 +-
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
| 38 +-
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simerr
| 39 +
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
| 18 +-
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
| 251 ++++++++++
5 files changed, 334 insertions(+), 30 deletions(-)
diffs (truncated from 481 to 300 lines):
diff -r d1f8610cdffd -r e535b95573c0
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
---
a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
Fri Jan 15 11:30:13 2016 +0000
+++
b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini
Sun Jan 17 21:13:29 2016 -0500
@@ -15,11 +15,12 @@
cache_line_size=64
clk_domain=system.clk_domain
eventq_index=0
+exit_on_work_items=false
hypervisor_addr=1099243257856
-hypervisor_bin=/scratch/nilay/GEM5/system/binaries/q_new.bin
+hypervisor_bin=/dist/m5/system/binaries/q_new.bin
hypervisor_desc=system.hypervisor_desc
hypervisor_desc_addr=133446500352
-hypervisor_desc_bin=/scratch/nilay/GEM5/system/binaries/1up-hv.bin
+hypervisor_desc_bin=/dist/m5/system/binaries/1up-hv.bin
init_param=0
kernel=
kernel_addr_check=true
@@ -29,18 +30,19 @@
mem_ranges=1048576:68157439 2147483648:2415919103
memories=system.hypervisor_desc system.nvram system.partition_desc
system.physmem0 system.physmem1 system.rom
mmap_using_noreserve=false
+multi_thread=false
num_work_ids=16
nvram=system.nvram
nvram_addr=133429198848
-nvram_bin=/scratch/nilay/GEM5/system/binaries/nvram1
+nvram_bin=/dist/m5/system/binaries/nvram1
openboot_addr=1099243716608
-openboot_bin=/scratch/nilay/GEM5/system/binaries/openboot_new.bin
+openboot_bin=/dist/m5/system/binaries/openboot_new.bin
partition_desc=system.partition_desc
partition_desc_addr=133445976064
-partition_desc_bin=/scratch/nilay/GEM5/system/binaries/1up-md.bin
-readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
+partition_desc_bin=/dist/m5/system/binaries/1up-md.bin
+readfile=/z/stever/hg/gem5/tests/halt.sh
reset_addr=1099243192320
-reset_bin=/scratch/nilay/GEM5/system/binaries/reset_new.bin
+reset_bin=/dist/m5/system/binaries/reset_new.bin
rom=system.rom
symbolfile=
work_begin_ckpt_count=0
@@ -161,7 +163,7 @@
[system.disk0.image.child]
type=RawDiskImage
eventq_index=0
-image_file=/scratch/nilay/GEM5/system/disks/disk.s10hw2
+image_file=/dist/m5/system/disks/disk.s10hw2
read_only=true
[system.dvfs_handler]
diff -r d1f8610cdffd -r e535b95573c0
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
---
a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
Fri Jan 15 11:30:13 2016 +0000
+++
b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json
Sun Jan 17 21:13:29 2016 -0500
@@ -473,8 +473,9 @@
"ret_data16": 65535
}
},
+ "partition_desc_addr": 133445976064,
"symbolfile": "",
- "readfile": "/scratch/nilay/GEM5/gem5/tests/halt.sh",
+ "readfile": "/z/stever/hg/gem5/tests/halt.sh",
"hypervisor_addr": 1099243257856,
"mem_ranges": [
"1048576:68157439",
@@ -482,7 +483,7 @@
],
"cxx_class": "SparcSystem",
"load_offset": 0,
- "reset_bin": "/scratch/nilay/GEM5/system/binaries/reset_new.bin",
+ "reset_bin": "/dist/m5/system/binaries/reset_new.bin",
"openboot_addr": 1099243716608,
"work_end_ckpt_count": 0,
"nvram_addr": 133429198848,
@@ -645,8 +646,8 @@
"type": "DVFSHandler"
},
"work_end_exit_count": 0,
- "hypervisor_desc_bin":
"/scratch/nilay/GEM5/system/binaries/1up-hv.bin",
- "openboot_bin":
"/scratch/nilay/GEM5/system/binaries/openboot_new.bin",
+ "hypervisor_desc_bin": "/dist/m5/system/binaries/1up-hv.bin",
+ "openboot_bin": "/dist/m5/system/binaries/openboot_new.bin",
"voltage_domain": {
"name": "voltage_domain",
"eventq_index": 0,
@@ -706,7 +707,7 @@
"work_cpus_ckpt_count": 0,
"work_begin_exit_count": 0,
"path": "system",
- "hypervisor_bin": "/scratch/nilay/GEM5/system/binaries/q_new.bin",
+ "hypervisor_bin": "/dist/m5/system/binaries/q_new.bin",
"cpu_clk_domain": {
"name": "cpu_clk_domain",
"clock": [
@@ -720,12 +721,12 @@
"type": "SrcClockDomain",
"domain_id": -1
},
- "nvram_bin": "/scratch/nilay/GEM5/system/binaries/nvram1",
+ "nvram_bin": "/dist/m5/system/binaries/nvram1",
"mem_mode": "atomic",
"name": "system",
"init_param": 0,
"type": "SparcSystem",
- "partition_desc_bin":
"/scratch/nilay/GEM5/system/binaries/1up-md.bin",
+ "partition_desc_bin": "/dist/m5/system/binaries/1up-md.bin",
"load_addr_mask": 1099511627775,
"cpu": {
"do_statistics_insts": true,
@@ -758,13 +759,15 @@
"peer": "system.membus.slave[1]",
"role": "MASTER"
},
- "interrupts": {
- "eventq_index": 0,
- "path": "system.cpu.interrupts",
- "type": "SparcInterrupts",
- "name": "interrupts",
- "cxx_class": "SparcISA::Interrupts"
- },
+ "interrupts": [
+ {
+ "eventq_index": 0,
+ "path": "system.cpu.interrupts",
+ "type": "SparcInterrupts",
+ "name": "interrupts",
+ "cxx_class": "SparcISA::Interrupts"
+ }
+ ],
"dcache_port": {
"peer": "system.membus.slave[2]",
"role": "MASTER"
@@ -831,7 +834,7 @@
"eventq_index": 0,
"cxx_class": "RawDiskImage",
"path": "system.disk0.image.child",
- "image_file":
"/scratch/nilay/GEM5/system/disks/disk.s10hw2",
+ "image_file": "/dist/m5/system/disks/disk.s10hw2",
"type": "RawDiskImage"
},
"path": "system.disk0.image",
@@ -848,11 +851,12 @@
"pio_addr": 134217728000,
"type": "MmDisk"
},
+ "multi_thread": false,
"reset_addr": 1099243192320,
"hypervisor_desc_addr": 133446500352,
- "partition_desc_addr": 133445976064,
+ "num_work_ids": 16,
"work_item_id": -1,
- "num_work_ids": 16
+ "exit_on_work_items": false
},
"time_sync_period": 200000000,
"eventq_index": 0,
diff -r d1f8610cdffd -r e535b95573c0
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simerr
---
a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simerr
Fri Jan 15 11:30:13 2016 +0000
+++
b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simerr
Sun Jan 17 21:13:29 2016 -0500
@@ -0,0 +1,39 @@
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: rounding error > tolerance
+ 0.145519 rounded to 0
+warn: Sockets disabled, not accepting terminal connections
+warn: Sockets disabled, not accepting gdb connections
+warn: Don't know what interrupt to clear for console.
diff -r d1f8610cdffd -r e535b95573c0
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
---
a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
Fri Jan 15 11:30:13 2016 +0000
+++
b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/simout
Sun Jan 17 21:13:29 2016 -0500
@@ -1,9 +1,17 @@
gem5 Simulator System. http://gem5.org
gem5 is copyrighted software; use the --copyright option for details.
-gem5 compiled Dec 4 2015 15:03:17
-gem5 started Dec 4 2015 15:03:30
-gem5 executing on e104799-lin, pid 26420
-command line: build/SPARC/gem5.opt -d
build/SPARC/tests/opt/long/fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic
-re /work/gem5/outgoing/gem5_2/tests/run.py
build/SPARC/tests/opt/long/fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic
+gem5 compiled Jan 17 2016 20:30:24
+gem5 started Jan 17 2016 20:30:38
+gem5 executing on zizzer, pid 47389
+command line: build/SPARC/gem5.opt -d
build/SPARC/tests/opt/long/fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic
-re /z/stever/hg/gem5/tests/run.py
build/SPARC/tests/opt/long/fs/80.solaris-boot/sparc/solaris/t1000-simple-atomic
-Skipping test: Can't find file 'disk.s10hw2' on path.
+Global frequency set at 2000000000 ticks per second
+info: No kernel set for full system simulation. Assuming you know what you're
doing
+ 0: system.t1000.htod: Real-time clock set to Thu Jan 1 00:00:00 2009
+
+ 0: system.t1000.htod: Real-time clock set to 1230768000
+info: Entering event queue @ 0. Starting simulation...
+info: Ignoring write to SPARC ERROR regsiter
+info: Ignoring write to SPARC ERROR regsiter
+Exiting @ tick 4467555024 because m5_exit instruction encountered
diff -r d1f8610cdffd -r e535b95573c0
tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
---
a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
Fri Jan 15 11:30:13 2016 +0000
+++
b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/stats.txt
Sun Jan 17 21:13:29 2016 -0500
@@ -0,0 +1,251 @@
+
+---------- Begin Simulation Statistics ----------
+sim_seconds 2.233778 #
Number of seconds simulated
+sim_ticks 4467555024 #
Number of ticks simulated
+final_tick 4467555024 #
Number of ticks from beginning of simulation (restored from checkpoints and
never reset)
+sim_freq 2000000000 #
Frequency of simulated ticks
+host_inst_rate 1658224 #
Simulator instruction rate (inst/s)
+host_op_rate 1658876 #
Simulator op (including micro ops) rate (op/s)
+host_tick_rate 3324623 #
Simulator tick rate (ticks/s)
+host_mem_usage 518260 #
Number of bytes of host memory used
+host_seconds 1343.78 #
Real time elapsed on the host
+sim_insts 2228284650 #
Number of instructions simulated
+sim_ops 2229160714 #
Number of ops (including micro ops) simulated
+system.voltage_domain.voltage 1 #
Voltage in Volts
+system.clk_domain.clock 2 #
Clock period in ticks
+system.hypervisor_desc.bytes_read::cpu.data 16792
# Number of bytes read from this memory
+system.hypervisor_desc.bytes_read::total 16792 #
Number of bytes read from this memory
+system.hypervisor_desc.num_reads::cpu.data 9024
# Number of read requests responded to by this memory
+system.hypervisor_desc.num_reads::total 9024 #
Number of read requests responded to by this memory
+system.hypervisor_desc.bw_read::cpu.data 7517 #
Total read bandwidth from this memory (bytes/s)
+system.hypervisor_desc.bw_read::total 7517 #
Total read bandwidth from this memory (bytes/s)
+system.hypervisor_desc.bw_total::cpu.data 7517 #
Total bandwidth to/from this memory (bytes/s)
+system.hypervisor_desc.bw_total::total 7517 #
Total bandwidth to/from this memory (bytes/s)
+system.nvram.bytes_read::cpu.data 284 #
Number of bytes read from this memory
+system.nvram.bytes_read::total 284 #
Number of bytes read from this memory
+system.nvram.bytes_written::cpu.data 92 #
Number of bytes written to this memory
+system.nvram.bytes_written::total 92 #
Number of bytes written to this memory
+system.nvram.num_reads::cpu.data 284 #
Number of read requests responded to by this memory
+system.nvram.num_reads::total 284 #
Number of read requests responded to by this memory
+system.nvram.num_writes::cpu.data 92 #
Number of write requests responded to by this memory
+system.nvram.num_writes::total 92 #
Number of write requests responded to by this memory
+system.nvram.bw_read::cpu.data 127 #
Total read bandwidth from this memory (bytes/s)
+system.nvram.bw_read::total 127 #
Total read bandwidth from this memory (bytes/s)
+system.nvram.bw_write::cpu.data 41 #
Write bandwidth from this memory (bytes/s)
+system.nvram.bw_write::total 41 #
Write bandwidth from this memory (bytes/s)
+system.nvram.bw_total::cpu.data 168 #
Total bandwidth to/from this memory (bytes/s)
+system.nvram.bw_total::total 168 #
Total bandwidth to/from this memory (bytes/s)
+system.partition_desc.bytes_read::cpu.data 4846
# Number of bytes read from this memory
+system.partition_desc.bytes_read::total 4846 #
Number of bytes read from this memory
+system.partition_desc.num_reads::cpu.data 608 #
Number of read requests responded to by this memory
+system.partition_desc.num_reads::total 608 #
Number of read requests responded to by this memory
+system.partition_desc.bw_read::cpu.data 2169 #
Total read bandwidth from this memory (bytes/s)
+system.partition_desc.bw_read::total 2169 #
Total read bandwidth from this memory (bytes/s)
+system.partition_desc.bw_total::cpu.data 2169 #
Total bandwidth to/from this memory (bytes/s)
+system.partition_desc.bw_total::total 2169 #
Total bandwidth to/from this memory (bytes/s)
+system.physmem0.bytes_read::cpu.inst 612291324 #
Number of bytes read from this memory
+system.physmem0.bytes_read::cpu.data 97534024 #
Number of bytes read from this memory
+system.physmem0.bytes_read::total 709825348 #
Number of bytes read from this memory
+system.physmem0.bytes_inst_read::cpu.inst 612291324 #
Number of instructions bytes read from this memory
+system.physmem0.bytes_inst_read::total 612291324 #
Number of instructions bytes read from this memory
+system.physmem0.bytes_written::cpu.data 15400223 #
Number of bytes written to this memory
+system.physmem0.bytes_written::total 15400223 #
Number of bytes written to this memory
+system.physmem0.num_reads::cpu.inst 153072831 #
Number of read requests responded to by this memory
+system.physmem0.num_reads::cpu.data 12152054 #
Number of read requests responded to by this memory
+system.physmem0.num_reads::total 165224885 #
Number of read requests responded to by this memory
+system.physmem0.num_writes::cpu.data 1927067 #
Number of write requests responded to by this memory
+system.physmem0.num_writes::total 1927067 #
Number of write requests responded to by this memory
+system.physmem0.num_other::cpu.data 14 #
Number of other requests responded to by this memory
+system.physmem0.num_other::total 14 #
Number of other requests responded to by this memory
+system.physmem0.bw_read::cpu.inst 274105779 #
Total read bandwidth from this memory (bytes/s)
+system.physmem0.bw_read::cpu.data 43663267 #
Total read bandwidth from this memory (bytes/s)
+system.physmem0.bw_read::total 317769046 #
Total read bandwidth from this memory (bytes/s)
+system.physmem0.bw_inst_read::cpu.inst 274105779 #
Instruction read bandwidth from this memory (bytes/s)
+system.physmem0.bw_inst_read::total 274105779 #
Instruction read bandwidth from this memory (bytes/s)
+system.physmem0.bw_write::cpu.data 6894251 #
Write bandwidth from this memory (bytes/s)
+system.physmem0.bw_write::total 6894251 #
Write bandwidth from this memory (bytes/s)
+system.physmem0.bw_total::cpu.inst 274105779 #
Total bandwidth to/from this memory (bytes/s)
+system.physmem0.bw_total::cpu.data 50557518 #
Total bandwidth to/from this memory (bytes/s)
+system.physmem0.bw_total::total 324663297 #
Total bandwidth to/from this memory (bytes/s)
+system.physmem1.bytes_read::cpu.inst 8318106840 #
Number of bytes read from this memory
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
