infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8366118: DontCompileHugeMethods is not respected with -XX:-TieredCompilation

Browse Source 
Co-authored-by: Chuck Rasbold <rasbold@openjdk.org>
Co-authored-by: Justin King <jcking@openjdk.org>
Reviewed-by: rasbold, iveresov, jiangli
This commit is contained in:
Man Cao 2025-09-10 17:42:15 +00:00
parent 7a3025e3d7
commit 4e2a85f750
2 changed files with 142 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/hotspot/share/compiler/compilationPolicy.cpp
View File

@ -922,28 +922,29 @@ void CompilationPolicy::compile(const methodHandle& mh, int bci, CompLevel level
return;
}
if (!CompilationModeFlag::disable_intermediate()) {
// Check if the method can be compiled. If it cannot be compiled with C1, continue profiling
// in the interpreter and then compile with C2 (the transition function will request that,
// see common() ). If the method cannot be compiled with C2 but still can with C1, compile it with
// pure C1.
if ((bci == InvocationEntryBci && !can_be_compiled(mh, level))) {
if (level == CompLevel_full_optimization && can_be_compiled(mh, CompLevel_simple)) {
compile(mh, bci, CompLevel_simple, THREAD);
}
return;
// Check if the method can be compiled. Additional logic for TieredCompilation:
// If it cannot be compiled with C1, continue profiling in the interpreter
// and then compile with C2 (the transition function will request that,
// see common() ). If the method cannot be compiled with C2 but still can with C1, compile it with
// pure C1.
if ((bci == InvocationEntryBci && !can_be_compiled(mh, level))) {
if (!CompilationModeFlag::disable_intermediate() &&
level == CompLevel_full_optimization && can_be_compiled(mh, CompLevel_simple)) {
compile(mh, bci, CompLevel_simple, THREAD);
}
if ((bci != InvocationEntryBci && !can_be_osr_compiled(mh, level))) {
if (level == CompLevel_full_optimization && can_be_osr_compiled(mh, CompLevel_simple)) {
nmethod* osr_nm = mh->lookup_osr_nmethod_for(bci, CompLevel_simple, false);
if (osr_nm != nullptr && osr_nm->comp_level() > CompLevel_simple) {
// Invalidate the existing OSR nmethod so that a compile at CompLevel_simple is permitted.
osr_nm->make_not_entrant(nmethod::InvalidationReason::OSR_INVALIDATION_FOR_COMPILING_WITH_C1);
}
compile(mh, bci, CompLevel_simple, THREAD);
return;
}
if ((bci != InvocationEntryBci && !can_be_osr_compiled(mh, level))) {
if (!CompilationModeFlag::disable_intermediate() &&
level == CompLevel_full_optimization && can_be_osr_compiled(mh, CompLevel_simple)) {
nmethod* osr_nm = mh->lookup_osr_nmethod_for(bci, CompLevel_simple, false);
if (osr_nm != nullptr && osr_nm->comp_level() > CompLevel_simple) {
// Invalidate the existing OSR nmethod so that a compile at CompLevel_simple is permitted.
osr_nm->make_not_entrant(nmethod::InvalidationReason::OSR_INVALIDATION_FOR_COMPILING_WITH_C1);
}
return;
compile(mh, bci, CompLevel_simple, THREAD);
}
return;
}
if (bci != InvocationEntryBci && mh->is_not_osr_compilable(level)) {
return;

122
test/hotspot/jtreg/compiler/runtime/TestDontCompileHugeMethods.java Normal file
View File

@ -0,0 +1,122 @@
/*
* Copyright (c) 2025, Google LLC. 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
* @bug 8366118
* @summary Check that a huge method is not compiled under -XX:+DontCompileHugeMethods.
* @library /test/lib
* @run main compiler.runtime.TestDontCompileHugeMethods
*/
package compiler.runtime;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import java.io.IOException;
import java.io.Writer;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
public class TestDontCompileHugeMethods {
private static final String HUGE_SWITCH_CLASS_NAME = "HugeSwitch";
private static void generateClass(Writer writer) throws IOException {
writer.write("""
public class HugeSwitch {
private static int hugeSwitch(int x) {
switch (x) {
""");
for (int i = 0; i < 2000; i++) {
writer.write(" case " + i + ": return " + i + " + 1;\n");
}
writer.write("""
default:
return 0;
}
}
private static int shortMethod(int x) {
if (x % 3 == 0) {
return x - 1;
}
return x + 1;
}
public static void main(String[] args) {
int val = 0;
for (int i = 0; i < 100000; i++) {
val += hugeSwitch(shortMethod(i));
}
System.out.println(val);
}
}
""");
}
private static void compileClass(Path workDir, Path sourceFile) throws Exception {
JDKToolLauncher javac = JDKToolLauncher.create("javac").addToolArg("-d")
.addToolArg(workDir.toAbsolutePath().toString()).addToolArg("-cp")
.addToolArg(Utils.TEST_CLASS_PATH).addToolArg(sourceFile.toAbsolutePath().toString());
OutputAnalyzer output = ProcessTools.executeProcess(javac.getCommand());
output.shouldHaveExitValue(0);
}
private static void generateAndCompileClass(Path workDir) throws Exception {
Path sourceFile = workDir.resolve(HUGE_SWITCH_CLASS_NAME + ".java");
try (Writer writer = Files.newBufferedWriter(sourceFile)) {
generateClass(writer);
} catch (IOException e) {
throw new RuntimeException(e);
}
compileClass(workDir, sourceFile);
}
private static void runTest(Path workDir, List jvmArgs) throws Exception {
ArrayList<String> command = new ArrayList<>();
command.add("-XX:+PrintCompilation");
command.add("-Xbatch");
command.addAll(jvmArgs);
command.add("-cp");
command.add(workDir.toAbsolutePath().toString());
command.add(HUGE_SWITCH_CLASS_NAME);
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(command);
OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
analyzer.shouldHaveExitValue(0);
analyzer.shouldContain(" HugeSwitch::shortMethod (");
analyzer.shouldNotContain(" HugeSwitch::hugeSwitch (");
}
public static void main(String[] args) throws Exception {
Path workDir = Paths.get("");
generateAndCompileClass(workDir);
runTest(workDir, List.of());
runTest(workDir, List.of("-XX:-TieredCompilation"));
}
}