diff -r 7100059f7bfd -r 868c58107488 configs/common/Benchmarks.py --- a/configs/common/Benchmarks.py Mon May 14 20:31:33 2012 -0500 +++ b/configs/common/Benchmarks.py Mon Apr 16 17:51:26 2012 -0500 @@ -50,13 +50,19 @@ def disk(self): if self.diskname: - return disk(self.diskname) + self.diskname = self.diskname.split(",") + disks = [] + for i in range(len(self.diskname)): + disks = disks + [disk(self.diskname[i].strip(' '))] + return disks elif buildEnv['TARGET_ISA'] == 'alpha': - return env.get('LINUX_IMAGE', disk('linux-latest.img')) + return [disk('linux-latest.img'), disk('linux-bigswap2.img')] elif buildEnv['TARGET_ISA'] == 'x86': - return env.get('LINUX_IMAGE', disk('x86root.img')) + return [disk('x86root.img'), disk('linux-bigswap2.img')] elif buildEnv['TARGET_ISA'] == 'arm': - return env.get('LINUX_IMAGE', disk('linux-arm-ael.img')) + return [disk('linux-arm-ael.img')] + elif buildEnv['TARGET_ISA'] == 'sparc': + return [disk('disk.s10hw2')] else: print "Don't know what default disk image to use for ISA %s" % \ buildEnv['TARGET_ISA'] diff -r 7100059f7bfd -r 868c58107488 configs/common/FSConfig.py --- a/configs/common/FSConfig.py Mon May 14 20:31:33 2012 -0500 +++ b/configs/common/FSConfig.py Mon Apr 16 17:51:26 2012 -0500 @@ -50,6 +50,14 @@ def childImage(self, ci): self.image.child.image_file = ci +def create_disks(disks): + disk = [] + for diskname in disks: + newdisk = CowIdeDisk(driveID='master') + newdisk.childImage(diskname) + disk.append(newdisk) + return disk + class MemBus(Bus): badaddr_responder = BadAddr() default = Self.badaddr_responder.pio @@ -59,8 +67,7 @@ IO_address_space_base = 0x80000000000 class BaseTsunami(Tsunami): ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0) - ide = IdeController(disks=[Parent.disk0, Parent.disk2], - pci_func=0, pci_dev=0, pci_bus=0) + ide = IdeController(pci_func=0, pci_dev=0, pci_bus=0) self = LinuxAlphaSystem() if not mdesc: @@ -77,11 +84,9 @@ self.bridge.master = self.iobus.slave self.bridge.slave = self.membus.master self.physmem.port = self.membus.master - self.disk0 = CowIdeDisk(driveID='master') - self.disk2 = CowIdeDisk(driveID='master') - self.disk0.childImage(mdesc.disk()) - self.disk2.childImage(disk('linux-bigswap2.img')) + self.disk = create_disks(mdesc.disk()) self.tsunami = BaseTsunami() + self.tsunami.ide.disks = self.disk self.tsunami.attachIO(self.iobus) self.tsunami.ide.pio = self.iobus.master self.tsunami.ide.config = self.iobus.master @@ -89,7 +94,7 @@ self.tsunami.ethernet.pio = self.iobus.master self.tsunami.ethernet.config = self.iobus.master self.tsunami.ethernet.dma = self.iobus.slave - self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(), + self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk()[0], read_only = True)) self.intrctrl = IntrControl() self.mem_mode = mem_mode @@ -106,8 +111,7 @@ def makeLinuxAlphaRubySystem(mem_mode, mdesc = None): class BaseTsunami(Tsunami): ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0) - ide = IdeController(disks=[Parent.disk0, Parent.disk2], - pci_func=0, pci_dev=0, pci_bus=0) + ide = IdeController(pci_func=0, pci_dev=0, pci_bus=0) physmem = SimpleMemory(range = AddrRange(mdesc.mem())) self = LinuxAlphaSystem(physmem = physmem) @@ -124,13 +128,9 @@ # RubyPort currently does support functional accesses. Therefore provide # the piobus a direct connection to physical memory # - self.piobus.master = physmem.port - - self.disk0 = CowIdeDisk(driveID='master') - self.disk2 = CowIdeDisk(driveID='master') - self.disk0.childImage(mdesc.disk()) - self.disk2.childImage(disk('linux-bigswap2.img')) + self.disk = create_disks(mdesc.disk()) self.tsunami = BaseTsunami() + self.tsunami.ide.disks = self.disk self.tsunami.attachIO(self.piobus) self.tsunami.ide.pio = self.piobus.master self.tsunami.ide.config = self.piobus.master @@ -143,7 +143,7 @@ # self._dma_ports = [self.tsunami.ide.dma, self.tsunami.ethernet.dma] - self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(), + self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk()[0], read_only = True)) self.intrctrl = IntrControl() self.mem_mode = mem_mode @@ -159,7 +159,6 @@ # Constants from iob.cc and uart8250.cc iob_man_addr = 0x9800000000 uart_pio_size = 8 - class CowMmDisk(MmDisk): image = CowDiskImage(child=RawDiskImage(read_only=True), read_only=False) @@ -191,9 +190,14 @@ self.hypervisor_desc.port = self.membus.master self.partition_desc.port = self.membus.master self.intrctrl = IntrControl() - self.disk0 = CowMmDisk() - self.disk0.childImage(disk('disk.s10hw2')) - self.disk0.pio = self.iobus.master + + disk = [] + for diskname in mdesc.disk(): + newdisk = CowMmDisk() + newdisk.childImage(diskname) + newdisk.pio = self.iobus.master + disk.append(newdisk) + self.disk = disk # The puart0 and hvuart are placed on the IO bus, so create ranges # for them. The remaining IO range is rather fragmented, so poke @@ -202,7 +206,7 @@ [ AddrRange(self.t1000.puart0.pio_addr, self.t1000.puart0.pio_addr + uart_pio_size - 1), - AddrRange(self.disk0.pio_addr, + AddrRange(self.disk[0].pio_addr, self.t1000.fake_jbi.pio_addr + self.t1000.fake_jbi.pio_size - 1), AddrRange(self.t1000.fake_clk.pio_addr, @@ -259,14 +263,14 @@ print "Unknown Machine Type" sys.exit(1) - self.cf0 = CowIdeDisk(driveID='master') - self.cf0.childImage(mdesc.disk()) + self.cf = create_disks(mdesc.disk()) + # default to an IDE controller rather than a CF one # assuming we've got one try: - self.realview.ide.disks = [self.cf0] + self.realview.ide.disks = self.cf except: - self.realview.cf_ctrl.disks = [self.cf0] + self.realview.cf_ctrl.disks = self.cf if bare_metal: # EOT character on UART will end the simulation @@ -293,7 +297,7 @@ self.gic_cpu_addr = self.realview.gic.cpu_addr self.flags_addr = self.realview.realview_io.pio_addr + 0x30 - if mdesc.disk().lower().count('android'): + if mdesc.disk()[0].lower().count('android'): boot_flags += " init=/init " self.boot_osflags = boot_flags @@ -312,8 +316,7 @@ def makeLinuxMipsSystem(mem_mode, mdesc = None): class BaseMalta(Malta): ethernet = NSGigE(pci_bus=0, pci_dev=1, pci_func=0) - ide = IdeController(disks=[Parent.disk0, Parent.disk2], - pci_func=0, pci_dev=0, pci_bus=0) + ide = IdeController(pci_func=0, pci_dev=0, pci_bus=0) self = LinuxMipsSystem() if not mdesc: @@ -327,11 +330,9 @@ self.bridge.master = self.iobus.slave self.bridge.slave = self.membus.master self.physmem.port = self.membus.master - self.disk0 = CowIdeDisk(driveID='master') - self.disk2 = CowIdeDisk(driveID='master') - self.disk0.childImage(mdesc.disk()) - self.disk2.childImage(disk('linux-bigswap2.img')) + self.disk = create_disks(mdesc.disk()) self.malta = BaseMalta() + self.malta.ide.disks = self.disk self.malta.attachIO(self.iobus) self.malta.ide.pio = self.iobus.master self.malta.ide.config = self.iobus.master @@ -339,7 +340,7 @@ self.malta.ethernet.pio = self.iobus.master self.malta.ethernet.config = self.iobus.master self.malta.ethernet.dma = self.iobus.slave - self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(), + self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk()[0], read_only = True)) self.intrctrl = IntrControl() self.mem_mode = mem_mode @@ -442,11 +443,7 @@ self.intrctrl = IntrControl() # Disks - disk0 = CowIdeDisk(driveID='master') - disk2 = CowIdeDisk(driveID='master') - disk0.childImage(mdesc.disk()) - disk2.childImage(disk('linux-bigswap2.img')) - self.pc.south_bridge.ide.disks = [disk0, disk2] + self.pc.south_bridge.ide.disks = create_disks(mdesc.disk()) # Add in a Bios information structure. structures = [X86SMBiosBiosInformation()] diff -r 7100059f7bfd -r 868c58107488 configs/common/Options.py --- a/configs/common/Options.py Mon May 14 20:31:33 2012 -0500 +++ b/configs/common/Options.py Mon Apr 16 17:51:26 2012 -0500 @@ -174,7 +174,9 @@ # Disk Image Options parser.add_option("--disk-image", action="store", type="string", default=None, - help="Path to the disk image to use.") + help="Path to the disk image to use. Specify multiple disks"\ + "by comma separated disks. Specify the primary OS disk first"\ + "in the list.") # Memory Size Options parser.add_option("--mem-size", action="store", type="string", default=None, diff -r 7100059f7bfd -r 868c58107488 configs/example/fs.py --- a/configs/example/fs.py Mon May 14 20:31:33 2012 -0500 +++ b/configs/example/fs.py Mon Apr 16 17:51:26 2012 -0500 @@ -86,7 +86,8 @@ sys.exit(1) else: if options.dual: - bm = [SysConfig(disk=options.disk_image, mem=options.mem_size), SysConfig(disk=options.disk_image, mem=options.mem_size)] + bm = [SysConfig(disk=options.disk_image, mem=options.mem_size) + , SysConfig(disk=options.disk_image, mem=options.mem_size)] else: bm = [SysConfig(disk=options.disk_image, mem=options.mem_size)] diff -r 7100059f7bfd -r 868c58107488 tests/configs/pc-o3-timing.py --- a/tests/configs/pc-o3-timing.py Mon May 14 20:31:33 2012 -0500 +++ b/tests/configs/pc-o3-timing.py Mon Apr 16 17:51:26 2012 -0500 @@ -83,7 +83,7 @@ #cpu cpu = DerivO3CPU(cpu_id=0) #the system -mdesc = SysConfig(disk = 'linux-x86.img') +mdesc = SysConfig(disk = 'linux-x86.img, linux-bigswap2.img') system = FSConfig.makeLinuxX86System('timing', mdesc=mdesc) system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9') system.iocache = IOCache() diff -r 7100059f7bfd -r 868c58107488 tests/configs/pc-simple-atomic.py --- a/tests/configs/pc-simple-atomic.py Mon May 14 20:31:33 2012 -0500 +++ b/tests/configs/pc-simple-atomic.py Mon Apr 16 17:51:26 2012 -0500 @@ -85,7 +85,7 @@ #cpu cpu = AtomicSimpleCPU(cpu_id=0) #the system -mdesc = SysConfig(disk = 'linux-x86.img') +mdesc = SysConfig(disk = 'linux-x86.img, linux-bigswap2.img') system = FSConfig.makeLinuxX86System('atomic', mdesc=mdesc) system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9') system.iocache = IOCache() diff -r 7100059f7bfd -r 868c58107488 tests/configs/pc-simple-timing-ruby.py --- a/tests/configs/pc-simple-timing-ruby.py Mon May 14 20:31:33 2012 -0500 +++ b/tests/configs/pc-simple-timing-ruby.py Mon Apr 16 17:51:26 2012 -0500 @@ -53,7 +53,7 @@ options.num_cpus = 2 #the system -mdesc = SysConfig(disk = 'linux-x86.img') +mdesc = SysConfig(disk = 'linux-x86.img, linux-bigswap2.img') system = FSConfig.makeLinuxX86System('timing', options.num_cpus, mdesc=mdesc, Ruby=True) system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9.smp') diff -r 7100059f7bfd -r 868c58107488 tests/configs/pc-simple-timing.py --- a/tests/configs/pc-simple-timing.py Mon May 14 20:31:33 2012 -0500 +++ b/tests/configs/pc-simple-timing.py Mon Apr 16 17:51:26 2012 -0500 @@ -84,7 +84,7 @@ #cpu cpu = TimingSimpleCPU(cpu_id=0) #the system -mdesc = SysConfig(disk = 'linux-x86.img') +mdesc = SysConfig(disk = 'linux-x86.img, linux-bigswap2.img') system = FSConfig.makeLinuxX86System('timing', mdesc = mdesc) system.kernel = FSConfig.binary('x86_64-vmlinux-2.6.22.9') diff -r 7100059f7bfd -r 868c58107488 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt --- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3-dual/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -375,12 +375,12 @@ system.disk0.dma_write_full_pages 298 # Number of full page size DMA writes. system.disk0.dma_write_bytes 2651136 # Number of bytes transfered via DMA writes. system.disk0.dma_write_txs 395 # Number of DMA write transactions. -system.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.disk2.dma_write_full_pages 1 # Number of full page size DMA writes. -system.disk2.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. -system.disk2.dma_write_txs 1 # Number of DMA write transactions. +system.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.disk1.dma_write_full_pages 1 # Number of full page size DMA writes. +system.disk1.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. +system.disk1.dma_write_txs 1 # Number of DMA write transactions. system.cpu0.dtb.fetch_hits 0 # ITB hits system.cpu0.dtb.fetch_misses 0 # ITB misses system.cpu0.dtb.fetch_acv 0 # ITB acv diff -r 7100059f7bfd -r 868c58107488 tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt --- a/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/alpha/linux/tsunami-o3/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -269,12 +269,12 @@ system.disk0.dma_write_full_pages 298 # Number of full page size DMA writes. system.disk0.dma_write_bytes 2651136 # Number of bytes transfered via DMA writes. system.disk0.dma_write_txs 395 # Number of DMA write transactions. -system.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.disk2.dma_write_full_pages 1 # Number of full page size DMA writes. -system.disk2.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. -system.disk2.dma_write_txs 1 # Number of DMA write transactions. +system.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.disk1.dma_write_full_pages 1 # Number of full page size DMA writes. +system.disk1.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. +system.disk1.dma_write_txs 1 # Number of DMA write transactions. system.cpu.dtb.fetch_hits 0 # ITB hits system.cpu.dtb.fetch_misses 0 # ITB misses system.cpu.dtb.fetch_acv 0 # ITB acv diff -r 7100059f7bfd -r 868c58107488 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-checker/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -273,12 +273,12 @@ system.l2c.overall_avg_mshr_uncacheable_latency::cpu.inst inf # average overall mshr uncacheable latency system.l2c.overall_avg_mshr_uncacheable_latency::cpu.data inf # average overall mshr uncacheable latency system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu.checker.dtb.inst_hits 0 # ITB inst hits system.cpu.checker.dtb.inst_misses 0 # ITB inst misses system.cpu.checker.dtb.read_hits 15048343 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3-dual/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -444,12 +444,12 @@ system.l2c.overall_avg_mshr_uncacheable_latency::cpu1.inst inf # average overall mshr uncacheable latency system.l2c.overall_avg_mshr_uncacheable_latency::cpu1.data inf # average overall mshr uncacheable latency system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu0.dtb.inst_hits 0 # ITB inst hits system.cpu0.dtb.inst_misses 0 # ITB inst misses system.cpu0.dtb.read_hits 7530160 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt --- a/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/long/fs/10.linux-boot/ref/arm/linux/realview-o3/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -273,12 +273,12 @@ system.l2c.overall_avg_mshr_uncacheable_latency::cpu.inst inf # average overall mshr uncacheable latency system.l2c.overall_avg_mshr_uncacheable_latency::cpu.data inf # average overall mshr uncacheable latency system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu.dtb.inst_hits 0 # ITB inst hits system.cpu.dtb.inst_misses 0 # ITB inst misses system.cpu.dtb.read_hits 52103903 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic-dual/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -189,12 +189,12 @@ system.disk0.dma_write_full_pages 298 # Number of full page size DMA writes. system.disk0.dma_write_bytes 2651136 # Number of bytes transfered via DMA writes. system.disk0.dma_write_txs 395 # Number of DMA write transactions. -system.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.disk2.dma_write_full_pages 1 # Number of full page size DMA writes. -system.disk2.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. -system.disk2.dma_write_txs 1 # Number of DMA write transactions. +system.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.disk1.dma_write_full_pages 1 # Number of full page size DMA writes. +system.disk1.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. +system.disk1.dma_write_txs 1 # Number of DMA write transactions. system.cpu0.dtb.fetch_hits 0 # ITB hits system.cpu0.dtb.fetch_misses 0 # ITB misses system.cpu0.dtb.fetch_acv 0 # ITB acv diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-atomic/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -142,12 +142,12 @@ system.disk0.dma_write_full_pages 298 # Number of full page size DMA writes. system.disk0.dma_write_bytes 2651136 # Number of bytes transfered via DMA writes. system.disk0.dma_write_txs 395 # Number of DMA write transactions. -system.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.disk2.dma_write_full_pages 1 # Number of full page size DMA writes. -system.disk2.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. -system.disk2.dma_write_txs 1 # Number of DMA write transactions. +system.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.disk1.dma_write_full_pages 1 # Number of full page size DMA writes. +system.disk1.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. +system.disk1.dma_write_txs 1 # Number of DMA write transactions. system.cpu.dtb.fetch_hits 0 # ITB hits system.cpu.dtb.fetch_misses 0 # ITB misses system.cpu.dtb.fetch_acv 0 # ITB acv diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing-dual/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -372,12 +372,12 @@ system.disk0.dma_write_full_pages 298 # Number of full page size DMA writes. system.disk0.dma_write_bytes 2651136 # Number of bytes transfered via DMA writes. system.disk0.dma_write_txs 395 # Number of DMA write transactions. -system.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.disk2.dma_write_full_pages 1 # Number of full page size DMA writes. -system.disk2.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. -system.disk2.dma_write_txs 1 # Number of DMA write transactions. +system.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.disk1.dma_write_full_pages 1 # Number of full page size DMA writes. +system.disk1.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. +system.disk1.dma_write_txs 1 # Number of DMA write transactions. system.cpu0.dtb.fetch_hits 0 # ITB hits system.cpu0.dtb.fetch_misses 0 # ITB misses system.cpu0.dtb.fetch_acv 0 # ITB acv diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/alpha/linux/tsunami-simple-timing/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -250,12 +250,12 @@ system.disk0.dma_write_full_pages 298 # Number of full page size DMA writes. system.disk0.dma_write_bytes 2651136 # Number of bytes transfered via DMA writes. system.disk0.dma_write_txs 395 # Number of DMA write transactions. -system.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.disk2.dma_write_full_pages 1 # Number of full page size DMA writes. -system.disk2.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. -system.disk2.dma_write_txs 1 # Number of DMA write transactions. +system.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.disk1.dma_write_full_pages 1 # Number of full page size DMA writes. +system.disk1.dma_write_bytes 8192 # Number of bytes transfered via DMA writes. +system.disk1.dma_write_txs 1 # Number of DMA write transactions. system.cpu.dtb.fetch_hits 0 # ITB hits system.cpu.dtb.fetch_misses 0 # ITB misses system.cpu.dtb.fetch_acv 0 # ITB acv diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic-dual/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -208,12 +208,12 @@ system.l2c.writebacks::writebacks 112464 # number of writebacks system.l2c.writebacks::total 112464 # number of writebacks system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu0.dtb.inst_hits 0 # ITB inst hits system.cpu0.dtb.inst_misses 0 # ITB inst misses system.cpu0.dtb.read_hits 9312139 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-atomic/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -133,12 +133,12 @@ system.l2c.writebacks::writebacks 102725 # number of writebacks system.l2c.writebacks::total 102725 # number of writebacks system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu.dtb.inst_hits 0 # ITB inst hits system.cpu.dtb.inst_misses 0 # ITB inst misses system.cpu.dtb.read_hits 14971229 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing-dual/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -435,12 +435,12 @@ system.l2c.overall_avg_mshr_uncacheable_latency::cpu1.inst inf # average overall mshr uncacheable latency system.l2c.overall_avg_mshr_uncacheable_latency::cpu1.data inf # average overall mshr uncacheable latency system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu0.dtb.inst_hits 0 # ITB inst hits system.cpu0.dtb.inst_misses 0 # ITB inst misses system.cpu0.dtb.read_hits 7070142 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt --- a/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/10.linux-boot/ref/arm/linux/realview-simple-timing/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -245,12 +245,12 @@ system.l2c.overall_avg_mshr_uncacheable_latency::cpu.inst inf # average overall mshr uncacheable latency system.l2c.overall_avg_mshr_uncacheable_latency::cpu.data inf # average overall mshr uncacheable latency system.l2c.no_allocate_misses 0 # Number of misses that were no-allocate -system.cf0.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -system.cf0.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -system.cf0.dma_read_txs 0 # Number of DMA read transactions (not PRD). -system.cf0.dma_write_full_pages 0 # Number of full page size DMA writes. -system.cf0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -system.cf0.dma_write_txs 0 # Number of DMA write transactions. +system.cf.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +system.cf.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +system.cf.dma_read_txs 0 # Number of DMA read transactions (not PRD). +system.cf.dma_write_full_pages 0 # Number of full page size DMA writes. +system.cf.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +system.cf.dma_write_txs 0 # Number of DMA write transactions. system.cpu.dtb.inst_hits 0 # ITB inst hits system.cpu.dtb.inst_misses 0 # ITB inst misses system.cpu.dtb.read_hits 14995950 # DTB read hits diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini --- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/config.ini Mon Apr 16 17:51:26 2012 -0500 @@ -1,6 +1,6 @@ [drivesys] type=LinuxAlphaSystem -children=bridge cpu disk0 disk2 intrctrl iobridge iobus membus physmem simple_disk terminal tsunami +children=bridge cpu disk intrctrl iobridge iobus membus physmem simple_disk terminal tsunami boot_cpu_frequency=1 boot_osflags=root=/dev/hda1 console=ttyS0 console=/dist/m5/system/binaries/console diff -r 7100059f7bfd -r 868c58107488 tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt --- a/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt Mon May 14 20:31:33 2012 -0500 +++ b/tests/quick/fs/80.netperf-stream/ref/alpha/linux/twosys-tsunami-simple-atomic/stats.txt Mon Apr 16 17:51:26 2012 -0500 @@ -27,12 +27,12 @@ testsys.disk0.dma_write_full_pages 0 # Number of full page size DMA writes. testsys.disk0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. testsys.disk0.dma_write_txs 0 # Number of DMA write transactions. -testsys.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -testsys.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -testsys.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -testsys.disk2.dma_write_full_pages 0 # Number of full page size DMA writes. -testsys.disk2.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -testsys.disk2.dma_write_txs 0 # Number of DMA write transactions. +testsys.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +testsys.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +testsys.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +testsys.disk1.dma_write_full_pages 0 # Number of full page size DMA writes. +testsys.disk1.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +testsys.disk1.dma_write_txs 0 # Number of DMA write transactions. testsys.cpu.dtb.fetch_hits 0 # ITB hits testsys.cpu.dtb.fetch_misses 0 # ITB misses testsys.cpu.dtb.fetch_acv 0 # ITB acv @@ -220,12 +220,12 @@ drivesys.disk0.dma_write_full_pages 0 # Number of full page size DMA writes. drivesys.disk0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. drivesys.disk0.dma_write_txs 0 # Number of DMA write transactions. -drivesys.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -drivesys.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -drivesys.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -drivesys.disk2.dma_write_full_pages 0 # Number of full page size DMA writes. -drivesys.disk2.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -drivesys.disk2.dma_write_txs 0 # Number of DMA write transactions. +drivesys.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +drivesys.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +drivesys.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +drivesys.disk1.dma_write_full_pages 0 # Number of full page size DMA writes. +drivesys.disk1.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +drivesys.disk1.dma_write_txs 0 # Number of DMA write transactions. drivesys.cpu.dtb.fetch_hits 0 # ITB hits drivesys.cpu.dtb.fetch_misses 0 # ITB misses drivesys.cpu.dtb.fetch_acv 0 # ITB acv @@ -414,12 +414,12 @@ testsys.disk0.dma_write_full_pages 0 # Number of full page size DMA writes. testsys.disk0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. testsys.disk0.dma_write_txs 0 # Number of DMA write transactions. -testsys.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -testsys.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -testsys.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -testsys.disk2.dma_write_full_pages 0 # Number of full page size DMA writes. -testsys.disk2.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -testsys.disk2.dma_write_txs 0 # Number of DMA write transactions. +testsys.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +testsys.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +testsys.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +testsys.disk1.dma_write_full_pages 0 # Number of full page size DMA writes. +testsys.disk1.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +testsys.disk1.dma_write_txs 0 # Number of DMA write transactions. testsys.cpu.dtb.fetch_hits 0 # ITB hits testsys.cpu.dtb.fetch_misses 0 # ITB misses testsys.cpu.dtb.fetch_acv 0 # ITB acv @@ -534,12 +534,12 @@ drivesys.disk0.dma_write_full_pages 0 # Number of full page size DMA writes. drivesys.disk0.dma_write_bytes 0 # Number of bytes transfered via DMA writes. drivesys.disk0.dma_write_txs 0 # Number of DMA write transactions. -drivesys.disk2.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). -drivesys.disk2.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). -drivesys.disk2.dma_read_txs 0 # Number of DMA read transactions (not PRD). -drivesys.disk2.dma_write_full_pages 0 # Number of full page size DMA writes. -drivesys.disk2.dma_write_bytes 0 # Number of bytes transfered via DMA writes. -drivesys.disk2.dma_write_txs 0 # Number of DMA write transactions. +drivesys.disk1.dma_read_full_pages 0 # Number of full page size DMA reads (not PRD). +drivesys.disk1.dma_read_bytes 0 # Number of bytes transfered via DMA reads (not PRD). +drivesys.disk1.dma_read_txs 0 # Number of DMA read transactions (not PRD). +drivesys.disk1.dma_write_full_pages 0 # Number of full page size DMA writes. +drivesys.disk1.dma_write_bytes 0 # Number of bytes transfered via DMA writes. +drivesys.disk1.dma_write_txs 0 # Number of DMA write transactions. drivesys.cpu.dtb.fetch_hits 0 # ITB hits drivesys.cpu.dtb.fetch_misses 0 # ITB misses drivesys.cpu.dtb.fetch_acv 0 # ITB acv