[llvm] r245004 - [PM/AA] Hoist the AA counter pass into a header to match the analysis
Chandler Carruth via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 13 19:05:42 PDT 2015
Author: chandlerc
Date: Thu Aug 13 21:05:41 2015
New Revision: 245004
URL: http://llvm.org/viewvc/llvm-project?rev=245004&view=rev
Log:
[PM/AA] Hoist the AA counter pass into a header to match the analysis
pattern.
Also hoist the creation routine out of the generic header and into the
pass header now that we have one.
I've worked to not make any changes, even formatting ones here. I'll
clean up the formatting and other things in a follow-up patch now that
the code is in the right place.
Added:
llvm/trunk/include/llvm/Analysis/AliasAnalysisCounter.h
- copied, changed from r245002, llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp
Modified:
llvm/trunk/include/llvm/Analysis/Passes.h
llvm/trunk/include/llvm/LinkAllPasses.h
llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp
Copied: llvm/trunk/include/llvm/Analysis/AliasAnalysisCounter.h (from r245002, llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/AliasAnalysisCounter.h?p2=llvm/trunk/include/llvm/Analysis/AliasAnalysisCounter.h&p1=llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp&r1=245002&r2=245004&rev=245004&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp (original)
+++ llvm/trunk/include/llvm/Analysis/AliasAnalysisCounter.h Thu Aug 13 21:05:41 2015
@@ -1,4 +1,4 @@
-//===- AliasAnalysisCounter.cpp - Alias Analysis Query Counter ------------===//
+//===- AliasAnalysisCounter.h - Alias Analysis Query Counter ----*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -6,28 +6,23 @@
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
-//
-// This file implements a pass which can be used to count how many alias queries
-// are being made and how the alias analysis implementation being used responds.
-//
+/// \file
+/// This declares an alias analysis which counts and prints queries made
+/// through it. By inserting this between other AAs you can track when specific
+/// layers of LLVM's AA get queried.
+///
//===----------------------------------------------------------------------===//
-#include "llvm/Analysis/Passes.h"
+#ifndef LLVM_ANALYSIS_ALIASANALYSISCOUNTER_H
+#define LLVM_ANALYSIS_ALIASANALYSISCOUNTER_H
+
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
-#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/Debug.h"
-#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
-using namespace llvm;
-static cl::opt<bool>
-PrintAll("count-aa-print-all-queries", cl::ReallyHidden, cl::init(true));
-static cl::opt<bool>
-PrintAllFailures("count-aa-print-all-failed-queries", cl::ReallyHidden);
+namespace llvm {
-namespace {
class AliasAnalysisCounter : public ModulePass, public AliasAnalysis {
unsigned No, May, Partial, Must;
unsigned NoMR, JustRef, JustMod, MR;
@@ -116,70 +111,14 @@ namespace {
return AliasAnalysis::getModRefInfo(CS1,CS2);
}
};
-}
-char AliasAnalysisCounter::ID = 0;
-INITIALIZE_AG_PASS(AliasAnalysisCounter, AliasAnalysis, "count-aa",
- "Count Alias Analysis Query Responses", false, true, false)
+ //===--------------------------------------------------------------------===//
+ //
+ // createAliasAnalysisCounterPass - This pass counts alias queries and how the
+ // alias analysis implementation responds.
+ //
+ ModulePass *createAliasAnalysisCounterPass();
-ModulePass *llvm::createAliasAnalysisCounterPass() {
- return new AliasAnalysisCounter();
}
-AliasResult AliasAnalysisCounter::alias(const MemoryLocation &LocA,
- const MemoryLocation &LocB) {
- AliasResult R = getAnalysis<AliasAnalysis>().alias(LocA, LocB);
-
- const char *AliasString = nullptr;
- switch (R) {
- case NoAlias: No++; AliasString = "No alias"; break;
- case MayAlias: May++; AliasString = "May alias"; break;
- case PartialAlias: Partial++; AliasString = "Partial alias"; break;
- case MustAlias: Must++; AliasString = "Must alias"; break;
- }
-
- if (PrintAll || (PrintAllFailures && R == MayAlias)) {
- errs() << AliasString << ":\t";
- errs() << "[" << LocA.Size << "B] ";
- LocA.Ptr->printAsOperand(errs(), true, M);
- errs() << ", ";
- errs() << "[" << LocB.Size << "B] ";
- LocB.Ptr->printAsOperand(errs(), true, M);
- errs() << "\n";
- }
-
- return R;
-}
-
-ModRefInfo AliasAnalysisCounter::getModRefInfo(ImmutableCallSite CS,
- const MemoryLocation &Loc) {
- ModRefInfo R = getAnalysis<AliasAnalysis>().getModRefInfo(CS, Loc);
-
- const char *MRString = nullptr;
- switch (R) {
- case MRI_NoModRef:
- NoMR++;
- MRString = "MRI_NoModRef";
- break;
- case MRI_Ref:
- JustRef++;
- MRString = "JustRef";
- break;
- case MRI_Mod:
- JustMod++;
- MRString = "JustMod";
- break;
- case MRI_ModRef:
- MR++;
- MRString = "MRI_ModRef";
- break;
- }
-
- if (PrintAll || (PrintAllFailures && R == MRI_ModRef)) {
- errs() << MRString << ": Ptr: ";
- errs() << "[" << Loc.Size << "B] ";
- Loc.Ptr->printAsOperand(errs(), true, M);
- errs() << "\t<->" << *CS.getInstruction() << '\n';
- }
- return R;
-}
+#endif
Modified: llvm/trunk/include/llvm/Analysis/Passes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/Passes.h?rev=245004&r1=245003&r2=245004&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Analysis/Passes.h (original)
+++ llvm/trunk/include/llvm/Analysis/Passes.h Thu Aug 13 21:05:41 2015
@@ -33,13 +33,6 @@ namespace llvm {
//===--------------------------------------------------------------------===//
//
- // createAliasAnalysisCounterPass - This pass counts alias queries and how the
- // alias analysis implementation responds.
- //
- ModulePass *createAliasAnalysisCounterPass();
-
- //===--------------------------------------------------------------------===//
- //
// createAAEvalPass - This pass implements a simple N^2 alias analysis
// accuracy evaluator.
//
Modified: llvm/trunk/include/llvm/LinkAllPasses.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LinkAllPasses.h?rev=245004&r1=245003&r2=245004&view=diff
==============================================================================
--- llvm/trunk/include/llvm/LinkAllPasses.h (original)
+++ llvm/trunk/include/llvm/LinkAllPasses.h Thu Aug 13 21:05:41 2015
@@ -17,6 +17,7 @@
#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/AliasSetTracker.h"
+#include "llvm/Analysis/AliasAnalysisCounter.h"
#include "llvm/Analysis/BasicAliasAnalysis.h"
#include "llvm/Analysis/CallPrinter.h"
#include "llvm/Analysis/DomPrinter.h"
Modified: llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp?rev=245004&r1=245003&r2=245004&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp (original)
+++ llvm/trunk/lib/Analysis/AliasAnalysisCounter.cpp Thu Aug 13 21:05:41 2015
@@ -12,7 +12,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Analysis/Passes.h"
+#include "llvm/Analysis/AliasAnalysisCounter.h"
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/IR/Module.h"
#include "llvm/Pass.h"
@@ -27,97 +27,6 @@ PrintAll("count-aa-print-all-queries", c
static cl::opt<bool>
PrintAllFailures("count-aa-print-all-failed-queries", cl::ReallyHidden);
-namespace {
- class AliasAnalysisCounter : public ModulePass, public AliasAnalysis {
- unsigned No, May, Partial, Must;
- unsigned NoMR, JustRef, JustMod, MR;
- Module *M;
- public:
- static char ID; // Class identification, replacement for typeinfo
- AliasAnalysisCounter() : ModulePass(ID) {
- initializeAliasAnalysisCounterPass(*PassRegistry::getPassRegistry());
- No = May = Partial = Must = 0;
- NoMR = JustRef = JustMod = MR = 0;
- }
-
- void printLine(const char *Desc, unsigned Val, unsigned Sum) {
- errs() << " " << Val << " " << Desc << " responses ("
- << Val*100/Sum << "%)\n";
- }
- ~AliasAnalysisCounter() override {
- unsigned AASum = No+May+Partial+Must;
- unsigned MRSum = NoMR+JustRef+JustMod+MR;
- if (AASum + MRSum) { // Print a report if any counted queries occurred...
- errs() << "\n===== Alias Analysis Counter Report =====\n"
- << " Analysis counted:\n"
- << " " << AASum << " Total Alias Queries Performed\n";
- if (AASum) {
- printLine("no alias", No, AASum);
- printLine("may alias", May, AASum);
- printLine("partial alias", Partial, AASum);
- printLine("must alias", Must, AASum);
- errs() << " Alias Analysis Counter Summary: " << No*100/AASum << "%/"
- << May*100/AASum << "%/"
- << Partial*100/AASum << "%/"
- << Must*100/AASum<<"%\n\n";
- }
-
- errs() << " " << MRSum << " Total MRI_Mod/MRI_Ref Queries Performed\n";
- if (MRSum) {
- printLine("no mod/ref", NoMR, MRSum);
- printLine("ref", JustRef, MRSum);
- printLine("mod", JustMod, MRSum);
- printLine("mod/ref", MR, MRSum);
- errs() << " MRI_Mod/MRI_Ref Analysis Counter Summary: "
- << NoMR * 100 / MRSum << "%/" << JustRef * 100 / MRSum << "%/"
- << JustMod * 100 / MRSum << "%/" << MR * 100 / MRSum
- << "%\n\n";
- }
- }
- }
-
- bool runOnModule(Module &M) override {
- this->M = &M;
- InitializeAliasAnalysis(this, &M.getDataLayout());
- return false;
- }
-
- void getAnalysisUsage(AnalysisUsage &AU) const override {
- AliasAnalysis::getAnalysisUsage(AU);
- AU.addRequired<AliasAnalysis>();
- AU.setPreservesAll();
- }
-
- /// getAdjustedAnalysisPointer - This method is used when a pass implements
- /// an analysis interface through multiple inheritance. If needed, it
- /// should override this to adjust the this pointer as needed for the
- /// specified pass info.
- void *getAdjustedAnalysisPointer(AnalysisID PI) override {
- if (PI == &AliasAnalysis::ID)
- return (AliasAnalysis*)this;
- return this;
- }
-
- // FIXME: We could count these too...
- bool pointsToConstantMemory(const MemoryLocation &Loc,
- bool OrLocal) override {
- return getAnalysis<AliasAnalysis>().pointsToConstantMemory(Loc, OrLocal);
- }
-
- // Forwarding functions: just delegate to a real AA implementation, counting
- // the number of responses...
- AliasResult alias(const MemoryLocation &LocA,
- const MemoryLocation &LocB) override;
-
- ModRefInfo getModRefInfo(ImmutableCallSite CS,
- const MemoryLocation &Loc) override;
- ModRefInfo getModRefInfo(ImmutableCallSite CS1,
- ImmutableCallSite CS2) override {
- return AliasAnalysis::getModRefInfo(CS1,CS2);
- }
- };
-}
-
char AliasAnalysisCounter::ID = 0;
INITIALIZE_AG_PASS(AliasAnalysisCounter, AliasAnalysis, "count-aa",
"Count Alias Analysis Query Responses", false, true, false)
More information about the llvm-commits
mailing list