From 7372d445afa0af9a6982e863affbc3dba1468658 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Wed, 7 Jan 2015 11:14:51 +0000 Subject: [PATCH] [PM] Give slightly less horrible names to the utility pass templates for requiring and invalidating specific analyses. Also make their printed names match their class names. Writing these out as prose really doesn't make sense to me any more. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225346 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/PassManager.h | 8 +++--- test/Other/new-pass-manager.ll | 46 +++++++++++++++++----------------- tools/opt/Passes.cpp | 12 ++++----- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/llvm/IR/PassManager.h b/include/llvm/IR/PassManager.h index 8ecc8448097..369228ed7fb 100644 --- a/include/llvm/IR/PassManager.h +++ b/include/llvm/IR/PassManager.h @@ -781,7 +781,7 @@ createModuleToFunctionPassAdaptor(FunctionPassT Pass) { /// /// This is a no-op pass which simply forces a specific analysis pass's result /// to be available when it is run. -template struct NoopAnalysisRequirementPass { +template struct RequireAnalysisPass { /// \brief Run this pass over some unit of IR. /// /// This pass can be run over any unit of IR and use any analysis manager @@ -796,7 +796,7 @@ template struct NoopAnalysisRequirementPass { return PreservedAnalyses::all(); } - static StringRef name() { return "No-op Analysis Requirement Pass"; } + static StringRef name() { return "RequireAnalysisPass"; } }; /// \brief A template utility pass to force an analysis result to be @@ -804,7 +804,7 @@ template struct NoopAnalysisRequirementPass { /// /// This is a no-op pass which simply forces a specific analysis result to be /// invalidated when it is run. -template struct NoopAnalysisInvalidationPass { +template struct InvalidateAnalysisPass { /// \brief Run this pass over some unit of IR. /// /// This pass can be run over any unit of IR and use any analysis manager @@ -821,7 +821,7 @@ template struct NoopAnalysisInvalidationPass { return PreservedAnalyses::all(); } - static StringRef name() { return "No-op Analysis Invalidation Pass"; } + static StringRef name() { return "InvalidateAnalysisPass"; } }; /// \brief A utility pass that does nothing but preserves no analyses. diff --git a/test/Other/new-pass-manager.ll b/test/Other/new-pass-manager.ll index d963ca16537..e3d47d19507 100644 --- a/test/Other/new-pass-manager.ll +++ b/test/Other/new-pass-manager.ll @@ -126,13 +126,13 @@ ; RUN: -passes='require,cgscc(require,function(require))' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-ANALYSES ; CHECK-ANALYSES: Starting module pass manager -; CHECK-ANALYSES: Running module pass: No-op Analysis Requirement Pass +; CHECK-ANALYSES: Running module pass: RequireAnalysisPass ; CHECK-ANALYSES: Running module analysis: NoOpModuleAnalysis ; CHECK-ANALYSES: Starting CGSCC pass manager -; CHECK-ANALYSES: Running CGSCC pass: No-op Analysis Requirement Pass +; CHECK-ANALYSES: Running CGSCC pass: RequireAnalysisPass ; CHECK-ANALYSES: Running CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-ANALYSES: Starting function pass manager -; CHECK-ANALYSES: Running function pass: No-op Analysis Requirement Pass +; CHECK-ANALYSES: Running function pass: RequireAnalysisPass ; CHECK-ANALYSES: Running function analysis: NoOpFunctionAnalysis ; Make sure no-op passes that preserve all analyses don't even try to do any @@ -147,7 +147,7 @@ ; RUN: -passes='require,require,require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Starting module pass manager -; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running module pass: No-op Analysis Requirement Pass +; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running module pass: RequireAnalysisPass ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS: Running module analysis: NoOpModuleAnalysis ; CHECK-DO-CACHE-MODULE-ANALYSIS-RESULTS-NOT: Running module analysis: NoOpModuleAnalysis @@ -155,7 +155,7 @@ ; RUN: -passes='require,invalidate,require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Starting module pass manager -; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running module pass: No-op Analysis Requirement Pass +; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running module pass: RequireAnalysisPass ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running module analysis: NoOpModuleAnalysis ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Invalidating module analysis: NoOpModuleAnalysis ; CHECK-DO-INVALIDATE-MODULE-ANALYSIS-RESULTS: Running module analysis: NoOpModuleAnalysis @@ -164,7 +164,7 @@ ; RUN: -passes='cgscc(require,require,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Starting CGSCC pass manager -; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running CGSCC pass: No-op Analysis Requirement Pass +; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running CGSCC pass: RequireAnalysisPass ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS: Running CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-DO-CACHE-CGSCC-ANALYSIS-RESULTS-NOT: Running CGSCC analysis: NoOpCGSCCAnalysis @@ -172,7 +172,7 @@ ; RUN: -passes='cgscc(require,invalidate,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Starting CGSCC pass manager -; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running CGSCC pass: No-op Analysis Requirement Pass +; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running CGSCC pass: RequireAnalysisPass ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Invalidating CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-DO-INVALIDATE-CGSCC-ANALYSIS-RESULTS: Running CGSCC analysis: NoOpCGSCCAnalysis @@ -181,7 +181,7 @@ ; RUN: -passes='function(require,require,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Starting function pass manager -; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running function pass: No-op Analysis Requirement Pass +; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running function pass: RequireAnalysisPass ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS: Running function analysis: NoOpFunctionAnalysis ; CHECK-DO-CACHE-FUNCTION-ANALYSIS-RESULTS-NOT: Running function analysis: NoOpFunctionAnalysis @@ -189,7 +189,7 @@ ; RUN: -passes='function(require,invalidate,require)' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Starting function pass manager -; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running function pass: No-op Analysis Requirement Pass +; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running function pass: RequireAnalysisPass ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running function analysis: NoOpFunctionAnalysis ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Invalidating function analysis: NoOpFunctionAnalysis ; CHECK-DO-INVALIDATE-FUNCTION-ANALYSIS-RESULTS: Running function analysis: NoOpFunctionAnalysis @@ -198,30 +198,30 @@ ; RUN: -passes='require,module(require,function(require,invalidate,require),require),require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL ; CHECK-INVALIDATE-ALL: Starting module pass manager run. -; CHECK-INVALIDATE-ALL: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL: Starting module pass manager run. -; CHECK-INVALIDATE-ALL: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-NOT: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL: Starting function pass manager run. -; CHECK-INVALIDATE-ALL: Running function pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL: Running function pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL: Running function analysis: NoOpFunctionAnalysis ; CHECK-INVALIDATE-ALL: Running function pass: InvalidateAllAnalysesPass ; CHECK-INVALIDATE-ALL: Invalidating all non-preserved analyses for function ; CHECK-INVALIDATE-ALL: Invalidating function analysis: NoOpFunctionAnalysis -; CHECK-INVALIDATE-ALL: Running function pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL: Running function pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL: Running function analysis: NoOpFunctionAnalysis ; CHECK-INVALIDATE-ALL: Finished function pass manager run. ; CHECK-INVALIDATE-ALL: Invalidating all non-preserved analyses for function ; CHECK-INVALIDATE-ALL-NOT: Running function analysis: NoOpFunctionAnalysis ; CHECK-INVALIDATE-ALL: Invalidating all non-preserved analyses for module ; CHECK-INVALIDATE-ALL: Invalidating module analysis: NoOpModuleAnalysis -; CHECK-INVALIDATE-ALL: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL: Finished module pass manager run. ; CHECK-INVALIDATE-ALL: Invalidating all non-preserved analyses for module ; CHECK-INVALIDATE-ALL-NOT: Invalidating module analysis: NoOpModuleAnalysis -; CHECK-INVALIDATE-ALL: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-NOT: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL: Finished module pass manager run. @@ -229,40 +229,40 @@ ; RUN: -passes='require,module(require,cgscc(require,function(require,invalidate,require),require),require),require' %s 2>&1 \ ; RUN: | FileCheck %s --check-prefix=CHECK-INVALIDATE-ALL-CG ; CHECK-INVALIDATE-ALL-CG: Starting module pass manager run. -; CHECK-INVALIDATE-ALL-CG: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL-CG: Starting module pass manager run. -; CHECK-INVALIDATE-ALL-CG: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG-NOT: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL-CG: Starting CGSCC pass manager run. -; CHECK-INVALIDATE-ALL-CG: Running CGSCC pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running CGSCC pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG: Running CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-INVALIDATE-ALL-CG: Starting function pass manager run. -; CHECK-INVALIDATE-ALL-CG: Running function pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running function pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG: Running function analysis: NoOpFunctionAnalysis ; CHECK-INVALIDATE-ALL-CG: Running function pass: InvalidateAllAnalysesPass ; CHECK-INVALIDATE-ALL-CG: Invalidating all non-preserved analyses for function ; CHECK-INVALIDATE-ALL-CG: Invalidating function analysis: NoOpFunctionAnalysis -; CHECK-INVALIDATE-ALL-CG: Running function pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running function pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG: Running function analysis: NoOpFunctionAnalysis ; CHECK-INVALIDATE-ALL-CG: Finished function pass manager run. ; CHECK-INVALIDATE-ALL-CG: Invalidating all non-preserved analyses for function ; CHECK-INVALIDATE-ALL-CG-NOT: Running function analysis: NoOpFunctionAnalysis ; CHECK-INVALIDATE-ALL-CG: Invalidating all non-preserved analyses for SCC ; CHECK-INVALIDATE-ALL-CG: Invalidating CGSCC analysis: NoOpCGSCCAnalysis -; CHECK-INVALIDATE-ALL-CG: Running CGSCC pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running CGSCC pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG: Running CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-INVALIDATE-ALL-CG: Finished CGSCC pass manager run. ; CHECK-INVALIDATE-ALL-CG: Invalidating all non-preserved analyses for SCC ; CHECK-INVALIDATE-ALL-CG-NOT: Invalidating CGSCC analysis: NoOpCGSCCAnalysis ; CHECK-INVALIDATE-ALL-CG: Invalidating all non-preserved analyses for module ; CHECK-INVALIDATE-ALL-CG: Invalidating module analysis: NoOpModuleAnalysis -; CHECK-INVALIDATE-ALL-CG: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL-CG: Finished module pass manager run. ; CHECK-INVALIDATE-ALL-CG: Invalidating all non-preserved analyses for module ; CHECK-INVALIDATE-ALL-CG-NOT: Invalidating module analysis: NoOpModuleAnalysis -; CHECK-INVALIDATE-ALL-CG: Running module pass: No-op Analysis Requirement Pass +; CHECK-INVALIDATE-ALL-CG: Running module pass: RequireAnalysisPass ; CHECK-INVALIDATE-ALL-CG-NOT: Running module analysis: NoOpModuleAnalysis ; CHECK-INVALIDATE-ALL-CG: Finished module pass manager run. diff --git a/tools/opt/Passes.cpp b/tools/opt/Passes.cpp index bc17e1d35b5..69301256f89 100644 --- a/tools/opt/Passes.cpp +++ b/tools/opt/Passes.cpp @@ -142,11 +142,11 @@ static bool parseModulePassName(ModulePassManager &MPM, StringRef Name) { } #define MODULE_ANALYSIS(NAME, CREATE_PASS) \ if (Name == "require<" NAME ">") { \ - MPM.addPass(NoopAnalysisRequirementPass()); \ + MPM.addPass(RequireAnalysisPass()); \ return true; \ } \ if (Name == "invalidate<" NAME ">") { \ - MPM.addPass(NoopAnalysisInvalidationPass()); \ + MPM.addPass(InvalidateAnalysisPass()); \ return true; \ } #include "PassRegistry.def" @@ -162,11 +162,11 @@ static bool parseCGSCCPassName(CGSCCPassManager &CGPM, StringRef Name) { } #define CGSCC_ANALYSIS(NAME, CREATE_PASS) \ if (Name == "require<" NAME ">") { \ - CGPM.addPass(NoopAnalysisRequirementPass()); \ + CGPM.addPass(RequireAnalysisPass()); \ return true; \ } \ if (Name == "invalidate<" NAME ">") { \ - CGPM.addPass(NoopAnalysisInvalidationPass()); \ + CGPM.addPass(InvalidateAnalysisPass()); \ return true; \ } #include "PassRegistry.def" @@ -182,11 +182,11 @@ static bool parseFunctionPassName(FunctionPassManager &FPM, StringRef Name) { } #define FUNCTION_ANALYSIS(NAME, CREATE_PASS) \ if (Name == "require<" NAME ">") { \ - FPM.addPass(NoopAnalysisRequirementPass()); \ + FPM.addPass(RequireAnalysisPass()); \ return true; \ } \ if (Name == "invalidate<" NAME ">") { \ - FPM.addPass(NoopAnalysisInvalidationPass()); \ + FPM.addPass(InvalidateAnalysisPass()); \ return true; \ } #include "PassRegistry.def"