From efc1dddbd8b25605d41e99a3a39895193deaf3da Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Tue, 18 Aug 2009 16:24:09 -0500 Subject: ruby: added random seed option to config scripts --- src/mem/ruby/config/MI_example-homogeneous.rb | 7 +++++++ src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'src/mem/ruby/config') diff --git a/src/mem/ruby/config/MI_example-homogeneous.rb b/src/mem/ruby/config/MI_example-homogeneous.rb index 2b416e647..409d0fe3a 100644 --- a/src/mem/ruby/config/MI_example-homogeneous.rb +++ b/src/mem/ruby/config/MI_example-homogeneous.rb @@ -34,6 +34,13 @@ for i in 0..$*.size-1 do elsif $*[i] == "-m" num_memories = $*[i+1].to_i i = i+1 + elsif $*[i] == "-R" + if $*[i+1] == "rand" + RubySystem.random_seed = "rand" + else + RubySystem.random_seed = $*[i+1].to_i + end + i = i+ 1 elsif $*[i] == "-s" memory_size_mb = $*[i+1].to_i i = i + 1 diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb index 8a202d450..2c59a0916 100644 --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb @@ -40,6 +40,13 @@ for i in 0..$*.size-1 do elsif $*[i] == "-p" num_cores = $*[i+1].to_i i = i+1 + elsif $*[i] == "-R" + if $*[i+1] == "rand" + RubySystem.random_seed = "rand" + else + RubySystem.random_seed = $*[i+1].to_i + end + i = i+ 1 elsif $*[i] == "-s" memory_size_mb = $*[i+1].to_i i = i + 1 -- cgit v1.2.3 From 849bad7ad7c8b483d02b317e7f6ecf0c1292a48d Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Tue, 1 Sep 2009 09:35:48 -0500 Subject: ruby: fixed config assertion failure --- src/mem/ruby/config/cfg.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mem/ruby/config') diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb index 445bb4885..16d658a4c 100644 --- a/src/mem/ruby/config/cfg.rb +++ b/src/mem/ruby/config/cfg.rb @@ -11,7 +11,7 @@ end def assert(condition,message) unless condition - raise AssertionFailure, "\n\nAssertion failed: \n\n #{message}\n\n" + raise AssertionFailure.new(message), "\n\nAssertion failed: \n\n #{message}\n\n" end end -- cgit v1.2.3 From e6e3ccf5c0f49342116eadd6386a4d169b8a6581 Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Thu, 10 Sep 2009 13:32:16 -0500 Subject: ruby: made L2 request/response latency based on cache latency by default --- src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb | 2 ++ src/mem/ruby/config/defaults.rb | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mem/ruby/config') diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb index 2c59a0916..aa176d0f1 100644 --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb @@ -79,6 +79,8 @@ num_l2_banks.times { |n| net_ports << MOESI_CMP_directory_L2CacheController.new("L2CacheController_"+n.to_s, "L2Cache", cache) + net_ports.last.request_latency = l2_cache_latency + 2 + net_ports.last.response_latency = l2_cache_latency + 2 end } num_memories.times { |n| diff --git a/src/mem/ruby/config/defaults.rb b/src/mem/ruby/config/defaults.rb index 384abd119..a286b01fb 100644 --- a/src/mem/ruby/config/defaults.rb +++ b/src/mem/ruby/config/defaults.rb @@ -163,8 +163,8 @@ class MOESI_CMP_directory_DirectoryController < DirectoryController end class MOESI_CMP_directory_DMAController < DMAController - default_param :request_latency, Integer, 6 - default_param :response_latency, Integer, 6 + default_param :request_latency, Integer, 14 + default_param :response_latency, Integer, 14 end class RubySystem -- cgit v1.2.3 From ef87b6dc82da7322a7bcd540f259e1ed2cb07864 Mon Sep 17 00:00:00 2001 From: Derek Hower Date: Thu, 10 Sep 2009 21:19:34 -0500 Subject: ruby: made randomization true by default --- src/mem/ruby/config/defaults.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mem/ruby/config') diff --git a/src/mem/ruby/config/defaults.rb b/src/mem/ruby/config/defaults.rb index a286b01fb..ab717cece 100644 --- a/src/mem/ruby/config/defaults.rb +++ b/src/mem/ruby/config/defaults.rb @@ -179,7 +179,7 @@ class RubySystem # you can still have a non-deterministic simulation if random seed # is set to "rand". This is because the Ruby swtiches use random # link priority elevation - default_param :randomization, Boolean, false + default_param :randomization, Boolean, true # tech_nm is the device size used to calculate latency and area # information about system components -- cgit v1.2.3