Skip to content
Permalink
Browse files

8237787: rewrite vmTestbase/vm/compiler/CodeCacheInfo* from shell to …

…java

Reviewed-by: epavlova, kvn
  • Loading branch information
iignatev committed Jan 30, 2020
1 parent 2880106 commit c484e1cee0a7a8a44165b8568e150686e924eb47
@@ -0,0 +1,75 @@
/*
* Copyright (c) 2017, 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.
*/


/*
* @test
*
* @summary converted from VM Testbase vm/compiler/CodeCacheInfo.
* VM Testbase readme:
* DESCRIPTION
* Test calls java -version and checks enhanced output format of the
* -XX:+PrintCodeCache vm option.
*
* @library /vmTestbase
* /test/lib
* @run driver vm.compiler.CodeCacheInfo.Test
*/

package vm.compiler.CodeCacheInfo;

import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;

public class Test {
private static String p1 = " size=\\d+Kb used=\\d+Kb max_used=\\d+Kb free=\\d+Kb\\n";
private static String p2 = " bounds \\[0x[0-9a-f]+, 0x[0-9a-f]+, 0x[0-9a-f]+\\]\\n";
private static String p3 = " total_blobs=\\d+ nmethods=\\d+ adapters=\\d+\\n";
private static String p4 = " compilation: enabled\\n";

private static String SEG_REGEXP = "^(CodeHeap '[^']+':" + p1 + p2 + ")+" + p3 + p4;
private static String NOSEG_REGEXP = "^CodeCache:" + p1 + p2 + p3 + p4;

public static void main(String[] args) throws Exception {
{
System.out.println("SegmentedCodeCache is enabled");
var pb = ProcessTools.createJavaProcessBuilder(true,
"-XX:+SegmentedCodeCache",
"-XX:+PrintCodeCache",
"-version");
var output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.stdoutShouldMatch(SEG_REGEXP);
}
{
System.out.println("SegmentedCodeCache is disabled");
var pb = ProcessTools.createJavaProcessBuilder(true,
"-XX:-SegmentedCodeCache",
"-XX:+PrintCodeCache",
"-version");
var output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.stdoutShouldMatch(NOSEG_REGEXP);
}
}
}

This file was deleted.

This file was deleted.

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 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
@@ -32,13 +32,28 @@
* format of the -XX:+PrintCodeCacheOnCompilation vm option during this method
* call.
*
* Test will be skipped if java has not "-Xcomp" option
*
*
* @library /vmTestbase
* /test/lib
* @run driver jdk.test.lib.FileInstaller . .
* @build vm.compiler.CodeCacheInfoOnCompilation.PrintOnCall
* @run shell run.sh
* @run driver vm.compiler.CodeCacheInfoOnCompilation.Test
*/

package vm.compiler.CodeCacheInfoOnCompilation;

import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;

public class Test {
private static String REGEXP = "^(CodeCache|(CodeHeap.*)): size=\\d+Kb used=\\d+Kb max_used=\\d+Kb free=\\d+Kb";

public static void main(String[] args) throws Exception {
var pb = ProcessTools.createJavaProcessBuilder(true,
"-XX:-PrintCodeCache",
"-XX:+PrintCodeCacheOnCompilation",
"-XX:-Inline",
"-Xcomp",
PrintOnCall.class.getName());
var output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.stdoutShouldMatch(REGEXP);
}
}

This file was deleted.

0 comments on commit c484e1c

Please sign in to comment.