8341692: Implement JEP 490: ZGC: Remove the Non-Generational Mode

src/hotspot/share/gc/z/zArguments.cpp

@@ -224,14 +224,14 @@ void ZArguments::initialize() {
 #endif
 }
 
-size_t ZArguments::heap_virtual_to_physical_ratio() {
-  return ZVirtualToPhysicalRatio;
-}
-
 size_t ZArguments::conservative_max_heap_alignment() {
   return 0;
 }
 
+size_t ZArguments::heap_virtual_to_physical_ratio() {
+  return ZVirtualToPhysicalRatio;
+}
+
 CollectedHeap* ZArguments::create_heap() {
   return new ZCollectedHeap();
 }

src/hotspot/share/gc/z/zArguments.hpp

@@ -38,8 +38,8 @@ class ZArguments : public GCArguments {
   virtual void initialize_alignments();
   virtual void initialize_heap_flags_and_sizes();
   virtual void initialize();
-  virtual size_t heap_virtual_to_physical_ratio();
   virtual size_t conservative_max_heap_alignment();
+  virtual size_t heap_virtual_to_physical_ratio();
   virtual CollectedHeap* create_heap();
 
   virtual bool is_supported() const;

src/hotspot/share/gc/z/z_globals.hpp

@@ -59,6 +59,19 @@
           "Uncommit memory if it has been unused for the specified "        \
           "amount of time (in seconds)")                                    \
                                                                             \
+  product(double, ZYoungCompactionLimit, 25.0,                              \
+          "Maximum allowed garbage in young pages")                         \
+          range(0, 100)                                                     \
+                                                                            \
+  product(double, ZCollectionIntervalMinor, -1,                             \
+          "Force Minor GC at a fixed time interval (in seconds)")           \
+                                                                            \
+  product(double, ZCollectionIntervalMajor, -1,                             \
+          "Force GC at a fixed time interval (in seconds)")                 \
+                                                                            \
+  product(bool, ZCollectionIntervalOnly, false,                             \
+          "Only use timers for GC heuristics")                              \
+                                                                            \
   product(double, ZAsyncUnmappingLimit, 100.0, DIAGNOSTIC,                  \
           "Specify the max amount (percentage of max heap size) of async "  \
           "unmapping that can be in-flight before unmapping requests are "  \
@@ -85,19 +98,6 @@
   product(bool, ZVerifyForwarding, false, DIAGNOSTIC,                       \
           "Verify forwarding tables")                                       \
                                                                             \
-  product(double, ZYoungCompactionLimit, 25.0,                              \
-          "Maximum allowed garbage in young pages")                         \
-          range(0, 100)                                                     \
-                                                                            \
-  product(double, ZCollectionIntervalMinor, -1,                             \
-          "Force Minor GC at a fixed time interval (in seconds)")           \
-                                                                            \
-  product(double, ZCollectionIntervalMajor, -1,                             \
-          "Force GC at a fixed time interval (in seconds)")                 \
-                                                                            \
-  product(bool, ZCollectionIntervalOnly, false,                             \
-          "Only use timers for GC heuristics")                              \
-                                                                            \
   product(bool, ZBufferStoreBarriers, true, DIAGNOSTIC,                     \
           "Buffer store barriers")                                          \
                                                                             \
@@ -115,13 +115,13 @@
   product(bool, ZVerifyRemembered, trueInDebug, DIAGNOSTIC,                 \
           "Verify remembered sets")                                         \
                                                                             \
-  develop(bool, ZVerifyOops, false,                                         \
-          "Verify accessed oops")                                           \
-                                                                            \
   product(int, ZTenuringThreshold, -1, DIAGNOSTIC,                          \
           "Young generation tenuring threshold, -1 for dynamic computation")\
           range(-1, static_cast<int>(ZPageAgeMax))                          \
                                                                             \
+  develop(bool, ZVerifyOops, false,                                         \
+          "Verify accessed oops")                                           \
+                                                                            \
   develop(size_t, ZForceDiscontiguousHeapReservations, 0,                   \
           "The gc will attempt to split the heap reservation into this "    \
           "many reservations, subject to available virtual address space "  \

src/hotspot/share/oops/stackChunkOop.inline.hpp

@@ -88,9 +88,7 @@ inline void stackChunkOopDesc::set_max_thawing_size(int value)  {
   jdk_internal_vm_StackChunk::set_maxThawingSize(this, (jint)value);
 }
 
-inline oop stackChunkOopDesc::cont() const                {
-  return jdk_internal_vm_StackChunk::cont(as_oop());
-}
+inline oop stackChunkOopDesc::cont() const                { return jdk_internal_vm_StackChunk::cont(as_oop()); }
 inline void stackChunkOopDesc::set_cont(oop value)        { jdk_internal_vm_StackChunk::set_cont(this, value); }
 template<typename P>
 inline void stackChunkOopDesc::set_cont_raw(oop value)    { jdk_internal_vm_StackChunk::set_cont_raw<P>(this, value); }

test/hotspot/jtreg/gc/TestAlwaysPreTouchBehavior.java

@@ -75,7 +75,7 @@
 /**
  * @test id=Z
  * @summary tests AlwaysPreTouch
- * @requires vm.gc.ZGC
+ * @requires vm.gc.Z
  * @requires os.maxMemory > 2G
  * @requires os.family != "aix"
  * @library /test/lib

test/hotspot/jtreg/gc/cslocker/TestCSLocker.java

@@ -33,11 +33,11 @@
  * @summary completely in JNI CS, while other is trying to allocate memory
  * @summary provoking GC. OOM means FAIL, deadlock means PASS.
  *
- * @comment This test assumes that no allocation happens during the sleep loop,   \
- *          which is something that we can't guarantee. With ZGC we see test      \
- *          timeouts because the main thread allocates and waits for the GC,      \
- *          which waits for the CSLocker, which waits for the main thread.        \
- * @requires !vm.gc.Z
+ * @comment This test assumes that no allocation happens during the sleep loop,
+ *          which is something that we can't guarantee. With ZGC we see test
+ *          timeouts because the main thread allocates and waits for the GC,
+ *          which waits for the CSLocker, which waits for the main thread.
+ * @requires vm.gc != "Z"
  *
  * @run main/native/othervm -Xmx256m gc.cslocker.TestCSLocker
  */

test/jdk/java/awt/Graphics2D/LargeWindowPaintTest.java

@@ -33,7 +33,7 @@
  */
 
 /*
- * @test id=ZG
+ * @test id=Z
  * @bug 8240654
  * @summary Test painting a large window works
  * @key headful

test/jdk/java/lang/ProcessBuilder/CloseRace.java

@@ -27,7 +27,7 @@
  * @summary Closing ProcessPipeInputStream at the time the process exits is racy
  *          and leads to data corruption. Run this test manually (as
  *          an ordinary java program) with  -Xmx8M  to repro bug 8024521.
- * @requires !vm.gc.Z
+ * @requires vm.gc != "Z"
  * @comment Don't allow -Xcomp, it disturbs the timing
  * @requires (vm.compMode != "Xcomp")
  * @run main/othervm -Xmx8M -Dtest.duration=2 CloseRace