Skip to content

[GR-38340] Remove AlwaysInlineAllCallees and AlwaysInlineSelectCallees. #4506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2022
Merged

[GR-38340] Remove AlwaysInlineAllCallees and AlwaysInlineSelectCallees. #4506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions ...tevm/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AlwaysInlineAllCallees.java
View file
Open in desktop

This file was deleted.

54 changes: 0 additions & 54 deletions ...m/src/com.oracle.svm.core/src/com/oracle/svm/core/annotate/AlwaysInlineSelectCallees.java
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/code/CompileQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,6 @@
import com.oracle.graal.pointsto.util.CompletionExecutor.DebugContextRunnable;
import com.oracle.svm.core.SubstrateOptions;
import com.oracle.svm.core.SubstrateOptions.OptimizationLevel;
import com.oracle.svm.core.annotate.AlwaysInlineAllCallees;
import com.oracle.svm.core.annotate.AlwaysInlineSelectCallees;
import com.oracle.svm.core.annotate.DeoptTest;
import com.oracle.svm.core.annotate.NeverInlineTrivial;
import com.oracle.svm.core.annotate.RestrictHeapAccess;
Expand Down Expand Up @@ -711,7 +709,7 @@ private void doInlineTrivial(DebugContext debug, final HostedMethod method) {
private boolean tryInlineTrivial(StructuredGraph graph, Invoke invoke, boolean firstInline) {
if (invoke.getInvokeKind().isDirect()) {
HostedMethod singleCallee = (HostedMethod) invoke.callTarget().targetMethod();
if (makeInlineDecision(invoke, singleCallee) && InliningUtilities.recursionDepth(invoke, singleCallee) == 0) {
if (makeInlineDecision(singleCallee) && InliningUtilities.recursionDepth(invoke, singleCallee) == 0) {
if (firstInline) {
graph.getDebug().dump(DebugContext.DETAILED_LEVEL, graph, "Before inlining");
}
Expand All @@ -724,20 +722,16 @@ private boolean tryInlineTrivial(StructuredGraph graph, Invoke invoke, boolean f
return false;
}

private boolean makeInlineDecision(Invoke invoke, HostedMethod callee) {
private boolean makeInlineDecision(HostedMethod callee) {
if (!callee.canBeInlined() || callee.getAnnotation(NeverInlineTrivial.class) != null) {
return false;
}
if (callee.shouldBeInlined() || callerAnnotatedWith(invoke, AlwaysInlineAllCallees.class)) {
if (callee.shouldBeInlined()) {
return true;
}
if (optionAOTTrivialInline && callee.compilationInfo.isTrivialMethod()) {
return true;
}
AlwaysInlineSelectCallees selectCallees = getCallerAnnotation(invoke, AlwaysInlineSelectCallees.class);
if (selectCallees != null && Arrays.stream(selectCallees.callees()).anyMatch(c -> c.equals(callee.getQualifiedName()))) {
return true;
}
return false;
}

Expand Down