Change old PRG to be SkLCGRandom; change new one to SkRandom

bench/MathBench.cpp

 #include "SkBenchmark.h"
 #include "SkColorPriv.h"
 #include "SkMatrix.h"
 #include "SkRandom.h"
 #include "SkString.h"
 #include "SkPaint.h"
 
 static float sk_fsel(float pred, float result_ge, float result_lt) {
     return pred >= 0 ? result_ge : result_lt;
 }
 
 static float fast_floor(float x) {
 //    float big = sk_fsel(x, 0x1.0p+23, -0x1.0p+23);
     float big = sk_fsel(x, (float)(1 << 23), -(float)(1 << 23));
     return (x + big) - big;
 }
 
 class MathBench : public SkBenchmark {
     enum {
         kBuffer = 100,
         kLoop   = 10000
     };
     SkString    fName;
     float       fSrc[kBuffer], fDst[kBuffer];
 public:
     MathBench(void* param, const char name[]) : INHERITED(param) {
         fName.printf("math_%s", name);
 
-        SkMWCRandom rand;
+        SkRandom rand;
         for (int i = 0; i < kBuffer; ++i) {
             fSrc[i] = rand.nextSScalar1();
         }
 
         fIsRendering = false;
     }
 
     virtual void performTest(float* SK_RESTRICT dst,
                               const float* SK_RESTRICT src,
                               int count) = 0;
@@ skipping 207 matching lines @@
 
 class IsFiniteBench : public SkBenchmark {
     enum {
         N = SkBENCHLOOP(1000),
         NN = SkBENCHLOOP(1000),
     };
     float fData[N];
 public:
 
     IsFiniteBench(void* param, int index) : INHERITED(param) {
-        SkMWCRandom rand;
+        SkRandom rand;
 
         for (int i = 0; i < N; ++i) {
             fData[i] = rand.nextSScalar1();
         }
 
         if (index < 0) {
             fProc = NULL;
             fName = "isfinite_rect";
         } else {
             fProc = gRec[index].fProc;
@@ skipping 47 matching lines @@
 class FloorBench : public SkBenchmark {
     enum {
         ARRAY = SkBENCHLOOP(1000),
         LOOP = SkBENCHLOOP(1000),
     };
     float fData[ARRAY];
     bool fFast;
 public:
 
     FloorBench(void* param, bool fast) : INHERITED(param), fFast(fast) {
-        SkMWCRandom rand;
+        SkRandom rand;
 
         for (int i = 0; i < ARRAY; ++i) {
             fData[i] = rand.nextSScalar1();
         }
 
         if (fast) {
             fName = "floor_fast";
         } else {
             fName = "floor_std";
         }
         fIsRendering = false;
     }
 
     virtual void process(float) {}
 
 protected:
     virtual void onDraw(SkCanvas*) {
-        SkMWCRandom rand;
+        SkRandom rand;
         float accum = 0;
         const float* data = fData;
 
         if (fFast) {
             for (int j = 0; j < LOOP; ++j) {
                 for (int i = 0; i < ARRAY; ++i) {
                     accum += fast_floor(data[i]);
                 }
                 this->process(accum);
             }
@@ skipping 23 matching lines @@
         LOOP = SkBENCHLOOP(5000),
     };
     uint32_t fData[ARRAY];
     bool fUsePortable;
 
 public:
     CLZBench(void* param, bool usePortable)
         : INHERITED(param)
         , fUsePortable(usePortable) {
 
-        SkMWCRandom rand;
+        SkRandom rand;
         for (int i = 0; i < ARRAY; ++i) {
             fData[i] = rand.nextU();
         }
 
         if (fUsePortable) {
             fName = "clz_portable";
         } else {
             fName = "clz_intrinsic";
         }
         fIsRendering = false;
@@ skipping 39 matching lines @@
     enum {
         ARRAY = SkBENCHLOOP(1000),
         LOOP = SkBENCHLOOP(1000),
     };
     SkVector fVec[ARRAY];
 
 public:
     NormalizeBench(void* param)
     : INHERITED(param) {
 
-        SkMWCRandom rand;
+        SkRandom rand;
         for (int i = 0; i < ARRAY; ++i) {
             fVec[i].set(rand.nextSScalar1(), rand.nextSScalar1());
         }
 
         fName = "point_normalize";
         fIsRendering = false;
     }
 
     // just so the compiler doesn't remove our loops
     virtual void process(int) {}
@@ skipping 25 matching lines @@
 class FixedMathBench : public SkBenchmark {
     enum {
         N = SkBENCHLOOP(1000),
         NN = SkBENCHLOOP(1000),
     };
     float fData[N];
     SkFixed fResult[N];
 public:
 
     FixedMathBench(void* param) : INHERITED(param) {
-        SkMWCRandom rand;
+        SkRandom rand;
         for (int i = 0; i < N; ++i) {
             fData[i] = rand.nextSScalar1();
         }
 
         fIsRendering = false;
     }
 
 protected:
     virtual void onDraw(SkCanvas*) {
         for (int j = 0; j < NN; ++j) {
@@ skipping 34 matching lines @@
 
 DEF_BENCH( return new FloorBench(p, false); )
 DEF_BENCH( return new FloorBench(p, true); )
 
 DEF_BENCH( return new CLZBench(p, false); )
 DEF_BENCH( return new CLZBench(p, true); )
 
 DEF_BENCH( return new NormalizeBench(p); )
 
 DEF_BENCH( return new FixedMathBench(p); )