[TSAR, APC] Exclude APC passes from a list of analysis passes that can be run separately.

Author: kaniandr

lib/APC/ArrayInfo.cpp

@@ -36,7 +36,6 @@
 #include "tsar/Analysis/Memory/Utils.h"
 #include "tsar/APC/APCContext.h"
 #include "tsar/APC/Passes.h"
-#include "tsar/Core/Query.h"
 #include "tsar/Support/Diagnostic.h"
 #include "tsar/Support/MetadataUtils.h"
 #include "tsar/Support/NumericUtils.h"
@@ -74,24 +73,21 @@ class APCArrayInfoPass : public FunctionPass, private bcl::Uncopyable {
 
 private:
   std::vector<apc::Array *> mArrays;
-  bool mMultipleLaunch = false;
 };
 }
 
 char APCArrayInfoPass::ID = 0;
 
-INITIALIZE_PASS_IN_GROUP_BEGIN(APCArrayInfoPass, "apc-array-info",
-  "Array Collector (APC)", true, true,
-  DefaultQueryManager::PrintPassGroup::getPassRegistry())
+INITIALIZE_PASS_BEGIN(APCArrayInfoPass, "apc-array-info",
+  "Array Collector (APC)", true, true)
   INITIALIZE_PASS_DEPENDENCY(DelinearizationPass)
   INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)
   INITIALIZE_PASS_DEPENDENCY(APCContextWrapper)
   INITIALIZE_PASS_DEPENDENCY(EstimateMemoryPass)
   INITIALIZE_PASS_DEPENDENCY(DIEstimateMemoryPass)
   INITIALIZE_PASS_DEPENDENCY(ClangDIMemoryMatcherPass)
-INITIALIZE_PASS_IN_GROUP_END(APCArrayInfoPass, "apc-array-info",
-  "Array Collector (APC)", true, true,
-  DefaultQueryManager::PrintPassGroup::getPassRegistry())
+INITIALIZE_PASS_END(APCArrayInfoPass, "apc-array-info",
+  "Array Collector (APC)", true, true)
 
 FunctionPass * llvm::createAPCArrayInfoPass() { return new APCArrayInfoPass; }
 
