From 737ec5130ef29bd447eb3c93d6a6e980cc0b16e3 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sat, 13 Jan 2007 05:06:52 +0000
Subject: [PATCH] For PR1043: Bye, Bye Booly. Remove the use of the bool type
from non-upgraded test cases and from grep expressions. The parser doesn't
accept it and the asm writer doesn't produce it any more.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33183 91177308-0d34-0410-b5e6-96231b3b80d8
---
test/Analysis/Andersens/modreftest.ll | 4 ++-
test/Assembler/2006-12-09-Cast-To-Bool.ll | 6 ++--
.../2007-01-02-Undefined-Arg-Type.ll | 4 +--
test/CodeGen/ARM/fcopysign.ll | 4 +--
test/CodeGen/ARM/fpcmp_ueq.ll | 2 +-
test/CodeGen/PowerPC/small-arguments.ll | 2 +-
test/CodeGen/X86/test-pic-cpool.ll | 2 +-
test/CodeGen/X86/trunc-to-bool.ll | 34 +++++++++----------
.../ConstProp/2006-12-01-TruncBoolBug.ll | 2 +-
test/Transforms/GlobalOpt/integer-bool.ll | 3 +-
.../IPConstantProp/return-constant.ll | 3 +-
.../IndVarsSimplify/2007-01-06-TripCount.ll | 8 ++---
.../2007-01-08-X86-64-Pointer.ll | 2 +-
.../InstCombine/2004-08-10-BoolSetCC.ll | 2 +-
.../2005-06-16-SetCCOrSetCCMiscompile.ll | 3 +-
test/Transforms/InstCombine/narrow.ll | 3 +-
.../exit_compare_live_range.ll | 7 ++--
test/Transforms/SCCP/2006-12-19-UndefBug.ll | 2 +-
18 files changed, 50 insertions(+), 43 deletions(-)
diff --git a/test/Analysis/Andersens/modreftest.ll b/test/Analysis/Andersens/modreftest.ll
index 488c6f54733..fcef0d17cc2 100644
--- a/test/Analysis/Andersens/modreftest.ll
+++ b/test/Analysis/Andersens/modreftest.ll
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN: opt -anders-aa -load-vn -gcse -instcombine | llvm-dis | \
+; RUN: grep 'ret i1 true'
%G = internal global int* null
declare int *%ext()
diff --git a/test/Assembler/2006-12-09-Cast-To-Bool.ll b/test/Assembler/2006-12-09-Cast-To-Bool.ll
index 7264918a427..3fc4d23070c 100644
--- a/test/Assembler/2006-12-09-Cast-To-Bool.ll
+++ b/test/Assembler/2006-12-09-Cast-To-Bool.ll
@@ -1,5 +1,5 @@
; RUN: llvm-as < %s | llvm-dis | grep bitcast
-define bool %main(i32 %X) {
- %res = bitcast bool true to bool
- ret bool %res
+define i1 %main(i32 %X) {
+ %res = bitcast i1 true to i1
+ ret i1 %res
}
diff --git a/test/Assembler/2007-01-02-Undefined-Arg-Type.ll b/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
index b12a897e7ab..96e6d6c4e98 100644
--- a/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
+++ b/test/Assembler/2007-01-02-Undefined-Arg-Type.ll
@@ -5,6 +5,6 @@
implementation ; Functions:
-define bool %someFunc(i32* %tmp.71.reload, %typedef.bc_struct* %n1) {
- ret bool true
+define i1 %someFunc(i32* %tmp.71.reload, %typedef.bc_struct* %n1) {
+ ret i1 true
}
diff --git a/test/CodeGen/ARM/fcopysign.ll b/test/CodeGen/ARM/fcopysign.ll
index 331ab93d0e3..66b639e9969 100644
--- a/test/CodeGen/ARM/fcopysign.ll
+++ b/test/CodeGen/ARM/fcopysign.ll
@@ -2,7 +2,7 @@
define csretcc void %__divsc3({ float, float }* %agg.result, float %a, float %b, float %c, float %d) {
entry:
- br bool false, label %bb, label %cond_next375
+ br i1 false, label %bb, label %cond_next375
bb: ; preds = %entry
%tmp81 = tail call float %copysignf( float 0x7FF0000000000000, float %c ) ; <float> [#uses=1]
@@ -16,6 +16,6 @@ cond_next375: ; preds = %bb, %entry
declare float %fabsf(float)
-declare bool %llvm.isunordered.f32(float, float)
+declare i1 %llvm.isunordered.f32(float, float)
declare float %copysignf(float, float)
diff --git a/test/CodeGen/ARM/fpcmp_ueq.ll b/test/CodeGen/ARM/fpcmp_ueq.ll
index 2bbaa5c34b8..0c2d4658a76 100644
--- a/test/CodeGen/ARM/fpcmp_ueq.ll
+++ b/test/CodeGen/ARM/fpcmp_ueq.ll
@@ -5,7 +5,7 @@
define i32 %f7(float %a, float %b) {
entry:
%tmp = fcmp ueq float %a,%b
- %retval = select bool %tmp, i32 666, i32 42
+ %retval = select i1 %tmp, i32 666, i32 42
ret i32 %retval
}
diff --git a/test/CodeGen/PowerPC/small-arguments.ll b/test/CodeGen/PowerPC/small-arguments.ll
index ab5ee17eed5..0068427772b 100644
--- a/test/CodeGen/PowerPC/small-arguments.ll
+++ b/test/CodeGen/PowerPC/small-arguments.ll
@@ -17,7 +17,7 @@ define i32 %test2(i16 zext %X) {
define void %test3() {
%tmp.0 = call i16 %foo() sext ;; no extsh!
%tmp.1 = icmp slt i16 %tmp.0, 1234
- br bool %tmp.1, label %then, label %UnifiedReturnBlock
+ br i1 %tmp.1, label %then, label %UnifiedReturnBlock
then:
call i32 %test1(i16 0 sext)
diff --git a/test/CodeGen/X86/test-pic-cpool.ll b/test/CodeGen/X86/test-pic-cpool.ll
index 7a9df5301df..3911c698dce 100644
--- a/test/CodeGen/X86/test-pic-cpool.ll
+++ b/test/CodeGen/X86/test-pic-cpool.ll
@@ -7,7 +7,7 @@
define double %foo(i32 %a.u) {
entry:
%tmp = icmp eq i32 %a.u,0
- %retval = select bool %tmp, double 4.561230e+02, double 1.234560e+02
+ %retval = select i1 %tmp, double 4.561230e+02, double 1.234560e+02
ret double %retval
}
diff --git a/test/CodeGen/X86/trunc-to-bool.ll b/test/CodeGen/X86/trunc-to-bool.ll
index e9c18c55d15..a9ac6c1b297 100644
--- a/test/CodeGen/X86/trunc-to-bool.ll
+++ b/test/CodeGen/X86/trunc-to-bool.ll
@@ -1,32 +1,32 @@
-; An integer truncation to bool should be done with an and instruction to make
+; An integer truncation to i1 should be done with an and instruction to make
; sure only the LSBit survives. Test that this is the case both for a returned
; value and as the operand of a branch.
; RUN: llvm-as < %s | llc -march=x86 &&
; RUN: llvm-as < %s | llc -march=x86 | grep '\(and\)\|\(test.*\$1\)' | \
; RUN: wc -l | grep 6
-define bool %test1(i32 %X) zext {
- %Y = trunc i32 %X to bool
- ret bool %Y
+define i1 %test1(i32 %X) zext {
+ %Y = trunc i32 %X to i1
+ ret i1 %Y
}
-define bool %test2(i32 %val, i32 %mask) {
+define i1 %test2(i32 %val, i32 %mask) {
entry:
%mask = trunc i32 %mask to i8
%shifted = ashr i32 %val, i8 %mask
%anded = and i32 %shifted, 1
- %trunced = trunc i32 %anded to bool
- br bool %trunced, label %ret_true, label %ret_false
+ %trunced = trunc i32 %anded to i1
+ br i1 %trunced, label %ret_true, label %ret_false
ret_true:
- ret bool true
+ ret i1 true
ret_false:
- ret bool false
+ ret i1 false
}
define i32 %test3(i8* %ptr) {
%val = load i8* %ptr
- %tmp = trunc i8 %val to bool
- br bool %tmp, label %cond_true, label %cond_false
+ %tmp = trunc i8 %val to i1
+ br i1 %tmp, label %cond_true, label %cond_false
cond_true:
ret i32 21
cond_false:
@@ -34,8 +34,8 @@ cond_false:
}
define i32 %test4(i8* %ptr) {
- %tmp = ptrtoint i8* %ptr to bool
- br bool %tmp, label %cond_true, label %cond_false
+ %tmp = ptrtoint i8* %ptr to i1
+ br i1 %tmp, label %cond_true, label %cond_false
cond_true:
ret i32 21
cond_false:
@@ -43,8 +43,8 @@ cond_false:
}
define i32 %test5(float %f) {
- %tmp = fptoui float %f to bool
- br bool %tmp, label %cond_true, label %cond_false
+ %tmp = fptoui float %f to i1
+ br i1 %tmp, label %cond_true, label %cond_false
cond_true:
ret i32 21
cond_false:
@@ -52,8 +52,8 @@ cond_false:
}
define i32 %test6(double %d) {
- %tmp = fptosi double %d to bool
- br bool %tmp, label %cond_true, label %cond_false
+ %tmp = fptosi double %d to i1
+ br i1 %tmp, label %cond_true, label %cond_false
cond_true:
ret i32 21
cond_false:
diff --git a/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll b/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
index 659900ba897..df727dbe15a 100644
--- a/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
+++ b/test/Transforms/ConstProp/2006-12-01-TruncBoolBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i1 false'
bool %test() {
%X = trunc uint 320 to bool
ret bool %X
diff --git a/test/Transforms/GlobalOpt/integer-bool.ll b/test/Transforms/GlobalOpt/integer-bool.ll
index 4c1fcb6ecef..29cb4f5d34c 100644
--- a/test/Transforms/GlobalOpt/integer-bool.ll
+++ b/test/Transforms/GlobalOpt/integer-bool.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -instcombine | \
+; RUN: llvm-dis | grep 'ret i1 true'
;; check that global opt turns integers that only hold 0 or 1 into bools.
diff --git a/test/Transforms/IPConstantProp/return-constant.ll b/test/Transforms/IPConstantProp/return-constant.ll
index 3518a25c16b..50e6a77a5b8 100644
--- a/test/Transforms/IPConstantProp/return-constant.ll
+++ b/test/Transforms/IPConstantProp/return-constant.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -ipconstprop -instcombine | \
+; RUN: llvm-dis | grep 'ret i1 true'
implementation
internal int %foo(bool %C) {
diff --git a/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll b/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll
index 0acaee1d27e..72757227830 100644
--- a/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll
+++ b/test/Transforms/IndVarsSimplify/2007-01-06-TripCount.ll
@@ -21,8 +21,8 @@ bb: ; preds = %cond_next, %cond_true
bb2: ; preds = %bb, %entry
%i.0 = phi i32 [ 0, %entry ], [ %tmp1, %bb ] ; <i32> [#uses=4]
- %tmp = icmp eq i32 %i.0, 0 ; <bool> [#uses=1]
- br bool %tmp, label %cond_true, label %cond_next
+ %tmp = icmp eq i32 %i.0, 0 ; <i1> [#uses=1]
+ br i1 %tmp, label %cond_true, label %cond_next
cond_true: ; preds = %bb2
br label %bb
@@ -30,8 +30,8 @@ cond_true: ; preds = %bb2
cond_next: ; preds = %bb2
%tmp = getelementptr [5 x i8]* %foo, i32 0, i32 %i.0 ; <i8*> [#uses=1]
%tmp = load i8* %tmp ; <i8> [#uses=1]
- %tmp5 = icmp eq i8 %tmp, 0 ; <bool> [#uses=1]
- br bool %tmp5, label %bb6, label %bb
+ %tmp5 = icmp eq i8 %tmp, 0 ; <i1> [#uses=1]
+ br i1 %tmp5, label %bb6, label %bb
bb6: ; preds = %cond_next
br label %return
diff --git a/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll b/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll
index 9b6ae8261b2..028e81f61cb 100644
--- a/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll
+++ b/test/Transforms/IndVarsSimplify/2007-01-08-X86-64-Pointer.ll
@@ -11,7 +11,7 @@ bb:
store double 0.000000e+00, double* %j
%k = add i64 %i, 1
%n = icmp eq i64 %k, 0
- br bool %n, label %return, label %bb
+ br i1 %n, label %return, label %bb
return:
ret void
diff --git a/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll b/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
index 88c4cc43153..e1144b61b0e 100644
--- a/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
+++ b/test/Transforms/InstCombine/2004-08-10-BoolSetCC.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret i1 false'
bool %test(bool %V) {
%Y = setlt bool %V, false
ret bool %Y
diff --git a/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll b/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
index 49abb12e6fc..f4d6703873b 100644
--- a/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
+++ b/test/Transforms/InstCombine/2005-06-16-SetCCOrSetCCMiscompile.ll
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool true'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: grep 'ret i1 true'
; PR586
%g_07918478 = external global uint ; <uint*> [#uses=1]
diff --git a/test/Transforms/InstCombine/narrow.ll b/test/Transforms/InstCombine/narrow.ll
index c382575f3f4..bff2b88a5db 100644
--- a/test/Transforms/InstCombine/narrow.ll
+++ b/test/Transforms/InstCombine/narrow.ll
@@ -1,7 +1,8 @@
; This file contains various testcases that check to see that instcombine
; is narrowing computations when possible.
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | grep 'ret bool false'
+; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
+; RUN: grep 'ret i1 false'
; test1 - Eliminating the casts in this testcase (by narrowing the AND
; operation) allows instcombine to realize the function always returns false.
diff --git a/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll b/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
index 5a34a2a3140..79beb0bff74 100644
--- a/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
+++ b/test/Transforms/LoopStrengthReduce/exit_compare_live_range.ll
@@ -1,8 +1,9 @@
; Make sure that the compare instruction occurs after the increment to avoid
-; having overlapping live ranges that result in copies. We want the setcc instruction
-; immediately before the conditional branch.
+; having overlapping live ranges that result in copies. We want the setcc
+; instruction immediately before the conditional branch.
;
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | %prcontext 'br bool' 1 | grep icmp
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | \
+; RUN: %prcontext 'br i1' 1 | grep icmp
void %foo(float* %D, uint %E) {
entry:
diff --git a/test/Transforms/SCCP/2006-12-19-UndefBug.ll b/test/Transforms/SCCP/2006-12-19-UndefBug.ll
index 388b9abb29f..e991818b6c9 100644
--- a/test/Transforms/SCCP/2006-12-19-UndefBug.ll
+++ b/test/Transforms/SCCP/2006-12-19-UndefBug.ll
@@ -1,5 +1,5 @@
; RUN: llvm-upgrade < %s | llvm-as | opt -sccp | llvm-dis | \
-; RUN: grep 'ret bool false'
+; RUN: grep 'ret i1 false'
bool %foo() {
%X = and bool false, undef