summaryrefslogtreecommitdiff
path: root/configs/example
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2006-10-08 01:12:42 -0400
committerKevin Lim <ktlim@umich.edu>2006-10-08 01:12:42 -0400
commit8949d813ff6f9941faf1b173d408e13b0a2440a7 (patch)
treef6be6522df707fc907710a9b234a93fdbe8ca13e /configs/example
parentb17421da2059935f7951f3ac963eae7ff6db4a3c (diff)
downloadgem5-8949d813ff6f9941faf1b173d408e13b0a2440a7.tar.xz
Clean up configs.
configs/common/FSConfig.py: configs/common/SysPaths.py: configs/example/fs.py: configs/example/se.py: tests/configs/o3-timing-mp.py: tests/configs/o3-timing.py: Clean up configs by removing FullO3Config and instead using default values. src/python/m5/objects/FUPool.py: Add in default FUPool. src/python/m5/objects/O3CPU.py: Use defaults better. Also set checker parameters, and fix up a config bug. --HG-- extra : convert_revision : 5fd0c000143f4881f10a9a575c3810dc97cb290b
Diffstat (limited to 'configs/example')
-rw-r--r--configs/example/fs.py4
-rw-r--r--configs/example/se.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 5edda6e5f..3d3313fbf 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -63,8 +63,8 @@ if args:
sys.exit(1)
if options.detailed:
- cpu = DetailedO3CPU()
- cpu2 = DetailedO3CPU()
+ cpu = DerivO3CPU()
+ cpu2 = DerivO3CPU()
mem_mode = 'timing'
elif options.timing:
cpu = TimingSimpleCPU()
diff --git a/configs/example/se.py b/configs/example/se.py
index de8b6c890..7b8a52288 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -34,7 +34,6 @@ import m5
from m5.objects import *
import os, optparse, sys
m5.AddToPath('../common')
-from FullO3Config import *
parser = optparse.OptionParser()
@@ -86,7 +85,7 @@ if options.detailed:
if options.timing:
cpu = TimingSimpleCPU()
elif options.detailed:
- cpu = DetailedO3CPU()
+ cpu = DerivO3CPU()
else:
cpu = AtomicSimpleCPU()