From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Tue, 1 Sep 2015 20:50:33 +0000 (-0500)
Subject: ruby: remove random seed
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe47f0a72fda6b101c10810acfb60569fe5b05cd;p=gem5.git

ruby: remove random seed
We no longer use the C library based random number generator: random().
Instead we use the C++ library provided rng.  So setting the random seed for
the RubySystem class has no effect.  Hence the variable and the corresponding
option are being dropped.
---

diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 44dbb925f..36fe42115 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -82,9 +82,6 @@ def define_options(parser):
     parser.add_option("--recycle-latency", type="int", default=10,
                       help="Recycle latency for ruby controller input buffers")
 
-    parser.add_option("--random_seed", type="int", default=1234,
-                      help="Used for seeding the random number generator")
-
     protocol = buildEnv['PROTOCOL']
     exec "import %s" % protocol
     eval("%s.define_options(parser)" % protocol)
@@ -236,7 +233,6 @@ def create_system(options, full_system, system, piobus = None, dma_ports = []):
 
     ruby._cpu_ports = cpu_sequencers
     ruby.num_of_sequencers = len(cpu_sequencers)
-    ruby.random_seed    = options.random_seed
 
     # Create a backing copy of physical memory in case required
     if options.access_backing_store:
diff --git a/src/mem/ruby/system/RubySystem.py b/src/mem/ruby/system/RubySystem.py
index 81a9a181b..c10f8117f 100644
--- a/src/mem/ruby/system/RubySystem.py
+++ b/src/mem/ruby/system/RubySystem.py
@@ -34,7 +34,6 @@ from SimpleMemory import *
 class RubySystem(ClockedObject):
     type = 'RubySystem'
     cxx_header = "mem/ruby/system/System.hh"
-    random_seed = Param.Int(1234, "random seed used by the simulation");
     randomization = Param.Bool(False,
         "insert random delays on message enqueue times");
     block_size_bytes = Param.UInt32(64,
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index 6ebdd3ad6..490a1f085 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -45,7 +45,6 @@
 
 using namespace std;
 
-int RubySystem::m_random_seed;
 bool RubySystem::m_randomization;
 uint32_t RubySystem::m_block_size_bytes;
 uint32_t RubySystem::m_block_size_bits;
@@ -60,8 +59,6 @@ RubySystem::RubySystem(const Params *p)
     : ClockedObject(p), m_access_backing_store(p->access_backing_store),
       m_cache_recorder(NULL)
 {
-    m_random_seed = p->random_seed;
-    srandom(m_random_seed);
     m_randomization = p->randomization;
 
     m_block_size_bytes = p->block_size_bytes;
diff --git a/src/mem/ruby/system/System.hh b/src/mem/ruby/system/System.hh
index 210a633e8..c79732651 100644
--- a/src/mem/ruby/system/System.hh
+++ b/src/mem/ruby/system/System.hh
@@ -70,7 +70,6 @@ class RubySystem : public ClockedObject
     ~RubySystem();
 
     // config accessors
-    static int getRandomSeed() { return m_random_seed; }
     static int getRandomization() { return m_randomization; }
     static uint32_t getBlockSizeBytes() { return m_block_size_bytes; }
     static uint32_t getBlockSizeBits() { return m_block_size_bits; }
@@ -130,7 +129,6 @@ class RubySystem : public ClockedObject
 
   private:
     // configuration parameters
-    static int m_random_seed;
     static bool m_randomization;
     static uint32_t m_block_size_bytes;
     static uint32_t m_block_size_bits;