stats: updates due to recent ruby and x86 changes

Also updates many out of date config files.

2 files changed, 98 insertions, 73 deletions

diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini
index bf000969d..925d90ad5 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.ini
@@ -10,7 +10,7 @@ time_sync_spin_threshold=100000000
 
 [system]
 type=LinuxX86System
-children=acpi_description_table_pointer apicbridge bridge clk_domain cpu0 cpu1 cpu2 cpu_clk_domain e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus voltage_domain
+children=acpi_description_table_pointer apicbridge bridge clk_domain cpu0 cpu1 cpu2 cpu_clk_domain dvfs_handler e820_table intel_mp_pointer intel_mp_table intrctrl iobus iocache l2c membus pc physmem smbios_table toL2Bus voltage_domain
 acpi_description_table_pointer=system.acpi_description_table_pointer
 boot_osflags=earlyprintk=ttyS0 console=ttyS0 lpj=7999923 root=/dev/hda1
 cache_line_size=64
@@ -20,14 +20,15 @@ eventq_index=0
 init_param=0
 intel_mp_pointer=system.intel_mp_pointer
 intel_mp_table=system.intel_mp_table
-kernel=/home/stever/m5/m5_system_2.0b3/binaries/x86_64-vmlinux-2.6.22.9
+kernel=/scratch/nilay/GEM5/system/binaries/x86_64-vmlinux-2.6.22.9
+kernel_addr_check=true
 load_addr_mask=18446744073709551615
 load_offset=0
 mem_mode=atomic
 mem_ranges=0:134217727
 memories=system.physmem
 num_work_ids=16
-readfile=/home/stever/hg/m5sim.org/gem5/tests/halt.sh
+readfile=/scratch/nilay/GEM5/gem5/tests/halt.sh
 smbios_table=system.smbios_table
 symbolfile=
 work_begin_ckpt_count=0
@@ -83,7 +84,9 @@ slave=system.membus.master[0]
 [system.clk_domain]
 type=SrcClockDomain
 clock=1000
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
 [system.cpu0]
@@ -769,9 +772,19 @@ eventq_index=0
 [system.cpu_clk_domain]
 type=SrcClockDomain
 clock=500
+domain_id=-1
 eventq_index=0
+init_perf_level=0
 voltage_domain=system.voltage_domain
 
+[system.dvfs_handler]
+type=DVFSHandler
+domains=
+enable=false
+eventq_index=0
+sys_clk_domain=system.clk_domain
+transition_latency=100000000
+
 [system.e820_table]
 type=X86E820Table
 children=entries0 entries1 entries2 entries3
@@ -1194,7 +1207,7 @@ type=NoncoherentBus
 clk_domain=system.clk_domain
 eventq_index=0
 header_cycles=1
-use_default_range=true
+use_default_range=false
 width=8
 default=system.pc.pciconfig.pio
 master=system.apicbridge.slave system.pc.south_bridge.cmos.pio system.pc.south_bridge.dma1.pio system.pc.south_bridge.ide.pio system.pc.south_bridge.ide.config system.pc.south_bridge.keyboard.pio system.pc.south_bridge.pic1.pio system.pc.south_bridge.pic2.pio system.pc.south_bridge.pit.pio system.pc.south_bridge.speaker.pio system.pc.south_bridge.io_apic.pio system.pc.i_dont_exist.pio system.pc.behind_pci.pio system.pc.com_1.pio system.pc.fake_com_2.pio system.pc.fake_com_3.pio system.pc.fake_com_4.pio system.pc.fake_floppy.pio system.iocache.cpu_side
@@ -1597,7 +1610,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks0.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/home/stever/m5/m5_system_2.0b3/disks/linux-x86.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-x86.img
 read_only=true
 
 [system.pc.south_bridge.ide.disks1]
@@ -1620,7 +1633,7 @@ table_size=65536
 [system.pc.south_bridge.ide.disks1.image.child]
 type=RawDiskImage
 eventq_index=0
-image_file=/home/stever/m5/m5_system_2.0b3/disks/linux-bigswap2.img
+image_file=/scratch/nilay/GEM5/system/disks/linux-bigswap2.img
 read_only=true
 
 [system.pc.south_bridge.int_lines0]
diff --git a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json
index 4aa2b2aae..b8b06f12b 100644
--- a/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json
+++ b/tests/long/fs/10.linux-boot/ref/x86/linux/pc-switcheroo-full/config.json
@@ -60,23 +60,7 @@
             "forward_snoops": true, 
             "size": 4194304
         }, 
