Author: Arthur Eubanks Date: 2020-12-08T13:38:56-08:00 New Revision: eca13e995c6428e11f0d402641a74c9fe26f124c
URL: https://github.com/llvm/llvm-project/commit/eca13e995c6428e11f0d402641a74c9fe26f124c DIFF: https://github.com/llvm/llvm-project/commit/eca13e995c6428e11f0d402641a74c9fe26f124c.diff LOG: [NFC] Rename IsCodeGenPass to ShouldPinPassToLegacyPM Codegen-specific passes are being ported to the NPM. Rename for better clarity and note that ported passes that fully work with the NPM should be removed from these lists. Reviewed By: asbirlea Differential Revision: https://reviews.llvm.org/D92818 Added: Modified: llvm/tools/opt/opt.cpp Removed: ################################################################################ diff --git a/llvm/tools/opt/opt.cpp b/llvm/tools/opt/opt.cpp index ed50c0c00a05..5e641783e274 100644 --- a/llvm/tools/opt/opt.cpp +++ b/llvm/tools/opt/opt.cpp @@ -457,10 +457,11 @@ struct TimeTracerRAII { } }; -// For use in NPM transition. +// For use in NPM transition. Currently this contains most codegen-specific +// passes. Remove passes from here when porting to the NPM. // TODO: use a codegen version of PassRegistry.def/PassBuilder::is*Pass() once // it exists. -static bool IsCodegenPass(StringRef Pass) { +static bool shouldPinPassToLegacyPM(StringRef Pass) { std::vector<StringRef> PassNamePrefix = { "x86-", "xcore-", "wasm-", "systemz-", "ppc-", "nvvm-", "nvptx-", "mips-", "lanai-", "hexagon-", "bpf-", "avr-", "thumb2-", "arm-", @@ -490,10 +491,10 @@ static bool IsCodegenPass(StringRef Pass) { } // For use in NPM transition. -static bool CodegenPassSpecifiedInPassList() { +static bool shouldForceLegacyPM() { for (const auto &P : PassList) { StringRef Arg = P->getPassArgument(); - if (IsCodegenPass(Arg)) + if (shouldPinPassToLegacyPM(Arg)) return true; } return false; @@ -722,7 +723,7 @@ int main(int argc, char **argv) { // If `-enable-new-pm` is specified and there are no codegen passes, use NPM. // e.g. `-enable-new-pm -sroa` will use NPM. // but `-enable-new-pm -codegenprepare` will still revert to legacy PM. - if ((EnableNewPassManager && !CodegenPassSpecifiedInPassList()) || + if ((EnableNewPassManager && !shouldForceLegacyPM()) || PassPipeline.getNumOccurrences() > 0) { if (AnalyzeOnly) { errs() << "Cannot specify -analyze under new pass manager\n"; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
