--- old/test/hotspot/jtreg/runtime/appcds/sharedStrings/LargePages.java 2019-07-24 08:28:05.265467747 -0400 +++ /dev/null 2019-07-22 09:37:15.068007775 -0400 @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2015, 2018, 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 - * @summary Basic shared string test with large pages - * @requires vm.cds.archived.java.heap - * @library /test/lib /test/hotspot/jtreg/runtime/appcds - * @modules jdk.jartool/sun.tools.jar - * @build HelloString - * @run driver LargePages - */ -public class LargePages { - static final String CDS_LOGGING = "-Xlog:cds,cds+hashtables"; - - public static void main(String[] args) throws Exception { - SharedStringsUtils.run(args, LargePages::test); - } - - public static void test(String[] args) throws Exception { - SharedStringsUtils.buildJar("HelloString"); - - SharedStringsUtils.dump(TestCommon.list("HelloString"), - "SharedStringsBasic.txt", "-XX:+UseLargePages", CDS_LOGGING); - SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseLargePages"); - - SharedStringsUtils.dump(TestCommon.list("HelloString"), - "SharedStringsBasic.txt", CDS_LOGGING, - "-XX:+UseLargePages", "-XX:+UseLargePagesInMetaspace"); - SharedStringsUtils.runWithArchive("HelloString", - "-XX:+UseLargePages", "-XX:+UseLargePagesInMetaspace"); - } -} --- /dev/null 2019-07-22 09:37:15.068007775 -0400 +++ new/test/hotspot/jtreg/runtime/cds/sharedStrings/LargePages.java 2019-07-24 08:28:04.949467758 -0400 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2015, 2018, 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 + * @summary Basic shared string test with large pages + * @requires vm.cds.archived.java.heap + * @library /test/lib /test/hotspot/jtreg/runtime/cds + * @modules jdk.jartool/sun.tools.jar + * @build HelloString + * @run driver LargePages + */ +public class LargePages { + static final String CDS_LOGGING = "-Xlog:cds,cds+hashtables"; + + public static void main(String[] args) throws Exception { + SharedStringsUtils.run(args, LargePages::test); + } + + public static void test(String[] args) throws Exception { + SharedStringsUtils.buildJar("HelloString"); + + SharedStringsUtils.dump(TestCommon.list("HelloString"), + "SharedStringsBasic.txt", "-XX:+UseLargePages", CDS_LOGGING); + SharedStringsUtils.runWithArchive("HelloString", "-XX:+UseLargePages"); + + SharedStringsUtils.dump(TestCommon.list("HelloString"), + "SharedStringsBasic.txt", CDS_LOGGING, + "-XX:+UseLargePages", "-XX:+UseLargePagesInMetaspace"); + SharedStringsUtils.runWithArchive("HelloString", + "-XX:+UseLargePages", "-XX:+UseLargePagesInMetaspace"); + } +}