Config: Use clock option in se/fs script and pass to switch_cpus

This patch changes the se and fs script to use the clock option and
not simply set the CPUs clock to 2 GHz. It also makes a minor change
to the assignment of the switch_cpus clock to allow different clocks.

2 files changed, 3 insertions, 3 deletions

diff --git a/configs/example/fs.py b/configs/example/fs.py
index a6d4869f3..b0eb2f1ae 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -74,8 +74,8 @@ drive_mem_mode = 'atomic'
 # system under test can be any CPU
 (TestCPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
 
-TestCPUClass.clock = '2GHz'
-DriveCPUClass.clock = '2GHz'
+TestCPUClass.clock = options.clock
+DriveCPUClass.clock = options.clock
 
 if options.benchmark:
     try:
diff --git a/configs/example/se.py b/configs/example/se.py
index fa20c37db..009f65055 100644
--- a/configs/example/se.py
+++ b/configs/example/se.py
@@ -147,7 +147,7 @@ if options.cpu_type == "detailed" or options.cpu_type == "inorder":
     numThreads = len(workloads)
 
 (CPUClass, test_mem_mode, FutureClass) = Simulation.setCPUClass(options)
-CPUClass.clock = '2GHz'
+CPUClass.clock = options.clock
 CPUClass.numThreads = numThreads;
 
 np = options.num_cpus