Skip to content

Revert "[Passes] Expose parseSinglePassOption" #86225

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
Mar 22, 2024
Merged

Revert "[Passes] Expose parseSinglePassOption" #86225

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
7 changes: 0 additions & 7 deletions llvm/include/llvm/Passes/PassBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,13 +672,6 @@ class PassBuilder {
return Result;
}

/// Handle passes only accept one bool-valued parameter.
///
/// \return false when Params is empty.
static Expected<bool> parseSinglePassOption(StringRef Params,
StringRef OptionName,
StringRef PassName);

private:
// O1 pass pipeline
FunctionPassManager
Expand Down
55 changes: 24 additions & 31 deletions llvm/lib/Passes/PassBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,9 +600,8 @@ Expected<LoopUnrollOptions> parseLoopUnrollOptions(StringRef Params) {
return UnrollOpts;
}

Expected<bool> PassBuilder::parseSinglePassOption(StringRef Params,
StringRef OptionName,
StringRef PassName) {
Expected<bool> parseSinglePassOption(StringRef Params, StringRef OptionName,
StringRef PassName) {
bool Result = false;
while (!Params.empty()) {
StringRef ParamName;
Expand All @@ -621,28 +620,24 @@ Expected<bool> PassBuilder::parseSinglePassOption(StringRef Params,
}

Expected<bool> parseGlobalDCEPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(
Params, "vfe-linkage-unit-visibility", "GlobalDCE");
return parseSinglePassOption(Params, "vfe-linkage-unit-visibility", "GlobalDCE");
}

Expected<bool> parseCGProfilePassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "in-lto-post-link",
"CGProfile");
return parseSinglePassOption(Params, "in-lto-post-link", "CGProfile");
}

Expected<bool> parseInlinerPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "only-mandatory",
"InlinerPass");
return parseSinglePassOption(Params, "only-mandatory", "InlinerPass");
}

Expected<bool> parseCoroSplitPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "reuse-storage",
"CoroSplitPass");
return parseSinglePassOption(Params, "reuse-storage", "CoroSplitPass");
}

Expected<bool> parsePostOrderFunctionAttrsPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(
Params, "skip-non-recursive-function-attrs", "PostOrderFunctionAttrs");
return parseSinglePassOption(Params, "skip-non-recursive-function-attrs",
"PostOrderFunctionAttrs");
}

Expected<CFGuardPass::Mechanism> parseCFGuardPassOptions(StringRef Params) {
Expand All @@ -666,21 +661,19 @@ Expected<CFGuardPass::Mechanism> parseCFGuardPassOptions(StringRef Params) {
}

Expected<bool> parseEarlyCSEPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "memssa", "EarlyCSE");
return parseSinglePassOption(Params, "memssa", "EarlyCSE");
}

Expected<bool> parseEntryExitInstrumenterPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "post-inline",
"EntryExitInstrumenter");
return parseSinglePassOption(Params, "post-inline", "EntryExitInstrumenter");
}

Expected<bool> parseLoopExtractorPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "single", "LoopExtractor");
return parseSinglePassOption(Params, "single", "LoopExtractor");
}

Expected<bool> parseLowerMatrixIntrinsicsPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "minimal",
"LowerMatrixIntrinsics");
return parseSinglePassOption(Params, "minimal", "LowerMatrixIntrinsics");
}

Expected<AddressSanitizerOptions> parseASanPassOptions(StringRef Params) {
Expand Down Expand Up @@ -1020,13 +1013,13 @@ parseStackLifetimeOptions(StringRef Params) {
}

Expected<bool> parseDependenceAnalysisPrinterOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "normalized-results",
"DependenceAnalysisPrinter");
return parseSinglePassOption(Params, "normalized-results",
"DependenceAnalysisPrinter");
}

Expected<bool> parseSeparateConstOffsetFromGEPPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "lower-gep",
"SeparateConstOffsetFromGEP");
return parseSinglePassOption(Params, "lower-gep",
"SeparateConstOffsetFromGEP");
}

Expected<OptimizationLevel>
Expand All @@ -1042,13 +1035,13 @@ parseFunctionSimplificationPipelineOptions(StringRef Params) {
}

Expected<bool> parseMemorySSAPrinterPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "no-ensure-optimized-uses",
"MemorySSAPrinterPass");
return parseSinglePassOption(Params, "no-ensure-optimized-uses",
"MemorySSAPrinterPass");
}

Expected<bool> parseSpeculativeExecutionPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "only-if-divergent-target",
"SpeculativeExecutionPass");
return parseSinglePassOption(Params, "only-if-divergent-target",
"SpeculativeExecutionPass");
}

Expected<std::string> parseMemProfUsePassOptions(StringRef Params) {
Expand All @@ -1069,13 +1062,13 @@ Expected<std::string> parseMemProfUsePassOptions(StringRef Params) {
}

Expected<bool> parseStructuralHashPrinterPassOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "detailed",
"StructuralHashPrinterPass");
return parseSinglePassOption(Params, "detailed",
"StructuralHashPrinterPass");
}

Expected<bool> parseWinEHPrepareOptions(StringRef Params) {
return PassBuilder::parseSinglePassOption(Params, "demote-catchswitch-only",
"WinEHPreparePass");
return parseSinglePassOption(Params, "demote-catchswitch-only",
"WinEHPreparePass");
}

Expected<GlobalMergeOptions> parseGlobalMergeOptions(StringRef Params) {
Expand Down