From 91af01a4b7a9a79a881436fa606bd6d6186cfa83 Mon Sep 17 00:00:00 2001 From: Dehao Chen Date: Thu, 26 Oct 2017 21:20:52 +0000 Subject: [PATCH] Do not add discriminator encoding for debug intrinsics. Summary: There are certain requirements for debug location of debug intrinsics, e.g. the scope of the DILocalVariable should be the same as the scope of its debug location. As a result, we should not add discriminator encoding for debug intrinsics. Reviewers: dblaikie, aprantl Reviewed By: aprantl Subscribers: JDevlieghere, aprantl, bjope, sanjoy, llvm-commits Differential Revision: https://reviews.llvm.org/D39343 llvm-svn: 316703 --- lib/Transforms/Utils/LoopUnroll.cpp | 5 +++-- lib/Transforms/Vectorize/LoopVectorize.cpp | 3 ++- test/Transforms/LoopVectorize/discriminator.ll | 14 ++++++++++---- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/Transforms/Utils/LoopUnroll.cpp b/lib/Transforms/Utils/LoopUnroll.cpp index 2994401f3cd..ebab844003a 100644 --- a/lib/Transforms/Utils/LoopUnroll.cpp +++ b/lib/Transforms/Utils/LoopUnroll.cpp @@ -544,8 +544,9 @@ LoopUnrollResult llvm::UnrollLoop( if (Header->getParent()->isDebugInfoForProfiling()) for (BasicBlock *BB : L->getBlocks()) for (Instruction &I : *BB) - if (const DILocation *DIL = I.getDebugLoc()) - I.setDebugLoc(DIL->cloneWithDuplicationFactor(Count)); + if (!isa(&I)) + if (const DILocation *DIL = I.getDebugLoc()) + I.setDebugLoc(DIL->cloneWithDuplicationFactor(Count)); for (unsigned It = 1; It != Count; ++It) { std::vector NewBlocks; diff --git a/lib/Transforms/Vectorize/LoopVectorize.cpp b/lib/Transforms/Vectorize/LoopVectorize.cpp index 0e380322c00..9da03f307c5 100644 --- a/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -803,7 +803,8 @@ static Instruction *getDebugLocFromInstOrOperands(Instruction *I) { void InnerLoopVectorizer::setDebugLocFromInst(IRBuilder<> &B, const Value *Ptr) { if (const Instruction *Inst = dyn_cast_or_null(Ptr)) { const DILocation *DIL = Inst->getDebugLoc(); - if (DIL && Inst->getFunction()->isDebugInfoForProfiling()) + if (DIL && Inst->getFunction()->isDebugInfoForProfiling() && + !isa(Inst)) B.SetCurrentDebugLocation(DIL->cloneWithDuplicationFactor(UF * VF)); else B.SetCurrentDebugLocation(DIL); diff --git a/test/Transforms/LoopVectorize/discriminator.ll b/test/Transforms/LoopVectorize/discriminator.ll index b7d34582dbd..6c7ac495799 100644 --- a/test/Transforms/LoopVectorize/discriminator.ll +++ b/test/Transforms/LoopVectorize/discriminator.ll @@ -1,7 +1,7 @@ -; RUN: opt -S -loop-vectorize -force-vector-width=4 -force-vector-interleave=1 < %s | FileCheck --check-prefix=LOOPVEC_4_1 %s -; RUN: opt -S -loop-vectorize -force-vector-width=2 -force-vector-interleave=3 < %s | FileCheck --check-prefix=LOOPVEC_2_3 %s -; RUN: opt -S -loop-unroll -unroll-count=5 < %s | FileCheck --check-prefix=LOOPUNROLL_5 %s -; RUN: opt -S -loop-vectorize -force-vector-width=4 -force-vector-interleave=4 -loop-unroll -unroll-count=2 < %s | FileCheck --check-prefix=LOOPVEC_UNROLL %s +; RUN: opt -S -loop-vectorize -force-vector-width=4 -force-vector-interleave=1 < %s | FileCheck --check-prefix=DBG_VALUE --check-prefix=LOOPVEC_4_1 %s +; RUN: opt -S -loop-vectorize -force-vector-width=2 -force-vector-interleave=3 < %s | FileCheck --check-prefix=DBG_VALUE --check-prefix=LOOPVEC_2_3 %s +; RUN: opt -S -loop-unroll -unroll-count=5 < %s | FileCheck --check-prefix=DBG_VALUE --check-prefix=LOOPUNROLL_5 %s +; RUN: opt -S -loop-vectorize -force-vector-width=4 -force-vector-interleave=4 -loop-unroll -unroll-count=2 < %s | FileCheck --check-prefix=DBG_VALUE --check-prefix=LOOPVEC_UNROLL %s ; Test if vectorization/unroll factor is recorded in discriminator. ; @@ -16,6 +16,7 @@ @a = local_unnamed_addr global i32* null, align 8 @b = local_unnamed_addr global i32* null, align 8 +declare void @llvm.dbg.declare(metadata, metadata, metadata) #1 define void @_Z3foov() local_unnamed_addr #0 !dbg !6 { %1 = load i32*, i32** @b, align 8, !dbg !8, !tbaa !9 @@ -29,6 +30,8 @@ define void @_Z3foov() local_unnamed_addr #0 !dbg !6 { %6 = getelementptr inbounds i32, i32* %2, i64 %indvars.iv, !dbg !13 %7 = load i32, i32* %6, align 4, !dbg !17, !tbaa !15 %8 = add nsw i32 %7, %5, !dbg !17 +;DBG_VALUE: call void @llvm.dbg.declare{{.*}}!dbg ![[DBG:[0-9]*]] + call void @llvm.dbg.declare(metadata i32 %8, metadata !22, metadata !DIExpression()), !dbg !17 store i32 %8, i32* %6, align 4, !dbg !17, !tbaa !15 %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1, !dbg !18 %exitcond = icmp eq i64 %indvars.iv.next, 4096, !dbg !19 @@ -38,6 +41,7 @@ define void @_Z3foov() local_unnamed_addr #0 !dbg !6 { ret void, !dbg !21 } +;DBG_VALUE: ![[TOP:[0-9]*]] = distinct !DISubprogram(name: "foo" ;LOOPVEC_4_1: discriminator: 17 ;LOOPVEC_2_3: discriminator: 25 ;LOOPUNROLL_5: discriminator: 21 @@ -45,6 +49,7 @@ define void @_Z3foov() local_unnamed_addr #0 !dbg !6 { ; are unrolled. ;LOOPVEC_UNROLL: discriminator: 385 ;LOOPVEC_UNROLL: discriminator: 9 +;DBG_VALUE: ![[DBG]] = {{.*}}, scope: ![[TOP]] !llvm.dbg.cu = !{!0} !llvm.module.flags = !{!3, !4} @@ -68,3 +73,4 @@ define void @_Z3foov() local_unnamed_addr #0 !dbg !6 { !19 = !DILocation(line: 5, column: 21, scope: !6) !20 = distinct !{!20, !14} !21 = !DILocation(line: 7, column: 1, scope: !6) +!22 = !DILocalVariable(name: "a", arg: 1, scope: !6, file: !1, line: 10)