-
Notifications
You must be signed in to change notification settings - Fork 717
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.
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
Set an absolute maximum inlining limit #3959
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -420,6 +420,9 @@ struct Inlining : public Pass { | |
continue; | ||
} | ||
Name inlinedName = inlinedFunction->name; | ||
if (!canInlineInto(func->name, inlinedName)) { | ||
continue; | ||
} | ||
#ifdef INLINING_DEBUG | ||
std::cout << "inline " << inlinedName << " into " << func->name << '\n'; | ||
#endif | ||
|
@@ -446,6 +449,20 @@ struct Inlining : public Pass { | |
// return whether we did any work | ||
return inlinedUses.size() > 0; | ||
} | ||
|
||
// Checks if we are allowed to inline source into target. | ||
bool canInlineInto(Name target, Name source) { | ||
// We wish to avoid certain extremely-large sizes after inlining, as they | ||
// may hit limits in VMs and/or slow down startup (measurements there | ||
// indicate something like ~1 second to optimize a 100K function). See e.g. | ||
// https://github.com/WebAssembly/binaryen/pull/3730#issuecomment-867939138 | ||
// https://github.com/emscripten-core/emscripten/issues/13899#issuecomment-825073344 | ||
auto combinedSize = infos[target].size + infos[source].size; | ||
// Estimate the binary size from the number of instructions. | ||
auto estimatedBinarySize = Measurer::BytesPerExpr * combinedSize; | ||
const Index MaxCombinedBinarySize = 400 * 1024; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is this an arbitrary limit? Maybe good to add a single-line comment on what this is. If this is an arbitrary limit, stating that will help readers too, in case they think this number has a specific meaning. |
||
return estimatedBinarySize < MaxCombinedBinarySize; | ||
} | ||
}; | ||
|
||
Pass* createInliningPass() { return new Inlining(); } | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: How about
isProfitableToInline
or something..? It is not that technically we cannot inline but we choose not to because of performance reasons..There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe
isUnderSizeLimit
to be precise?