*** old/test/compiler/intrinsics/bmi/BMITestRunner.java	Tue Oct 28 19:58:51 2014
--- new/test/compiler/intrinsics/bmi/BMITestRunner.java	Tue Oct 28 19:58:51 2014

*** 20,36 ****
--- 20,40 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  
! import java.util.*;
! import com.oracle.java.testlibrary.Asserts;
+ import com.oracle.java.testlibrary.OutputAnalyzer;
+ import com.oracle.java.testlibrary.ProcessTools;
+ import com.oracle.java.testlibrary.Utils;
  import java.io.IOException;
  import java.nio.file.Files;
  import java.nio.file.Paths;
! import java.nio.charset.StandardCharsets;
  
! import com.oracle.java.testlibrary.*;
! import java.util.Collections;
+ import java.util.LinkedList;
! import java.util.List;
+ import java.util.Random;
  
  /**
   * Test runner that invokes all methods implemented by particular Expr
   * with random arguments in two different JVM processes and compares output.
   * JVMs being started in different modes - one in int and other in comp

*** 67,77 ****
--- 71,81 ----
      public static void runTests(Class<? extends Expr> expr,
                                  String testOpts[],
                                  String... additionalVMOpts)
                           throws Throwable {
  
!         int seed = new Random().nextInt();
!         int seed = Utils.getRandomInstance().nextInt();
          int iterations = DEFAULT_ITERATIONS_COUNT;
  
          for (String testOption : testOpts) {
              if (testOption.startsWith("-iterations=")) {
                  iterations = Integer.valueOf(testOption.

*** 79,90 ****
--- 83,92 ----
              } else if (testOption.startsWith("-seed=")) {
                  seed = Integer.valueOf(testOption.replace("-seed=", ""));
              }
          }
  
          System.out.println("Running test with seed: " + seed);
  
          OutputAnalyzer intOutput = runTest(expr, VMMode.INT,
                                             additionalVMOpts,
                                             seed, iterations);
          OutputAnalyzer compOutput = runTest(expr, VMMode.COMP,
                                              additionalVMOpts,

*** 137,149 ****
--- 139,151 ----
              break;
          }
  
          Collections.addAll(vmOpts, new String[] {
                  "-XX:+DisplayVMOutputToStderr",
+                 "-D" + Utils.SEED_PROPERTY_NAME + "=" + seed,
                  Executor.class.getName(),
                  expr.getName(),
                  new Integer(seed).toString(),
                  new Integer(iterations).toString()
              });
  
          OutputAnalyzer outputAnalyzer = ProcessTools.
              executeTestJvm(vmOpts.toArray(new String[vmOpts.size()]));

*** 177,196 ****
--- 179,197 ----
       * Expr instance.
       */
      public static class Executor {
  
          /**
!          * Usage: BMITestRunner$Executor <ExprClassName> <seed> <iterations>
!          * Usage: BMITestRunner$Executor &lt;ExprClassName&gt; &lt;iterations&gt;
           */
          public static void main(String args[]) throws Exception {
              @SuppressWarnings("unchecked")
              Class<? extends Expr> exprClass =
                  (Class<? extends Expr>)Class.forName(args[0]);
              Expr expr = exprClass.getConstructor().newInstance();
!             Random rng = new Random(Integer.valueOf(args[1]));
!             int iterations = Integer.valueOf(args[2]);
              runTests(expr, iterations, rng);
!             int iterations = Integer.valueOf(args[1]);
!             runTests(expr, iterations, Utils.getRandomInstance());
          }
  
  
          public static int[] getIntBitShifts() {
              //SIZE+1 shift is for zero.