changeset 12320:3f551de87e59

8169711: CDS does not patch entry trampoline if intrinsic method is disabled Summary: Always create interpreter method entries for intrinsified methods but replace them with vanilla entries if the intrinsic is disabled at runtime. Reviewed-by: kvn, iklam
author thartmann
date Mon, 21 Nov 2016 08:27:10 +0100
parents f5689e544d44
children 431caa270a51
files src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp src/cpu/sparc/vm/vm_version_sparc.cpp src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp src/share/vm/interpreter/abstractInterpreter.cpp src/share/vm/interpreter/templateInterpreterGenerator.cpp test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java
diffstat 7 files changed, 133 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp	Fri Nov 18 19:04:48 2016 +0000
+++ b/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp	Mon Nov 21 08:27:10 2016 +0100
@@ -203,6 +203,9 @@
     __ mov(sp, r13);
     generate_transcendental_entry(kind, 2);
     break;
+  case Interpreter::java_lang_math_fmaD :
+  case Interpreter::java_lang_math_fmaF :
+    return NULL;
   default:
     ;
   }
--- a/src/cpu/sparc/vm/vm_version_sparc.cpp	Fri Nov 18 19:04:48 2016 +0000
+++ b/src/cpu/sparc/vm/vm_version_sparc.cpp	Mon Nov 21 08:27:10 2016 +0100
@@ -351,7 +351,7 @@
       FLAG_SET_DEFAULT(UseCRC32Intrinsics, true);
     }
   } else if (UseCRC32Intrinsics) {
-    warning("SPARC CRC32 intrinsics require VIS3 insructions support. Intriniscs will be disabled");
+    warning("SPARC CRC32 intrinsics require VIS3 instructions support. Intrinsics will be disabled");
     FLAG_SET_DEFAULT(UseCRC32Intrinsics, false);
   }
 
