8339299: C1 will miss type profile when inline final method

Reviewed-by: lmesnik, vlivanov
This commit is contained in:
Kuai Wei 2024-09-24 11:08:36 +00:00
parent 3e673d9e46
commit e1c4d3039f
2 changed files with 150 additions and 2 deletions

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2024, 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
@ -2033,8 +2033,9 @@ class LIR_OpProfileCall : public LIR_Op {
virtual void print_instr(outputStream* out) const PRODUCT_RETURN;
bool should_profile_receiver_type() const {
bool callee_is_static = _profiled_callee->is_loaded() && _profiled_callee->is_static();
bool callee_is_private = _profiled_callee->is_loaded() && _profiled_callee->is_private();
Bytecodes::Code bc = _profiled_method->java_code_at_bci(_profiled_bci);
bool call_is_virtual = (bc == Bytecodes::_invokevirtual && !_profiled_callee->can_be_statically_bound()) || bc == Bytecodes::_invokeinterface;
bool call_is_virtual = (bc == Bytecodes::_invokevirtual && !callee_is_private) || bc == Bytecodes::_invokeinterface;
return C1ProfileVirtualCalls && call_is_virtual && !callee_is_static;
}
};

View File

@ -0,0 +1,147 @@
/*
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2024, Alibaba Group Holding Limited. 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 test c1 to record type profile with CHA optimization
* @requires vm.flavor == "server" & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 4)
* @library /test/lib
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run driver compiler.cha.TypeProfileFinalMethod
*/
package compiler.cha;
import java.io.File;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import jdk.test.lib.Asserts;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import jdk.test.whitebox.WhiteBox;
public class TypeProfileFinalMethod {
public static void main(String[] args) throws Exception {
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-Xbootclasspath/a:.",
"-Xbatch", "-XX:-UseOnStackReplacement",
"-XX:+UnlockDiagnosticVMOptions", "-XX:+WhiteBoxAPI",
"-XX:Tier3InvocationThreshold=200", "-XX:Tier4InvocationThreshold=5000",
Launcher.class.getName());
OutputAnalyzer output = ProcessTools.executeProcess(pb);
System.out.println("debug output");
System.out.println(output.getOutput());
System.out.println("debug output end");
output.shouldHaveExitValue(0);
output.shouldNotContain("failed to inline: virtual call");
Pattern pattern = Pattern.compile("Child1::m.* inline ");
Matcher matcher = pattern.matcher(output.getOutput());
int matchCnt = 0;
while (matcher.find()) {
matchCnt++;
}
Asserts.assertEquals(matchCnt, 2); // inline Child1::m() twice
}
static class Launcher {
public static void main(String[] args) throws Exception {
addCompilerDirectives();
int cnt = 5300;
// warmup test1 to be compiled with c1 and c2
// and only compile test2 with c1
for (int i = 0; i < cnt; i++) {
test1(i);
}
for (int i = 0; i < cnt; i++) {
test2(i);
}
Parent c = new TypeProfileFinalMethod.Child2();
System.out.println("======== break CHA");
// trigger c2 to compile test2
for (int i = 0; i < 100; i++) {
test2(i);
}
}
static void addCompilerDirectives() {
WhiteBox WB = WhiteBox.getWhiteBox();
// do not inline getInstance() for test1() and test2()
String directive = "[{ match: [\"" + Launcher.class.getName() + "::test1\"]," +
"inline:[\"-" + Launcher.class.getName()+"::getInstance()\"] }]";
WB.addCompilerDirective(directive);
directive = "[{ match: [\"" + Launcher.class.getName() + "::test2\"]," +
"inline:[\"-" + Launcher.class.getName()+"::getInstance()\"] }]";
WB.addCompilerDirective(directive);
// do not inline test1() for test2() in c1 compilation
directive = "[{ match: [\"" + Launcher.class.getName() + "::test2\"]," +
"c1: { inline:[\"-" + Launcher.class.getName()+"::test1()\"] } }]";
WB.addCompilerDirective(directive);
// print inline tree for checking
directive = "[{ match: [\"" + Launcher.class.getName() + "::test2\"]," +
"c2: { PrintInlining: true } }]";
WB.addCompilerDirective(directive);
}
static int test1(int i) {
int ret = 0;
Parent ix = getInstance();
if (i<200) {
return ix.m();
}
for (int j = 0; j < 50; j++) {
ret += ix.m(); // the callsite we are interesting
}
return ret;
}
static int test2(int i) {
return test1(i);
}
static Parent getInstance() {
return new TypeProfileFinalMethod.Child1();
}
}
static abstract class Parent {
abstract public int m();
}
final static class Child1 extends Parent {
public int m() {
return 1;
}
}
final static class Child2 extends Parent {
public int m() {
return 2;
}
}
}