--- old/test/hotspot/jtreg/gc/g1/TestHumongousAllocInitialMark.java 2020-07-03 17:41:09.699237975 +0200 +++ /dev/null 2020-07-03 08:12:55.446864289 +0200 @@ -1,84 +0,0 @@ -/* - * Copyright (c) 2012, 2020, 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. - */ - -package gc.g1; - -/* - * @test TestHumongousAllocInitialMark - * @bug 7168848 - * @summary G1: humongous object allocations should initiate marking cycles when necessary - * @requires vm.gc.G1 - * @library /test/lib - * @modules java.base/jdk.internal.misc - * java.management - * @run driver gc.g1.TestHumongousAllocInitialMark - */ - -import jdk.test.lib.process.OutputAnalyzer; -import jdk.test.lib.process.ProcessTools; - -public class TestHumongousAllocInitialMark { - // Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to - // fulfill alignment constraints. - private static final int heapSize = 224; // MB - private static final int heapRegionSize = 1; // MB - private static final int initiatingHeapOccupancyPercent = 50; // % - - public static void main(String[] args) throws Exception { - ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( - "-XX:+UseG1GC", - "-Xms" + heapSize + "m", - "-Xmx" + heapSize + "m", - "-XX:G1HeapRegionSize=" + heapRegionSize + "m", - "-XX:InitiatingHeapOccupancyPercent=" + initiatingHeapOccupancyPercent, - "-Xlog:gc", - HumongousObjectAllocator.class.getName()); - - OutputAnalyzer output = new OutputAnalyzer(pb.start()); - output.shouldContain("Pause Young (Concurrent Start) (G1 Humongous Allocation)"); - output.shouldNotContain("Full GC"); - output.shouldHaveExitValue(0); - } - - static class HumongousObjectAllocator { - private static byte[] dummy; - - public static void main(String [] args) throws Exception { - // Make object size 75% of region size - final int humongousObjectSize = - (int)(heapRegionSize * 1024 * 1024 * 0.75); - - // Number of objects to allocate to go above IHOP - final int humongousObjectAllocations = - (int)((heapSize * initiatingHeapOccupancyPercent / 100.0) / heapRegionSize) + 1; - - // Allocate - for (int i = 1; i <= humongousObjectAllocations; i++) { - System.out.println("Allocating humongous object " + i + "/" + humongousObjectAllocations + - " of size " + humongousObjectSize + " bytes"); - dummy = new byte[humongousObjectSize]; - } - } - } -} - --- /dev/null 2020-07-03 08:12:55.446864289 +0200 +++ new/test/hotspot/jtreg/gc/g1/TestHumongousAllocConcurrentStart.java 2020-07-03 17:41:09.543235712 +0200 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2012, 2020, 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. + */ + +package gc.g1; + +/* + * @test TestHumongousAllocConcurrentStart + * @bug 7168848 + * @summary G1: humongous object allocations should initiate marking cycles when necessary + * @requires vm.gc.G1 + * @library /test/lib + * @modules java.base/jdk.internal.misc + * java.management + * @run driver gc.g1.TestHumongousAllocConcurrentStart + */ + +import jdk.test.lib.process.OutputAnalyzer; +import jdk.test.lib.process.ProcessTools; + +public class TestHumongousAllocConcurrentStart { + // Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to + // fulfill alignment constraints. + private static final int heapSize = 224; // MB + private static final int heapRegionSize = 1; // MB + private static final int initiatingHeapOccupancyPercent = 50; // % + + public static void main(String[] args) throws Exception { + ProcessBuilder pb = ProcessTools.createJavaProcessBuilder( + "-XX:+UseG1GC", + "-Xms" + heapSize + "m", + "-Xmx" + heapSize + "m", + "-XX:G1HeapRegionSize=" + heapRegionSize + "m", + "-XX:InitiatingHeapOccupancyPercent=" + initiatingHeapOccupancyPercent, + "-Xlog:gc", + HumongousObjectAllocator.class.getName()); + + OutputAnalyzer output = new OutputAnalyzer(pb.start()); + output.shouldContain("Pause Young (Concurrent Start) (G1 Humongous Allocation)"); + output.shouldNotContain("Full GC"); + output.shouldHaveExitValue(0); + } + + static class HumongousObjectAllocator { + private static byte[] dummy; + + public static void main(String [] args) throws Exception { + // Make object size 75% of region size + final int humongousObjectSize = + (int)(heapRegionSize * 1024 * 1024 * 0.75); + + // Number of objects to allocate to go above IHOP + final int humongousObjectAllocations = + (int)((heapSize * initiatingHeapOccupancyPercent / 100.0) / heapRegionSize) + 1; + + // Allocate + for (int i = 1; i <= humongousObjectAllocations; i++) { + System.out.println("Allocating humongous object " + i + "/" + humongousObjectAllocations + + " of size " + humongousObjectSize + " bytes"); + dummy = new byte[humongousObjectSize]; + } + } + } +} +