Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates
Got it. Thanks, Brad > -Original Message- > From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > Behalf Of Derek Hower > Sent: Wednesday, January 20, 2010 1:37 PM > To: M5 Developer List > Subject: Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > > There are only three protocols that work (prior to your changes). Two > of them work with this configuration, and one, MI_example, is not a > two level protocol. > > On Wed, Jan 20, 2010 at 3:34 PM, Beckmann, Brad > wrote: > > Ah...I read it wrong. Let me rephrase my question. So why can you > only use those two protocols? I'm just wondering if there is any > functionality that I need to make sure I maintain in my changes. > > > > Thanks, > > > > Brad > > > > > >> -Original Message- > >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > >> Behalf Of Derek Hower > >> Sent: Wednesday, January 20, 2010 12:42 PM > >> To: M5 Developer List > >> Subject: Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > >> > >> You can. In fact, that is the only two you can use with it. > >> > >> On Wed, Jan 20, 2010 at 2:12 PM, Beckmann, Brad > > >> wrote: > >> > Just curious. Why can't you use the MESI_CMP_directory or > >> > MOESI_CMP_directory protocols in this config file? > >> > > >> > Brad > >> > > >> > > >> >> -Original Message- > >> >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] > On > >> >> Behalf Of Derek Hower > >> >> Sent: Tuesday, January 19, 2010 3:20 PM > >> >> To: m5-dev@m5sim.org > >> >> Subject: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > >> >> > >> >> # HG changeset patch > >> >> # User Derek Hower > >> >> # Date 1252966262 18000 > >> >> # Node ID 0bf5c598c9c5221632044a222d47a67f30ae38cd > >> >> # Parent 829892ec644cf1ac856fdb610ba81053dc593902 > >> >> ruby: configuration updates > >> >> > >> >> diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> >> b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> >> --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> >> +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> >> @@ -27,7 +27,7 @@ > >> >> num_dma = 1 > >> >> > >> >> #default protocol > >> >> -protocol = "MESI_CMP_directory" > >> >> +protocol = ""#"MESI_CMP_directory" > >> >> > >> >> # check for overrides > >> >> > >> >> @@ -57,7 +57,7 @@ > >> >> net_ports = Array.new > >> >> iface_ports = Array.new > >> >> > >> >> -assert((protocol == "MESI_CMP_directory" or protocol == > >> >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > >> >> "+protocol); > >> >> +assert((protocol == "MESI_CMP_directory" or protocol == > >> >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > >> >> #{protocol}"); > >> >> > >> >> require protocol+".rb" > >> >> > >> >> diff --git a/src/mem/ruby/config/cfg.rb > b/src/mem/ruby/config/cfg.rb > >> >> --- a/src/mem/ruby/config/cfg.rb > >> >> +++ b/src/mem/ruby/config/cfg.rb > >> >> @@ -1,7 +1,7 @@ > >> >> #!/usr/bin/ruby > >> >> > >> >> -class AssertionFailure < RuntimeError > >> >> -end > >> >> +root = File.dirname(File.expand_path(__FILE__)) > >> >> +require root+'/assert.rb' > >> >> > >> >> class Boolean > >> >> def self.is_a?(obj) > >> >> @@ -9,12 +9,6 @@ > >> >> end > >> >> end > >> >> > >> >> -def assert(condition,message) > >> >> - unless condition > >> >> - raise AssertionFailure.new(message), "\n\nAssertion failed: > >> \n\n > >> >> #{message}\n\n" > >> >> - end > >> >> -end > >> >> - > >> >> class LibRubyObject > >> >> @@all_objs = Array.new
Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates
Oh, is that because those are the only two protocols that support the new atomic implementation? Brad > -Original Message- > From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > Behalf Of Beckmann, Brad > Sent: Wednesday, January 20, 2010 1:35 PM > To: M5 Developer List > Subject: Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > > Ah...I read it wrong. Let me rephrase my question. So why can you > only use those two protocols? I'm just wondering if there is any > functionality that I need to make sure I maintain in my changes. > > Thanks, > > Brad > > > > -Original Message- > > From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > > Behalf Of Derek Hower > > Sent: Wednesday, January 20, 2010 12:42 PM > > To: M5 Developer List > > Subject: Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > > > > You can. In fact, that is the only two you can use with it. > > > > On Wed, Jan 20, 2010 at 2:12 PM, Beckmann, Brad > > > wrote: > > > Just curious. Why can't you use the MESI_CMP_directory or > > > MOESI_CMP_directory protocols in this config file? > > > > > > Brad > > > > > > > > >> -Original Message- > > >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] > On > > >> Behalf Of Derek Hower > > >> Sent: Tuesday, January 19, 2010 3:20 PM > > >> To: m5-dev@m5sim.org > > >> Subject: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > > >> > > >> # HG changeset patch > > >> # User Derek Hower > > >> # Date 1252966262 18000 > > >> # Node ID 0bf5c598c9c5221632044a222d47a67f30ae38cd > > >> # Parent 829892ec644cf1ac856fdb610ba81053dc593902 > > >> ruby: configuration updates > > >> > > >> diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > > >> b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > > >> --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > > >> +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > > >> @@ -27,7 +27,7 @@ > > >> num_dma = 1 > > >> > > >> #default protocol > > >> -protocol = "MESI_CMP_directory" > > >> +protocol = ""#"MESI_CMP_directory" > > >> > > >> # check for overrides > > >> > > >> @@ -57,7 +57,7 @@ > > >> net_ports = Array.new > > >> iface_ports = Array.new > > >> > > >> -assert((protocol == "MESI_CMP_directory" or protocol == > > >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > > >> "+protocol); > > >> +assert((protocol == "MESI_CMP_directory" or protocol == > > >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > > >> #{protocol}"); > > >> > > >> require protocol+".rb" > > >> > > >> diff --git a/src/mem/ruby/config/cfg.rb > b/src/mem/ruby/config/cfg.rb > > >> --- a/src/mem/ruby/config/cfg.rb > > >> +++ b/src/mem/ruby/config/cfg.rb > > >> @@ -1,7 +1,7 @@ > > >> #!/usr/bin/ruby > > >> > > >> -class AssertionFailure < RuntimeError > > >> -end > > >> +root = File.dirname(File.expand_path(__FILE__)) > > >> +require root+'/assert.rb' > > >> > > >> class Boolean > > >> def self.is_a?(obj) > > >> @@ -9,12 +9,6 @@ > > >> end > > >> end > > >> > > >> -def assert(condition,message) > > >> - unless condition > > >> - raise AssertionFailure.new(message), "\n\nAssertion failed: > > \n\n > > >> #{message}\n\n" > > >> - end > > >> -end > > >> - > > >> class LibRubyObject > > >> @@all_objs = Array.new > > >> attr_reader :obj_name > > >> diff --git a/src/mem/ruby/config/defaults.rb > > >> b/src/mem/ruby/config/defaults.rb > > >> --- a/src/mem/ruby/config/defaults.rb > > >> +++ b/src/mem/ruby/config/defaults.rb > > >> @@ -1,7 +1,5 @@ > > >> #!/usr/bin/ruby > > >> > > >> - > > >> - > > >> class NetPort < LibRubyObject > > >> # number of transitions a SLICC state machine can tra
Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates
There are only three protocols that work (prior to your changes). Two of them work with this configuration, and one, MI_example, is not a two level protocol. On Wed, Jan 20, 2010 at 3:34 PM, Beckmann, Brad wrote: > Ah...I read it wrong. Let me rephrase my question. So why can you only use > those two protocols? I'm just wondering if there is any functionality that I > need to make sure I maintain in my changes. > > Thanks, > > Brad > > >> -Original Message- >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On >> Behalf Of Derek Hower >> Sent: Wednesday, January 20, 2010 12:42 PM >> To: M5 Developer List >> Subject: Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates >> >> You can. In fact, that is the only two you can use with it. >> >> On Wed, Jan 20, 2010 at 2:12 PM, Beckmann, Brad >> wrote: >> > Just curious. Why can't you use the MESI_CMP_directory or >> > MOESI_CMP_directory protocols in this config file? >> > >> > Brad >> > >> > >> >> -Original Message- >> >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On >> >> Behalf Of Derek Hower >> >> Sent: Tuesday, January 19, 2010 3:20 PM >> >> To: m5-dev@m5sim.org >> >> Subject: [m5-dev] [PATCH 18 of 43] ruby: configuration updates >> >> >> >> # HG changeset patch >> >> # User Derek Hower >> >> # Date 1252966262 18000 >> >> # Node ID 0bf5c598c9c5221632044a222d47a67f30ae38cd >> >> # Parent 829892ec644cf1ac856fdb610ba81053dc593902 >> >> ruby: configuration updates >> >> >> >> diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> >> b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> >> --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> >> +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> >> @@ -27,7 +27,7 @@ >> >> num_dma = 1 >> >> >> >> #default protocol >> >> -protocol = "MESI_CMP_directory" >> >> +protocol = ""#"MESI_CMP_directory" >> >> >> >> # check for overrides >> >> >> >> @@ -57,7 +57,7 @@ >> >> net_ports = Array.new >> >> iface_ports = Array.new >> >> >> >> -assert((protocol == "MESI_CMP_directory" or protocol == >> >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol >> >> "+protocol); >> >> +assert((protocol == "MESI_CMP_directory" or protocol == >> >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol >> >> #{protocol}"); >> >> >> >> require protocol+".rb" >> >> >> >> diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb >> >> --- a/src/mem/ruby/config/cfg.rb >> >> +++ b/src/mem/ruby/config/cfg.rb >> >> @@ -1,7 +1,7 @@ >> >> #!/usr/bin/ruby >> >> >> >> -class AssertionFailure < RuntimeError >> >> -end >> >> +root = File.dirname(File.expand_path(__FILE__)) >> >> +require root+'/assert.rb' >> >> >> >> class Boolean >> >> def self.is_a?(obj) >> >> @@ -9,12 +9,6 @@ >> >> end >> >> end >> >> >> >> -def assert(condition,message) >> >> - unless condition >> >> - raise AssertionFailure.new(message), "\n\nAssertion failed: >> \n\n >> >> #{message}\n\n" >> >> - end >> >> -end >> >> - >> >> class LibRubyObject >> >> @@all_objs = Array.new >> >> attr_reader :obj_name >> >> diff --git a/src/mem/ruby/config/defaults.rb >> >> b/src/mem/ruby/config/defaults.rb >> >> --- a/src/mem/ruby/config/defaults.rb >> >> +++ b/src/mem/ruby/config/defaults.rb >> >> @@ -1,7 +1,5 @@ >> >> #!/usr/bin/ruby >> >> >> >> - >> >> - >> >> class NetPort < LibRubyObject >> >> # number of transitions a SLICC state machine can transition per >> >> # cycle >> >> @@ -11,7 +9,6 @@ >> >> # SLICC Controllers. When 0, infinite buffering is used. >> >> default_param :buffer_size, Integer, 32 >> >> >> >> - # added by SS for TBE >> >&g
Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates
Ah...I read it wrong. Let me rephrase my question. So why can you only use those two protocols? I'm just wondering if there is any functionality that I need to make sure I maintain in my changes. Thanks, Brad > -Original Message- > From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > Behalf Of Derek Hower > Sent: Wednesday, January 20, 2010 12:42 PM > To: M5 Developer List > Subject: Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > > You can. In fact, that is the only two you can use with it. > > On Wed, Jan 20, 2010 at 2:12 PM, Beckmann, Brad > wrote: > > Just curious. Why can't you use the MESI_CMP_directory or > > MOESI_CMP_directory protocols in this config file? > > > > Brad > > > > > >> -Original Message- > >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > >> Behalf Of Derek Hower > >> Sent: Tuesday, January 19, 2010 3:20 PM > >> To: m5-dev@m5sim.org > >> Subject: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > >> > >> # HG changeset patch > >> # User Derek Hower > >> # Date 1252966262 18000 > >> # Node ID 0bf5c598c9c5221632044a222d47a67f30ae38cd > >> # Parent 829892ec644cf1ac856fdb610ba81053dc593902 > >> ruby: configuration updates > >> > >> diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > >> @@ -27,7 +27,7 @@ > >> num_dma = 1 > >> > >> #default protocol > >> -protocol = "MESI_CMP_directory" > >> +protocol = ""#"MESI_CMP_directory" > >> > >> # check for overrides > >> > >> @@ -57,7 +57,7 @@ > >> net_ports = Array.new > >> iface_ports = Array.new > >> > >> -assert((protocol == "MESI_CMP_directory" or protocol == > >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > >> "+protocol); > >> +assert((protocol == "MESI_CMP_directory" or protocol == > >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > >> #{protocol}"); > >> > >> require protocol+".rb" > >> > >> diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb > >> --- a/src/mem/ruby/config/cfg.rb > >> +++ b/src/mem/ruby/config/cfg.rb > >> @@ -1,7 +1,7 @@ > >> #!/usr/bin/ruby > >> > >> -class AssertionFailure < RuntimeError > >> -end > >> +root = File.dirname(File.expand_path(__FILE__)) > >> +require root+'/assert.rb' > >> > >> class Boolean > >> def self.is_a?(obj) > >> @@ -9,12 +9,6 @@ > >> end > >> end > >> > >> -def assert(condition,message) > >> - unless condition > >> - raise AssertionFailure.new(message), "\n\nAssertion failed: > \n\n > >> #{message}\n\n" > >> - end > >> -end > >> - > >> class LibRubyObject > >> @@all_objs = Array.new > >> attr_reader :obj_name > >> diff --git a/src/mem/ruby/config/defaults.rb > >> b/src/mem/ruby/config/defaults.rb > >> --- a/src/mem/ruby/config/defaults.rb > >> +++ b/src/mem/ruby/config/defaults.rb > >> @@ -1,7 +1,5 @@ > >> #!/usr/bin/ruby > >> > >> - > >> - > >> class NetPort < LibRubyObject > >> # number of transitions a SLICC state machine can transition per > >> # cycle > >> @@ -11,7 +9,6 @@ > >> # SLICC Controllers. When 0, infinite buffering is used. > >> default_param :buffer_size, Integer, 32 > >> > >> - # added by SS for TBE > >> default_param :number_of_TBEs, Integer, 256 > >> > >> default_param :recycle_latency, Integer, 10 > >> @@ -39,10 +36,10 @@ > >> default_param :protocol_trace, Boolean, false > >> > >> # a string for filtering debugging output (for all g_debug vars > see > >> Debug.h) > >> - default_param :filter_string, String, "" > >> + default_param :filter_string, String, "none" > >> > >> - # filters debugging messages based on priority (low, med, high) > >> - default_param :verbosity_string, String, "" > >>
Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates
You can. In fact, that is the only two you can use with it. On Wed, Jan 20, 2010 at 2:12 PM, Beckmann, Brad wrote: > Just curious. Why can't you use the MESI_CMP_directory or > MOESI_CMP_directory protocols in this config file? > > Brad > > >> -Original Message- >> From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On >> Behalf Of Derek Hower >> Sent: Tuesday, January 19, 2010 3:20 PM >> To: m5-dev@m5sim.org >> Subject: [m5-dev] [PATCH 18 of 43] ruby: configuration updates >> >> # HG changeset patch >> # User Derek Hower >> # Date 1252966262 18000 >> # Node ID 0bf5c598c9c5221632044a222d47a67f30ae38cd >> # Parent 829892ec644cf1ac856fdb610ba81053dc593902 >> ruby: configuration updates >> >> diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb >> @@ -27,7 +27,7 @@ >> num_dma = 1 >> >> #default protocol >> -protocol = "MESI_CMP_directory" >> +protocol = ""#"MESI_CMP_directory" >> >> # check for overrides >> >> @@ -57,7 +57,7 @@ >> net_ports = Array.new >> iface_ports = Array.new >> >> -assert((protocol == "MESI_CMP_directory" or protocol == >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol >> "+protocol); >> +assert((protocol == "MESI_CMP_directory" or protocol == >> "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol >> #{protocol}"); >> >> require protocol+".rb" >> >> diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb >> --- a/src/mem/ruby/config/cfg.rb >> +++ b/src/mem/ruby/config/cfg.rb >> @@ -1,7 +1,7 @@ >> #!/usr/bin/ruby >> >> -class AssertionFailure < RuntimeError >> -end >> +root = File.dirname(File.expand_path(__FILE__)) >> +require root+'/assert.rb' >> >> class Boolean >> def self.is_a?(obj) >> @@ -9,12 +9,6 @@ >> end >> end >> >> -def assert(condition,message) >> - unless condition >> - raise AssertionFailure.new(message), "\n\nAssertion failed: \n\n >> #{message}\n\n" >> - end >> -end >> - >> class LibRubyObject >> @@all_objs = Array.new >> attr_reader :obj_name >> diff --git a/src/mem/ruby/config/defaults.rb >> b/src/mem/ruby/config/defaults.rb >> --- a/src/mem/ruby/config/defaults.rb >> +++ b/src/mem/ruby/config/defaults.rb >> @@ -1,7 +1,5 @@ >> #!/usr/bin/ruby >> >> - >> - >> class NetPort < LibRubyObject >> # number of transitions a SLICC state machine can transition per >> # cycle >> @@ -11,7 +9,6 @@ >> # SLICC Controllers. When 0, infinite buffering is used. >> default_param :buffer_size, Integer, 32 >> >> - # added by SS for TBE >> default_param :number_of_TBEs, Integer, 256 >> >> default_param :recycle_latency, Integer, 10 >> @@ -39,10 +36,10 @@ >> default_param :protocol_trace, Boolean, false >> >> # a string for filtering debugging output (for all g_debug vars see >> Debug.h) >> - default_param :filter_string, String, "" >> + default_param :filter_string, String, "none" >> >> - # filters debugging messages based on priority (low, med, high) >> - default_param :verbosity_string, String, "" >> + # filters debugging messages based on priority (none, low, med, >> high) >> + default_param :verbosity_string, String, "none" >> >> # filters debugging messages based on a ruby time >> default_param :start_time, Integer, 1 >> @@ -65,7 +62,7 @@ >> >> # indicates whether the topology config will be displayed in the >> # stats file >> - default_param :print_config, Boolean, true >> + default_param :print_config, Boolean, false >> end >> >> class Network < LibRubyObject >> @@ -94,20 +91,15 @@ >> default_param :using_network_testing, Boolean, false >> end >> >> - >> - >> -#added by SS >> class Tracer < LibRubyObject >> default_param :warmup_length, Integer, 100 >> end >> >> -#added by SS >> class Profiler < LibRubyObject >> default_param :hot_lines, Boolean, false >> default_param :all_instructions, Boolean, false >> end >> >> -#added by SS >> class MemoryControl < LibRubyObject >> >> default_param :mem_bus_cycle_multiplier, Integer, 10 >> @@ -230,7 +222,6 @@ >> >> default_param :profiler, Profiler, Profiler.new("profiler0") >> end >> -#added by SS >> >> >> >> ___ >> m5-dev mailing list >> m5-dev@m5sim.org >> http://m5sim.org/mailman/listinfo/m5-dev > > > ___ > m5-dev mailing list > m5-dev@m5sim.org > http://m5sim.org/mailman/listinfo/m5-dev > ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev
Re: [m5-dev] [PATCH 18 of 43] ruby: configuration updates
Just curious. Why can't you use the MESI_CMP_directory or MOESI_CMP_directory protocols in this config file? Brad > -Original Message- > From: m5-dev-boun...@m5sim.org [mailto:m5-dev-boun...@m5sim.org] On > Behalf Of Derek Hower > Sent: Tuesday, January 19, 2010 3:20 PM > To: m5-dev@m5sim.org > Subject: [m5-dev] [PATCH 18 of 43] ruby: configuration updates > > # HG changeset patch > # User Derek Hower > # Date 1252966262 18000 > # Node ID 0bf5c598c9c5221632044a222d47a67f30ae38cd > # Parent 829892ec644cf1ac856fdb610ba81053dc593902 > ruby: configuration updates > > diff --git a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > --- a/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > +++ b/src/mem/ruby/config/TwoLevel_SplitL1UnifiedL2.rb > @@ -27,7 +27,7 @@ > num_dma = 1 > > #default protocol > -protocol = "MESI_CMP_directory" > +protocol = ""#"MESI_CMP_directory" > > # check for overrides > > @@ -57,7 +57,7 @@ > net_ports = Array.new > iface_ports = Array.new > > -assert((protocol == "MESI_CMP_directory" or protocol == > "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > "+protocol); > +assert((protocol == "MESI_CMP_directory" or protocol == > "MOESI_CMP_directory"), __FILE__+" cannot be used with protocol > #{protocol}"); > > require protocol+".rb" > > diff --git a/src/mem/ruby/config/cfg.rb b/src/mem/ruby/config/cfg.rb > --- a/src/mem/ruby/config/cfg.rb > +++ b/src/mem/ruby/config/cfg.rb > @@ -1,7 +1,7 @@ > #!/usr/bin/ruby > > -class AssertionFailure < RuntimeError > -end > +root = File.dirname(File.expand_path(__FILE__)) > +require root+'/assert.rb' > > class Boolean >def self.is_a?(obj) > @@ -9,12 +9,6 @@ >end > end > > -def assert(condition,message) > - unless condition > -raise AssertionFailure.new(message), "\n\nAssertion failed: \n\n > #{message}\n\n" > - end > -end > - > class LibRubyObject >@@all_objs = Array.new >attr_reader :obj_name > diff --git a/src/mem/ruby/config/defaults.rb > b/src/mem/ruby/config/defaults.rb > --- a/src/mem/ruby/config/defaults.rb > +++ b/src/mem/ruby/config/defaults.rb > @@ -1,7 +1,5 @@ > #!/usr/bin/ruby > > - > - > class NetPort < LibRubyObject ># number of transitions a SLICC state machine can transition per ># cycle > @@ -11,7 +9,6 @@ ># SLICC Controllers. When 0, infinite buffering is used. >default_param :buffer_size, Integer, 32 > > - # added by SS for TBE >default_param :number_of_TBEs, Integer, 256 > >default_param :recycle_latency, Integer, 10 > @@ -39,10 +36,10 @@ >default_param :protocol_trace, Boolean, false > ># a string for filtering debugging output (for all g_debug vars see > Debug.h) > - default_param :filter_string, String, "" > + default_param :filter_string, String, "none" > > - # filters debugging messages based on priority (low, med, high) > - default_param :verbosity_string, String, "" > + # filters debugging messages based on priority (none, low, med, > high) > + default_param :verbosity_string, String, "none" > ># filters debugging messages based on a ruby time >default_param :start_time, Integer, 1 > @@ -65,7 +62,7 @@ > ># indicates whether the topology config will be displayed in the ># stats file > - default_param :print_config, Boolean, true > + default_param :print_config, Boolean, false > end > > class Network < LibRubyObject > @@ -94,20 +91,15 @@ >default_param :using_network_testing, Boolean, false > end > > - > - > -#added by SS > class Tracer < LibRubyObject >default_param :warmup_length, Integer, 100 > end > > -#added by SS > class Profiler < LibRubyObject >default_param :hot_lines, Boolean, false >default_param :all_instructions, Boolean, false > end > > -#added by SS > class MemoryControl < LibRubyObject > >default_param :mem_bus_cycle_multiplier, Integer, 10 > @@ -230,7 +222,6 @@ > >default_param :profiler, Profiler, Profiler.new("profiler0") > end > -#added by SS > > > > ___ > m5-dev mailing list > m5-dev@m5sim.org > http://m5sim.org/mailman/listinfo/m5-dev ___ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev