Get rid of the Random context and add the support directly to python.

We don't currently use randomness much, so I didn't go too far, but
in the future, we may want to actually expose the random number values
themselves to python.  For now, I'll at least let you seed it.
While we're at it, clean up a clearly bad way for generating random
doubles.

--HG--
extra : convert_revision : df2aa8b58dd0d9c2a7c771668a760b2df8db1e11

diff --git a/src/SConscript b/src/SConscript
index 6541fa85e26b896637289b43a6a957a5b62a453e..9037f96340a8c6c817ec8332ffb8c324e06bd9e6 100644 (file)
--- a/src/SConscript
+++ b/src/SConscript
@@ -133,6 +133,7 @@ base_sources = Split('''
         python/swig/debug_wrap.cc
         python/swig/main_wrap.cc
         python/swig/event_wrap.cc
+        python/swig/random_wrap.cc
         python/swig/trace_wrap.cc
         python/swig/pyevent.cc
 

diff --git a/src/base/random.cc b/src/base/random.cc
index 0ccedcb00ac9d83182fc1c3034ae4576ef9ea7dc..ceab337d9cd0b396282099c3181d490286fba4b2 100644 (file)
--- a/src/base/random.cc
+++ b/src/base/random.cc
@@ -40,38 +40,20 @@
 #include <cstdlib>
 #include <cmath>
 
-
-#include "sim/param.hh"
 #include "base/random.hh"
-#include "base/trace.hh"
 
 using namespace std;
 
-class RandomContext : public ParamContext
-{
-  public:
-    RandomContext(const string &_iniSection)
-        : ::ParamContext(_iniSection) {}
-    ~RandomContext() {}
-
-    void checkParams();
-};
-
-RandomContext paramContext("random");
-
-Param<unsigned>
-seed(&paramContext, "seed", "seed to random number generator", 1);
-
-void
-RandomContext::checkParams()
+uint32_t
+getInt32()
 {
-    ::srand48(seed);
+    return mrand48() & 0xffffffff;
 }
 
-long
-getLong()
+double
+getDouble()
 {
-    return mrand48();
+    return drand48();
 }
 
 double
@@ -105,21 +87,3 @@ getUniformPos(uint64_t min, uint64_t max)
 
     return (uint64_t)m5round(r);
 }
-
-
-// idea for generating a double from erand48
-double
-getDouble()
-{
-    union {
-        uint32_t _long[2];
-        uint16_t _short[4];
-    };
-
-    _long[0] = mrand48();
-    _long[1] = mrand48();
-
-    return ldexp((double) _short[0], -48) +
-        ldexp((double) _short[1], -32) +
-        ldexp((double) _short[2], -16);
-}

diff --git a/src/base/random.hh b/src/base/random.hh
index 40d62da7f4d83a39eeb75b2bbf73f913e151741f..0cd88728de216351685ebe9b43795fa548f0a9f1 100644 (file)
--- a/src/base/random.hh
+++ b/src/base/random.hh
@@ -34,7 +34,7 @@
 
 #include "sim/host.hh"
 
-long getLong();
+uint32_t getUInt32();
 double getDouble();
 double m5random(double r);
 uint64_t getUniformPos(uint64_t min, uint64_t max);
@@ -46,7 +46,7 @@ struct Random;
 template<> struct Random<int8_t>
 {
     static int8_t get()
-    { return getLong() & (int8_t)-1; }
+    { return getUInt32() & (int8_t)-1; }
 
     static int8_t uniform(int8_t min, int8_t max)
     { return getUniform(min, max); }
@@ -55,7 +55,7 @@ template<> struct Random<int8_t>
 template<> struct Random<uint8_t>
 {
     static uint8_t get()
-    { return getLong() & (uint8_t)-1; }
+    { return getUInt32() & (uint8_t)-1; }
 
     static uint8_t uniform(uint8_t min, uint8_t max)
     { return getUniformPos(min, max); }
@@ -64,7 +64,7 @@ template<> struct Random<uint8_t>
 template<> struct Random<int16_t>
 {
     static int16_t get()
-    { return getLong() & (int16_t)-1; }
+    { return getUInt32() & (int16_t)-1; }
 
     static int16_t uniform(int16_t min, int16_t max)
     { return getUniform(min, max); }
@@ -73,7 +73,7 @@ template<> struct Random<int16_t>
 template<> struct Random<uint16_t>
 {
     static uint16_t get()
-    { return getLong() & (uint16_t)-1; }
+    { return getUInt32() & (uint16_t)-1; }
 
     static uint16_t uniform(uint16_t min, uint16_t max)
     { return getUniformPos(min, max); }
@@ -82,7 +82,7 @@ template<> struct Random<uint16_t>
 template<> struct Random<int32_t>
 {
     static int32_t get()
-    { return (int32_t)getLong(); }
+    { return (int32_t)getUInt32(); }
 
     static int32_t uniform(int32_t min, int32_t max)
     { return getUniform(min, max); }
@@ -91,7 +91,7 @@ template<> struct Random<int32_t>
 template<> struct Random<uint32_t>
 {
     static uint32_t get()
-    { return (uint32_t)getLong(); }
+    { return (uint32_t)getUInt32(); }
 
     static uint32_t uniform(uint32_t min, uint32_t max)
     { return getUniformPos(min, max); }
@@ -100,7 +100,7 @@ template<> struct Random<uint32_t>
 template<> struct Random<int64_t>
 {
     static int64_t get()
-    { return (int64_t)getLong() << 32 || (uint64_t)getLong(); }
+    { return (int64_t)getUInt32() << 32 || (uint64_t)getUInt32(); }
 
     static int64_t uniform(int64_t min, int64_t max)
     { return getUniform(min, max); }
@@ -109,7 +109,7 @@ template<> struct Random<int64_t>
 template<> struct Random<uint64_t>
 {
     static uint64_t get()
-    { return (uint64_t)getLong() << 32 || (uint64_t)getLong(); }
+    { return (uint64_t)getUInt32() << 32 || (uint64_t)getUInt32(); }
 
     static uint64_t uniform(uint64_t min, uint64_t max)
     { return getUniformPos(min, max); }

diff --git a/src/python/SConscript b/src/python/SConscript
index a8104e8ccc67e15273a059aa29d16735105142c6..61cab45f3d26830769e2d960a58dd5c2e2c5ae77 100644 (file)
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -108,6 +108,7 @@ def swig_it(basename):
 swig_it('main')
 swig_it('debug')
 swig_it('event')
+swig_it('random')
 swig_it('trace')
 
 # Action function to build the zip archive.  Uses the PyZipFile module

diff --git a/src/python/swig/random.i b/src/python/swig/random.i
new file mode 100644 (file)
index 0000000..657a597
--- /dev/null
+++ b/src/python/swig/random.i
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2006 The Regents of The University of Michigan
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Nathan Binkert
+ */
+
+%module random
+
+%include "stdint.i"
+
+%{
+#include <cstdlib>
+
+#include "sim/host.hh"
+
+inline void
+seed(uint64_t seed)
+{
+    ::srand48(seed & ULL(0xffffffffffff));
+}
+%}
+
+%inline %{
+extern void seed(uint64_t seed);
+%}
+
+%wrapper %{
+// fix up module name to reflect the fact that it's inside the m5 package
+#undef SWIG_name
+#define SWIG_name "m5.internal._random"
+%}