Merge branch 'master' into goetz_backport_8343314

Author: GoeLin

src/hotspot/cpu/aarch64/register_aarch64.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, 2021, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -165,7 +165,13 @@ class FloatRegister {
     max_slots_per_register  =  4,
     save_slots_per_register =  2,
     slots_per_neon_register =  4,
-    extra_save_slots_per_neon_register = slots_per_neon_register - save_slots_per_register
+    extra_save_slots_per_neon_register = slots_per_neon_register - save_slots_per_register,
+    neon_vl = 16,
+    // VLmax: The maximum sve vector length is determined by the hardware
+    // sve_vl_min <= VLmax <= sve_vl_max.
+    sve_vl_min = 16,
+    // Maximum supported vector length across all CPUs
+    sve_vl_max = 256
   };
 
   class FloatRegisterImpl: public AbstractRegisterImpl {

src/hotspot/cpu/aarch64/vm_version_aarch64.cpp

@@ -25,6 +25,7 @@
 
 #include "precompiled.hpp"
 #include "pauth_aarch64.hpp"
+#include "register_aarch64.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/globals_extension.hpp"
 #include "runtime/java.hpp"
@@ -440,7 +441,19 @@ void VM_Version::initialize() {
   }
 
   if (UseSVE > 0) {
-    _initial_sve_vector_length = get_current_sve_vector_length();
+    int vl = get_current_sve_vector_length();
+    if (vl < 0) {
+      warning("Unable to get SVE vector length on this system. "
+              "Disabling SVE. Specify -XX:UseSVE=0 to shun this warning.");
+      FLAG_SET_DEFAULT(UseSVE, 0);
+    } else if ((vl == 0) || ((vl % FloatRegister::sve_vl_min) != 0) || !is_power_of_2(vl)) {
+      warning("Detected SVE vector length (%d) should be a power of two and a multiple of %d. "
+              "Disabling SVE. Specify -XX:UseSVE=0 to shun this warning.",
+              vl, FloatRegister::sve_vl_min);
+      FLAG_SET_DEFAULT(UseSVE, 0);
+    } else {
+      _initial_sve_vector_length = vl;
+    }
   }
 
   // This machine allows unaligned memory accesses

src/hotspot/share/jfr/recorder/checkpoint/types/jfrTypeSet.cpp

@@ -756,15 +756,6 @@ static void write_classloaders() {
     CompositeCldCallback callback(&_subsystem_callback, &ccldwwc);
     do_class_loaders();
   }
-  if (is_initial_typeset_for_chunk()) {
-    CldPtr bootloader = get_cld(Universe::boolArrayKlassObj());
-    assert(bootloader != nullptr, "invariant");
-    if (IS_NOT_SERIALIZED(bootloader)) {
-      write__classloader(_writer, bootloader);
-      assert(IS_SERIALIZED(bootloader), "invariant");
-      cldw.add(1);
-    }
-  }
   _artifacts->tally(cldw);
 }
 

src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp

@@ -634,7 +634,11 @@ static void write_thread_local_buffer(JfrChunkWriter& chunkwriter, Thread* t) {
 
 size_t JfrRecorderService::flush() {
   size_t total_elements = flush_metadata(_chunkwriter);
-  total_elements = flush_storage(_storage, _chunkwriter);
+  const size_t storage_elements = flush_storage(_storage, _chunkwriter);
+  if (0 == storage_elements) {
+    return total_elements;
+  }
+  total_elements += storage_elements;
   if (_string_pool.is_modified()) {
     total_elements += flush_stringpool(_string_pool, _chunkwriter);
   }

src/jdk.hotspot.agent/linux/native/libsaproc/symtab.c

@@ -389,9 +389,9 @@ static struct symtab* build_symtab_internal(int fd, const char *filename, bool t
         goto bad;
       }
 
-      // int rslt =
-      hcreate_r(htab_sz, symtab->hash_table);
-      // guarantee(rslt, "unexpected failure: hcreate_r");
+      if (hcreate_r(htab_sz, symtab->hash_table) == 0) {
+        goto bad;
+      }
 
       // shdr->sh_link points to the section that contains the actual strings
       // for symbol names. the st_name field in ELF_SYM is just the

test/jdk/jdk/jfr/event/gc/stacktrace/AllocationStackTrace.java

@@ -79,15 +79,15 @@ public void allocate() {
 class OldGenMemoryAllocator extends MemoryAllocator {
 
     private List<byte[]> list = new ArrayList<byte[]>();
-    private int counter = 6000;
+    private int counter = 5000;
 
     @Override
     public void allocate() {
         if (counter-- > 0) {
             list.add(new byte[10 * KB]);
         } else {
             list = new ArrayList<byte[]>();
-            counter = 6000;
+            counter = 5000;
         }
 
         garbage = list;

test/jdk/tools/jpackage/TEST.properties

@@ -2,5 +2,14 @@ keys=jpackagePlatformPackage
 requires.properties=jpackage.test.SQETest
 maxOutputSize=2000000
 
+# Run jpackage tests on windows platform sequentially.
+# Having "share" directory in the list affects tests on other platforms.
+# The better option would be:
+#   if (platfrom == windowws) {
+#     exclusiveAccess.dirs=share windows
+#   }
+# but conditionals are not supported by jtreg configuration files.
+exclusiveAccess.dirs=share windows
+
 modules=jdk.jpackage/jdk.jpackage.internal:+open \
         java.base/jdk.internal.util