config: Add a CPU clock command-line option

This patch adds a 'cpu_clock' command-line option and uses the value
to assign clocks to components running at the CPU speed (L1 and L2
including the L2-bus). The configuration scripts are updated
accordingly.

The 'clock' option is left unchanged in this patch as it is still used
by a number of components. In follow-on patches the latter will be
disambiguated further.

3 files changed, 4 insertions, 4 deletions

diff --git a/configs/example/fs.py b/configs/example/fs.py
index b17266e54..31106cba7 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -81,8 +81,8 @@ def is_kvm_cpu(cpu_class):
 # system under test can be any CPU
 (TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 
-TestCPUClass.clock = options.clock
-DriveCPUClass.clock = options.clock
+TestCPUClass.clock = options.cpu_clock
+DriveCPUClass.clock = options.cpu_clock
 
 # Match the memories with the CPUs, the driver system always simple,
 # and based on the options for the test system
diff --git a/configs/example/ruby_fs.py b/configs/example/ruby_fs.py
index e04e14434..e6239caf4 100644
--- a/configs/example/ruby_fs.py
+++ b/configs/example/ruby_fs.py
@@ -80,7 +80,7 @@ if not (options.cpu_type == "detailed" or options.cpu_type == "timing"):
     sys.exit(1)
 (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 
-CPUClass.clock = options.clock
+CPUClass.clock = options.cpu_clock
 
 TestMemClass = Simulation.setMemClass(options)
 
diff --git a/configs/example/se.py b/configs/example/se.py
index 299a2efb0..000390080 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -147,7 +147,7 @@ else:
 
 
 (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
-CPUClass.clock = options.clock
+CPUClass.clock = options.cpu_clock
 CPUClass.numThreads = numThreads
 
 MemClass = Simulation.setMemClass(options)