@@ -249,10 +245,6 @@ bool APCArrayInfoPass::runOnFunction(Function &Func) {
     Var.get<MD>() = &ClientDIEM;
     if (auto *A{APCCtx.findArray(ClientRawDIM)}) {
       auto S{A->GetDeclSymbol()};
-      // This pass may be executed in analysis mode. It depends on -print-only
-      // and -print-step options. In case of parallelization pass manager must
-      // invokes this pass only once for each function.
-      mMultipleLaunch |= S->getVariable(&Func).hasValue();
       S->addRedeclaration(std::move(Var));
       continue;
     }
@@ -267,7 +259,6 @@ bool APCArrayInfoPass::runOnFunction(Function &Func) {
       llvm_unreachable("Unable to add new array to an APC context!");
       delete APCArray;
       mArrays.push_back(APCCtx.findArray(ClientRawDIM));
-      mMultipleLaunch = true;
       continue;
     }
     mArrays.push_back(APCArray);
@@ -289,9 +280,6 @@ bool APCArrayInfoPass::runOnFunction(Function &Func) {
 }
 
 void APCArrayInfoPass::print(raw_ostream &OS, const Module *M) const {
-  if (mMultipleLaunch)
-    OS << "warning: possible multiple launches of the pass for the same "
-          "function: print merged results\n";
   for (auto *A : mArrays) {
     OS << format("%s [short=%s, unique=%s, id=%d]\n", A->GetName().c_str(),
       A->GetShortName().c_str(), A->GetArrayUniqKey().c_str(), A->GetId());

lib/APC/CMakeLists.txt

@@ -1,4 +1,4 @@
-set(APC_SOURCES Passes.cpp APCContext.cpp Utils.cpp LoopInfoBase.cpp
+set(APC_SOURCES Passes.cpp APCContext.cpp Utils.cpp LoopInfo.cpp
   ArrayInfo.cpp FunctionInfo.cpp Parallelization.cpp ClangDVMHWriter.cpp
   DistributionLimits.cpp DirectivesCollector.cpp DiagnosticPrinter.cpp)
 

lib/APC/FunctionInfo.cpp

@@ -31,7 +31,6 @@
 #include "tsar/Analysis/Memory/Utils.h"
 #include "tsar/APC/APCContext.h"
 #include "tsar/APC/Passes.h"
-#include "tsar/Core/Query.h"
 #include "tsar/Support/Diagnostic.h"
 #include "tsar/Support/MetadataUtils.h"
 #include "tsar/Support/Utils.h"
@@ -58,16 +57,6 @@ using APCFunctionInfoPassProvider =
     FunctionPassAAProvider<DIEstimateMemoryPass, EstimateMemoryPass,
                            DominatorTreeWrapperPass, AAResultsWrapperPass>;
 
-class APCFunctionInfoPassInfo final : public PassGroupInfo {
-  bool isNecessaryPass(llvm::AnalysisID ID) const override {
-    static llvm::AnalysisID Passes[] = {
-      getPassIDAndErase(createAPCLoopInfoBasePass()),
-      getPassIDAndErase(createAPCArrayInfoPass()),
-    };
-    return count(Passes, ID);
-  }
-};
-
 class APCFunctionInfoPass: public ModulePass, private bcl::Uncopyable {
 public:
   static char ID;
@@ -137,10 +126,8 @@ char APCFunctionInfoPass::ID = 0;
 INITIALIZE_PROVIDER(APCFunctionInfoPassProvider, "apc-function-info-provider",
   "Function Collector (APC, Provider")
 
-INITIALIZE_PASS_IN_GROUP_BEGIN(APCFunctionInfoPass, "apc-function-info",
-  "Function Collector (APC)", true, true,
-  DefaultQueryManager::PrintPassGroup::getPassRegistry())
-  INITIALIZE_PASS_IN_GROUP_INFO(APCFunctionInfoPassInfo);
+INITIALIZE_PASS_BEGIN(APCFunctionInfoPass, "apc-function-info",
+  "Function Collector (APC)", true, true)
   INITIALIZE_PASS_DEPENDENCY(LoopInfoWrapperPass)
   INITIALIZE_PASS_DEPENDENCY(DIMemoryEnvironmentWrapper)
   INITIALIZE_PASS_DEPENDENCY(DIEstimateMemoryPass)
@@ -151,9 +138,8 @@ INITIALIZE_PASS_IN_GROUP_BEGIN(APCFunctionInfoPass, "apc-function-info",
   INITIALIZE_PASS_DEPENDENCY(APCContextWrapper)
   INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
   INITIALIZE_PASS_DEPENDENCY(APCFunctionInfoPassProvider)
-INITIALIZE_PASS_IN_GROUP_END(APCFunctionInfoPass, "apc-function-info",
-  "Function Collector (APC)", true, true,
-  DefaultQueryManager::PrintPassGroup::getPassRegistry())
+INITIALIZE_PASS_END(APCFunctionInfoPass, "apc-function-info",
+  "Function Collector (APC)", true, true)
 
 ModulePass * llvm::createAPCFunctionInfoPass() {
   return new APCFunctionInfoPass;
@@ -195,13 +181,6 @@ bool APCFunctionInfoPass::runOnModule(Module &M) {
       continue;
     auto Pair = registerFunction(const_cast<Function &>(*Caller.first), APCCtx);
     mFunctions.push_back(Pair.first);
-    if (!Pair.second) {
-      // This pass may be executed in analysis mode. It depends on -print-only
-      // and -print-step options. In case of parallelization pass manager must
-      // invokes this pass only once for each function.
-      mMultipleLaunch = true;
-      continue;
-    }
     auto &FI = *Pair.first;
     auto DIFunc = Caller.first->getSubprogram();
     /// TODO ([email protected]): should we emit warning or error if filename
@@ -382,9 +361,6 @@ bool APCFunctionInfoPass::runOnModule(Module &M) {
 }
 
 void APCFunctionInfoPass::print(raw_ostream &OS, const Module *M) const {
-  if (mMultipleLaunch)
-    OS << "warning: possible multiple launches of the pass for the same "
-          "module: print merged results\n";
   auto printParams = [&OS](const apc::FuncParam &Params, const Twine &Prefix) {
     for (std::size_t I = 0, EI = Params.countOfPars; I < EI; ++I) {
       OS << Prefix << "idx: " << I << "\n";

lib/APC/LoopInfoBase.cpp renamed to lib/APC/LoopInfo.cpp

@@ -1,4 +1,4 @@
-//===---- LoopInfoBase.cpp ----- APC Loop Graph Builder  --------*- C++ -*-===//
+//===---- LoopInfo.cpp ----- APC Loop Graph Builder  --------*- C++ -*-===//
 //
 //                       Traits Static Analyzer (SAPFOR)
 //
@@ -44,7 +44,6 @@
 #include "tsar/APC/APCContext.h"
 #include "tsar/APC/Passes.h"
 #include "tsar/APC/Utils.h"
-#include "tsar/Core/Query.h"
 #include "tsar/Frontend/Clang/TransformationContext.h"
 #include "tsar/Support/GlobalOptions.h"
 #include "tsar/Support/NumericUtils.h"
@@ -68,7 +67,7 @@ using namespace llvm;
 using namespace tsar;
 
 #undef DEBUG_TYPE
-#define DEBUG_TYPE "apc-loop-base"
+#define DEBUG_TYPE "apc-loop-info"
 
 namespace {
 class APCLoopInfoBasePass : public FunctionPass, private bcl::Uncopyable {
@@ -138,9 +137,8 @@ class APCLoopInfoBasePass : public FunctionPass, private bcl::Uncopyable {
 
 char APCLoopInfoBasePass::ID = 0;
 
-INITIALIZE_PASS_IN_GROUP_BEGIN(APCLoopInfoBasePass, "apc-loop-info",
-  "Loop Graph Builder (APC)", true, true,
-  DefaultQueryManager::PrintPassGroup::getPassRegistry())
+INITIALIZE_PASS_BEGIN(APCLoopInfoBasePass, "apc-loop-info",
+  "Loop Graph Builder (APC)", true, true)
   INITIALIZE_PASS_DEPENDENCY(AnalysisSocketImmutableWrapper)
   INITIALIZE_PASS_DEPENDENCY(APCContextWrapper)
   INITIALIZE_PASS_DEPENDENCY(ClangDIMemoryMatcherPass)
@@ -155,9 +153,8 @@ INITIALIZE_PASS_IN_GROUP_BEGIN(APCLoopInfoBasePass, "apc-loop-info",
   INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
   INITIALIZE_PASS_DEPENDENCY(ParallelLoopPass)
   INITIALIZE_PASS_DEPENDENCY(TransformationEnginePass)
-INITIALIZE_PASS_IN_GROUP_END(APCLoopInfoBasePass, "apc-loop-info",
-  "Loop Graph Builder (APC)", true, true,
-    DefaultQueryManager::PrintPassGroup::getPassRegistry())
+INITIALIZE_PASS_END(APCLoopInfoBasePass, "apc-loop-info",
+  "Loop Graph Builder (APC)", true, true)
 
 FunctionPass * llvm::createAPCLoopInfoBasePass() {
   return new APCLoopInfoBasePass;

lib/Core/Query.cpp

@@ -335,21 +335,10 @@ void DefaultQueryManager::run(llvm::Module *M, TransformationInfo *TfmInfo) {
   // avoid dangling handles. So, we add pool before environment in the manager.
   Passes.add(createDIMemoryTraitPoolStorage());
   Passes.add(createDIMemoryEnvironmentStorage());
-#ifdef APC_FOUND
-  Passes.add(createAPCContextStorage());
-  addIfNecessary(createAPCLoopInfoBasePass(), mPrintPasses,
-                 PrintPassGroup::getPassRegistry(), Passes);
-#endif
   addBeforeTfmAnalysis(Passes);
   addPrint(BeforeTfmAnalysis);
   addOutput(BeforeTfmAnalysis);
   addAfterSROAAnalysis(*mGlobalOptions, M->getDataLayout(), Passes);
-#ifdef APC_FOUND
-  addIfNecessary(createAPCFunctionInfoPass(), mPrintPasses,
-                 PrintPassGroup::getPassRegistry(), Passes);
-  addIfNecessary(createAPCArrayInfoPass(), mPrintPasses,
-                 PrintPassGroup::getPassRegistry(), Passes);
-#endif
   addPrint(AfterSroaAnalysis);
   addOutput(AfterSroaAnalysis);
   addAfterFunctionInlineAnalysis(