Skip to content

Commit 43f752f

Browse files
rm-gh-8shipilev
authored andcommitted
8293484: AArch64: TestUseSHA512IntrinsicsOptionOnSupportedCPU.java fails on CPU with SHA512 feature support
Backport-of: 6968216
1 parent 04bd246 commit 43f752f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

test/hotspot/jtreg/compiler/intrinsics/sha/cli/DigestOptionsBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -120,7 +120,7 @@ public static BooleanSupplier getPredicateForOption(String optionName) {
120120
case DigestOptionsBase.USE_SHA256_INTRINSICS_OPTION:
121121
return IntrinsicPredicates.SHA256_INSTRUCTION_AVAILABLE;
122122
case DigestOptionsBase.USE_SHA512_INTRINSICS_OPTION:
123-
return IntrinsicPredicates.SHA512_INSTRUCTION_AVAILABLE;
123+
return IntrinsicPredicates.isSHA512IntrinsicAvailable();
124124
case DigestOptionsBase.USE_SHA3_INTRINSICS_OPTION:
125125
return IntrinsicPredicates.SHA3_INSTRUCTION_AVAILABLE;
126126
default:

test/hotspot/jtreg/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,6 @@
2525
* @test
2626
* @bug 8035968
2727
* @summary Verify UseSHA512Intrinsics option processing on supported CPU.
28-
* @requires os.arch!="x86" & os.arch!="i386"
2928
* @library /test/lib /
3029
* @requires vm.flagless
3130
*

0 commit comments

Comments
 (0)