<div dir="ltr">Hi Florian,<div><br></div><div>it appears that your commit is breaking this bot:</div><div><a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/25449/steps/build%20release%20tsan%20with%20clang/logs/stdio">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/25449/steps/build%20release%20tsan%20with%20clang/logs/stdio</a><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 25, 2018 at 12:17 PM, Florian Hahn via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: fhahn<br>
Date: Mon Jun 25 12:17:29 2018<br>
New Revision: 335513<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=335513&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=335513&view=rev</a><br>
Log:<br>
[SCEVExp] Advance found insertion point until we find a non-dbg instruction.<br>
<br>
This avoids creating unnecessary casts if the IP used to be a dbg info<br>
intrinsic. Fixes PR37727.<br>
<br>
Reviewers: vsk, aprantl, sanjoy, efriedma<br>
<br>
Reviewed By: vsk, efriedma<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D47874" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D47874</a><br>
<br>
<br>
Added:<br>
    llvm/trunk/test/Transforms/<wbr>LoopVectorize/scev-expander-<wbr>debug.ll<br>
Modified:<br>
    llvm/trunk/lib/Analysis/<wbr>ScalarEvolutionExpander.cpp<br>
<br>
Modified: llvm/trunk/lib/Analysis/<wbr>ScalarEvolutionExpander.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolutionExpander.cpp?rev=335513&r1=335512&r2=335513&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/lib/<wbr>Analysis/<wbr>ScalarEvolutionExpander.cpp?<wbr>rev=335513&r1=335512&r2=<wbr>335513&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/lib/Analysis/<wbr>ScalarEvolutionExpander.cpp (original)<br>
+++ llvm/trunk/lib/Analysis/<wbr>ScalarEvolutionExpander.cpp Mon Jun 25 12:17:29 2018<br>
@@ -162,7 +162,8 @@ Value *SCEVExpander::<wbr>InsertNoopCastOfTo(<br>
<br>
   // Cast the instruction immediately after the instruction.<br>
   Instruction *I = cast<Instruction>(V);<br>
-  BasicBlock::iterator IP = findInsertPointAfter(I, Builder.GetInsertBlock());<br>
+  BasicBlock::iterator IP = skipDebugInfo(<br>
+      findInsertPointAfter(I, Builder.GetInsertBlock()));<br>
   return ReuseOrCreateCast(I, Ty, Op, IP);<br>
 }<br>
