Index: llvm/trunk/include/llvm/IR/DiagnosticInfo.h =================================================================== --- llvm/trunk/include/llvm/IR/DiagnosticInfo.h +++ llvm/trunk/include/llvm/IR/DiagnosticInfo.h @@ -392,6 +392,7 @@ 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") {} Index: llvm/trunk/include/llvm/Transforms/Scalar/GVN.h =================================================================== --- llvm/trunk/include/llvm/Transforms/Scalar/GVN.h +++ llvm/trunk/include/llvm/Transforms/Scalar/GVN.h @@ -28,6 +28,7 @@ #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. @@ -109,6 +110,7 @@ const TargetLibraryInfo *TLI; AssumptionCache *AC; SetVector DeadBlocks; + OptimizationRemarkEmitter *ORE; ValueTable VN; @@ -134,7 +136,7 @@ bool runImpl(Function &F, AssumptionCache &RunAC, DominatorTree &RunDT, const TargetLibraryInfo &RunTLI, AAResults &RunAA, - MemoryDependenceResults *RunMD); + MemoryDependenceResults *RunMD, OptimizationRemarkEmitter *ORE); /// Push a new Value to the LeaderTable onto the list for its value number. void addToLeaderTable(uint32_t N, Value *V, const BasicBlock *BB) { Index: llvm/trunk/lib/IR/DiagnosticInfo.cpp =================================================================== --- llvm/trunk/lib/IR/DiagnosticInfo.cpp +++ llvm/trunk/lib/IR/DiagnosticInfo.cpp @@ -180,6 +180,12 @@ 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)) {} Index: llvm/trunk/lib/Transforms/Scalar/GVN.cpp =================================================================== --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp @@ -33,6 +33,7 @@ #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" @@ -586,7 +587,8 @@ auto &TLI = AM.getResult(F); auto &AA = AM.getResult(F); auto &MemDep = AM.getResult(F); - bool Changed = runImpl(F, AC, DT, TLI, AA, &MemDep); + auto &ORE = AM.getResult(F); + bool Changed = runImpl(F, AC, DT, TLI, AA, &MemDep, &ORE); if (!Changed) return PreservedAnalyses::all(); PreservedAnalyses PA; @@ -1582,10 +1584,18 @@ 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) { @@ -1656,6 +1666,7 @@ MD->invalidateCachedPointerInfo(V); markInstructionForDeletion(LI); ++NumGVNLoad; + reportLoadElim(LI, ORE); return true; } @@ -1802,6 +1813,7 @@ 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()) @@ -2179,7 +2191,8 @@ /// 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) { + MemoryDependenceResults *RunMD, + OptimizationRemarkEmitter *RunORE) { AC = &RunAC; DT = &RunDT; VN.setDomTree(DT); @@ -2187,6 +2200,7 @@ VN.setAliasAnalysis(&RunAA); MD = RunMD; VN.setMemDep(MD); + ORE = RunORE; bool Changed = false; bool ShouldContinue = true; @@ -2699,7 +2713,8 @@ getAnalysis().getTLI(), getAnalysis().getAAResults(), NoLoads ? nullptr - : &getAnalysis().getMemDep()); + : &getAnalysis().getMemDep(), + &getAnalysis().getORE()); } void getAnalysisUsage(AnalysisUsage &AU) const override { @@ -2712,6 +2727,7 @@ AU.addPreserved(); AU.addPreserved(); + AU.addRequired(); } private: @@ -2733,4 +2749,5 @@ 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) Index: llvm/trunk/test/Transforms/GVN/opt-remarks.ll =================================================================== --- llvm/trunk/test/Transforms/GVN/opt-remarks.ll +++ llvm/trunk/test/Transforms/GVN/opt-remarks.ll @@ -0,0 +1,59 @@ +; 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 +}