archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8153816: [BACKOUT] Make intrinsics flags diagnostic

Browse source 
Backout fix for 8145348

Reviewed-by: kvn, jwilhelm
This commit is contained in:
Bharadwaj Yadavalli 2016-04-08 01:00:10 -04:00
parent 4397e85e26
commit 1e6ac67ecf
5 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/share/vm/c1/c1_globals.hpp
View file

@ -176,7 +176,7 @@
product(bool, InlineSynchronizedMethods, true, \ product(bool, InlineSynchronizedMethods, true, \
"Inline synchronized methods") \ "Inline synchronized methods") \
\ \
diagnostic(bool, InlineNIOCheckIndex, true, \ develop(bool, InlineNIOCheckIndex, true, \
"Intrinsify java.nio.Buffer.checkIndex") \ "Intrinsify java.nio.Buffer.checkIndex") \
\ \
develop(bool, CanonicalizeNodes, true, \ develop(bool, CanonicalizeNodes, true, \

26
hotspot/src/share/vm/opto/c2_globals.hpp
View file

@ -595,26 +595,26 @@
product(bool, BlockLayoutRotateLoops, true, \ product(bool, BlockLayoutRotateLoops, true, \
"Allow back branches to be fall throughs in the block layour") \ "Allow back branches to be fall throughs in the block layour") \
\ \
diagnostic(bool, InlineReflectionGetCallerClass, true, \ develop(bool, InlineReflectionGetCallerClass, true, \
"inline sun.reflect.Reflection.getCallerClass(), known to be " \ "inline sun.reflect.Reflection.getCallerClass(), known to be " \
"part of base library DLL") \ "part of base library DLL") \
\ \
diagnostic(bool, InlineObjectCopy, true, \ develop(bool, InlineObjectCopy, true, \
"inline Object.clone and Arrays.copyOf[Range] intrinsics") \ "inline Object.clone and Arrays.copyOf[Range] intrinsics") \
\ \
diagnostic(bool, SpecialStringCompareTo, true, \ develop(bool, SpecialStringCompareTo, true, \
"special version of string compareTo") \ "special version of string compareTo") \
\ \
diagnostic(bool, SpecialStringIndexOf, true, \ develop(bool, SpecialStringIndexOf, true, \
"special version of string indexOf") \ "special version of string indexOf") \
\ \
diagnostic(bool, SpecialStringEquals, true, \ develop(bool, SpecialStringEquals, true, \
"special version of string equals") \ "special version of string equals") \
\ \
diagnostic(bool, SpecialArraysEquals, true, \ develop(bool, SpecialArraysEquals, true, \
"special version of Arrays.equals(char[],char[])") \ "special version of Arrays.equals(char[],char[])") \
\ \
diagnostic(bool, SpecialEncodeISOArray, true, \ product(bool, SpecialEncodeISOArray, true, \
"special version of ISO_8859_1$Encoder.encodeISOArray") \ "special version of ISO_8859_1$Encoder.encodeISOArray") \
\ \
develop(bool, BailoutToInterpreterForThrows, false, \ develop(bool, BailoutToInterpreterForThrows, false, \
@ -716,22 +716,22 @@
diagnostic(bool, OptimizeExpensiveOps, true, \ diagnostic(bool, OptimizeExpensiveOps, true, \
"Find best control for expensive operations") \ "Find best control for expensive operations") \
\ \
diagnostic(bool, UseMathExactIntrinsics, true, \ product(bool, UseMathExactIntrinsics, true, \
"Enables intrinsification of various java.lang.Math functions") \ "Enables intrinsification of various java.lang.Math functions") \
\ \
diagnostic(bool, UseMultiplyToLenIntrinsic, false, \ product(bool, UseMultiplyToLenIntrinsic, false, \
"Enables intrinsification of BigInteger.multiplyToLen()") \ "Enables intrinsification of BigInteger.multiplyToLen()") \
\ \
diagnostic(bool, UseSquareToLenIntrinsic, false, \ product(bool, UseSquareToLenIntrinsic, false, \
"Enables intrinsification of BigInteger.squareToLen()") \ "Enables intrinsification of BigInteger.squareToLen()") \
\ \
diagnostic(bool, UseMulAddIntrinsic, false, \ product(bool, UseMulAddIntrinsic, false, \
"Enables intrinsification of BigInteger.mulAdd()") \ "Enables intrinsification of BigInteger.mulAdd()") \
\ \
diagnostic(bool, UseMontgomeryMultiplyIntrinsic, false, \ product(bool, UseMontgomeryMultiplyIntrinsic, false, \
"Enables intrinsification of BigInteger.montgomeryMultiply()") \ "Enables intrinsification of BigInteger.montgomeryMultiply()") \
\ \
diagnostic(bool, UseMontgomerySquareIntrinsic, false, \ product(bool, UseMontgomerySquareIntrinsic, false, \
"Enables intrinsification of BigInteger.montgomerySquare()") \ "Enables intrinsification of BigInteger.montgomerySquare()") \
\ \
product(bool, UseTypeSpeculation, true, \ product(bool, UseTypeSpeculation, true, \

34
hotspot/src/share/vm/runtime/globals.hpp
View file

@ -738,7 +738,7 @@ public:
"Control whether SHA instructions can be used " \ "Control whether SHA instructions can be used " \
"on SPARC, on ARM and on x86") \ "on SPARC, on ARM and on x86") \
\ \
diagnostic(bool, UseGHASHIntrinsics, false, \ product(bool, UseGHASHIntrinsics, false, \
"Use intrinsics for GHASH versions of crypto") \ "Use intrinsics for GHASH versions of crypto") \
\ \
product(size_t, LargePageSizeInBytes, 0, \ product(size_t, LargePageSizeInBytes, 0, \
@ -808,27 +808,27 @@ public:
product(bool, UseInlineCaches, true, \ product(bool, UseInlineCaches, true, \
"Use Inline Caches for virtual calls ") \ "Use Inline Caches for virtual calls ") \
\ \
diagnostic(bool, InlineArrayCopy, true, \ develop(bool, InlineArrayCopy, true, \
"Inline arraycopy native that is known to be part of " \ "Inline arraycopy native that is known to be part of " \
"base library DLL") \ "base library DLL") \
\ \
diagnostic(bool, InlineObjectHash, true, \ develop(bool, InlineObjectHash, true, \
"Inline Object::hashCode() native that is known to be part " \ "Inline Object::hashCode() native that is known to be part " \
"of base library DLL") \ "of base library DLL") \
\ \
diagnostic(bool, InlineNatives, true, \ develop(bool, InlineNatives, true, \
"Inline natives that are known to be part of base library DLL") \ "Inline natives that are known to be part of base library DLL") \
\ \
diagnostic(bool, InlineMathNatives, true, \ develop(bool, InlineMathNatives, true, \
"Inline SinD, CosD, etc.") \ "Inline SinD, CosD, etc.") \
\ \
diagnostic(bool, InlineClassNatives, true, \ develop(bool, InlineClassNatives, true, \
"Inline Class.isInstance, etc") \ "Inline Class.isInstance, etc") \
\ \
diagnostic(bool, InlineThreadNatives, true, \ develop(bool, InlineThreadNatives, true, \
"Inline Thread.currentThread, etc") \ "Inline Thread.currentThread, etc") \
\ \
diagnostic(bool, InlineUnsafeOps, true, \ develop(bool, InlineUnsafeOps, true, \
"Inline memory ops (native methods) from Unsafe") \ "Inline memory ops (native methods) from Unsafe") \
\ \
product(bool, CriticalJNINatives, true, \ product(bool, CriticalJNINatives, true, \
@ -837,34 +837,34 @@ public:
notproduct(bool, StressCriticalJNINatives, false, \ notproduct(bool, StressCriticalJNINatives, false, \
"Exercise register saving code in critical natives") \ "Exercise register saving code in critical natives") \
\ \
diagnostic(bool, UseAESIntrinsics, false, \ product(bool, UseAESIntrinsics, false, \
"Use intrinsics for AES versions of crypto") \ "Use intrinsics for AES versions of crypto") \
\ \
diagnostic(bool, UseAESCTRIntrinsics, false, \ product(bool, UseAESCTRIntrinsics, false, \
"Use intrinsics for the paralleled version of AES/CTR crypto") \ "Use intrinsics for the paralleled version of AES/CTR crypto") \
\ \
diagnostic(bool, UseSHA1Intrinsics, false, \ product(bool, UseSHA1Intrinsics, false, \
"Use intrinsics for SHA-1 crypto hash function. " \ "Use intrinsics for SHA-1 crypto hash function. " \
"Requires that UseSHA is enabled.") \ "Requires that UseSHA is enabled.") \
\ \
diagnostic(bool, UseSHA256Intrinsics, false, \ product(bool, UseSHA256Intrinsics, false, \
"Use intrinsics for SHA-224 and SHA-256 crypto hash functions. " \ "Use intrinsics for SHA-224 and SHA-256 crypto hash functions. " \
"Requires that UseSHA is enabled.") \ "Requires that UseSHA is enabled.") \
\ \
diagnostic(bool, UseSHA512Intrinsics, false, \ product(bool, UseSHA512Intrinsics, false, \
"Use intrinsics for SHA-384 and SHA-512 crypto hash functions. " \ "Use intrinsics for SHA-384 and SHA-512 crypto hash functions. " \
"Requires that UseSHA is enabled.") \ "Requires that UseSHA is enabled.") \
\ \
diagnostic(bool, UseCRC32Intrinsics, false, \ product(bool, UseCRC32Intrinsics, false, \
"use intrinsics for java.util.zip.CRC32") \ "use intrinsics for java.util.zip.CRC32") \
\ \
diagnostic(bool, UseCRC32CIntrinsics, false, \ product(bool, UseCRC32CIntrinsics, false, \
"use intrinsics for java.util.zip.CRC32C") \ "use intrinsics for java.util.zip.CRC32C") \
\ \
diagnostic(bool, UseAdler32Intrinsics, false, \ product(bool, UseAdler32Intrinsics, false, \
"use intrinsics for java.util.zip.Adler32") \ "use intrinsics for java.util.zip.Adler32") \
\ \
diagnostic(bool, UseVectorizedMismatchIntrinsic, false, \ product(bool, UseVectorizedMismatchIntrinsic, false, \
"Enables intrinsification of ArraysSupport.vectorizedMismatch()") \ "Enables intrinsification of ArraysSupport.vectorizedMismatch()") \
\ \
diagnostic(ccstrlist, DisableIntrinsic, "", \ diagnostic(ccstrlist, DisableIntrinsic, "", \

2
hotspot/test/compiler/intrinsics/muladd/TestMulAdd.java
View file

@ -28,7 +28,7 @@
* @summary Add C2 x86 intrinsic for BigInteger::mulAdd() method * @summary Add C2 x86 intrinsic for BigInteger::mulAdd() method
* *
* @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-UseSquareToLenIntrinsic -XX:-UseMultiplyToLenIntrinsic * -XX:+IgnoreUnrecognizedVMOptions -XX:-UseSquareToLenIntrinsic -XX:-UseMultiplyToLenIntrinsic
* -XX:CompileCommand=dontinline,TestMulAdd::main * -XX:CompileCommand=dontinline,TestMulAdd::main
* -XX:CompileCommand=option,TestMulAdd::base_multiply,ccstr,DisableIntrinsic,_mulAdd * -XX:CompileCommand=option,TestMulAdd::base_multiply,ccstr,DisableIntrinsic,_mulAdd
* -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstr,DisableIntrinsic,_mulAdd * -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstr,DisableIntrinsic,_mulAdd

2
hotspot/test/compiler/runtime/6859338/Test6859338.java
View file

@ -27,7 +27,7 @@
* @bug 6859338 * @bug 6859338
* @summary Assertion failure in sharedRuntime.cpp * @summary Assertion failure in sharedRuntime.cpp
* *
* @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:-InlineObjectHash -Xbatch -XX:-ProfileInterpreter Test6859338 * @run main/othervm -Xcomp -XX:+IgnoreUnrecognizedVMOptions -XX:-InlineObjectHash -Xbatch -XX:-ProfileInterpreter Test6859338
*/ */
public class Test6859338 { public class Test6859338 {