-
Notifications
You must be signed in to change notification settings - Fork 14.7k
[CodeGen][NPM] Update BranchFolderLegacy make tail merge configurable via flag #135277
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
Open
mikhailramalho
wants to merge
14
commits into
llvm:main
Choose a base branch
from
mikhailramalho:branch-folder-new-pm
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+23
−12
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
1439764
[CodeGen][NPM] Create method to add the branch folding pass with the …
mikhailramalho 1129f40
Add printPipeline
mikhailramalho 7d8d9df
Remove unused include
mikhailramalho 9b95974
Pass global flag via argument
mikhailramalho 17fcc45
Removed the default arg
mikhailramalho 73b228a
PassConfig is no longer needed
mikhailramalho f2dd02c
Implemented suggested changes
mikhailramalho fc156b5
Default to true
mikhailramalho b49d6d3
Revert "Implemented suggested changes"
mikhailramalho 1293477
Check if the pass was disabled when adding the pass via the pass' poi…
mikhailramalho 756e1a5
Moved requiresStructuredCFG check to pass creation
mikhailramalho 501a1cf
Use isPassSubstitutedOrOverridden to check if the pass was disabled
mikhailramalho 61251d3
Removed unnecessary local variable
mikhailramalho ec4571a
clang-format
mikhailramalho 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 hidden or 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 hidden or 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 hidden or 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 |
---|---|---|
|
@@ -39,7 +39,6 @@ | |
#include "llvm/CodeGen/MachineSizeOpts.h" | ||
#include "llvm/CodeGen/TargetInstrInfo.h" | ||
#include "llvm/CodeGen/TargetOpcodes.h" | ||
#include "llvm/CodeGen/TargetPassConfig.h" | ||
#include "llvm/CodeGen/TargetRegisterInfo.h" | ||
#include "llvm/CodeGen/TargetSubtargetInfo.h" | ||
#include "llvm/IR/DebugInfoMetadata.h" | ||
|
@@ -90,18 +89,20 @@ namespace { | |
|
||
/// BranchFolderPass - Wrap branch folder in a machine function pass. | ||
class BranchFolderLegacy : public MachineFunctionPass { | ||
bool EnableTailMerge; | ||
|
||
public: | ||
static char ID; | ||
|
||
explicit BranchFolderLegacy() : MachineFunctionPass(ID) {} | ||
explicit BranchFolderLegacy(bool EnableTailMerge = true) | ||
: MachineFunctionPass(ID), EnableTailMerge(EnableTailMerge) {} | ||
|
||
bool runOnMachineFunction(MachineFunction &MF) override; | ||
|
||
void getAnalysisUsage(AnalysisUsage &AU) const override { | ||
AU.addRequired<MachineBlockFrequencyInfoWrapperPass>(); | ||
AU.addRequired<MachineBranchProbabilityInfoWrapperPass>(); | ||
AU.addRequired<ProfileSummaryInfoWrapperPass>(); | ||
AU.addRequired<TargetPassConfig>(); | ||
MachineFunctionPass::getAnalysisUsage(AU); | ||
} | ||
|
||
|
@@ -123,9 +124,6 @@ INITIALIZE_PASS(BranchFolderLegacy, DEBUG_TYPE, "Control Flow Optimizer", false, | |
PreservedAnalyses BranchFolderPass::run(MachineFunction &MF, | ||
MachineFunctionAnalysisManager &MFAM) { | ||
MFPropsModifier _(*this, MF); | ||
bool EnableTailMerge = | ||
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. Since you're removing it here, the NPM require the flag |
||
!MF.getTarget().requiresStructuredCFG() && this->EnableTailMerge; | ||
|
||
auto &MBPI = MFAM.getResult<MachineBranchProbabilityAnalysis>(MF); | ||
auto *PSI = MFAM.getResult<ModuleAnalysisManagerMachineFunctionProxy>(MF) | ||
.getCachedResult<ProfileSummaryAnalysis>( | ||
|
@@ -144,15 +142,17 @@ PreservedAnalyses BranchFolderPass::run(MachineFunction &MF, | |
return getMachineFunctionPassPreservedAnalyses(); | ||
} | ||
|
||
void BranchFolderPass::printPipeline( | ||
raw_ostream &OS, function_ref<StringRef(StringRef)> MapClassName2PassName) { | ||
OS << MapClassName2PassName(name()); | ||
if (EnableTailMerge) | ||
OS << "<enable-tail-merge>"; | ||
} | ||
|
||
bool BranchFolderLegacy::runOnMachineFunction(MachineFunction &MF) { | ||
if (skipFunction(MF.getFunction())) | ||
return false; | ||
|
||
TargetPassConfig *PassConfig = &getAnalysis<TargetPassConfig>(); | ||
// TailMerge can create jump into if branches that make CFG irreducible for | ||
// HW that requires structurized CFG. | ||
bool EnableTailMerge = !MF.getTarget().requiresStructuredCFG() && | ||
PassConfig->getEnableTailMerge(); | ||
MBFIWrapper MBBFreqInfo( | ||
getAnalysis<MachineBlockFrequencyInfoWrapperPass>().getMBFI()); | ||
BranchFolder Folder( | ||
|
@@ -2080,3 +2080,7 @@ bool BranchFolder::HoistCommonCodeInSuccs(MachineBasicBlock *MBB) { | |
++NumHoist; | ||
return true; | ||
} | ||
|
||
MachineFunctionPass *llvm::createBranchFolderPass(bool EnableTailMerge = true) { | ||
return new BranchFolderLegacy(EnableTailMerge); | ||
} |
This file contains hidden or 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
Oops, something went wrong.
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.
Are you talking about the default argument? I see that
BranchFolderPass
already takes abool EnableTailMerge
:llvm-project/llvm/include/llvm/CodeGen/BranchFoldingPass.h
Line 19 in b39ab7a