ruby: made configuration parameters uniform

diff --git a/src/mem/ruby/config/MESI_CMP_directory.rb b/src/mem/ruby/config/MESI_CMP_directory.rb
index 4d9ff30b3f600158b05bee35ad3670377880cb93..7a9d47f2438b66627b53b57e3c9159c0700906ab 100644 (file)
--- a/src/mem/ruby/config/MESI_CMP_directory.rb
+++ b/src/mem/ruby/config/MESI_CMP_directory.rb
@@ -12,8 +12,8 @@ class MESI_CMP_directory_L2CacheController < CacheController
   def argv()
     vec = super()
     vec += " cache " + cache.obj_name
-    vec += " l2_request_latency "+l2_request_latency.to_s 
-    vec += " l2_response_latency "+l2_response_latency.to_s
+    vec += " l2_request_latency "+request_latency.to_s 
+    vec += " l2_response_latency "+response_latency.to_s
     vec += " to_l1_latency "+to_L1_latency.to_s
     return vec
   end

diff --git a/src/mem/ruby/config/defaults.rb b/src/mem/ruby/config/defaults.rb
index 20d633d87db1da02b8de35c9f76ec88622e77080..fd19e92b6b87889a73fdee4d1879fe71d821c151 100644 (file)
--- a/src/mem/ruby/config/defaults.rb
+++ b/src/mem/ruby/config/defaults.rb
@@ -160,8 +160,8 @@ class MOESI_CMP_directory_DMAController < DMAController
 end
 
 class MESI_CMP_directory_L2CacheController < CacheController
-  default_param :l2_request_latency, Integer, 2
-  default_param :l2_response_latency, Integer, 2
+  default_param :request_latency, Integer, 2
+  default_param :response_latency, Integer, 2
   default_param :to_L1_latency, Integer, 1
 
 #if 0 then automatically calculated