infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 13:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

8139907: compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java fails with timeout

Browse Source 
Change MontgomeryMultiplyTest.java test to execute only on platforms on which the tested intrinsics are available.

Reviewed-by: kvn, neliasso
This commit is contained in:
Zoltan Majo 2015-10-28 15:15:59 +01:00
parent ba17a6c8f8
commit d8c5daffb0
1 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
hotspot/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java
View File

@ -27,21 +27,36 @@ import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigInteger;
import java.util.Arrays;
import java.util.Random;
import sun.hotspot.WhiteBox;
import jdk.test.lib.Platform;
/**
* @test
* @bug 8130150
* @bug 8130150 8131779 8139907
* @summary Verify that the Montgomery multiply and square intrinsic works and correctly checks their arguments.
* @library /testlibrary /../../test/lib
* @library /testlibrary
* @summary Verify that the Montgomery multiply intrinsic works and correctly checks its arguments.
* @build MontgomeryMultiplyTest
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI MontgomeryMultiplyTest
*/
public class MontgomeryMultiplyTest {
private static final WhiteBox wb = WhiteBox.getWhiteBox();
/* Compilation level corresponding to C2. */
private static final int COMP_LEVEL_FULL_OPTIMIZATION = 4;
static final MethodHandles.Lookup lookup = MethodHandles.lookup();
static final MethodHandle montgomeryMultiplyHandle, montgomerySquareHandle;
@ -76,6 +91,37 @@ public class MontgomeryMultiplyTest {
}
}
/* Obtain executable for the intrinsics tested. Depending on the
* value of 'isMultiply', the executable corresponding to either
* implMontgomerMultiply or implMontgomerySqure is returned. */
static Executable getExecutable(boolean isMultiply) throws RuntimeException {
try {
Class aClass = Class.forName("java.math.BigInteger");
Method aMethod;
if (isMultiply) {
aMethod = aClass.getDeclaredMethod("implMontgomeryMultiply",
int[].class,
int[].class,
int[].class,
int.class,
long.class,
int[].class);
} else {
aMethod = aClass.getDeclaredMethod("implMontgomerySquare",
int[].class,
int[].class,
int.class,
long.class,
int[].class);
}
return aMethod;
} catch (NoSuchMethodException e) {
throw new RuntimeException("Test bug, method is unavailable. " + e);
} catch (ClassNotFoundException e) {
throw new RuntimeException("Test bug, class is unavailable. " + e);
}
}
// Invoke either BigInteger.montgomeryMultiply or BigInteger.montgomerySquare.
int[] montgomeryMultiply(int[] a, int[] b, int[] n, int len, long inv,
int[] product) throws Throwable {
@ -267,11 +313,15 @@ public class MontgomeryMultiplyTest {
}
public static void main(String args[]) {
try {
new MontgomeryMultiplyTest().testMontgomeryMultiplyChecks();
new MontgomeryMultiplyTest().testResultValues();
} catch (Throwable ex) {
throw new RuntimeException(ex);
if (Platform.isServer() &&
wb.isIntrinsicAvailable(getExecutable(true), COMP_LEVEL_FULL_OPTIMIZATION) &&
wb.isIntrinsicAvailable(getExecutable(false), COMP_LEVEL_FULL_OPTIMIZATION)) {
try {
new MontgomeryMultiplyTest().testMontgomeryMultiplyChecks();
new MontgomeryMultiplyTest().testResultValues();
} catch (Throwable ex) {
throw new RuntimeException(ex);
}
}
}
}
}