From 612bf7cac568b7670b06e0d2c1e784e39bbf23aa Mon Sep 17 00:00:00 2001 From: Anastasis Grammenos Date: Tue, 10 Jul 2018 13:29:50 +0000 Subject: [PATCH] [DebugInfo][LoopVectorize] Preserve DL in induction PHI and Add Differential Revision: https://reviews.llvm.org/D48968 llvm-svn: 336667 --- llvm/lib/Transforms/Vectorize/LoopVectorize.cpp | 2 ++ llvm/test/Transforms/LoopVectorize/i8-induction.ll | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp index 2a150e6c321e..802f38e13dad 100644 --- a/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp +++ b/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp @@ -1821,6 +1821,7 @@ void InnerLoopVectorizer::createVectorIntOrFpInductionPHI( // factor. The last of those goes into the PHI. PHINode *VecInd = PHINode::Create(SteppedStart->getType(), 2, "vec.ind", &*LoopVectorBody->getFirstInsertionPt()); + VecInd->setDebugLoc(EntryVal->getDebugLoc()); Instruction *LastInduction = VecInd; for (unsigned Part = 0; Part < UF; ++Part) { VectorLoopValueMap.setVectorValue(EntryVal, Part, LastInduction); @@ -1831,6 +1832,7 @@ void InnerLoopVectorizer::createVectorIntOrFpInductionPHI( LastInduction = cast(addFastMathFlag( Builder.CreateBinOp(AddOp, LastInduction, SplatVF, "step.add"))); + LastInduction->setDebugLoc(EntryVal->getDebugLoc()); } // Move the last step to the end of the latch block. This ensures consistent diff --git a/llvm/test/Transforms/LoopVectorize/i8-induction.ll b/llvm/test/Transforms/LoopVectorize/i8-induction.ll index 9a13978a605e..a9e8b755f182 100644 --- a/llvm/test/Transforms/LoopVectorize/i8-induction.ll +++ b/llvm/test/Transforms/LoopVectorize/i8-induction.ll @@ -1,4 +1,5 @@ ; RUN: opt < %s -loop-vectorize -force-vector-interleave=1 -force-vector-width=4 -dce -instcombine -S +; RUN: opt < %s -debugify -loop-vectorize -S | FileCheck %s --check-prefix=DEBUGLOC target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" @@ -6,6 +7,12 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3 @b = common global i8 0, align 1 define void @f() nounwind uwtable ssp { +; Check that the induction phis and adds have debug location. +; +; DEBUGLOC-LABEL: vector.body: +; DEBUGLOC: %vec.ind = phi {{.*}}, !dbg ![[DbgLoc:[0-9]+]] +; DEBUGLOC: %vec.ind.next = add {{.*}}, !dbg ![[DbgLoc]] + scalar.ph: store i8 0, i8* inttoptr (i64 1 to i8*), align 1 %0 = load i8, i8* @a, align 1 @@ -28,3 +35,6 @@ for.end: ; preds = %for.body store i8 %mul, i8* @b, align 1 ret void } + +; Check that the location of the new phi comes from %c.015 = phi i8 +; DEBUGLOC: ![[DbgLoc]] = !DILocation(line: 5