From d52ad61e79a510d046b0fa189328f6e76a8582a2 Mon Sep 17 00:00:00 2001 From: Adam Nemet Date: Wed, 30 Nov 2016 01:14:35 +0000 Subject: [PATCH] Revert "[GVN] Basic optimization remark support" This reverts commit r288210. The failure on the stage2 LTO build is back. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@288226 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/IR/DiagnosticInfo.h | 1 - include/llvm/Transforms/Scalar/GVN.h | 4 +-- lib/IR/DiagnosticInfo.cpp | 6 ---- lib/Transforms/Scalar/GVN.cpp | 23 ++------------ test/Transforms/GVN/opt-remarks.ll | 59 ------------------------------------ 5 files changed, 4 insertions(+), 89 deletions(-) delete mode 100644 test/Transforms/GVN/opt-remarks.ll diff --git a/include/llvm/IR/DiagnosticInfo.h b/include/llvm/IR/DiagnosticInfo.h index e739dfbd673..62732abe024 100644 --- a/include/llvm/IR/DiagnosticInfo.h +++ b/include/llvm/IR/DiagnosticInfo.h @@ -392,7 +392,6 @@ public: explicit Argument(StringRef Str = "") : Key("String"), Val(Str) {} Argument(StringRef Key, Value *V); - Argument(StringRef Key, Type *T); Argument(StringRef Key, int N); Argument(StringRef Key, unsigned N); Argument(StringRef Key, bool B) : Key(Key), Val(B ? "true" : "false") {} diff --git a/include/llvm/Transforms/Scalar/GVN.h b/include/llvm/Transforms/Scalar/GVN.h index 6bcaca0b8db..a86a9a8c448 100644 --- a/include/llvm/Transforms/Scalar/GVN.h +++ b/include/llvm/Transforms/Scalar/GVN.h @@ -28,7 +28,6 @@ #include "llvm/IR/PassManager.h" namespace llvm { -class OptimizationRemarkEmitter; /// A private "module" namespace for types and utilities used by GVN. These /// are implementation details and should not be used by clients. @@ -110,7 +109,6 @@ private: const TargetLibraryInfo *TLI; AssumptionCache *AC; SetVector DeadBlocks; - OptimizationRemarkEmitter *ORE; ValueTable VN; @@ -136,7 +134,7 @@ private: bool runImpl(Function &F, AssumptionCache &RunAC, DominatorTree &RunDT, const TargetLibraryInfo &RunTLI, AAResults &RunAA, - MemoryDependenceResults *RunMD, OptimizationRemarkEmitter *ORE); + MemoryDependenceResults *RunMD); /// Push a new Value to the LeaderTable onto the list for its value number. void addToLeaderTable(uint32_t N, Value *V, const BasicBlock *BB) { diff --git a/lib/IR/DiagnosticInfo.cpp b/lib/IR/DiagnosticInfo.cpp index 6a3fdcff233..5618de8f602 100644 --- a/lib/IR/DiagnosticInfo.cpp +++ b/lib/IR/DiagnosticInfo.cpp @@ -180,12 +180,6 @@ DiagnosticInfoOptimizationBase::Argument::Argument(StringRef Key, Value *V) DLoc = I->getDebugLoc(); } -DiagnosticInfoOptimizationBase::Argument::Argument(StringRef Key, Type *T) - : Key(Key) { - raw_string_ostream OS(Val); - OS << *T; -} - DiagnosticInfoOptimizationBase::Argument::Argument(StringRef Key, int N) : Key(Key), Val(itostr(N)) {} diff --git a/lib/Transforms/Scalar/GVN.cpp b/lib/Transforms/Scalar/GVN.cpp index 83a7efe14e9..d5234c0f7e3 100644 --- a/lib/Transforms/Scalar/GVN.cpp +++ b/lib/Transforms/Scalar/GVN.cpp @@ -33,7 +33,6 @@ #include "llvm/Analysis/Loads.h" #include "llvm/Analysis/MemoryBuiltins.h" #include "llvm/Analysis/MemoryDependenceAnalysis.h" -#include "llvm/Analysis/OptimizationDiagnosticInfo.h" #include "llvm/Analysis/PHITransAddr.h" #include "llvm/Analysis/TargetLibraryInfo.h" #include "llvm/Analysis/ValueTracking.h" @@ -587,8 +586,7 @@ PreservedAnalyses GVN::run(Function &F, FunctionAnalysisManager &AM) { auto &TLI = AM.getResult(F); auto &AA = AM.getResult(F); auto &MemDep = AM.getResult(F); - auto &ORE = AM.getResult(F); - bool Changed = runImpl(F, AC, DT, TLI, AA, &MemDep, &ORE); + bool Changed = runImpl(F, AC, DT, TLI, AA, &MemDep); if (!Changed) return PreservedAnalyses::all(); PreservedAnalyses PA; @@ -1584,18 +1582,10 @@ bool GVN::PerformLoadPRE(LoadInst *LI, AvailValInBlkVect &ValuesPerBlock, if (V->getType()->getScalarType()->isPointerTy()) MD->invalidateCachedPointerInfo(V); markInstructionForDeletion(LI); - ORE->emit(OptimizationRemark(DEBUG_TYPE, "LoadPRE", LI) - << "load eliminated by PRE"); ++NumPRELoad; return true; } -static void reportLoadElim(LoadInst *LI, OptimizationRemarkEmitter *ORE) { - ORE->emit(OptimizationRemark(DEBUG_TYPE, "LoadElim", LI) - << "load of type " << ore::NV("Type", LI->getType()) - << " eliminated"); -} - /// Attempt to eliminate a load whose dependencies are /// non-local by performing PHI construction. bool GVN::processNonLocalLoad(LoadInst *LI) { @@ -1666,7 +1656,6 @@ bool GVN::processNonLocalLoad(LoadInst *LI) { MD->invalidateCachedPointerInfo(V); markInstructionForDeletion(LI); ++NumGVNLoad; - reportLoadElim(LI, ORE); return true; } @@ -1813,7 +1802,6 @@ bool GVN::processLoad(LoadInst *L) { patchAndReplaceAllUsesWith(L, AvailableValue); markInstructionForDeletion(L); ++NumGVNLoad; - reportLoadElim(L, ORE); // Tell MDA to rexamine the reused pointer since we might have more // information after forwarding it. if (MD && AvailableValue->getType()->getScalarType()->isPointerTy()) @@ -2191,8 +2179,7 @@ bool GVN::processInstruction(Instruction *I) { /// runOnFunction - This is the main transformation entry point for a function. bool GVN::runImpl(Function &F, AssumptionCache &RunAC, DominatorTree &RunDT, const TargetLibraryInfo &RunTLI, AAResults &RunAA, - MemoryDependenceResults *RunMD, - OptimizationRemarkEmitter *RunORE) { + MemoryDependenceResults *RunMD) { AC = &RunAC; DT = &RunDT; VN.setDomTree(DT); @@ -2200,7 +2187,6 @@ bool GVN::runImpl(Function &F, AssumptionCache &RunAC, DominatorTree &RunDT, VN.setAliasAnalysis(&RunAA); MD = RunMD; VN.setMemDep(MD); - ORE = RunORE; bool Changed = false; bool ShouldContinue = true; @@ -2713,8 +2699,7 @@ public: getAnalysis().getTLI(), getAnalysis().getAAResults(), NoLoads ? nullptr - : &getAnalysis().getMemDep(), - &getAnalysis().getORE()); + : &getAnalysis().getMemDep()); } void getAnalysisUsage(AnalysisUsage &AU) const override { @@ -2727,7 +2712,6 @@ public: AU.addPreserved(); AU.addPreserved(); - AU.addRequired(); } private: @@ -2749,5 +2733,4 @@ INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass) INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass) INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass) INITIALIZE_PASS_DEPENDENCY(GlobalsAAWrapperPass) -INITIALIZE_PASS_DEPENDENCY(OptimizationRemarkEmitterWrapperPass) INITIALIZE_PASS_END(GVNLegacyPass, "gvn", "Global Value Numbering", false, false) diff --git a/test/Transforms/GVN/opt-remarks.ll b/test/Transforms/GVN/opt-remarks.ll deleted file mode 100644 index c451833f765..00000000000 --- a/test/Transforms/GVN/opt-remarks.ll +++ /dev/null @@ -1,59 +0,0 @@ -; RUN: opt < %s -gvn -o /dev/null -pass-remarks-output=%t -S -pass-remarks=gvn \ -; RUN: 2>&1 | FileCheck %s -; RUN: cat %t | FileCheck -check-prefix=YAML %s - -; CHECK: remark: :0:0: load of type i32 eliminated{{$}} -; CHECK-NEXT: remark: :0:0: load of type i32 eliminated{{$}} -; CHECK-NEXT: remark: :0:0: load of type i32 eliminated{{$}} -; CHECK-NOT: remark: - -; YAML: --- !Passed -; YAML-NEXT: Pass: gvn -; YAML-NEXT: Name: LoadElim -; YAML-NEXT: Function: arg -; YAML-NEXT: Args: -; YAML-NEXT: - String: 'load of type ' -; YAML-NEXT: - Type: i32 -; YAML-NEXT: - String: ' eliminated' -; YAML-NEXT: ... -; YAML-NEXT: --- !Passed -; YAML-NEXT: Pass: gvn -; YAML-NEXT: Name: LoadElim -; YAML-NEXT: Function: const -; YAML-NEXT: Args: -; YAML-NEXT: - String: 'load of type ' -; YAML-NEXT: - Type: i32 -; YAML-NEXT: - String: ' eliminated' -; YAML-NEXT: ... -; YAML-NEXT: --- !Passed -; YAML-NEXT: Pass: gvn -; YAML-NEXT: Name: LoadElim -; YAML-NEXT: Function: inst -; YAML-NEXT: Args: -; YAML-NEXT: - String: 'load of type ' -; YAML-NEXT: - Type: i32 -; YAML-NEXT: - String: ' eliminated' -; YAML-NEXT: ... - - -define i32 @arg(i32* %p, i32 %i) { -entry: - store i32 %i, i32* %p - %load = load i32, i32* %p - ret i32 %load -} - -define i32 @const(i32* %p) { -entry: - store i32 4, i32* %p - %load = load i32, i32* %p - ret i32 %load -} - -define i32 @inst(i32* %p) { -entry: - %load1 = load i32, i32* %p - %load = load i32, i32* %p - %add = add i32 %load1, %load - ret i32 %add -} -- 2.11.0