[llvm] r336256 - [DebugInfo][LoopVectorize] Preserve DL in generated phi instruction

[Anastasis Grammenos via llvm-commits]

Author: gramanas
Date: Wed Jul  4 03:16:55 2018
New Revision: 336256

URL: http://llvm.org/viewvc/llvm-project?rev=336256&view=rev
Log:
[DebugInfo][LoopVectorize] Preserve DL in generated phi instruction

When creating `phi` instructions to resume at the scalar part of the loop,
copy the DebugLoc from the original phi over to the new one.

Differential Revision: https://reviews.llvm.org/D48769

Added:
    llvm/trunk/test/Transforms/LoopVectorize/preserve-dbg-loc-and-loop-metadata.ll
      - copied, changed from r336250, llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll
Removed:
    llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll
Modified:
    llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp

Modified: llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp?rev=336256&r1=336255&r2=336256&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp (original)
+++ llvm/trunk/lib/Transforms/Vectorize/LoopVectorize.cpp Wed Jul  4 03:16:55 2018
@@ -2912,6 +2912,8 @@ BasicBlock *InnerLoopVectorizer::createV
     // Create phi nodes to merge from the  backedge-taken check block.
     PHINode *BCResumeVal = PHINode::Create(
         OrigPhi->getType(), 3, "bc.resume.val", ScalarPH->getTerminator());
+    // Copy original phi DL over to the new one.
+    BCResumeVal->setDebugLoc(OrigPhi->getDebugLoc());
     Value *&EndValue = IVEndValues[OrigPhi];
     if (OrigPhi == OldInduction) {
       // We know what the end value is.

Removed: llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll?rev=336255&view=auto
==============================================================================
--- llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll (original)
+++ llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll (removed)
@@ -1,29 +0,0 @@
-; RUN: opt < %s -loop-vectorize -S 2>&1 | FileCheck %s
-target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
-
-; This test makes sure we don't duplicate the loop vectorizer's metadata
-; while marking them as already vectorized (by setting width = 1), even
-; at lower optimization levels, where no extra cleanup is done
-
-define void @_Z3fooPf(float* %a) {
-entry:
-  br label %for.body
-
-for.body:                                         ; preds = %for.body, %entry
-  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next, %for.body ]
-  %arrayidx = getelementptr inbounds float, float* %a, i64 %indvars.iv
-  %p = load float, float* %arrayidx, align 4
-  %mul = fmul float %p, 2.000000e+00
-  store float %mul, float* %arrayidx, align 4
-  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1
-  %exitcond = icmp eq i64 %indvars.iv.next, 1024
-  br i1 %exitcond, label %for.end, label %for.body, !llvm.loop !0
-
-for.end:                                          ; preds = %for.body
-  ret void
-}
-
-!0 = !{!0, !1}
-!1 = !{!"llvm.loop.vectorize.width", i32 4}
-; CHECK-NOT: !{metadata !"llvm.loop.vectorize.width", i32 4}
-; CHECK: !{!"llvm.loop.isvectorized", i32 1}

Copied: llvm/trunk/test/Transforms/LoopVectorize/preserve-dbg-loc-and-loop-metadata.ll (from r336250, llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/preserve-dbg-loc-and-loop-metadata.ll?p2=llvm/trunk/test/Transforms/LoopVectorize/preserve-dbg-loc-and-loop-metadata.ll&p1=llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll&r1=336250&r2=336256&rev=336256&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/LoopVectorize/duplicated-metadata.ll (original)
+++ llvm/trunk/test/Transforms/LoopVectorize/preserve-dbg-loc-and-loop-metadata.ll Wed Jul  4 03:16:55 2018
@@ -1,10 +1,14 @@
 ; RUN: opt < %s -loop-vectorize -S 2>&1 | FileCheck %s
+; RUN: opt < %s -debugify -loop-vectorize -S | FileCheck %s -check-prefix DEBUGLOC
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 ; This test makes sure we don't duplicate the loop vectorizer's metadata
 ; while marking them as already vectorized (by setting width = 1), even
 ; at lower optimization levels, where no extra cleanup is done
 
+; DEBUGLOC-LABEL: define void @_Z3fooPf(
+; Check that the phi to resume the scalar part of the loop
+; has Debug Location.
 define void @_Z3fooPf(float* %a) {
 entry:
   br label %for.body
@@ -19,6 +23,11 @@ for.body:
   %exitcond = icmp eq i64 %indvars.iv.next, 1024
   br i1 %exitcond, label %for.end, label %for.body, !llvm.loop !0
 
+; DEBUGLOC: scalar.ph:
+; DEBUGLOC-NEXT:    %bc.resume.val = phi {{.*}} !dbg ![[DbgLoc:[0-9]+]]
+;
+; DEBUGLOC: ![[DbgLoc]] = !DILocation(line: 2
+
 for.end:                                          ; preds = %for.body
   ret void
 }