-        "acpi_description_table_pointer": {
-            "name": "acpi_description_table_pointer", 
-            "xsdt": {
-                "name": "xsdt", 
-                "creator_revision": 0, 
-                "eventq_index": 0, 
-                "cxx_class": "X86ISA::ACPI::XSDT", 
-                "path": "system.acpi_description_table_pointer.xsdt", 
-                "oem_revision": 0, 
-                "type": "X86ACPIXSDT"
-            }, 
-            "eventq_index": 0, 
-            "cxx_class": "X86ISA::ACPI::RSDP", 
-            "path": "system.acpi_description_table_pointer", 
-            "type": "X86ACPIRSDP", 
-            "revision": 2
-        }, 
+        "kernel_addr_check": true, 
         "membus": {
             "slave": {
                 "peer": [
@@ -175,7 +159,7 @@
             "cxx_class": "NoncoherentBus", 
             "path": "system.iobus", 
             "type": "NoncoherentBus", 
-            "use_default_range": true
+            "use_default_range": false
         }, 
         "physmem": [
             {
@@ -720,14 +704,39 @@
         "cxx_class": "LinuxX86System", 
         "load_offset": 0, 
         "work_end_ckpt_count": 0, 
+        "smbios_table": {
+            "name": "smbios_table", 
+            "structures": [
+                {
+                    "major": 0, 
+                    "name": "structures", 
+                    "emb_cont_firmware_major": 0, 
+                    "rom_size": 0, 
+                    "starting_addr_segment": 0, 
+                    "emb_cont_firmware_minor": 0, 
+                    "eventq_index": 0, 
+                    "cxx_class": "X86ISA::SMBios::BiosInformation", 
+                    "path": "system.smbios_table.structures", 
+                    "type": "X86SMBiosBiosInformation", 
+                    "minor": 0
+                }
+            ], 
+            "major_version": 2, 
+            "minor_version": 5, 
+            "eventq_index": 0, 
+            "cxx_class": "X86ISA::SMBios::SMBiosTable", 
+            "path": "system.smbios_table", 
+            "type": "X86SMBiosSMBiosTable"
+        }, 
         "work_begin_ckpt_count": 0, 
         "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
         }, 
         "pc": {
             "fake_com_4": {
@@ -1372,54 +1381,31 @@
             "path": "system.e820_table", 
             "type": "X86E820Table"
         }, 
-        "smbios_table": {
-            "name": "smbios_table", 
-            "structures": [
-                {
-                    "major": 0, 
-                    "name": "structures", 
-                    "emb_cont_firmware_major": 0, 
-                    "rom_size": 0, 
-                    "starting_addr_segment": 0, 
-                    "emb_cont_firmware_minor": 0, 
-                    "eventq_index": 0, 
-                    "cxx_class": "X86ISA::SMBios::BiosInformation", 
-                    "path": "system.smbios_table.structures", 
-                    "type": "X86SMBiosBiosInformation", 
-                    "minor": 0
-                }
-            ], 
-            "major_version": 2, 
-            "minor_version": 5, 
+        "acpi_description_table_pointer": {
+            "name": "acpi_description_table_pointer", 
+            "xsdt": {
+                "name": "xsdt", 
+                "creator_revision": 0, 
+                "eventq_index": 0, 
+                "cxx_class": "X86ISA::ACPI::XSDT", 
+                "path": "system.acpi_description_table_pointer.xsdt", 
+                "oem_revision": 0, 
+                "type": "X86ACPIXSDT"
+            }, 
             "eventq_index": 0, 
-            "cxx_class": "X86ISA::SMBios::SMBiosTable", 
-            "path": "system.smbios_table", 
-            "type": "X86SMBiosSMBiosTable"
+            "cxx_class": "X86ISA::ACPI::RSDP", 
+            "path": "system.acpi_description_table_pointer", 
+            "type": "X86ACPIRSDP", 
+            "revision": 2
         }, 
-        "toL2Bus": {
-            "slave": {
-                "peer": [
-                    "system.cpu0.icache.mem_side", 
-                    "system.cpu0.dcache.mem_side", 
-                    "system.cpu0.itb.walker.port", 
-                    "system.cpu0.dtb.walker.port"
-                ], 
-                "role": "SLAVE"
-            }, 
-            "name": "toL2Bus", 
-            "header_cycles": 1, 
-            "width": 8, 
+        "dvfs_handler": {
+            "enable": false, 
+            "name": "dvfs_handler", 
+            "transition_latency": 9.999999999999999e-05, 
             "eventq_index": 0, 
-            "master": {
-                "peer": [
-                    "system.l2c.cpu_side"
-                ], 
-                "role": "MASTER"
-            }, 
-            "cxx_class": "CoherentBus", 
-            "path": "system.toL2Bus", 
-            "type": "CoherentBus", 
-            "use_default_range": false
+            "cxx_class": "DVFSHandler", 
+            "path": "system.dvfs_handler", 
+            "type": "DVFSHandler"
         }, 
         "work_end_exit_count": 0, 
         "type": "LinuxX86System", 
@@ -1446,11 +1432,37 @@
         "path": "system", 
         "cpu_clk_domain": {
             "name": "cpu_clk_domain", 
-            "clock": 5e-10, 
+            "init_perf_level": 0, 
             "eventq_index": 0, 
             "cxx_class": "SrcClockDomain", 
             "path": "system.cpu_clk_domain", 
-            "type": "SrcClockDomain"
+            "type": "SrcClockDomain", 
+            "domain_id": -1
+        }, 
+        "toL2Bus": {
+            "slave": {
+                "peer": [
+                    "system.cpu0.icache.mem_side", 
+                    "system.cpu0.dcache.mem_side", 
+                    "system.cpu0.itb.walker.port", 
+                    "system.cpu0.dtb.walker.port"
+                ], 
+                "role": "SLAVE"
+            }, 
+            "name": "toL2Bus", 
+            "header_cycles": 1, 
+            "width": 8, 
+            "eventq_index": 0, 
+            "master": {
+                "peer": [
+                    "system.l2c.cpu_side"
+                ], 
+                "role": "MASTER"
+            }, 
+            "cxx_class": "CoherentBus", 
+            "path": "system.toL2Bus", 
+            "type": "CoherentBus", 
+            "use_default_range": false
         }, 
         "iocache": {
             "assoc": 8,