test/compiler/intrinsics/bmi/BMITestRunner.java
Index
Unified diffs
Context diffs
Sdiffs
Patch
New
Old
Previous File
Next File
hotspot Cdiff test/compiler/intrinsics/bmi/BMITestRunner.java
test/compiler/intrinsics/bmi/BMITestRunner.java
Print this page
rev 7259 : 8044186: Introduce a reproducible random generator
Reviewed-by: iignatyev
Contributed-by: sergei.kovalev@oracle.com
*** 20,36 ****
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
! import java.util.*;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
! import java.nio.charset.StandardCharsets;
!
! import com.oracle.java.testlibrary.*;
/**
* 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
--- 20,40 ----
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
! 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.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 ****
public static void runTests(Class<? extends Expr> expr,
String testOpts[],
String... additionalVMOpts)
throws Throwable {
! int seed = new Random().nextInt();
int iterations = DEFAULT_ITERATIONS_COUNT;
for (String testOption : testOpts) {
if (testOption.startsWith("-iterations=")) {
iterations = Integer.valueOf(testOption.
--- 71,81 ----
public static void runTests(Class<? extends Expr> expr,
String testOpts[],
String... additionalVMOpts)
throws Throwable {
! int seed = Utils.getRandomInstance().nextInt();
int iterations = DEFAULT_ITERATIONS_COUNT;
for (String testOption : testOpts) {
if (testOption.startsWith("-iterations=")) {
iterations = Integer.valueOf(testOption.
*** 79,90 ****
} 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,
--- 83,92 ----
*** 137,149 ****
break;
}
Collections.addAll(vmOpts, new String[] {
"-XX:+DisplayVMOutputToStderr",
Executor.class.getName(),
expr.getName(),
- new Integer(seed).toString(),
new Integer(iterations).toString()
});
OutputAnalyzer outputAnalyzer = ProcessTools.
executeTestJvm(vmOpts.toArray(new String[vmOpts.size()]));
--- 139,151 ----
break;
}
Collections.addAll(vmOpts, new String[] {
"-XX:+DisplayVMOutputToStderr",
+ "-D" + Utils.SEED_PROPERTY_NAME + "=" + seed,
Executor.class.getName(),
expr.getName(),
new Integer(iterations).toString()
});
OutputAnalyzer outputAnalyzer = ProcessTools.
executeTestJvm(vmOpts.toArray(new String[vmOpts.size()]));
*** 177,196 ****
* Expr instance.
*/
public static class Executor {
/**
! * Usage: BMITestRunner$Executor <ExprClassName> <seed> <iterations>
*/
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);
}
public static int[] getIntBitShifts() {
//SIZE+1 shift is for zero.
--- 179,197 ----
* Expr instance.
*/
public static class Executor {
/**
! * Usage: BMITestRunner$Executor <ExprClassName> <iterations>
*/
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();
! int iterations = Integer.valueOf(args[1]);
! runTests(expr, iterations, Utils.getRandomInstance());
}
public static int[] getIntBitShifts() {
//SIZE+1 shift is for zero.
test/compiler/intrinsics/bmi/BMITestRunner.java
Index
Unified diffs
Context diffs
Sdiffs
Patch
New
Old
Previous File
Next File