Merge master

make/devkit/createJMHBundle.sh

@@ -26,7 +26,7 @@
 # Create a bundle in the build directory, containing what's needed to
 # build and run JMH microbenchmarks from the OpenJDK build.
 
-JMH_VERSION=1.32
+JMH_VERSION=1.33
 COMMONS_MATH3_VERSION=3.2
 JOPT_SIMPLE_VERSION=4.6
 

make/jdk/src/classes/build/tools/classlist/HelloClasslist.java

@@ -116,6 +116,12 @@ public static void main(String ... args) throws Throwable {
                 DateFormat.getDateInstance(DateFormat.DEFAULT, Locale.ROOT)
                         .format(new Date()));
 
+        // A selection of trivial and common reflection operations
+        var instance = HelloClasslist.class.getConstructor().newInstance();
+        HelloClasslist.class.getMethod("staticMethod_V").invoke(null);
+        var obj = HelloClasslist.class.getMethod("staticMethod_L_L", Object.class).invoke(null, instance);
+        HelloClasslist.class.getField("field").get(instance);
+
         // A selection of trivial and relatively common MH operations
         invoke(MethodHandles.identity(double.class), 1.0);
         invoke(MethodHandles.identity(int.class), 1);
@@ -126,8 +132,14 @@ public static void main(String ... args) throws Throwable {
         LOGGER.log(Level.FINE, "New Date: " + newDate + " - old: " + oldDate);
     }
 
+    public HelloClasslist() {}
+
+    public String field = "someValue";
+
     public static void staticMethod_V() {}
 
+    public static Object staticMethod_L_L(Object o) { return o; }
+
     private static MethodHandle handle(String name, MethodType type) throws Throwable {
         return MethodHandles.lookup().findStatic(HelloClasslist.class, name, type);
     }

make/test/JtregNativeJdk.gmk

@@ -89,8 +89,9 @@ ifeq ($(call isTargetOs, macosx), true)
       -framework Cocoa -framework SystemConfiguration
 else
   BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.m
-  BUILD_JDK_JTREG_EXCLUDE += exeJniInvocationTest.c
   BUILD_JDK_JTREG_EXCLUDE += libTestDynamicStore.m
+  BUILD_JDK_JTREG_EXCLUDE += exeJniInvocationTest.c
+  BUILD_JDK_JTREG_EXCLUDE += exeLibraryCache.c
 endif
 
 ifeq ($(call isTargetOs, linux), true)

src/demo/share/java2d/J2DBench/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2002, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -80,10 +80,10 @@ SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files
 all: mkdirs J2DBench.jar J2DAnalyzer.jar
 
 run: mkdirs J2DBench.jar
-	java -jar J2DBench.jar
+	java -jar $(DIST)/J2DBench.jar
 
 analyze: mkdirs J2DAnalyzer.jar
-	java -jar J2DAnalyzer.jar
+	java -jar $(DIST)/J2DAnalyzer.jar
 
 J2DBench.jar: \
 	$(J2DBENCH_CLASSES) $(J2DBENCH_RESOURCES) \

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2401,9 +2401,6 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
     // Special cases
     switch (opcode) {
     case Op_VectorMaskCmp:
-    // We don't have VectorReinterpret with bit_size less than 64 support for
-    // now, even for byte type. To be refined with fully VectorCast support.
-    case Op_VectorReinterpret:
       if (vlen < 2 || bit_size < 64) {
         return false;
       }
@@ -2421,23 +2418,6 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
         return false;
       }
       break;
-    // Some types of VectorCast are not implemented for now.
-    case Op_VectorCastI2X:
-      if (bt == T_BYTE) {
-        return false;
-      }
-      break;
-    case Op_VectorCastS2X:
-      if (vlen < 4 || bit_size < 64) {
-        return false;
-      }
-      break;
-    case Op_VectorCastF2X:
-    case Op_VectorCastD2X:
-      if (bt == T_INT || bt == T_SHORT || bt == T_BYTE || bt == T_LONG) {
-        return false;
-      }
-      break;
     case Op_LoadVectorGather:
     case Op_StoreVectorScatter:
       return false;