Improve test cases from r134746.

Use memory barriers to force if-conversion off for these tests instead of
the internal llc command line option ifcvt-limit.

llvm-svn: 134986

2 files changed, 21 insertions, 5 deletions

diff --git a/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll b/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll
index 5e07b7c6dcf..70febc060e8 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-bcc.ll
@@ -1,7 +1,8 @@
-; RUN: llc < %s -ifcvt-limit=0 -march=thumb -mattr=+thumb2 | FileCheck %s
-; RUN: llc < %s -ifcvt-limit=0 -march=thumb -mattr=+thumb2 | not grep it
+; RUN: llc < %s -march=thumb -mattr=+thumb2 | FileCheck %s
+; RUN: llc < %s -march=thumb -mattr=+thumb2 | not grep it
 ; If-conversion defeats the purpose of this test, which is to check CBZ
-; generation, so turn it off.
+; generation, so use memory barrier instruction to make sure it doesn't
+; happen and we get actual branches.
 
 define i32 @t1(i32 %a, i32 %b, i32 %c) {
 ; CHECK: t1:
@@ -10,12 +11,16 @@ define i32 @t1(i32 %a, i32 %b, i32 %c) {
 	br i1 %tmp2, label %cond_false, label %cond_true
 
 cond_true:
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
 	%tmp5 = add i32 %b, 1
         %tmp6 = and i32 %tmp5, %c
 	ret i32 %tmp6
 
 cond_false:
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
 	%tmp7 = add i32 %b, -1
         %tmp8 = xor i32 %tmp7, %c
 	ret i32 %tmp8
 }
+
+declare void @llvm.memory.barrier(i1, i1, i1, i1, i1) nounwind
diff --git a/llvm/test/CodeGen/Thumb2/thumb2-branch.ll b/llvm/test/CodeGen/Thumb2/thumb2-branch.ll
index 9c6f68b3431..4d9eda062f9 100644
--- a/llvm/test/CodeGen/Thumb2/thumb2-branch.ll
+++ b/llvm/test/CodeGen/Thumb2/thumb2-branch.ll
@@ -1,6 +1,7 @@
-; RUN: llc < %s -ifcvt-limit=0 -mtriple=thumbv7-apple-darwin -mattr=+thumb2 | FileCheck %s
+; RUN: llc < %s -mtriple=thumbv7-apple-darwin -mattr=+thumb2 | FileCheck %s
 ; If-conversion defeats the purpose of this test, which is to check conditional
-; branch generation, so turn it off.
+; branch generation, so use memory barrier instruction to make sure it doesn't
+; happen and we get actual branches.
 
 define i32 @f1(i32 %a, i32 %b, i32* %v) {
 entry:
@@ -10,10 +11,12 @@ entry:
         br i1 %tmp, label %cond_true, label %return
 
 cond_true:              ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         store i32 0, i32* %v
         ret i32 0
 
 return:         ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         ret i32 1
 }
 
@@ -25,10 +28,12 @@ entry:
         br i1 %tmp, label %cond_true, label %return
 
 cond_true:              ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         store i32 0, i32* %v
         ret i32 0
 
 return:         ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         ret i32 1
 }
 
@@ -40,10 +45,12 @@ entry:
         br i1 %tmp, label %cond_true, label %return
 
 cond_true:              ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         store i32 0, i32* %v
         ret i32 0
 
 return:         ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         ret i32 1
 }
 
@@ -55,9 +62,13 @@ entry:
         br i1 %tmp, label %return, label %cond_true
 
 cond_true:              ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         store i32 0, i32* %v
         ret i32 0
 
 return:         ; preds = %entry
+        call void @llvm.memory.barrier(i1 true, i1 true, i1 true, i1 true, i1 false)
         ret i32 1
 }
+
+declare void @llvm.memory.barrier(i1, i1, i1, i1, i1) nounwind