Update configs to set the CPU clock properly.

[gem5.git] / tests / configs / o3-timing.py

diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py
index 227e1ba2111ef4a6d0e024e74d3d1fc16408f4cb..d20a7e0c861e63b11b26c9e8e6a62d4a71953e4f 100644 (file)
--- a/tests/configs/o3-timing.py
+++ b/tests/configs/o3-timing.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2006 The Regents of The University of Michigan
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,7 +29,6 @@
 import m5
 from m5.objects import *
 m5.AddToPath('../configs/common')
-from FullO3Config import *
 
 class MyCache(BaseCache):
     assoc = 2
@@ -38,10 +37,10 @@ class MyCache(BaseCache):
     mshrs = 10
     tgts_per_mshr = 5
 
-cpu = DetailedO3CPU()
+cpu = DerivO3CPU(cpu_id=0)
 cpu.addTwoLevelCacheHierarchy(MyCache(size = '128kB'), MyCache(size = '256kB'),
                               MyCache(size = '2MB'))
-cpu.mem = cpu.dcache
+cpu.clock = '2GHz'
 
 system = System(cpu = cpu,
                 physmem = PhysicalMemory(),