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

Reviewed-by: epavlova, kvn
This commit is contained in:
Igor Ignatyev 2020-01-29 19:27:01 -08:00
parent 28801066d0
commit c484e1cee0
5 changed files with 97 additions and 157 deletions
test/hotspot/jtreg/vmTestbase/vm/compiler
CodeCacheInfo
CodeCacheInfoOnCompilation

@ -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);
}
}
}

@ -1,40 +0,0 @@
/*
* Copyright (c) 2017, 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 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 jdk.test.lib.FileInstaller . .
* @run shell run.sh
*/

@ -1,60 +0,0 @@
#!/bin/bash
#
# Copyright (c) 2013, 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.
#
JAVA_OPTS="$TESTJAVAOPTS $TESTVMOPTS"
TESTED_JAVA_HOME="$TESTJAVA"
digit="[0123456789]"
number="${digit}*"
size_pattern="${number}Kb"
bound_pattern="0x[0123456789abcdef]*"
s1=" size=${size_pattern} used=${size_pattern} max_used=${size_pattern} free=${size_pattern}"
s2=" bounds \[${bound_pattern}, ${bound_pattern}, ${bound_pattern}\]"
s3=" total_blobs=${number} nmethods=${number} adapters=${number}"
s4=" compilation: enabled"
summary_pat_nonseg="CodeCache:${s1}${s2}${s3}${s4}"
summary_pat_seg="((CodeHeap.*):${s1}${s2})+${s3}${s4}"
# check whether SegmentedCodeCache enabled
segmented=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -XX:+PrintFlagsFinal -version | egrep -c ' +SegmentedCodeCache +:?= +true')
out=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -XX:+PrintCodeCache -version)
if [ "${segmented}" = "1" ]; then
summary_pat=${summary_pat_seg}
status="enabled"
else
summary_pat=${summary_pat_nonseg}
status="disabled"
fi
echo "INFO: SegmentedCodeCache is ${status}"
res=$(echo ${out} | egrep -c "${summary_pat}")
if [ "${res}" = "1" ]; then
echo "passed"
true
else
echo ${summary_pat}
echo "did not match for:"
echo ${out}
false
fi

@ -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);
}
}

@ -1,50 +0,0 @@
#!/bin/sh
#
# Copyright (c) 2013, 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.
#
JAVA_OPTS="-cp $TESTCLASSPATH $TESTJAVAOPTS $TESTVMOPTS"
TESTED_JAVA_HOME="$TESTJAVA"
ver=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -version 2>&1)
isComp=$( echo ${ver} | grep -c "compiled mode")
if [ "$isComp" -ne 1 ]; then
echo "skipped. This test works only with -Xcomp"
exit
fi
digit="[0123456789]"
number="${digit}+"
size_pattern="${number}Kb"
pattern="(CodeCache|(CodeHeap.*)): size=${size_pattern} used=${size_pattern} max_used=${size_pattern} free=${size_pattern}"
res=$(${TESTED_JAVA_HOME}/bin/java ${JAVA_OPTS} -XX:+PrintCodeCacheOnCompilation -XX:-Inline vm.compiler.CodeCacheInfoOnCompilation.PrintOnCall | egrep -ce "${pattern}")
echo "res: " ${res}
if [ "$res" -ne 0 ]; then
echo "passed"
true
else
echo $pattern
echo " not found"
false
fi