[SimplifyCFG] rename test file, regenerate checks, and add test

The fdiv test shows a problem similar to:
https://reviews.llvm.org/rL279970

llvm-svn: 279972

2 files changed, 70 insertions, 41 deletions

diff --git a/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll b/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll
deleted file mode 100644
index 740ea25f93a..00000000000
--- a/llvm/test/Transforms/SimplifyCFG/2009-01-19-UnconditionalTrappingConstantExpr.ll
+++ /dev/null
@@ -1,41 +0,0 @@
-; RUN: opt < %s -simplifycfg -S | FileCheck %s
-; PR3354
-; Do not merge bb1 into the entry block, it might trap.
-
-@G = extern_weak global i32
-
-; CHECK-LABEL: @test(
-; CHECK: br i1 %tmp25
-; CHECK: bb1:
-; CHECK: sdiv
-
-define i32 @test(i32 %tmp21, i32 %tmp24) {
-	%tmp25 = icmp sle i32 %tmp21, %tmp24		
-	br i1 %tmp25, label %bb2, label %bb1	
-					
-bb1:		; preds = %bb	
-	%tmp26 = icmp sgt i32 sdiv (i32 -32768, i32 ptrtoint (i32* @G to i32)), 0
-	br i1 %tmp26, label %bb6, label %bb2		
-bb2:
-	ret i32 42
-
-bb6:
-	ret i32 927
-}
-
-; CHECK-LABEL: @test2(
-; CHECK: br i1 %tmp34
-; CHECK: bb5:
-; CHECK: sdiv
-
-define i32 @test2(i32 %tmp21, i32 %tmp24, i1 %tmp34) {
-	br i1 %tmp34, label %bb5, label %bb6
-
-bb5:		; preds = %bb4
-	br i1 icmp sgt (i32 sdiv (i32 32767, i32 ptrtoint (i32* @G to i32)), i32 0), label %bb6, label %bb7
-bb6:
-	ret i32 42
-bb7:
-	ret i32 927
-}
-
diff --git a/llvm/test/Transforms/SimplifyCFG/ConditionalTrappingConstantExpr.ll b/llvm/test/Transforms/SimplifyCFG/ConditionalTrappingConstantExpr.ll
new file mode 100644
index 00000000000..029cda3bbc6
--- /dev/null
+++ b/llvm/test/Transforms/SimplifyCFG/ConditionalTrappingConstantExpr.ll
@@ -0,0 +1,70 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt < %s -simplifycfg -S | FileCheck %s
+
+@G = extern_weak global i32
+
+; PR3354
+; Do not merge bb1 into the entry block, it might trap.
+
+define i32 @admiral(i32 %a, i32 %b) {
+; CHECK-LABEL: @admiral(
+; CHECK-NEXT:    [[C:%.*]] = icmp sle i32 %a, %b
+; CHECK-NEXT:    br i1 [[C]], label %bb2, label %bb1
+; CHECK:       bb1:
+; CHECK-NEXT:    [[D:%.*]] = icmp sgt i32 sdiv (i32 -32768, i32 ptrtoint (i32* @G to i32)), 0
+; CHECK-NEXT:    [[DOT:%.*]] = select i1 [[D]], i32 927, i32 42
+; CHECK-NEXT:    br label %bb2
+; CHECK:       bb2:
+; CHECK-NEXT:    [[MERGE:%.*]] = phi i32 [ 42, %0 ], [ [[DOT]], %bb1 ]
+; CHECK-NEXT:    ret i32 [[MERGE]]
+;
+  %c = icmp sle i32 %a, %b
+  br i1 %c, label %bb2, label %bb1
+bb1:
+  %d = icmp sgt i32 sdiv (i32 -32768, i32 ptrtoint (i32* @G to i32)), 0
+  br i1 %d, label %bb6, label %bb2
+bb2:
+  ret i32 42
+bb6:
+  ret i32 927
+}
+
+define i32 @ackbar(i1 %c) {
+; CHECK-LABEL: @ackbar(
+; CHECK-NEXT:    br i1 %c, label %bb5, label %bb6
+; CHECK:       bb5:
+; CHECK-NEXT:    [[DOT:%.*]] = select i1 icmp sgt (i32 sdiv (i32 32767, i32 ptrtoint (i32* @G to i32)), i32 0), i32 42, i32 927
+; CHECK-NEXT:    br label %bb6
+; CHECK:       bb6:
+; CHECK-NEXT:    [[MERGE:%.*]] = phi i32 [ 42, %0 ], [ [[DOT]], %bb5 ]
+; CHECK-NEXT:    ret i32 [[MERGE]]
+;
+  br i1 %c, label %bb5, label %bb6
+bb5:
+  br i1 icmp sgt (i32 sdiv (i32 32767, i32 ptrtoint (i32* @G to i32)), i32 0), label %bb6, label %bb7
+bb6:
+  ret i32 42
+bb7:
+  ret i32 927
+}
+
+; FIXME: FP ops don't trap by default, so this is safe to hoist.
+
+define i32 @tarp(i1 %c) {
+; CHECK-LABEL: @tarp(
+; CHECK-NEXT:    br i1 %c, label %bb8, label %bb9
+; CHECK:       bb8:
+; CHECK-NEXT:    [[DOT:%.*]] = select i1 fcmp oeq (float fdiv (float 3.000000e+00, float sitofp (i32 ptrtoint (i32* @G to i32) to float)), float 1.000000e+00), i32 42, i32 927
+; CHECK-NEXT:    br label %bb9
+; CHECK:       bb9:
+; CHECK-NEXT:    [[MERGE:%.*]] = phi i32 [ 42, %0 ], [ [[DOT]], %bb8 ]
+; CHECK-NEXT:    ret i32 [[MERGE]]
+;
+  br i1 %c, label %bb8, label %bb9
+bb8:
+  br i1 fcmp oeq (float fdiv (float 3.0, float sitofp (i32 ptrtoint (i32* @G to i32) to float)), float 1.0), label %bb9, label %bb10
+bb9:
+  ret i32 42
+bb10:
+  ret i32 927
+}