Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/3100
Change subject: config: Fix up some configs to not use CPU aliases.
......................................................................
config: Fix up some configs to not use CPU aliases.
Support for CPU aliases were removed recently.
Change-Id: I3c1173dc34170d8639d95e52bf660f248848f77f
---
M configs/common/CacheConfig.py
M configs/example/apu_se.py
M configs/example/arm/fs_power.py
M configs/example/etrace_replay.py
M configs/example/fs.py
M configs/example/se.py
M configs/network/Network.py
M configs/ruby/Ruby.py
8 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/configs/common/CacheConfig.py b/configs/common/CacheConfig.py
index 52659e8..d9d0ae7 100644
--- a/configs/common/CacheConfig.py
+++ b/configs/common/CacheConfig.py
@@ -53,7 +53,7 @@
if options.external_memory_system:
ExternalCache =
ExternalCacheFactory(options.external_memory_system)
- if options.cpu_type == "arm_detailed":
+ if options.cpu_type == "O3_ARM_v7a_3":
try:
from O3_ARM_v7a import *
except:
diff --git a/configs/example/apu_se.py b/configs/example/apu_se.py
index 28ba92b..f93442d 100644
--- a/configs/example/apu_se.py
+++ b/configs/example/apu_se.py
@@ -181,9 +181,9 @@
fatal("GPU model requires ruby")
# Currently the gpu model requires only timing or detailed CPU
-if not (options.cpu_type == "timing" or
- options.cpu_type == "detailed"):
- fatal("GPU model requires timing or detailed CPU")
+if not (options.cpu_type == "TimingSimpleCPU" or
+ options.cpu_type == "DerivO3CPU"):
+ fatal("GPU model requires TimingSimpleCPU or DerivO3CPU")
# This file can support multiple compute units
assert(options.num_compute_units >= 1)
diff --git a/configs/example/arm/fs_power.py
b/configs/example/arm/fs_power.py
index 14dbae0..1bef00d 100644
--- a/configs/example/arm/fs_power.py
+++ b/configs/example/arm/fs_power.py
@@ -75,8 +75,8 @@
bL.addOptions(parser)
options = parser.parse_args()
- if options.cpu_type != "timing":
- m5.fatal("The power example script requires 'timing' CPUs.")
+ if options.cpu_type != "TimingSimpleCPU":
+ m5.fatal("The power example script requires TimingSimpleCPUs.")
root = bL.build(options)
diff --git a/configs/example/etrace_replay.py
b/configs/example/etrace_replay.py
index 0b0e37f..385a2d1 100644
--- a/configs/example/etrace_replay.py
+++ b/configs/example/etrace_replay.py
@@ -65,9 +65,9 @@
numThreads = 1
-if options.cpu_type != "trace":
+if options.cpu_type != "TraceCPU":
fatal("This is a script for elastic trace replay simulation, use "\
- "--cpu-type=trace\n");
+ "--cpu-type=TraceCPU\n");
if options.num_cpus > 1:
fatal("This script does not support multi-processor trace replay.\n")
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 8102edc..36365af 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -147,7 +147,8 @@
if options.ruby:
# Check for timing mode because ruby does not support atomic
accesses
- if not (options.cpu_type == "detailed" or options.cpu_type
== "timing"):
+ if not (options.cpu_type == "DerivO3CPU" or
+ options.cpu_type == "TimingSimpleCPU"):
print >> sys.stderr, "Ruby requires TimingSimpleCPU or O3CPU!!"
sys.exit(1)
diff --git a/configs/example/se.py b/configs/example/se.py
index b26bc91..0fc7d74 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -115,7 +115,7 @@
idx += 1
if options.smt:
- assert(options.cpu_type == "detailed")
+ assert(options.cpu_type == "DerivO3CPU")
return multiprocesses, idx
else:
return multiprocesses, 1
diff --git a/configs/network/Network.py b/configs/network/Network.py
index 1fbb381..567e6b0 100644
--- a/configs/network/Network.py
+++ b/configs/network/Network.py
@@ -34,7 +34,7 @@
def define_options(parser):
# By default, ruby uses the simple timing cpu
- parser.set_defaults(cpu_type="timing")
+ parser.set_defaults(cpu_type="TimingSimpleCPU")
parser.add_option("--topology", type="string", default="Crossbar",
help="check configs/topologies for complete set")
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 50b5ba9..8f5edb8 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -52,7 +52,7 @@
def define_options(parser):
# By default, ruby uses the simple timing cpu
- parser.set_defaults(cpu_type="timing")
+ parser.set_defaults(cpu_type="TimingSimpleCPU")
parser.add_option("--ruby-clock", action="store", type="string",
default='2GHz',
@@ -212,6 +212,6 @@
# currently, 2 scenarios warrant forwarding evictions to the CPU:
# 1. The O3 model must keep the LSQ coherent with the caches
# 2. The x86 mwait instruction is built on top of coherence
invalidations
- if options.cpu_type == "detailed" or buildEnv['TARGET_ISA'] == 'x86':
+ if options.cpu_type == "DerivO3CPU" or buildEnv['TARGET_ISA'] == 'x86':
return True
return False
--
To view, visit https://gem5-review.googlesource.com/3100
To unsubscribe, visit https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c1173dc34170d8639d95e52bf660f248848f77f
Gerrit-Change-Number: 3100
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
