return Count;
}
+static std::optional<std::pair<bool, bool>>
+parseFunctionPipelineName(StringRef Name) {
+ std::pair<bool, bool> Params;
+ if (!Name.consume_front("function"))
+ return std::nullopt;
+ if (Name.empty())
+ return Params;
+ if (!Name.consume_front("<") || !Name.consume_back(">"))
+ return std::nullopt;
+ while (!Name.empty()) {
+ auto [Front, Back] = Name.split(';');
+ Name = Back;
+ if (Front == "eager-inv")
+ Params.first = true;
+ else if (Front == "no-rerun")
+ Params.second = true;
+ else
+ return std::nullopt;
+ }
+ return Params;
+}
+
static std::optional<int> parseDevirtPassName(StringRef Name) {
if (!Name.consume_front("devirt<") || !Name.consume_back(">"))
return std::nullopt;
if (startsWithDefaultPipelineAliasPrefix(Name))
return DefaultAliasRegex.match(Name);
+ StringRef NameNoBracket = Name.take_until([](char C) { return C == '<'; });
+
// Explicitly handle pass manager names.
if (Name == "module")
return true;
if (Name == "cgscc")
return true;
- if (Name == "function" || Name == "function<eager-inv>")
+ if (NameNoBracket == "function")
return true;
if (Name == "coro-cond")
return true;
template <typename CallbacksT>
static bool isCGSCCPassName(StringRef Name, CallbacksT &Callbacks) {
// Explicitly handle pass manager names.
+ StringRef NameNoBracket = Name.take_until([](char C) { return C == '<'; });
if (Name == "cgscc")
return true;
- if (Name == "function" || Name == "function<eager-inv>")
+ if (NameNoBracket == "function")
return true;
// Explicitly handle custom-parsed pass names.
template <typename CallbacksT>
static bool isFunctionPassName(StringRef Name, CallbacksT &Callbacks) {
// Explicitly handle pass manager names.
- if (Name == "function" || Name == "function<eager-inv>")
+ StringRef NameNoBracket = Name.take_until([](char C) { return C == '<'; });
+ if (NameNoBracket == "function")
return true;
if (Name == "loop" || Name == "loop-mssa")
return true;
MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
return Error::success();
}
- if (Name == "function" || Name == "function<eager-inv>") {
+ if (auto Params = parseFunctionPipelineName(Name)) {
+ if (Params->second)
+ return make_error<StringError>(
+ "cannot have a no-rerun module to function adaptor",
+ inconvertibleErrorCode());
FunctionPassManager FPM;
if (auto Err = parseFunctionPassPipeline(FPM, InnerPipeline))
return Err;
- MPM.addPass(createModuleToFunctionPassAdaptor(std::move(FPM),
- Name != "function"));
+ MPM.addPass(
+ createModuleToFunctionPassAdaptor(std::move(FPM), Params->first));
return Error::success();
}
if (auto Count = parseRepeatPassName(Name)) {
CGPM.addPass(std::move(NestedCGPM));
return Error::success();
}
- if (Name == "function" || Name == "function<eager-inv>") {
+ if (auto Params = parseFunctionPipelineName(Name)) {
FunctionPassManager FPM;
if (auto Err = parseFunctionPassPipeline(FPM, InnerPipeline))
return Err;
// Add the nested pass manager with the appropriate adaptor.
- CGPM.addPass(
- createCGSCCToFunctionPassAdaptor(std::move(FPM), Name != "function"));
+ CGPM.addPass(createCGSCCToFunctionPassAdaptor(
+ std::move(FPM), Params->first, Params->second));
return Error::success();
}
if (auto Count = parseRepeatPassName(Name)) {
;; Test function-attrs
; RUN: opt -disable-output -disable-verify -print-pipeline-passes -passes='cgscc(function-attrs<skip-non-recursive>)' < %s | FileCheck %s --match-full-lines --check-prefixes=CHECK-29
; CHECK-29: cgscc(function-attrs<skip-non-recursive>)
+
+;; Test cgscc -> function adaptor
+; RUN: opt -disable-output -disable-verify -print-pipeline-passes -passes='cgscc(function<eager-inv;no-rerun>(no-op-function))' < %s | FileCheck %s --match-full-lines --check-prefixes=CHECK-30
+; CHECK-30: cgscc(function<eager-inv;no-rerun>(no-op-function))
+
+; RUN: opt -disable-output -disable-verify -print-pipeline-passes -passes='cgscc(function<no-rerun;eager-inv>(no-op-function))' < %s | FileCheck %s --match-full-lines --check-prefixes=CHECK-31
+; CHECK-31: cgscc(function<eager-inv;no-rerun>(no-op-function))
+
+; RUN: opt -disable-output -disable-verify -print-pipeline-passes -passes='cgscc(function<no-rerun>(no-op-function))' < %s | FileCheck %s --match-full-lines --check-prefixes=CHECK-32
+; CHECK-32: cgscc(function<no-rerun>(no-op-function))