Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit e9741d2

Browse files
anemetanemet
committed
[GVN] Basic optimization remark support
Follow-on patches will add more interesting cases. The goal of this patch-set is to get the GVN messages printed in opt-viewer from Dhrystone as was presented in my Dev Meeting talk. This is the optimization view for the function (the last remark in the function has a bug which is fixed in this series): http://lab.llvm.org:8080/artifacts/opt-view_test-suite/build/SingleSource/Benchmarks/Dhrystone/CMakeFiles/dry.dir/html/_org_test-suite_SingleSource_Benchmarks_Dhrystone_dry.c.html#L430 Differential Revision: https://reviews.llvm.org/D26488 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@288046 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 55a0fd2 commit e9741d2

File tree

5 files changed

+89
-4
lines changed

5 files changed

+89
-4
lines changed

‎include/llvm/IR/DiagnosticInfo.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ class DiagnosticInfoOptimizationBase : public DiagnosticInfoWithDebugLocBase {
392392

393393
explicit Argument(StringRef Str = "") : Key("String"), Val(Str) {}
394394
Argument(StringRef Key, Value *V);
395+
Argument(StringRef Key, Type *T);
395396
Argument(StringRef Key, int N);
396397
Argument(StringRef Key, unsigned N);
397398
Argument(StringRef Key, bool B) : Key(Key), Val(B ? "true" : "false") {}

‎include/llvm/Transforms/Scalar/GVN.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "llvm/IR/PassManager.h"
2929

3030
namespace llvm {
31+
class OptimizationRemarkEmitter;
3132

3233
/// A private "module" namespace for types and utilities used by GVN. These
3334
/// are implementation details and should not be used by clients.
@@ -109,6 +110,7 @@ class GVN : public PassInfoMixin<GVN> {
109110
const TargetLibraryInfo *TLI;
110111
AssumptionCache *AC;
111112
SetVector<BasicBlock *> DeadBlocks;
113+
OptimizationRemarkEmitter *ORE;
112114

113115
ValueTable VN;
114116

@@ -134,7 +136,7 @@ class GVN : public PassInfoMixin<GVN> {
134136

135137
bool runImpl(Function &F, AssumptionCache &RunAC, DominatorTree &RunDT,
136138
const TargetLibraryInfo &RunTLI, AAResults &RunAA,
137-
MemoryDependenceResults *RunMD);
139+
MemoryDependenceResults *RunMD, OptimizationRemarkEmitter *ORE);
138140

139141
/// Push a new Value to the LeaderTable onto the list for its value number.
140142
void addToLeaderTable(uint32_t N, Value *V, const BasicBlock *BB) {

‎lib/IR/DiagnosticInfo.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,12 @@ DiagnosticInfoOptimizationBase::Argument::Argument(StringRef Key, Value *V)
180180
DLoc = I->getDebugLoc();
181181
}
182182

183+
DiagnosticInfoOptimizationBase::Argument::Argument(StringRef Key, Type *T)
184+
: Key(Key) {
185+
raw_string_ostream OS(Val);
186+
OS << *T;
187+
}
188+
183189
DiagnosticInfoOptimizationBase::Argument::Argument(StringRef Key, int N)
184190
: Key(Key), Val(itostr(N)) {}
185191

‎lib/Transforms/Scalar/GVN.cpp

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include "llvm/Analysis/Loads.h"
3434
#include "llvm/Analysis/MemoryBuiltins.h"
3535
#include "llvm/Analysis/MemoryDependenceAnalysis.h"
36+
#include "llvm/Analysis/OptimizationDiagnosticInfo.h"
3637
#include "llvm/Analysis/PHITransAddr.h"
3738
#include "llvm/Analysis/TargetLibraryInfo.h"
3839
#include "llvm/Analysis/ValueTracking.h"
@@ -586,7 +587,8 @@ PreservedAnalyses GVN::run(Function &F, FunctionAnalysisManager &AM) {
586587
auto &TLI = AM.getResult<TargetLibraryAnalysis>(F);
587588
auto &AA = AM.getResult<AAManager>(F);
588589
auto &MemDep = AM.getResult<MemoryDependenceAnalysis>(F);
589-
bool Changed = runImpl(F, AC, DT, TLI, AA, &MemDep);
590+
auto &ORE = AM.getResult<OptimizationRemarkEmitterAnalysis>(F);
591+
bool Changed = runImpl(F, AC, DT, TLI, AA, &MemDep, &ORE);
590592
if (!Changed)
591593
return PreservedAnalyses::all();
592594
PreservedAnalyses PA;
@@ -1582,10 +1584,18 @@ bool GVN::PerformLoadPRE(LoadInst *LI, AvailValInBlkVect &ValuesPerBlock,
15821584
if (V->getType()->getScalarType()->isPointerTy())
15831585
MD->invalidateCachedPointerInfo(V);
15841586
markInstructionForDeletion(LI);
1587+
ORE->emit(OptimizationRemark(DEBUG_TYPE, "LoadPRE", LI)
1588+
<< "load eliminated by PRE");
15851589
++NumPRELoad;
15861590
return true;
15871591
}
15881592

1593+
static void reportLoadElim(LoadInst *LI, OptimizationRemarkEmitter *ORE) {
1594+
ORE->emit(OptimizationRemark(DEBUG_TYPE, "LoadElim", LI)
1595+
<< "load of type " << ore::NV("Type", LI->getType())
1596+
<< " eliminated");
1597+
}
1598+
15891599
/// Attempt to eliminate a load whose dependencies are
15901600
/// non-local by performing PHI construction.
15911601
bool GVN::processNonLocalLoad(LoadInst *LI) {
@@ -1656,6 +1666,7 @@ bool GVN::processNonLocalLoad(LoadInst *LI) {
16561666
MD->invalidateCachedPointerInfo(V);
16571667
markInstructionForDeletion(LI);
16581668
++NumGVNLoad;
1669+
reportLoadElim(LI, ORE);
16591670
return true;
16601671
}
16611672

@@ -1802,6 +1813,7 @@ bool GVN::processLoad(LoadInst *L) {
18021813
patchAndReplaceAllUsesWith(L, AvailableValue);
18031814
markInstructionForDeletion(L);
18041815
++NumGVNLoad;
1816+
reportLoadElim(L, ORE);
18051817
// Tell MDA to rexamine the reused pointer since we might have more
18061818
// information after forwarding it.
18071819
if (MD && AvailableValue->getType()->getScalarType()->isPointerTy())
@@ -2179,14 +2191,16 @@ bool GVN::processInstruction(Instruction *I) {
21792191
/// runOnFunction - This is the main transformation entry point for a function.
21802192
bool GVN::runImpl(Function &F, AssumptionCache &RunAC, DominatorTree &RunDT,
21812193
const TargetLibraryInfo &RunTLI, AAResults &RunAA,
2182-
MemoryDependenceResults *RunMD) {
2194+
MemoryDependenceResults *RunMD,
2195+
OptimizationRemarkEmitter *RunORE) {
21832196
AC = &RunAC;
21842197
DT = &RunDT;
21852198
VN.setDomTree(DT);
21862199
TLI = &RunTLI;
21872200
VN.setAliasAnalysis(&RunAA);
21882201
MD = RunMD;
21892202
VN.setMemDep(MD);
2203+
ORE = RunORE;
21902204

21912205
bool Changed = false;
21922206
bool ShouldContinue = true;
@@ -2699,7 +2713,8 @@ class llvm::gvn::GVNLegacyPass : public FunctionPass {
26992713
getAnalysis<TargetLibraryInfoWrapperPass>().getTLI(),
27002714
getAnalysis<AAResultsWrapperPass>().getAAResults(),
27012715
NoLoads ? nullptr
2702-
: &getAnalysis<MemoryDependenceWrapperPass>().getMemDep());
2716+
: &getAnalysis<MemoryDependenceWrapperPass>().getMemDep(),
2717+
&getAnalysis<OptimizationRemarkEmitterWrapperPass>().getORE());
27032718
}
27042719

27052720
void getAnalysisUsage(AnalysisUsage &AU) const override {
@@ -2712,6 +2727,7 @@ class llvm::gvn::GVNLegacyPass : public FunctionPass {
27122727

27132728
AU.addPreserved<DominatorTreeWrapperPass>();
27142729
AU.addPreserved<GlobalsAAWrapperPass>();
2730+
AU.addRequired<OptimizationRemarkEmitterWrapperPass>();
27152731
}
27162732

27172733
private:
@@ -2733,4 +2749,5 @@ INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass)
27332749
INITIALIZE_PASS_DEPENDENCY(TargetLibraryInfoWrapperPass)
27342750
INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)
27352751
INITIALIZE_PASS_DEPENDENCY(GlobalsAAWrapperPass)
2752+
INITIALIZE_PASS_DEPENDENCY(OptimizationRemarkEmitterWrapperPass)
27362753
INITIALIZE_PASS_END(GVNLegacyPass, "gvn", "Global Value Numbering", false, false)

‎test/Transforms/GVN/opt-remarks.ll

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
; RUN: opt < %s -gvn -o /dev/null -pass-remarks-output=%t -S -pass-remarks=gvn \
2+
; RUN: 2>&1 | FileCheck %s
3+
; RUN: cat %t | FileCheck -check-prefix=YAML %s
4+
5+
; CHECK: remark: <unknown>:0:0: load of type i32 eliminated{{$}}
6+
; CHECK-NEXT: remark: <unknown>:0:0: load of type i32 eliminated{{$}}
7+
; CHECK-NEXT: remark: <unknown>:0:0: load of type i32 eliminated{{$}}
8+
; CHECK-NOT: remark:
9+
10+
; YAML: --- !Passed
11+
; YAML-NEXT: Pass: gvn
12+
; YAML-NEXT: Name: LoadElim
13+
; YAML-NEXT: Function: arg
14+
; YAML-NEXT: Args:
15+
; YAML-NEXT: - String: 'load of type '
16+
; YAML-NEXT: - Type: i32
17+
; YAML-NEXT: - String: ' eliminated'
18+
; YAML-NEXT: ...
19+
; YAML-NEXT: --- !Passed
20+
; YAML-NEXT: Pass: gvn
21+
; YAML-NEXT: Name: LoadElim
22+
; YAML-NEXT: Function: const
23+
; YAML-NEXT: Args:
24+
; YAML-NEXT: - String: 'load of type '
25+
; YAML-NEXT: - Type: i32
26+
; YAML-NEXT: - String: ' eliminated'
27+
; YAML-NEXT: ...
28+
; YAML-NEXT: --- !Passed
29+
; YAML-NEXT: Pass: gvn
30+
; YAML-NEXT: Name: LoadElim
31+
; YAML-NEXT: Function: inst
32+
; YAML-NEXT: Args:
33+
; YAML-NEXT: - String: 'load of type '
34+
; YAML-NEXT: - Type: i32
35+
; YAML-NEXT: - String: ' eliminated'
36+
; YAML-NEXT: ...
37+
38+
39+
define i32 @arg(i32* %p, i32 %i) {
40+
entry:
41+
store i32 %i, i32* %p
42+
%load = load i32, i32* %p
43+
ret i32 %load
44+
}
45+
46+
define i32 @const(i32* %p) {
47+
entry:
48+
store i32 4, i32* %p
49+
%load = load i32, i32* %p
50+
ret i32 %load
51+
}
52+
53+
define i32 @inst(i32* %p) {
54+
entry:
55+
%load1 = load i32, i32* %p
56+
%load = load i32, i32* %p
57+
%add = add i32 %load1, %load
58+
ret i32 %add
59+
}

0 commit comments

Comments
 (0)