8209459: TestSHA512MultiBlockIntrinsics failed on AArch64

Prevent classloading to avoid generation of SHA stubs.

Reviewed-by: kvn, thartmann
This commit is contained in:
Joshua Zhu 2018-08-15 14:35:33 +02:00 committed by Tobias Hartmann
parent 4377d3abe2
commit f87ec5faf7
7 changed files with 18 additions and 15 deletions

@ -60,7 +60,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA1Intrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA1_INTRINSICS_AVAILABLE,
new SHASanityTestBase(IntrinsicPredicates.isSHA1IntrinsicAvailable(),
SHASanityTestBase.SHA1_INTRINSIC_ID).test();
}
}

@ -68,7 +68,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA1MultiBlockIntrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA1_INTRINSICS_AVAILABLE,
new SHASanityTestBase(IntrinsicPredicates.isSHA1IntrinsicAvailable(),
SHASanityTestBase.MB_INTRINSIC_ID).test();
}
}

@ -79,7 +79,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA256Intrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA256_INTRINSICS_AVAILABLE,
new SHASanityTestBase(IntrinsicPredicates.isSHA256IntrinsicAvailable(),
SHASanityTestBase.SHA256_INTRINSIC_ID).test();
}
}

@ -95,7 +95,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA256MultiBlockIntrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA256_INTRINSICS_AVAILABLE,
new SHASanityTestBase(IntrinsicPredicates.isSHA256IntrinsicAvailable(),
SHASanityTestBase.MB_INTRINSIC_ID).test();
}
}

@ -79,7 +79,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA512Intrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA512_INTRINSICS_AVAILABLE,
new SHASanityTestBase(IntrinsicPredicates.isSHA512IntrinsicAvailable(),
SHASanityTestBase.SHA512_INTRINSIC_ID).test();
}
}

@ -96,7 +96,7 @@ import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA512MultiBlockIntrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA512_INTRINSICS_AVAILABLE,
new SHASanityTestBase(IntrinsicPredicates.isSHA512IntrinsicAvailable(),
SHASanityTestBase.MB_INTRINSIC_ID).test();
}
}

@ -100,17 +100,20 @@ public class IntrinsicPredicates {
IntrinsicPredicates.SHA256_INSTRUCTION_AVAILABLE,
IntrinsicPredicates.SHA512_INSTRUCTION_AVAILABLE));
public static final BooleanSupplier SHA1_INTRINSICS_AVAILABLE
= new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2,
IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA", "implCompress0"));
public static BooleanSupplier isSHA1IntrinsicAvailable() {
return new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2,
IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA", "implCompress0"));
}
public static final BooleanSupplier SHA256_INTRINSICS_AVAILABLE
= new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2,
IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA2", "implCompress0"));
public static BooleanSupplier isSHA256IntrinsicAvailable() {
return new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2,
IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA2", "implCompress0"));
}
public static final BooleanSupplier SHA512_INTRINSICS_AVAILABLE
= new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2,
IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA5", "implCompress0"));
public static BooleanSupplier isSHA512IntrinsicAvailable() {
return new AndPredicate(IntrinsicPredicates.COMPILABLE_BY_C2,
IntrinsicPredicates.isIntrinsicAvailable("sun.security.provider.SHA5", "implCompress0"));
}
private static BooleanSupplier isIntrinsicAvailable(String klass, String method) {
try {