[PATCH] D105438: [NFC] Update some fragile tests

[Florian Hahn via Phabricator via llvm-commits]

fhahn added inline comments.


================
Comment at: llvm/test/Transforms/LoopVectorize/pr47343-expander-lcssa-after-cfg-update.ll:75
 ;
+
+
----------------
remove whitespace?


================
Comment at: llvm/test/Transforms/LoopVersioningLICM/loopversioningLICM1.ll:11
 ;
-; CHECK: for.body3:
-; CHECK-NEXT: %[[induction:.*]] = phi i32 [ %arrayidx7.promoted, %for.body3.ph ], [ %add8, %for.body3 ]
-; CHECK-NEXT: %j.113 = phi i32 [ %j.016, %for.body3.ph ], [ %inc, %for.body3 ]
-; CHECK-NEXT: %idxprom = zext i32 %j.113 to i64
-; CHECK-NEXT: %arrayidx = getelementptr inbounds i32, i32* %var1, i64 %idxprom
-; CHECK-NEXT: store i32 %add, i32* %arrayidx, align 4, !alias.scope !2, !noalias !2
-; CHECK-NEXT: %add8 = add nsw i32 %[[induction]], %add
-; CHECK-NEXT: %inc = add nuw i32 %j.113, 1
-; CHECK-NEXT: %cmp2 = icmp ult i32 %inc, %itr
-; CHECK-NEXT: br i1 %cmp2, label %for.body3, label %for.inc11.loopexit.loopexit7, !llvm.loop !5
+; CHECK:       for.body3:
+; CHECK-NEXT:    [[ADD89:%.*]] = phi i32 [ [[ARRAYIDX7_PROMOTED:%.*]], [[FOR_BODY3_PH:%.*]] ], [ [[ADD8:%.*]], [[FOR_BODY3:%.*]] ]
----------------
As we only check a single basic block, it is probably best to keep checking the hard-coded basic block names, because regex matched basic block names are only meaningful if the whole CFG is checked.



================
Comment at: llvm/test/Transforms/LoopVersioningLICM/loopversioningLICM2.ll:11
 ;
-; CHECK: for.cond1.for.inc17_crit_edge.us.loopexit7:       ; preds = %for.body3.us
-; CHECK-NEXT: %add14.us.lcssa = phi float [ %add14.us, %for.body3.us ]
-; CHECK-NEXT: store float %add14.us.lcssa, float* %arrayidx.us, align 4, !alias.scope !0, !noalias !0
-; CHECK-NEXT: br label %for.cond1.for.inc17_crit_edge.us
+; CHECK:       for.cond1.for.inc17_crit_edge.us.loopexit7:
+; CHECK-NEXT:    [[ADD14_US_LCSSA:%.*]] = phi float [ [[ADD14_US:%.*]], [[FOR_BODY3_US:%.*]] ]
----------------
I think in D104148, the check here is causing the problem. Probably best to keep checking the hard-coded basic block names, because regex matched basic block names are only meaningful if the whole CFG is checked.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D105438/new/

https://reviews.llvm.org/D105438