# HG changeset patch
# User vkempik
# Date 1457542283 -10800
# Node ID 4abc54f62213e07c2f38041d91ced10f0bea15c4
# Parent  5601e440e5e7dd0c4a2ffaa7ada47e45768a7a31
8151522: Disable 8130150 and 8081778 intrinsics by default
Reviewed-by: kvn

diff -r 5601e440e5e7 -r 4abc54f62213 src/cpu/x86/vm/vm_version_x86.cpp
--- a/src/cpu/x86/vm/vm_version_x86.cpp	Fri Mar 04 16:15:48 2016 +0300
+++ b/src/cpu/x86/vm/vm_version_x86.cpp	Wed Mar 09 19:51:23 2016 +0300
@@ -704,16 +704,16 @@
     UseMultiplyToLenIntrinsic = true;
   }
   if (FLAG_IS_DEFAULT(UseSquareToLenIntrinsic)) {
-    UseSquareToLenIntrinsic = true;
+    UseSquareToLenIntrinsic = false;
   }
   if (FLAG_IS_DEFAULT(UseMulAddIntrinsic)) {
-    UseMulAddIntrinsic = true;
+    UseMulAddIntrinsic = false;
   }
   if (FLAG_IS_DEFAULT(UseMontgomeryMultiplyIntrinsic)) {
-    UseMontgomeryMultiplyIntrinsic = true;
+    UseMontgomeryMultiplyIntrinsic = false;
   }
   if (FLAG_IS_DEFAULT(UseMontgomerySquareIntrinsic)) {
-    UseMontgomerySquareIntrinsic = true;
+    UseMontgomerySquareIntrinsic = false;
   }
 #else
   if (UseMultiplyToLenIntrinsic) {
diff -r 5601e440e5e7 -r 4abc54f62213 test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java
--- a/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java	Fri Mar 04 16:15:48 2016 +0300
+++ b/test/compiler/intrinsics/montgomerymultiply/MontgomeryMultiplyTest.java	Wed Mar 09 19:51:23 2016 +0300
@@ -39,6 +39,12 @@
  * @library /testlibrary
  * @requires (os.simpleArch == "x64") & (os.family != "windows")
  * @summary Verify that the Montgomery multiply intrinsic works and correctly checks its arguments.
+ * @run main/othervm -XX:+UseMontgomerySquareIntrinsic -XX:+UseMontgomeryMultiplyIntrinsic
+ *      MontgomeryMultiplyTest
+ * @run main/othervm -XX:+UseMontgomerySquareIntrinsic -XX:-UseMontgomeryMultiplyIntrinsic
+ *      MontgomeryMultiplyTest
+ * @run main/othervm -XX:-UseMontgomerySquareIntrinsic -XX:+UseMontgomeryMultiplyIntrinsic
+ *      MontgomeryMultiplyTest
  */
 
 public class MontgomeryMultiplyTest {
diff -r 5601e440e5e7 -r 4abc54f62213 test/compiler/intrinsics/muladd/TestMulAdd.java
--- a/test/compiler/intrinsics/muladd/TestMulAdd.java	Fri Mar 04 16:15:48 2016 +0300
+++ b/test/compiler/intrinsics/muladd/TestMulAdd.java	Wed Mar 09 19:51:23 2016 +0300
@@ -29,6 +29,7 @@
  *
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch
  *      -XX:+IgnoreUnrecognizedVMOptions -XX:-UseSquareToLenIntrinsic -XX:-UseMultiplyToLenIntrinsic
+ *      -XX:+UseMulAddIntrinsic
  *      -XX:CompileCommand=dontinline,TestMulAdd::main
  *      -XX:CompileCommand=option,TestMulAdd::base_multiply,ccstr,DisableIntrinsic,_mulAdd
  *      -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstr,DisableIntrinsic,_mulAdd
diff -r 5601e440e5e7 -r 4abc54f62213 test/compiler/intrinsics/squaretolen/TestSquareToLen.java
--- a/test/compiler/intrinsics/squaretolen/TestSquareToLen.java	Fri Mar 04 16:15:48 2016 +0300
+++ b/test/compiler/intrinsics/squaretolen/TestSquareToLen.java	Wed Mar 09 19:51:23 2016 +0300
@@ -28,6 +28,7 @@
  * @summary Add C2 x86 intrinsic for BigInteger::squareToLen() method
  *
  * @run main/othervm/timeout=600 -XX:-TieredCompilation -Xbatch
+ *      -XX:+UseSquareToLenIntrinsic
  *      -XX:CompileCommand=exclude,TestSquareToLen::main
  *      -XX:CompileCommand=option,TestSquareToLen::base_multiply,ccstr,DisableIntrinsic,_squareToLen
  *      -XX:CompileCommand=option,java.math.BigInteger::multiply,ccstr,DisableIntrinsic,_squareToLen