--- a/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp	Fri Nov 18 19:04:48 2016 +0000
+++ b/src/cpu/x86/vm/templateInterpreterGenerator_x86_32.cpp	Mon Nov 21 08:27:10 2016 +0100
@@ -342,6 +342,9 @@
   //        [ hi(arg) ]
   //
   if (kind == Interpreter::java_lang_math_fmaD) {
+    if (!UseFMA) {
+      return NULL; // Generate a vanilla entry
+    }
     __ movdbl(xmm2, Address(rsp, 5 * wordSize));
     __ movdbl(xmm1, Address(rsp, 3 * wordSize));
     __ movdbl(xmm0, Address(rsp, 1 * wordSize));
@@ -352,6 +355,9 @@
 
     return entry_point;
   } else if (kind == Interpreter::java_lang_math_fmaF) {
+    if (!UseFMA) {
+      return NULL; // Generate a vanilla entry
+    }
     __ movflt(xmm2, Address(rsp, 3 * wordSize));
     __ movflt(xmm1, Address(rsp, 2 * wordSize));
     __ movflt(xmm0, Address(rsp, 1 * wordSize));
--- a/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp	Fri Nov 18 19:04:48 2016 +0000
+++ b/src/cpu/x86/vm/templateInterpreterGenerator_x86_64.cpp	Mon Nov 21 08:27:10 2016 +0100
@@ -370,11 +370,17 @@
   //
 
   if (kind == Interpreter::java_lang_math_fmaD) {
+    if (!UseFMA) {
+      return NULL; // Generate a vanilla entry
+    }
     __ movdbl(xmm0, Address(rsp, wordSize));
     __ movdbl(xmm1, Address(rsp, 3 * wordSize));
     __ movdbl(xmm2, Address(rsp, 5 * wordSize));
     __ fmad(xmm0, xmm1, xmm2, xmm0);
   } else if (kind == Interpreter::java_lang_math_fmaF) {
+    if (!UseFMA) {
+      return NULL; // Generate a vanilla entry
+    }
     __ movflt(xmm0, Address(rsp, wordSize));
     __ movflt(xmm1, Address(rsp, 2 * wordSize));
     __ movflt(xmm2, Address(rsp, 3 * wordSize));
--- a/src/share/vm/interpreter/abstractInterpreter.cpp	Fri Nov 18 19:04:48 2016 +0000
+++ b/src/share/vm/interpreter/abstractInterpreter.cpp	Mon Nov 21 08:27:10 2016 +0100
@@ -124,29 +124,19 @@
   }
 
 #ifndef CC_INTERP
-  if (UseCRC32Intrinsics && m->is_native()) {
+  switch (m->intrinsic_id()) {
     // Use optimized stub code for CRC32 native methods.
-    switch (m->intrinsic_id()) {
-      case vmIntrinsics::_updateCRC32            : return java_util_zip_CRC32_update;
-      case vmIntrinsics::_updateBytesCRC32       : return java_util_zip_CRC32_updateBytes;
-      case vmIntrinsics::_updateByteBufferCRC32  : return java_util_zip_CRC32_updateByteBuffer;
-    }
+    case vmIntrinsics::_updateCRC32            : return java_util_zip_CRC32_update;
+    case vmIntrinsics::_updateBytesCRC32       : return java_util_zip_CRC32_updateBytes;
+    case vmIntrinsics::_updateByteBufferCRC32  : return java_util_zip_CRC32_updateByteBuffer;
+    // Use optimized stub code for CRC32C methods.
+    case vmIntrinsics::_updateBytesCRC32C             : return java_util_zip_CRC32C_updateBytes;
+    case vmIntrinsics::_updateDirectByteBufferCRC32C  : return java_util_zip_CRC32C_updateDirectByteBuffer;
+    case vmIntrinsics::_intBitsToFloat:      return java_lang_Float_intBitsToFloat;
+    case vmIntrinsics::_floatToRawIntBits:   return java_lang_Float_floatToRawIntBits;
+    case vmIntrinsics::_longBitsToDouble:    return java_lang_Double_longBitsToDouble;
+    case vmIntrinsics::_doubleToRawLongBits: return java_lang_Double_doubleToRawLongBits;
   }
-  if (UseCRC32CIntrinsics) {
-    // Use optimized stub code for CRC32C methods.
-    switch (m->intrinsic_id()) {
-      case vmIntrinsics::_updateBytesCRC32C             : return java_util_zip_CRC32C_updateBytes;
-      case vmIntrinsics::_updateDirectByteBufferCRC32C  : return java_util_zip_CRC32C_updateDirectByteBuffer;
-    }
-  }
-
-  switch(m->intrinsic_id()) {
-  case vmIntrinsics::_intBitsToFloat:      return java_lang_Float_intBitsToFloat;
-  case vmIntrinsics::_floatToRawIntBits:   return java_lang_Float_floatToRawIntBits;
-  case vmIntrinsics::_longBitsToDouble:    return java_lang_Double_longBitsToDouble;
-  case vmIntrinsics::_doubleToRawLongBits: return java_lang_Double_doubleToRawLongBits;
-  }
-
 #endif // CC_INTERP
 
   // Native method?
@@ -189,18 +179,13 @@
     case vmIntrinsics::_dlog10: return java_lang_math_log10;
     case vmIntrinsics::_dpow  : return java_lang_math_pow  ;
     case vmIntrinsics::_dexp  : return java_lang_math_exp  ;
+    case vmIntrinsics::_fmaD  : return java_lang_math_fmaD ;
+    case vmIntrinsics::_fmaF  : return java_lang_math_fmaF ;
 
     case vmIntrinsics::_Reference_get:
                                 return java_lang_ref_reference_get;
   }
 
-  if (UseFMA) {
-    switch (m->intrinsic_id()) {
-      case vmIntrinsics::_fmaD: return java_lang_math_fmaD;
-      case vmIntrinsics::_fmaF: return java_lang_math_fmaF;
-    }
-  }
-
   // Accessor method?
   if (m->is_getter()) {
     // TODO: We should have used ::is_accessor above, but fast accessors in Zero expect only getters.
--- a/src/share/vm/interpreter/templateInterpreterGenerator.cpp	Fri Nov 18 19:04:48 2016 +0000
+++ b/src/share/vm/interpreter/templateInterpreterGenerator.cpp	Mon Nov 21 08:27:10 2016 +0100
@@ -239,10 +239,8 @@
       method_entry(java_lang_math_log10)
       method_entry(java_lang_math_exp  )
       method_entry(java_lang_math_pow  )
-      if (UseFMA) {
-        method_entry(java_lang_math_fmaF)
-        method_entry(java_lang_math_fmaD)
-      }
+      method_entry(java_lang_math_fmaF )
+      method_entry(java_lang_math_fmaD )
       method_entry(java_lang_ref_reference_get)
 
       AbstractInterpreter::initialize_method_handle_entries();
@@ -253,16 +251,11 @@
       method_entry(native_synchronized)
       Interpreter::_native_entry_end = Interpreter::code()->code_end();
 
-      if (UseCRC32Intrinsics) {
-        method_entry(java_util_zip_CRC32_update)
-        method_entry(java_util_zip_CRC32_updateBytes)
-        method_entry(java_util_zip_CRC32_updateByteBuffer)
-      }
-
-      if (UseCRC32CIntrinsics) {
-        method_entry(java_util_zip_CRC32C_updateBytes)
-        method_entry(java_util_zip_CRC32C_updateDirectByteBuffer)
-      }
+      method_entry(java_util_zip_CRC32_update)
+      method_entry(java_util_zip_CRC32_updateBytes)
+      method_entry(java_util_zip_CRC32_updateByteBuffer)
+      method_entry(java_util_zip_CRC32C_updateBytes)
+      method_entry(java_util_zip_CRC32C_updateDirectByteBuffer)
 
       method_entry(java_lang_Float_intBitsToFloat);
       method_entry(java_lang_Float_floatToRawIntBits);
@@ -451,7 +444,7 @@
   case Interpreter::java_lang_math_pow     : // fall thru
   case Interpreter::java_lang_math_exp     : // fall thru
   case Interpreter::java_lang_math_fmaD    : // fall thru
-  case Interpreter::java_lang_math_fmaF     : entry_point = generate_math_entry(kind);      break;
+  case Interpreter::java_lang_math_fmaF    : entry_point = generate_math_entry(kind);      break;
   case Interpreter::java_lang_ref_reference_get
                                            : entry_point = generate_Reference_get_entry(); break;
   case Interpreter::java_util_zip_CRC32_update
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/runtime/SharedArchiveFile/TestInterpreterMethodEntries.java	Mon Nov 21 08:27:10 2016 +0100
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test InterpreterMethodEntries
+ * @bug 8169711
+ * @summary Test interpreter method entries for intrinsics with CDS (class data sharing)
+ *          and different settings of the intrinsic flag during dump/use of the archive.
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
+ *          java.management
+ * @run main TestInterpreterMethodEntries
+ */
+
+import java.lang.Math;
+import java.util.zip.CRC32;
+import java.util.zip.CRC32C;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+public class TestInterpreterMethodEntries {
+
+    public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+          // Dump and use shared archive with different flag combinations
+          dumpAndUseSharedArchive("+", "-");
+          dumpAndUseSharedArchive("-", "+");
+        } else {
+          // Call intrinsified java.lang.Math::fma()
+          Math.fma(1.0, 2.0, 3.0);
+
+          byte[] buffer = new byte[256];
+          // Call intrinsified java.util.zip.CRC32::update()
+          CRC32 crc32 = new CRC32();
+          crc32.update(buffer, 0, 256);
+
+          // Call intrinsified java.util.zip.CRC32C::updateBytes(..)
+          CRC32C crc32c = new CRC32C();
+          crc32c.update(buffer, 0, 256);
+        }
+    }
+
+    private static void dumpAndUseSharedArchive(String dump, String use) throws Exception {
+        String dumpFMA    = "-XX:" + dump + "UseFMA";
+        String dumpCRC32  = "-XX:" + dump + "UseCRC32Intrinsics";
+        String dumpCRC32C = "-XX:" + dump + "UseCRC32CIntrinsics";
+        String useFMA     = "-XX:" + use  + "UseFMA";
+        String useCRC32   = "-XX:" + use  + "UseCRC32Intrinsics";
+        String useCRC32C  = "-XX:" + use  + "UseCRC32CIntrinsics";
+
+        // Dump shared archive
+        String filename = "./TestInterpreterMethodEntries" + dump + ".jsa";
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+            "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:SharedArchiveFile=" + filename,
+            "-Xshare:dump",
+            dumpFMA, dumpCRC32, dumpCRC32C);
+        OutputAnalyzer output = new OutputAnalyzer(pb.start());
+        CDSTestUtils.checkDump(output);
+
+        // Use shared archive
+        pb = ProcessTools.createJavaProcessBuilder(
+            "-XX:+UnlockDiagnosticVMOptions",
+            "-XX:SharedArchiveFile=" + filename,
+            "-Xshare:on",
+            useFMA, useCRC32, useCRC32C,
+            "TestInterpreterMethodEntries", "run");
+        output = new OutputAnalyzer(pb.start());
+        if (CDSTestUtils.isUnableToMap(output)) {
+          System.out.println("Unable to map shared archive: test did not complete; assumed PASS");
+          return;
+        }
+        output.shouldHaveExitValue(0);
+    }
+}
+