summaryrefslogtreecommitdiff
path: root/configs/ruby
diff options
context:
space:
mode:
authorGabe Black <gabeblack@google.com>2017-05-07 23:57:47 -0700
committerGabe Black <gabeblack@google.com>2017-05-09 16:48:30 +0000
commit942e2957994fc6779a5540c3b94a8756258e3149 (patch)
treed6b721cafc5dbadcf00fc2ca6bf2f8cb59d5c00d /configs/ruby
parent80c391730b6c4c78644717617d766c9679e99c45 (diff)
downloadgem5-942e2957994fc6779a5540c3b94a8756258e3149.tar.xz
config: Fix up some configs to not use CPU aliases.
Support for CPU aliases were removed recently. Change-Id: I3c1173dc34170d8639d95e52bf660f248848f77f Reviewed-on: https://gem5-review.googlesource.com/3100 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'configs/ruby')
-rw-r--r--configs/ruby/Ruby.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 50b5ba9af..8f5edb807 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -52,7 +52,7 @@ from network import Network
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 @@ def send_evicts(options):
# 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