From 597d2aa3a661587268e3d79cf4726212329fb4af Mon Sep 17 00:00:00 2001 From: Akash Bagdia Date: Thu, 27 Jun 2013 05:49:49 -0400 Subject: config: Rename clock option to Ruby clock This patch changes the 'clock' option to 'ruby-clock' as it is only used by Ruby. --- configs/common/Options.py | 1 - configs/ruby/Ruby.py | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configs/common/Options.py b/configs/common/Options.py index aa4d65ead..6c97f547f 100644 --- a/configs/common/Options.py +++ b/configs/common/Options.py @@ -77,7 +77,6 @@ def addCommonOptions(parser): help="Enable basic block profiling for SimPoints") parser.add_option("--simpoint-interval", type="int", default=10000000, help="SimPoint interval in num of instructions") - parser.add_option("--clock", action="store", type="string", default='2GHz') parser.add_option("--sys-clock", action="store", type="string", default='1GHz', help = """Top-level clock for blocks running at system diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index a11ff53c3..5c5e84197 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -48,6 +48,10 @@ def define_options(parser): # By default, ruby uses the simple timing cpu parser.set_defaults(cpu_type="timing") + parser.add_option("--ruby-clock", action="store", type="string", + default='2GHz', + help="Clock for blocks running at Ruby system's speed") + # ruby network options parser.add_option("--topology", type="string", default="Crossbar", help="check src/mem/ruby/network/topologies for complete set") @@ -91,7 +95,7 @@ def create_topology(controllers, options): def create_system(options, system, piobus = None, dma_ports = []): - system.ruby = RubySystem(clock = options.clock, + system.ruby = RubySystem(clock = options.ruby_clock, stats_filename = options.ruby_stats, no_mem_vec = options.use_map) ruby = system.ruby -- cgit v1.2.3