Skip to content

Commit 4f1ae8c

Browse files
committed
Address comments, and fix getFilterName issue
1 parent 976c581 commit 4f1ae8c

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

llvm/lib/Passes/PassBuilder.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2240,8 +2240,9 @@ Error PassBuilder::parseAAPipeline(AAManager &AA, StringRef PipelineText) {
22402240
}
22412241

22422242
static StringRef getFilterName(StringRef PassName) {
2243-
PassName = PassName.drop_until([](char C) { return C == '<'; });
2244-
StringRef Params = PassName.drop_front().drop_back();
2243+
StringRef Params = PassName.drop_until([](char C) { return C == '<'; });
2244+
if (!Params.empty())
2245+
Params = Params.drop_front().drop_back();
22452246
while (!Params.empty()) {
22462247
StringRef ParamName;
22472248
std::tie(ParamName, Params) = Params.split(';');

llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -760,19 +760,15 @@ void AMDGPUTargetMachine::registerPassBuilderCallbacks(
760760
CodeGenOptLevel::None)) {
761761
// TODO: Add greedy register allocator.
762762
} else {
763-
RegAllocFastPassOptions Opts;
764-
Opts.Filter = onlyAllocateSGPRs;
765-
Opts.FilterName = "sgpr";
766-
Opts.ClearVRegs = false;
763+
RegAllocFastPassOptions SGPRRunOpts{allocateAllRegClasses, "sgpr",
764+
false};
767765
MachineFunctionPassManager MFPM;
768-
MFPM.addPass(RegAllocFastPass(Opts));
766+
MFPM.addPass(RegAllocFastPass(SGPRRunOpts));
769767
RegAllocMap["sgpr"] = std::move(MFPM);
770768

771-
Opts.Filter = onlyAllocateVGPRs;
772-
Opts.FilterName = "vgpr";
773-
Opts.ClearVRegs = true;
769+
RegAllocFastPassOptions VGPRRunOpts{onlyAllocateVGPRs, "vgpr", true};
774770
MFPM = MachineFunctionPassManager();
775-
MFPM.addPass(RegAllocFastPass(Opts));
771+
MFPM.addPass(RegAllocFastPass(VGPRRunOpts));
776772
RegAllocMap["vgpr"] = std::move(MFPM);
777773
}
778774
});

0 commit comments

Comments
 (0)