stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8257848: -XX:CompileCommand=blackhole,* should be diagnostic

Browse Source 
Reviewed-by: vlivanov
This commit is contained in:
Aleksey Shipilev 2020-12-08 10:11:01 +00:00
parent d2b66196b4
commit 35e81536e7
3 changed files with 130 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/hotspot/share/compiler/compilerOracle.cpp
View File

@ -286,6 +286,11 @@ static void register_command(TypedMethodOptionMatcher* matcher,
}
assert(CompilerOracle::option_matches_type(option, value), "Value must match option type");
if (option == CompileCommand::Blackhole && !UnlockDiagnosticVMOptions) {
warning("Blackhole compile option is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions");
return;
}
matcher->init(option, option_list);
matcher->set_value<T>(value);
option_list = matcher;
@ -410,15 +415,16 @@ bool CompilerOracle::should_break_at(const methodHandle& method) {
}
bool CompilerOracle::should_blackhole(const methodHandle& method) {
if (check_predicate(CompileCommand::Blackhole, method)) {
if (method->result_type() == T_VOID) {
return true;
} else {
warning("blackhole compile command only works for methods with void type: %s",
method->name_and_sig_as_C_string());
}
if (!check_predicate(CompileCommand::Blackhole, method)) {
return false;
}
return false;
guarantee(UnlockDiagnosticVMOptions, "Checked during initial parsing");
if (method->result_type() != T_VOID) {
warning("Blackhole compile option only works for methods with void type: %s",
method->name_and_sig_as_C_string());
return false;
}
return true;
}
static enum CompileCommand parse_option_name(const char* line, int* bytes_read, char* errorbuf, int bufsize) {

109
test/hotspot/jtreg/compiler/blackhole/BlackholeDiagnosticUnlockTest.java Normal file
View File

@ -0,0 +1,109 @@
/*
* Copyright (c) 2020, Red Hat, Inc. 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
* @library /test/lib
* @build compiler.blackhole.BlackholeTarget
* @run driver compiler.blackhole.BlackholeDiagnosticUnlockTest
*/
package compiler.blackhole;
import java.io.IOException;
import jdk.test.lib.Platform;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class BlackholeDiagnosticUnlockTest {
private static final int CYCLES = 1_000_000;
private static final int TRIES = 10;
public static void main(String[] args) throws IOException {
if (args.length == 0) {
driver();
} else {
runner();
}
}
public static void driver() throws IOException {
final String msg = "Blackhole compile option is diagnostic and must be enabled via -XX:+UnlockDiagnosticVMOptions";
if (!Platform.isDebugBuild()) { // UnlockDiagnosticVMOptions is true in debug
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-Xbatch",
"-XX:CompileCommand=quiet",
"-XX:CompileCommand=option,compiler/blackhole/BlackholeTarget.bh_*,Blackhole",
"compiler.blackhole.BlackholeDiagnosticUnlockTest",
"run"
);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.shouldContain(msg);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:-PrintWarnings",
"-XX:CompileCommand=quiet",
"-XX:CompileCommand=option,compiler/blackhole/BlackholeTarget.bh_*,Blackhole",
"compiler.blackhole.BlackholeDiagnosticUnlockTest",
"run"
);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.shouldNotContain(msg);
}
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:CompileCommand=quiet",
"-XX:CompileCommand=option,compiler/blackhole/BlackholeTarget.bh_*,Blackhole",
"compiler.blackhole.BlackholeDiagnosticUnlockTest",
"run"
);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldHaveExitValue(0);
output.shouldNotContain(msg);
}
}
public static void runner() {
for (int t = 0; t < TRIES; t++) {
run();
}
}
public static void run() {
for (int c = 0; c < CYCLES; c++) {
BlackholeTarget.bh_s_int_1(c);
}
}
}

12
test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarning.java → test/hotspot/jtreg/compiler/blackhole/BlackholeNonVoidWarningTest.java
View File

@ -25,7 +25,7 @@
* @test
* @library /test/lib
* @build compiler.blackhole.BlackholeTarget
* @run driver compiler.blackhole.BlackholeNonVoidWarning
* @run driver compiler.blackhole.BlackholeNonVoidWarningTest
*/
package compiler.blackhole;
@ -34,7 +34,7 @@ import java.io.IOException;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
public class BlackholeNonVoidWarning {
public class BlackholeNonVoidWarningTest {
private static final int CYCLES = 1_000_000;
private static final int TRIES = 10;
@ -48,15 +48,16 @@ public class BlackholeNonVoidWarning {
}
public static void driver() throws IOException {
final String msg = "blackhole compile command only works for methods with void type: compiler.blackhole.BlackholeTarget.bh_sr_int(I)I";
final String msg = "Blackhole compile option only works for methods with void type: compiler.blackhole.BlackholeTarget.bh_sr_int(I)I";
{
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-Xbatch",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:CompileCommand=quiet",
"-XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*",
"compiler.blackhole.BlackholeNonVoidWarning",
"compiler.blackhole.BlackholeNonVoidWarningTest",
"run"
);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
@ -68,9 +69,10 @@ public class BlackholeNonVoidWarning {
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
"-Xmx128m",
"-XX:-PrintWarnings",
"-XX:+UnlockDiagnosticVMOptions",
"-XX:CompileCommand=quiet",
"-XX:CompileCommand=blackhole,compiler/blackhole/BlackholeTarget.bh_*",
"compiler.blackhole.BlackholeNonVoidWarning",
"compiler.blackhole.BlackholeNonVoidWarningTest",
"run"
);
OutputAnalyzer output = new OutputAnalyzer(pb.start());