Enable tests from rG8e67982384d4a11892c04d16c2d10d7533e56094 that seem to work now

[vtjnash]

Summary

I noticed randomly that the only reason these tests from rG8e67982384d4a11892c04d16c2d10d7533e56094 seemed to still be failing is that they are missing CHECK lines. I don't know anymore than that they don't appear to crash or assert when I ran them today.

[vtjnash]

run update_test_checks.py on these files too

[vtjnash]

remove accidental commit added by arc

[vtjnash]

rebase on main branch

[vtjnash]

@fhahn You added these test failures recently, but they are working now. Does this look good to you to enable them?

[vtjnash]

ping @fhahn

[fhahn]

Thanks for enabling the tests!

LGTM

llvm/test/Transforms/NewGVN/pr35074-phi-of-ops.ll

+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -passes=newgvn -S %s | FileCheck %s
+
+define void @crash1_pr35074(i32 %this, i1 %c) {
+; CHECK-LABEL: @crash1_pr35074(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br label [[FOR_COND:%.*]]
+; CHECK:       for.cond:
+; CHECK-NEXT:    [[PHIOFOPS:%.*]] = phi i32 [ 0, [[ENTRY:%.*]] ], [ [[Y_0:%.*]], [[FOR_INC6:%.*]] ]
+; CHECK-NEXT:    [[Y_0]] = phi i32 [ 1, [[ENTRY]] ], [ [[INC7:%.*]], [[FOR_INC6]] ]
+; CHECK-NEXT:    br i1 [[C:%.*]], label [[FOR_INC6]], label [[FOR_BODY_LR_PH:%.*]]
+; CHECK:       for.body.lr.ph:
+; CHECK-NEXT:    br label [[FOR_BODY4:%.*]]
+; CHECK:       for.body4:
+; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt i32 [[PHIOFOPS]], [[Y_0]]
+; CHECK-NEXT:    br i1 [[CMP]], label [[FOR_END:%.*]], label [[FOR_BODY4_1:%.*]]
+; CHECK:       for.end:
+; CHECK-NEXT:    ret void
+; CHECK:       for.inc6:
+; CHECK-NEXT:    [[INC7]] = add nuw nsw i32 [[Y_0]], 1
+; CHECK-NEXT:    br label [[FOR_COND]]
+; CHECK:       for.body4.1:
+; CHECK-NEXT:    [[INC_1:%.*]] = add nuw nsw i32 [[Y_0]], 1
+; CHECK-NEXT:    tail call void @_blah(i32 [[INC_1]])
+; CHECK-NEXT:    br label [[FOR_END]]
+;
+entry:
+  br label %for.cond
+
+for.cond:                                         ; preds = %for.inc6, %entry
+  %y.0 = phi i32 [ 1, %entry ], [ %inc7, %for.inc6 ]
+  br i1 %c, label %for.inc6, label %for.body.lr.ph
+
+for.body.lr.ph:                                   ; preds = %for.cond
+  %sub = add nsw i32 %y.0, -1
+  br label %for.body4
+
+for.body4:                                        ; preds = %for.body.lr.ph
+  %cmp = icmp ugt i32 %sub, %y.0
+  br i1 %cmp, label %for.end, label %for.body4.1
+
+for.end:                                          ; preds = %for.body4.1, %for.body4
+  ret void
+
+for.inc6:                                         ; preds = %for.cond
+  %inc7 = add nuw nsw i32 %y.0, 1
+  br label %for.cond
+
+for.body4.1:                                      ; preds = %for.body4
+  %inc.1 = add nuw nsw i32 %y.0, 1
+  tail call void @_blah(i32 %inc.1)
+  br label %for.end
+}
+
+declare void @_blah(i32)

llvm/test/Transforms/NewGVN/pr37121-seens-this-value-a-lot.ll

-; REQUIRES: asserts
-
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt -passes=newgvn -S %s | FileCheck %s
 
-; XFAIL: *
-
-; TODO: Current NewGVN crashes on the function below. See PR37121.
-
 define hidden void @foo() {
+; CHECK-LABEL: @foo(
+; CHECK-NEXT:  top:
+; CHECK-NEXT:    br label [[IF:%.*]]
+; CHECK:       if:
+; CHECK-NEXT:    br i1 false, label [[L50:%.*]], label [[IF]]
+; CHECK:       L50:
+; CHECK-NEXT:    store i8 poison, i8* null, align 1
+; CHECK-NEXT:    ret void
+;
 top:
   %.promoted = load i8, i8* undef, align 8
   br label %if
 
 ;; This is really a multi-valued phi, because the phi is defined by an expression of the phi.
 ;; This means that we can't propagate the value over the backedge, because we'll just cycle
 ;; through every value.
 

llvm/test/Transforms/NewGVN/pr42422-phi-of-ops.ll

+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -passes=newgvn -S %s | FileCheck %s
+
+define void @d() {
+; CHECK-LABEL: @d(
+; CHECK-NEXT:  entry:
+; CHECK-NEXT:    br label [[FOR_COND:%.*]]
+; CHECK:       for.cond:
+; CHECK-NEXT:    br label [[FOR_COND1:%.*]]
+; CHECK:       for.cond1:
+; CHECK-NEXT:    [[TMP0:%.*]] = phi i32 [ [[INC18:%.*]], [[FOR_INC17:%.*]] ], [ 0, [[FOR_COND]] ]
+; CHECK-NEXT:    [[CMP:%.*]] = icmp sle i32 [[TMP0]], 1
+; CHECK-NEXT:    br i1 [[CMP]], label [[FOR_BODY:%.*]], label [[FOR_END19:%.*]]
+; CHECK:       for.body:
+; CHECK-NEXT:    br i1 undef, label [[FOR_BODY3:%.*]], label [[FOR_BODY_FOR_COND4_CRIT_EDGE:%.*]]
+; CHECK:       for.body.for.cond4_crit_edge:
+; CHECK-NEXT:    br label [[FOR_COND4:%.*]]
+; CHECK:       for.body3:
+; CHECK-NEXT:    br label [[CLEANUP14:%.*]]
+; CHECK:       for.cond4:
+; CHECK-NEXT:    br i1 undef, label [[IF_THEN:%.*]], label [[IF_END:%.*]]
+; CHECK:       if.then:
+; CHECK-NEXT:    br label [[CLEANUP:%.*]]
+; CHECK:       if.end:
+; CHECK-NEXT:    br label [[FOR_COND6:%.*]]
+; CHECK:       for.cond6:
+; CHECK-NEXT:    [[TMP1:%.*]] = phi i64 [ [[INC:%.*]], [[FOR_INC:%.*]] ], [ 0, [[IF_END]] ]
+; CHECK-NEXT:    [[CMP7:%.*]] = icmp sle i64 [[TMP1]], 1
+; CHECK-NEXT:    br i1 [[CMP7]], label [[FOR_INC]], label [[FOR_END9:%.*]]
+; CHECK:       for.inc:
+; CHECK-NEXT:    [[INC]] = add nsw i64 [[TMP1]], 1
+; CHECK-NEXT:    br label [[FOR_COND6]]
+; CHECK:       for.end9:
+; CHECK-NEXT:    br i1 true, label [[IF_THEN11:%.*]], label [[IF_END12:%.*]]
+; CHECK:       if.then11:
+; CHECK-NEXT:    br label [[CLEANUP]]
+; CHECK:       if.end12:
+; CHECK-NEXT:    store i8 poison, i8* null, align 1
+; CHECK-NEXT:    br label [[CLEANUP]]
+; CHECK:       cleanup:
+; CHECK-NEXT:    [[CLEANUP_DEST:%.*]] = phi i32 [ poison, [[IF_END12]] ], [ 1, [[IF_THEN11]] ], [ 9, [[IF_THEN]] ]
+; CHECK-NEXT:    switch i32 [[CLEANUP_DEST]], label [[CLEANUP14]] [
+; CHECK-NEXT:    i32 0, label [[FOR_COND4]]
+; CHECK-NEXT:    i32 9, label [[FOR_END13:%.*]]
+; CHECK-NEXT:    ]
+; CHECK:       for.end13:
+; CHECK-NEXT:    br label [[CLEANUP14]]
+; CHECK:       cleanup14:
+; CHECK-NEXT:    [[CLEANUP_DEST15:%.*]] = phi i32 [ 0, [[FOR_END13]] ], [ [[CLEANUP_DEST]], [[CLEANUP]] ], [ 1, [[FOR_BODY3]] ]
+; CHECK-NEXT:    [[COND1:%.*]] = icmp eq i32 [[CLEANUP_DEST15]], 0
+; CHECK-NEXT:    br i1 [[COND1]], label [[FOR_INC17]], label [[CLEANUP20:%.*]]
+; CHECK:       for.inc17:
+; CHECK-NEXT:    [[INC18]] = add nsw i32 [[TMP0]], 1
+; CHECK-NEXT:    br label [[FOR_COND1]]
+; CHECK:       for.end19:
+; CHECK-NEXT:    br label [[CLEANUP20]]
+; CHECK:       cleanup20:
+; CHECK-NEXT:    [[PHIOFOPS:%.*]] = phi i1 [ true, [[FOR_END19]] ], [ [[COND1]], [[CLEANUP14]] ]
+; CHECK-NEXT:    [[CLEANUP_DEST21:%.*]] = phi i32 [ [[CLEANUP_DEST15]], [[CLEANUP14]] ], [ 0, [[FOR_END19]] ]
+; CHECK-NEXT:    br i1 [[PHIOFOPS]], label [[FOR_COND]], label [[CLEANUP23:%.*]]
+; CHECK:       cleanup23:
+; CHECK-NEXT:    ret void
+;
+entry:
+  br label %for.cond
+
+for.cond:                                         ; preds = %cleanup20, %entry
+  br label %for.cond1
+
+for.cond1:                                        ; preds = %for.inc17, %for.cond
+  %0 = phi i32 [ %inc18, %for.inc17 ], [ 0, %for.cond ]
+  %cmp = icmp sle i32 %0, 1
+  br i1 %cmp, label %for.body, label %for.end19
+
+for.body:                                         ; preds = %for.cond1
+  br i1 undef, label %for.body3, label %for.body.for.cond4_crit_edge
+
+for.body.for.cond4_crit_edge:                     ; preds = %for.body
+  br label %for.cond4
+
+for.body3:                                        ; preds = %for.body
+  br label %cleanup14
+
+for.cond4:                                        ; preds = %cleanup, %for.body.for.cond4_crit_edge
+  br i1 undef, label %if.then, label %if.end
+
+if.then:                                          ; preds = %for.cond4
+  br label %cleanup
+
+if.end:                                           ; preds = %for.cond4
+  br label %for.cond6
+
+for.cond6:                                        ; preds = %for.inc, %if.end
+  %1 = phi i64 [ %inc, %for.inc ], [ 0, %if.end ]
+  %cmp7 = icmp sle i64 %1, 1
+  br i1 %cmp7, label %for.inc, label %for.end9
+
+for.inc:                                          ; preds = %for.cond6
+  %inc = add nsw i64 %1, 1
+  br label %for.cond6
+
+for.end9:                                         ; preds = %for.cond6
+  br i1 true, label %if.then11, label %if.end12
+
+if.then11:                                        ; preds = %for.end9
+  br label %cleanup
+
+if.end12:                                         ; preds = %for.end9
+  br label %cleanup
+
+cleanup:                                          ; preds = %if.end12, %if.then11, %if.then
+  %cleanup.dest = phi i32 [ undef, %if.end12 ], [ 1, %if.then11 ], [ 9, %if.then ]
+  switch i32 %cleanup.dest, label %cleanup14 [
+  i32 0, label %for.cond4
+  i32 9, label %for.end13
+  ]
+
+for.end13:                                        ; preds = %cleanup
+  br label %cleanup14
+
+cleanup14:                                        ; preds = %for.end13, %cleanup, %for.body3
+  %cleanup.dest15 = phi i32 [ 0, %for.end13 ], [ %cleanup.dest, %cleanup ], [ 1, %for.body3 ]
+  %cond1 = icmp eq i32 %cleanup.dest15, 0
+  br i1 %cond1, label %for.inc17, label %cleanup20
+
+for.inc17:                                        ; preds = %cleanup14
+  %inc18 = add nsw i32 %0, 1
+  br label %for.cond1
+
+for.end19:                                        ; preds = %for.cond1
+  br label %cleanup20
+
+cleanup20:                                        ; preds = %for.end19, %cleanup14
+  %cleanup.dest21 = phi i32 [ %cleanup.dest15, %cleanup14 ], [ 0, %for.end19 ]
+  %cond = icmp eq i32 %cleanup.dest21, 0
+  br i1 %cond, label %for.cond, label %cleanup23
+
+cleanup23:                                        ; preds = %cleanup20
+  ret void
+}

llvm/test/Transforms/NewGVN/todo-pr35074-phi-of-ops.ll

-; REQUIRES: asserts
-
-; RUN: opt -passes=newgvn -S %s | FileCheck %s
-
-XFAIL: *
-
-; TODO: Test case for PR35074. Crashes caused by phi-of-ops.
-define void @crash1_pr35074(i32 %this, i1 %c) {
-entry:
-  br label %for.cond
-
-for.cond:                                         ; preds = %for.inc6, %entry
-  %y.0 = phi i32 [ 1, %entry ], [ %inc7, %for.inc6 ]
-  br i1 %c, label %for.inc6, label %for.body.lr.ph
-
-for.body.lr.ph:                                   ; preds = %for.cond
-  %sub = add nsw i32 %y.0, -1
-  br label %for.body4
-
-for.body4:                                        ; preds = %for.body.lr.ph
-  %cmp = icmp ugt i32 %sub, %y.0
-  br i1 %cmp, label %for.end, label %for.body4.1
-
-for.end:                                          ; preds = %for.body4.1, %for.body4
-  ret void
-
-for.inc6:                                         ; preds = %for.cond
-  %inc7 = add nuw nsw i32 %y.0, 1
-  br label %for.cond
-
-for.body4.1:                                      ; preds = %for.body4
-  %inc.1 = add nuw nsw i32 %y.0, 1
-  tail call void @_blah(i32 %inc.1)
-  br label %for.end
-}
-
-declare void @_blah(i32)

llvm/test/Transforms/NewGVN/todo-pr42422-phi-of-ops.ll

-; REQUIRES: asserts
-
-; RUN: opt -passes=newgvn -S %s | FileCheck %s
-
-; XFAIL: *
-
-; TODO: Currently NewGVN crashes on the function below, see PR42422.
-
-define void @d() {
-entry:
-  br label %for.cond
-
-for.cond:                                         ; preds = %cleanup20, %entry
-  br label %for.cond1
-
-for.cond1:                                        ; preds = %for.inc17, %for.cond
-  %0 = phi i32 [ %inc18, %for.inc17 ], [ 0, %for.cond ]
-  %cmp = icmp sle i32 %0, 1
-  br i1 %cmp, label %for.body, label %for.end19
-
-for.body:                                         ; preds = %for.cond1
-  br i1 undef, label %for.body3, label %for.body.for.cond4_crit_edge
-
-for.body.for.cond4_crit_edge:                     ; preds = %for.body
-  br label %for.cond4
-
-for.body3:                                        ; preds = %for.body
-  br label %cleanup14
-
-for.cond4:                                        ; preds = %cleanup, %for.body.for.cond4_crit_edge
-  br i1 undef, label %if.then, label %if.end
-
-if.then:                                          ; preds = %for.cond4
-  br label %cleanup
-
-if.end:                                           ; preds = %for.cond4
-  br label %for.cond6
-
-for.cond6:                                        ; preds = %for.inc, %if.end
-  %1 = phi i64 [ %inc, %for.inc ], [ 0, %if.end ]
-  %cmp7 = icmp sle i64 %1, 1
-  br i1 %cmp7, label %for.inc, label %for.end9
-
-for.inc:                                          ; preds = %for.cond6
-  %inc = add nsw i64 %1, 1
-  br label %for.cond6
-
-for.end9:                                         ; preds = %for.cond6
-  br i1 true, label %if.then11, label %if.end12
-
-if.then11:                                        ; preds = %for.end9
-  br label %cleanup
-
-if.end12:                                         ; preds = %for.end9
-  br label %cleanup
-
-cleanup:                                          ; preds = %if.end12, %if.then11, %if.then
-  %cleanup.dest = phi i32 [ undef, %if.end12 ], [ 1, %if.then11 ], [ 9, %if.then ]
-  switch i32 %cleanup.dest, label %cleanup14 [
-    i32 0, label %for.cond4
-    i32 9, label %for.end13
-  ]
-
-for.end13:                                        ; preds = %cleanup
-  br label %cleanup14
-
-cleanup14:                                        ; preds = %for.end13, %cleanup, %for.body3
-  %cleanup.dest15 = phi i32 [ 0, %for.end13 ], [ %cleanup.dest, %cleanup ], [ 1, %for.body3 ]
-  %cond1 = icmp eq i32 %cleanup.dest15, 0
-  br i1 %cond1, label %for.inc17, label %cleanup20
-
-for.inc17:                                        ; preds = %cleanup14
-  %inc18 = add nsw i32 %0, 1
-  br label %for.cond1
-
-for.end19:                                        ; preds = %for.cond1
-  br label %cleanup20
-
-cleanup20:                                        ; preds = %for.end19, %cleanup14
-  %cleanup.dest21 = phi i32 [ %cleanup.dest15, %cleanup14 ], [ 0, %for.end19 ]
-  %cond = icmp eq i32 %cleanup.dest21, 0
-  br i1 %cond, label %for.cond, label %cleanup23
-
-cleanup23:                                        ; preds = %cleanup20
-  ret void
-}