From 66e331c7bb7d503c35808325e1bfaa9f18f4bdb9 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Thu, 25 Oct 2012 13:14:38 -0400 Subject: [PATCH] config: Use SimpleDRAM in full-system, and with o3 and inorder This patch favours using SimpleDRAM with the default timing instead of SimpleMemory for all regressions that involve the o3 or inorder CPU, or are full system (in other words, where the actual performance of the memory is important for the overall performance). Moving forward, the solution for FSConfig and the users of fs.py and se.py is probably something similar to what we use to choose the CPU type. I envision a few pre-set configurations SimpleLPDDR2, SimpleDDR3, etc that can be choosen by a dram_type option. Feedback on this part is welcome. This patch changes plenty stats and adds all the DRAM controller related stats. A follow-on patch updates the relevant statistics. The total run-time for the entire regression goes up with ~5% with this patch due to the added complexity of the SimpleDRAM model. This is a concious trade-off to ensure that the model is properly tested. --- configs/common/FSConfig.py | 16 ++++++++-------- tests/configs/inorder-timing.py | 2 +- tests/configs/o3-timing-checker.py | 2 +- tests/configs/o3-timing-mp.py | 2 +- tests/configs/o3-timing.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 657b9bcaa..bc49be808 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -73,7 +73,7 @@ def makeLinuxAlphaSystem(mem_mode, mdesc = None): # base address (including the PCI config space) self.bridge = Bridge(delay='50ns', ranges = [AddrRange(IO_address_space_base, Addr.max)]) - self.physmem = SimpleMemory(range = AddrRange(mdesc.mem())) + self.physmem = SimpleDRAM(range = AddrRange(mdesc.mem())) self.bridge.master = self.iobus.slave self.bridge.slave = self.membus.master self.physmem.port = self.membus.master @@ -109,7 +109,7 @@ def makeLinuxAlphaRubySystem(mem_mode, mdesc = None): ide = IdeController(disks=[Parent.disk0, Parent.disk2], pci_func=0, pci_dev=0, pci_bus=0) - physmem = SimpleMemory(range = AddrRange(mdesc.mem())) + physmem = SimpleDRAM(range = AddrRange(mdesc.mem())) self = LinuxAlphaSystem(physmem = physmem) if not mdesc: # generic system @@ -178,9 +178,9 @@ def makeSparcSystem(mem_mode, mdesc = None): self.t1000 = T1000() self.t1000.attachOnChipIO(self.membus) self.t1000.attachIO(self.iobus) - self.physmem = SimpleMemory(range = AddrRange(Addr('1MB'), size = '64MB'), + self.physmem = SimpleDRAM(range = AddrRange(Addr('1MB'), size = '64MB'), zero = True) - self.physmem2 = SimpleMemory(range = AddrRange(Addr('2GB'), size ='256MB'), + self.physmem2 = SimpleDRAM(range = AddrRange(Addr('2GB'), size ='256MB'), zero = True) self.bridge.master = self.iobus.slave self.bridge.slave = self.membus.master @@ -271,7 +271,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): if bare_metal: # EOT character on UART will end the simulation self.realview.uart.end_on_eot = True - self.physmem = SimpleMemory(range = AddrRange(Addr(mdesc.mem())), + self.physmem = SimpleDRAM(range = AddrRange(Addr(mdesc.mem())), zero = True) else: self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8') @@ -285,7 +285,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, bare_metal=False): boot_flags = 'earlyprintk console=ttyAMA0 lpj=19988480 norandmaps ' + \ 'rw loglevel=8 mem=%s root=/dev/sda1' % mdesc.mem() - self.physmem = SimpleMemory(range = + self.physmem = SimpleDRAM(range = AddrRange(self.realview.mem_start_addr, size = mdesc.mem()), conf_table_reported = True) @@ -323,7 +323,7 @@ def makeLinuxMipsSystem(mem_mode, mdesc = None): self.iobus = NoncoherentBus() self.membus = MemBus() self.bridge = Bridge(delay='50ns') - self.physmem = SimpleMemory(range = AddrRange('1GB')) + self.physmem = SimpleDRAM(range = AddrRange('1GB')) self.bridge.master = self.iobus.slave self.bridge.slave = self.membus.master self.physmem.port = self.membus.master @@ -428,7 +428,7 @@ def makeX86System(mem_mode, numCPUs = 1, mdesc = None, self = None, Ruby = False self.mem_mode = mem_mode # Physical memory - self.physmem = SimpleMemory(range = AddrRange(mdesc.mem())) + self.physmem = SimpleDRAM(range = AddrRange(mdesc.mem())) # Platform self.pc = Pc() diff --git a/tests/configs/inorder-timing.py b/tests/configs/inorder-timing.py index 5f2156ff9..edec312d0 100644 --- a/tests/configs/inorder-timing.py +++ b/tests/configs/inorder-timing.py @@ -50,7 +50,7 @@ cpu.addTwoLevelCacheHierarchy(MyL1Cache(size = '128kB'), cpu.clock = '2GHz' system = System(cpu = cpu, - physmem = SimpleMemory(), + physmem = SimpleDRAM(), membus = CoherentBus()) system.system_port = system.membus.slave system.physmem.port = system.membus.master diff --git a/tests/configs/o3-timing-checker.py b/tests/configs/o3-timing-checker.py index a54c9b7ca..4ff3f0187 100644 --- a/tests/configs/o3-timing-checker.py +++ b/tests/configs/o3-timing-checker.py @@ -63,7 +63,7 @@ cpu.addTwoLevelCacheHierarchy(MyL1Cache(size = '128kB'), cpu.clock = '2GHz' system = System(cpu = cpu, - physmem = SimpleMemory(), + physmem = SimpleDRAM(), membus = CoherentBus()) system.system_port = system.membus.slave system.physmem.port = system.membus.master diff --git a/tests/configs/o3-timing-mp.py b/tests/configs/o3-timing-mp.py index b02b43d03..2b611fb9d 100644 --- a/tests/configs/o3-timing-mp.py +++ b/tests/configs/o3-timing-mp.py @@ -35,7 +35,7 @@ nb_cores = 4 cpus = [ DerivO3CPU(cpu_id=i) for i in xrange(nb_cores) ] # system simulated -system = System(cpu = cpus, physmem = SimpleMemory(), membus = CoherentBus()) +system = System(cpu = cpus, physmem = SimpleDRAM(), membus = CoherentBus()) # l2cache & bus system.toL2Bus = CoherentBus(clock = '2GHz') diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py index f87e0e355..b9bc40bc2 100644 --- a/tests/configs/o3-timing.py +++ b/tests/configs/o3-timing.py @@ -52,7 +52,7 @@ cpu.addTwoLevelCacheHierarchy(MyL1Cache(size = '128kB'), cpu.clock = '2GHz' system = System(cpu = cpu, - physmem = SimpleMemory(), + physmem = SimpleDRAM(), membus = CoherentBus()) system.system_port = system.membus.slave system.physmem.port = system.membus.master -- 2.30.2