From fa1fbcf020ee9aacdd4a7a09e81a633e09bad97a Mon Sep 17 00:00:00 2001 From: Nilay Vaish Date: Mon, 1 Sep 2014 16:55:52 -0500 Subject: stats: updates due to recent ruby and x86 changes Also updates many out of date config files. --- .../sparc/solaris/t1000-simple-atomic/config.ini | 33 +++++--- .../sparc/solaris/t1000-simple-atomic/config.json | 92 ++++++++++++---------- 2 files changed, 75 insertions(+), 50 deletions(-) (limited to 'tests/long/fs/80.solaris-boot/ref/sparc/solaris') diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini index 477b3f3c7..f59a11c09 100644 --- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini +++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.ini @@ -10,35 +10,36 @@ time_sync_spin_threshold=200000 [system] type=SparcSystem -children=bridge clk_domain cpu cpu_clk_domain disk0 hypervisor_desc intrctrl iobus membus nvram partition_desc physmem0 physmem1 rom t1000 voltage_domain +children=bridge clk_domain cpu cpu_clk_domain disk0 dvfs_handler hypervisor_desc intrctrl iobus membus nvram partition_desc physmem0 physmem1 rom t1000 voltage_domain boot_osflags=a cache_line_size=64 clk_domain=system.clk_domain eventq_index=0 hypervisor_addr=1099243257856 -hypervisor_bin=/dist/m5/system/binaries/q_new.bin +hypervisor_bin=/scratch/nilay/GEM5/system/binaries/q_new.bin hypervisor_desc=system.hypervisor_desc hypervisor_desc_addr=133446500352 -hypervisor_desc_bin=/dist/m5/system/binaries/1up-hv.bin +hypervisor_desc_bin=/scratch/nilay/GEM5/system/binaries/1up-hv.bin init_param=0 kernel= +kernel_addr_check=true load_addr_mask=1099511627775 load_offset=0 mem_mode=atomic mem_ranges=1048576:68157439 2147483648:2415919103 -memories=system.nvram system.rom system.hypervisor_desc system.physmem0 system.physmem1 system.partition_desc +memories=system.partition_desc system.rom system.nvram system.physmem1 system.hypervisor_desc system.physmem0 num_work_ids=16 nvram=system.nvram nvram_addr=133429198848 -nvram_bin=/dist/m5/system/binaries/nvram1 +nvram_bin=/scratch/nilay/GEM5/system/binaries/nvram1 openboot_addr=1099243716608 -openboot_bin=/dist/m5/system/binaries/openboot_new.bin +openboot_bin=/scratch/nilay/GEM5/system/binaries/openboot_new.bin partition_desc=system.partition_desc partition_desc_addr=133445976064 -partition_desc_bin=/dist/m5/system/binaries/1up-md.bin -readfile=/z/stever/hg/gem5/tests/halt.sh +partition_desc_bin=/scratch/nilay/GEM5/system/binaries/1up-md.bin +readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh reset_addr=1099243192320 -reset_bin=/dist/m5/system/binaries/reset_new.bin +reset_bin=/scratch/nilay/GEM5/system/binaries/reset_new.bin rom=system.rom symbolfile= work_begin_ckpt_count=0 @@ -64,7 +65,9 @@ slave=system.membus.master[2] [system.clk_domain] type=SrcClockDomain clock=2 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.cpu] @@ -132,7 +135,9 @@ eventq_index=0 [system.cpu_clk_domain] type=SrcClockDomain clock=2 +domain_id=-1 eventq_index=0 +init_perf_level=0 voltage_domain=system.voltage_domain [system.disk0] @@ -158,9 +163,17 @@ table_size=65536 [system.disk0.image.child] type=RawDiskImage eventq_index=0 -image_file=/dist/m5/system/disks/disk.s10hw2 +image_file=/scratch/nilay/GEM5/system/disks/disk.s10hw2 read_only=true +[system.dvfs_handler] +type=DVFSHandler +domains= +enable=false +eventq_index=0 +sys_clk_domain=system.clk_domain +transition_latency=200000 + [system.hypervisor_desc] type=SimpleMemory bandwidth=0.000000 diff --git a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json index 5f0592320..e4d168593 100644 --- a/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json +++ b/tests/long/fs/80.solaris-boot/ref/sparc/solaris/t1000-simple-atomic/config.json @@ -20,42 +20,7 @@ "resp_size": 16, "type": "Bridge" }, - "iobus": { - "slave": { - "peer": [ - "system.bridge.master" - ], - "role": "SLAVE" - }, - "name": "iobus", - "header_cycles": 1, - "width": 8, - "eventq_index": 0, - "master": { - "peer": [ - "system.t1000.fake_clk.pio", - "system.t1000.fake_membnks.pio", - "system.t1000.fake_l2_1.pio", - "system.t1000.fake_l2_2.pio", - "system.t1000.fake_l2_3.pio", - "system.t1000.fake_l2_4.pio", - "system.t1000.fake_l2esr_1.pio", - "system.t1000.fake_l2esr_2.pio", - "system.t1000.fake_l2esr_3.pio", - "system.t1000.fake_l2esr_4.pio", - "system.t1000.fake_ssi.pio", - "system.t1000.fake_jbi.pio", - "system.t1000.puart0.pio", - "system.t1000.hvuart.pio", - "system.disk0.pio" - ], - "role": "MASTER" - }, - "cxx_class": "NoncoherentBus", - "path": "system.iobus", - "type": "NoncoherentBus", - "use_default_range": false - }, + "kernel_addr_check": true, "rom": { "latency": 3.0000000000000004e-08, "name": "rom", @@ -129,6 +94,42 @@ "type": "CoherentBus", "use_default_range": false }, + "iobus": { + "slave": { + "peer": [ + "system.bridge.master" + ], + "role": "SLAVE" + }, + "name": "iobus", + "header_cycles": 1, + "width": 8, + "eventq_index": 0, + "master": { + "peer": [ + "system.t1000.fake_clk.pio", + "system.t1000.fake_membnks.pio", + "system.t1000.fake_l2_1.pio", + "system.t1000.fake_l2_2.pio", + "system.t1000.fake_l2_3.pio", + "system.t1000.fake_l2_4.pio", + "system.t1000.fake_l2esr_1.pio", + "system.t1000.fake_l2esr_2.pio", + "system.t1000.fake_l2esr_3.pio", + "system.t1000.fake_l2esr_4.pio", + "system.t1000.fake_ssi.pio", + "system.t1000.fake_jbi.pio", + "system.t1000.puart0.pio", + "system.t1000.hvuart.pio", + "system.disk0.pio" + ], + "role": "MASTER" + }, + "cxx_class": "NoncoherentBus", + "path": "system.iobus", + "type": "NoncoherentBus", + "use_default_range": false + }, "t1000": { "htod": { "name": "htod", @@ -520,11 +521,12 @@ }, "clk_domain": { "name": "clk_domain", - "clock": 1e-09, + "init_perf_level": 0, "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.clk_domain", - "type": "SrcClockDomain" + "type": "SrcClockDomain", + "domain_id": -1 }, "hypervisor_desc": { "latency": 3.0000000000000004e-08, @@ -559,6 +561,15 @@ "in_addr_map": true }, "eventq_index": 0, + "dvfs_handler": { + "enable": false, + "name": "dvfs_handler", + "transition_latency": 9.999999999999999e-05, + "eventq_index": 0, + "cxx_class": "DVFSHandler", + "path": "system.dvfs_handler", + "type": "DVFSHandler" + }, "work_end_exit_count": 0, "type": "SparcSystem", "voltage_domain": { @@ -575,11 +586,12 @@ "path": "system", "cpu_clk_domain": { "name": "cpu_clk_domain", - "clock": 1e-09, + "init_perf_level": 0, "eventq_index": 0, "cxx_class": "SrcClockDomain", "path": "system.cpu_clk_domain", - "type": "SrcClockDomain" + "type": "SrcClockDomain", + "domain_id": -1 }, "mem_mode": "atomic", "name": "system", -- cgit v1.2.3