<br>
@@ -1480,8 +1481,8 @@ Value *SCEVExpander::<wbr>visitAddRecExpr(con<br>
       NewOps[i] = SE.getAnyExtendExpr(S->op_<wbr>begin()[i], CanonicalIV->getType());<br>
     Value *V = expand(SE.getAddRecExpr(<wbr>NewOps, S->getLoop(),<br>
                                        S->getNoWrapFlags(SCEV::<wbr>FlagNW)));<br>
-    BasicBlock::iterator NewInsertPt =<br>
-        findInsertPointAfter(cast<<wbr>Instruction>(V), Builder.GetInsertBlock());<br>
+    BasicBlock::iterator NewInsertPt = skipDebugInfo(<br>
+        findInsertPointAfter(cast<<wbr>Instruction>(V), Builder.GetInsertBlock()));<br>
     V = expandCodeFor(SE.<wbr>getTruncateExpr(SE.getUnknown(<wbr>V), Ty), nullptr,<br>
                       &*NewInsertPt);<br>
     return V;<br>
<br>
Added: llvm/trunk/test/Transforms/<wbr>LoopVectorize/scev-expander-<wbr>debug.ll<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopVectorize/scev-expander-debug.ll?rev=335513&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/test/<wbr>Transforms/LoopVectorize/scev-<wbr>expander-debug.ll?rev=335513&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/Transforms/<wbr>LoopVectorize/scev-expander-<wbr>debug.ll (added)<br>
+++ llvm/trunk/test/Transforms/<wbr>LoopVectorize/scev-expander-<wbr>debug.ll Mon Jun 25 12:17:29 2018<br>
@@ -0,0 +1,61 @@<br>
+; RUN: opt -loop-vectorize %s -S | FileCheck %s<br>
+; Tests that the debug intrinsic does not cause additional instructions to be<br>
+; created by SCEVExpander.<br>
+<br>
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:<wbr>32:64-S128"<br>
+target triple = "x86_64-unknown-linux-gnu"<br>
+<br>
+%struct.s = type { double* }<br>
+<br>
+; CHECK-LABEL: entry:<br>
+; CHECK: %[[LV:.+]] = load double*, double** %a<br>
+; CHECK-NEXT: call void @llvm.dbg.value(metadata double* %[[LV]]<br>
+; CHECK-NEXT: %[[PTI:.+]] = ptrtoint double* %[[LV]] to i64<br>
+; CHECK-NEXT: %[[MPTR:.+]] = and i64 %[[PTI]], 31<br>
+; CHECK-NEXT: %[[MCOND:.+]] = icmp eq i64 %[[MPTR]], 0<br>
+; CHECK-NEXT: br i1 false, label %<a href="http://scalar.ph" rel="noreferrer" target="_blank">scalar.ph</a>, label %vector.scevcheck<br>
+<br>
+<br>
+define void @test(%struct.s* %x) !dbg !6 {<br>
+entry:<br>
+  %a = getelementptr inbounds %struct.s, %struct.s* %x, i64 0, i32 0<br>
+  %0 = load double*, double** %a, align 8<br>
+  call void @llvm.dbg.value(metadata double* %0, metadata !9, metadata !DIExpression()), !dbg !11<br>
+  %ptrint = ptrtoint double* %0 to i64<br>
+  %maskedptr = and i64 %ptrint, 31<br>
+  %maskcond = icmp eq i64 %maskedptr, 0<br>
+  br label %for.body<br>
+<br>
+for.body:                                         ; preds = %for.body, %entry<br>
+  %indvars.iv = phi i64 [ 0, %entry ], [ %indvars.iv.next.1, %for.body ]<br>
+  %arrayidx = getelementptr inbounds double, double* %0, i64 %indvars.iv<br>
+  %1 = load double, double* %arrayidx, align 16<br>
+  %add = fadd double %1, 1.000000e+00<br>
+  store double %add, double* %arrayidx, align 16<br>
+  %indvars.iv.next = add nuw nsw i64 %indvars.iv, 1<br>
+  %arrayidx.1 = getelementptr inbounds double, double* %0, i64 %indvars.iv.next<br>
+  %2 = load double, double* %arrayidx.1, align 8<br>
+  %add.1 = fadd double %2, 1.000000e+00<br>
+  store double %add.1, double* %arrayidx.1, align 8<br>
+  %indvars.iv.next.1 = add nuw nsw i64 %indvars.iv.next, 1<br>
+  %exitcond.1 = icmp eq i64 %indvars.iv.next, 1599<br>
+  br i1 %exitcond.1, label %for.end, label %for.body<br>
+<br>
+for.end:                                          ; preds = %for.body<br>
+  ret void<br>
+}<br>
+<br>
+declare void @llvm.dbg.value(metadata, metadata, metadata)<br>
+<br>
+!<a href="http://llvm.dbg.cu" rel="noreferrer" target="_blank">llvm.dbg.cu</a> = !{!0}<br>
+!llvm.module.flags = !{!5}<br>
+<br>
+!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer: "debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)<br>
+!1 = !DIFile(filename: "file.ll", directory: "/")<br>
+!2 = !{}<br>
+!5 = !{i32 2, !"Debug Info Version", i32 3}<br>
+!6 = distinct !DISubprogram(name: "test", linkageName: "test", scope: null, file: !1, line: 1, type: !7, isLocal: false, isDefinition: true, scopeLine: 1, isOptimized: true, unit: !0)<br>
+!7 = !DISubroutineType(types: !2)<br>
+!9 = !DILocalVariable(name: "1", scope: !6, file: !1, line: 1, type: !10)<br>
+!10 = !DIBasicType(name: "ty64", size: 64, encoding: DW_ATE_unsigned)<br>
+!11 = !DILocation(line: 1, column: 1, scope: !6)<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>