This is an archive of the discontinued LLVM Phabricator instance.

Differential D29906

Correct typo s/hosting/hoisting/
ClosedPublic

Authored by bcain on Feb 13 2017, 12:35 PM.

Details

Reviewers
anemet

Diff Detail

Repository
rL LLVM

Event Timeline

bcain created this revision.Feb 13 2017, 12:35 PM
anemet accepted this revision.Feb 13 2017, 1:38 PM

LGTM, thanks.

This revision is now accepted and ready to land.Feb 13 2017, 1:38 PM
bcain updated this revision to Diff 88382.Feb 14 2017, 8:36 AM

Included corresponding test cases.

anemet added a comment.Feb 14 2017, 8:50 AM

Still looks good!

bcain closed this revision.Feb 19 2017, 1:27 PM

Revision Contents

PathSize
lib/
Transforms/
Scalar/
2 lines
test/
Other/
2 lines
Transforms/
LICM/
2 lines

Diff 88382

lib/Transforms/Scalar/LICM.cpp

Show First 20 Lines • Show All 841 Lines • ▼ Show 20 Lines
/// ///
static bool hoist(Instruction &I, const DominatorTree *DT, const Loop *CurLoop, static bool hoist(Instruction &I, const DominatorTree *DT, const Loop *CurLoop,
const LoopSafetyInfo *SafetyInfo, const LoopSafetyInfo *SafetyInfo,
OptimizationRemarkEmitter *ORE) { OptimizationRemarkEmitter *ORE) {
auto *Preheader = CurLoop->getLoopPreheader(); auto *Preheader = CurLoop->getLoopPreheader();
DEBUG(dbgs() << "LICM hoisting to " << Preheader->getName() << ": " << I DEBUG(dbgs() << "LICM hoisting to " << Preheader->getName() << ": " << I
<< "\n"); << "\n");
ORE->emit(OptimizationRemark(DEBUG_TYPE, "Hoisted", &I) ORE->emit(OptimizationRemark(DEBUG_TYPE, "Hoisted", &I)
<< "hosting " << ore::NV("Inst", &I)); << "hoisting " << ore::NV("Inst", &I));
// Metadata can be dependent on conditions we are hoisting above. // Metadata can be dependent on conditions we are hoisting above.
// Conservatively strip all metadata on the instruction unless we were // Conservatively strip all metadata on the instruction unless we were
// guaranteed to execute I if we entered the loop, in which case the metadata // guaranteed to execute I if we entered the loop, in which case the metadata
// is valid in the loop preheader. // is valid in the loop preheader.
if (I.hasMetadataOtherThanDebugLoc() && if (I.hasMetadataOtherThanDebugLoc() &&
// The check on hasMetadataOtherThanDebugLoc is to prevent us from burning // The check on hasMetadataOtherThanDebugLoc is to prevent us from burning
// time in isGuaranteedToExecute if we don't actually have anything to // time in isGuaranteedToExecute if we don't actually have anything to
▲ Show 20 Lines • Show All 515 Lines • Show Last 20 Lines

test/Other/optimization-remarks-invalidation.ll

Show First 20 Lines • Show All 47 Lines • ▼ Show 20 Lines
Entry: Entry:
br label %Loop br label %Loop
Loop: Loop:
%j = phi i32 [ 0, %Entry ], [ %Next, %Loop ] %j = phi i32 [ 0, %Entry ], [ %Next, %Loop ]
%addr = getelementptr i32, i32* %array, i32 %j %addr = getelementptr i32, i32* %array, i32 %j
%a = load i32, i32* %addr %a = load i32, i32* %addr
; CHECK: remark: /tmp/kk.c:2:20: hosting load ; CHECK: remark: /tmp/kk.c:2:20: hoisting load
%b = load i32, i32* %p, !dbg !8 %b = load i32, i32* %p, !dbg !8
%a2 = add i32 %a, %b %a2 = add i32 %a, %b
store i32 %a2, i32* %addr store i32 %a2, i32* %addr
%Next = add i32 %j, 1 %Next = add i32 %j, 1
%cond = icmp eq i32 %Next, 0 %cond = icmp eq i32 %Next, 0
br i1 %cond, label %Out, label %Loop br i1 %cond, label %Out, label %Loop
Out: Out:
Show All 16 Lines

test/Transforms/LICM/opt-remarks.ll

; RUN: opt < %s -licm -pass-remarks=licm -o /dev/null 2>&1 | FileCheck %s ; RUN: opt < %s -licm -pass-remarks=licm -o /dev/null 2>&1 | FileCheck %s
; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop(licm)' %s -o /dev/null -pass-remarks=licm 2>&1 | FileCheck %s ; RUN: opt -aa-pipeline=basic-aa -passes='require<aa>,require<targetir>,require<scalar-evolution>,require<opt-remark-emit>,loop(licm)' %s -o /dev/null -pass-remarks=licm 2>&1 | FileCheck %s
target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128" target datalayout = "E-p:64:64:64-a0:0:8-f32:32:32-f64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-v64:64:64-v128:128:128"
define void @hoist(i32* %array, i32* noalias %p) { define void @hoist(i32* %array, i32* noalias %p) {
Entry: Entry:
br label %Loop br label %Loop
Loop: Loop:
%j = phi i32 [ 0, %Entry ], [ %Next, %Loop ] %j = phi i32 [ 0, %Entry ], [ %Next, %Loop ]
%addr = getelementptr i32, i32* %array, i32 %j %addr = getelementptr i32, i32* %array, i32 %j
%a = load i32, i32* %addr %a = load i32, i32* %addr
; CHECK: remark: /tmp/kk.c:2:20: hosting load ; CHECK: remark: /tmp/kk.c:2:20: hoisting load
%b = load i32, i32* %p, !dbg !8 %b = load i32, i32* %p, !dbg !8
%a2 = add i32 %a, %b %a2 = add i32 %a, %b
store i32 %a2, i32* %addr store i32 %a2, i32* %addr
%Next = add i32 %j, 1 %Next = add i32 %j, 1
%cond = icmp eq i32 %Next, 0 %cond = icmp eq i32 %Next, 0
br i1 %cond, label %Out, label %Loop br i1 %cond, label %Out, label %Loop
Out: Out:
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines