Skip to content

Commit b3f2bba

Browse files
duanyangjingduanyangjing
committed
hotspot: Match VM options DIAGNOSTIC flag with classlib8
For options that were changed from product to diagnostic after jdk8
1 parent 6bda324 commit b3f2bba

5 files changed

Lines changed: 12 additions & 17 deletions

File tree

‎cvm/conf/jtreg_hotspot8_excludes_aarch64.list‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ compiler/6859338/Test6859338.java
22
compiler/7196199/Test7196199.java
33
compiler/8004741/Test8004741.java
44
compiler/EscapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java
5-
compiler/intrinsics/muladd/TestMulAdd.java
65
compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
76
compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
87
compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
98
compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
109
compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
11-
compiler/intrinsics/squaretolen/TestSquareToLen.java
1210
compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
1311
compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
1412
compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
@@ -150,6 +148,4 @@ compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java
150148
compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java
151149
compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java
152150
compiler/7184394/TestAESMain.java
153-
compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
154-
compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java
155151
compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java

‎cvm/conf/jtreg_hotspot8_excludes_x64.list‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ compiler/6859338/Test6859338.java
22
compiler/7196199/Test7196199.java
33
compiler/8004741/Test8004741.java
44
compiler/EscapeAnalysis/TestUnsafePutAddressNullObjMustNotEscape.java
5-
compiler/intrinsics/muladd/TestMulAdd.java
65
compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
76
compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
87
compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
98
compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
109
compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
11-
compiler/intrinsics/squaretolen/TestSquareToLen.java
1210
compiler/jsr292/methodHandleExceptions/TestAMEnotNPE.java
1311
compiler/jsr292/RedefineMethodUsedByMultipleMethodHandles.java
1412
compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
@@ -139,7 +137,6 @@ testlibrary_tests/whitebox/vm_flags/IntxTest.java
139137
testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java
140138
vmTestbase/nsk/jdb/monitor/monitor002/monitor002.java
141139

142-
compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java
143140
compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
144141
compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
145142
compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java

‎src/hotspot/share/opto/c2_globals.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -698,19 +698,19 @@
698698
product(bool, UseCharacterCompareIntrinsics, false, DIAGNOSTIC, \
699699
"Enables intrinsification of java.lang.Character functions") \
700700
\
701-
product(bool, UseMultiplyToLenIntrinsic, false, DIAGNOSTIC, \
701+
product(bool, UseMultiplyToLenIntrinsic, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
702702
"Enables intrinsification of BigInteger.multiplyToLen()") \
703703
\
704-
product(bool, UseSquareToLenIntrinsic, false, DIAGNOSTIC, \
704+
product(bool, UseSquareToLenIntrinsic, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
705705
"Enables intrinsification of BigInteger.squareToLen()") \
706706
\
707-
product(bool, UseMulAddIntrinsic, false, DIAGNOSTIC, \
707+
product(bool, UseMulAddIntrinsic, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
708708
"Enables intrinsification of BigInteger.mulAdd()") \
709709
\
710-
product(bool, UseMontgomeryMultiplyIntrinsic, false, DIAGNOSTIC, \
710+
product(bool, UseMontgomeryMultiplyIntrinsic, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
711711
"Enables intrinsification of BigInteger.montgomeryMultiply()") \
712712
\
713-
product(bool, UseMontgomerySquareIntrinsic, false, DIAGNOSTIC, \
713+
product(bool, UseMontgomerySquareIntrinsic, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
714714
"Enables intrinsification of BigInteger.montgomerySquare()") \
715715
\
716716
product(bool, EnableVectorSupport, false, EXPERIMENTAL, \

‎src/hotspot/share/runtime/globals.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ const intx ObjectAlignmentInBytes = 8;
323323
product(bool, CriticalJNINatives, false, \
324324
"(Deprecated) Check for critical JNI entry points") \
325325
\
326-
product(bool, UseAESIntrinsics, false, DIAGNOSTIC, \
326+
product(bool, UseAESIntrinsics, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
327327
"Use intrinsics for AES versions of crypto") \
328328
\
329329
product(bool, UseAESCTRIntrinsics, false, DIAGNOSTIC, \
@@ -332,23 +332,23 @@ const intx ObjectAlignmentInBytes = 8;
332332
product(bool, UseMD5Intrinsics, false, DIAGNOSTIC, \
333333
"Use intrinsics for MD5 crypto hash function") \
334334
\
335-
product(bool, UseSHA1Intrinsics, false, DIAGNOSTIC, \
335+
product(bool, UseSHA1Intrinsics, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
336336
"Use intrinsics for SHA-1 crypto hash function. " \
337337
"Requires that UseSHA is enabled.") \
338338
\
339-
product(bool, UseSHA256Intrinsics, false, DIAGNOSTIC, \
339+
product(bool, UseSHA256Intrinsics, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
340340
"Use intrinsics for SHA-224 and SHA-256 crypto hash functions. " \
341341
"Requires that UseSHA is enabled.") \
342342
\
343-
product(bool, UseSHA512Intrinsics, false, DIAGNOSTIC, \
343+
product(bool, UseSHA512Intrinsics, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
344344
"Use intrinsics for SHA-384 and SHA-512 crypto hash functions. " \
345345
"Requires that UseSHA is enabled.") \
346346
\
347347
product(bool, UseSHA3Intrinsics, false, DIAGNOSTIC, \
348348
"Use intrinsics for SHA3 crypto hash function. " \
349349
"Requires that UseSHA is enabled.") \
350350
\
351-
product(bool, UseCRC32Intrinsics, false, DIAGNOSTIC, \
351+
product(bool, UseCRC32Intrinsics, false, CLASSLIB17_ONLY_FLAGS(DIAGNOSTIC,) \
352352
"use intrinsics for java.util.zip.CRC32") \
353353
\
354354
product(bool, UseCRC32CIntrinsics, false, DIAGNOSTIC, \

‎src/hotspot/share/utilities/macros.hpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -643,6 +643,7 @@
643643
#define CLASSLIB17_ONLY(code)
644644
#define CLASSLIB8_EARLY_RETURN(ret) return ret
645645
#define CLASSLIB8_EARLY_RETURN_() return
646+
#define CLASSLIB17_ONLY_FLAGS(...)
646647
#ifndef PRODUCT
647648
#define CLASSLIB8_DEBUG_ONLY(code) code
648649
#else
@@ -655,6 +656,7 @@
655656
#define CLASSLIB8_EARLY_RETURN(ret)
656657
#define CLASSLIB8_EARLY_RETURN_()
657658
#define CLASSLIB8_DEBUG_ONLY(code)
659+
#define CLASSLIB17_ONLY_FLAGS(...) __VA_ARGS__
658660
#else
659661
#error("Unsupported class library version: " HOTSPOT_TARGET_CLASSLIB)
660662
#endif

0 commit comments

Comments
 (0)