# HG changeset patch
# User Brad Beckmann <[email protected]>
# Date 1268941833 25200
# Node ID 0a636e374a2ea05a82f1255ab51f11583bdd4c76
# Parent  bd4aafe90771a0ed4936f90994b717cdf4d99957
ruby: Added flag to disable mem_vec allocation

The RubySystem flag no_mem_vec will disable Ruby from allocating it's memory
data array.

diff --git a/src/mem/ruby/system/DirectoryMemory.cc 
b/src/mem/ruby/system/DirectoryMemory.cc
--- a/src/mem/ruby/system/DirectoryMemory.cc
+++ b/src/mem/ruby/system/DirectoryMemory.cc
@@ -64,14 +64,13 @@
       m_entries = new Directory_Entry*[m_num_entries];
       for (int i=0; i < m_num_entries; i++)
           m_entries[i] = NULL;
+      m_ram = g_system_ptr->getMemoryVector();
   } else {
       int entry_bits = log_int(m_num_entries);
       assert(entry_bits >= m_map_levels);
       m_sparseMemory = new SparseMemory(entry_bits, m_map_levels);
   }
 
-  m_ram = g_system_ptr->getMemoryVector();
-
   m_num_directories++;
   m_num_directories_bits = log_int(m_num_directories);
   m_total_size_bytes += m_size_bytes;
diff --git a/src/mem/ruby/system/RubySystem.py 
b/src/mem/ruby/system/RubySystem.py
--- a/src/mem/ruby/system/RubySystem.py
+++ b/src/mem/ruby/system/RubySystem.py
@@ -45,3 +45,4 @@
     tracer = Param.RubyTracer("");
     stats_filename = Param.String("ruby.stats",
         "file to which ruby dumps its stats")
+    no_mem_vec = Param.Bool(False, "do not allocate Ruby's mem vector");
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -89,8 +89,12 @@
 
     g_eventQueue_ptr = new RubyEventQueue(p->eventq, m_clock);
     g_system_ptr = this;
-    m_mem_vec_ptr = new MemoryVector;
-    m_mem_vec_ptr->setSize(m_memory_size_bytes);
+    if (p->no_mem_vec) {
+        m_mem_vec_ptr = NULL;
+    } else {
+        m_mem_vec_ptr = new MemoryVector;
+        m_mem_vec_ptr->setSize(m_memory_size_bytes);
+    }
 
     //
     // Print ruby configuration and stats at exit
@@ -111,7 +115,9 @@
   delete m_network_ptr;
   delete m_profiler_ptr;
   delete m_tracer_ptr;
-  delete m_mem_vec_ptr;
+  if (m_mem_vec_ptr != NULL) {
+      delete m_mem_vec_ptr;
+  }
 }
 
 void RubySystem::printSystemConfig(ostream & out)

_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev

Reply via email to