[InstCombine] Regenerate some old bool math tests to use FileCheck and UTC scripts

Don't use %a and %A in the same test as FileCheck doesn't like it.

Author: RKSimon

llvm/test/Transforms/InstCombine/2008-05-31-AddBool.ll

@@ -1,9 +1,13 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
 ; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 ; PR2389
 
-; CHECK: xor
-
 define i1 @test(i1 %a, i1 %b) {
-  %A = add i1 %a, %b
-  ret i1 %A
+; CHECK-LABEL: define i1 @test(
+; CHECK-SAME: i1 [[A:%.*]], i1 [[B:%.*]]) {
+; CHECK-NEXT:    [[R:%.*]] = xor i1 [[A]], [[B]]
+; CHECK-NEXT:    ret i1 [[R]]
+;
+  %r = add i1 %a, %b
+  ret i1 %r
 }

llvm/test/Transforms/InstCombine/2008-05-31-Bools.ll

@@ -1,24 +1,40 @@
-; RUN: opt < %s -passes=instcombine -S > %t
-; RUN: grep "xor" %t
-; RUN: grep "and" %t
-; RUN: not grep "div" %t
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
+; RUN: opt < %s -passes=instcombine -S | FileCheck %s
 
 define i1 @foo1(i1 %a, i1 %b) {
-  %A = sub i1 %a, %b
-  ret i1 %A
+; CHECK-LABEL: define i1 @foo1(
+; CHECK-SAME: i1 [[A:%.*]], i1 [[B:%.*]]) {
+; CHECK-NEXT:    [[R:%.*]] = xor i1 [[B]], [[A]]
+; CHECK-NEXT:    ret i1 [[R]]
+;
+  %r = sub i1 %a, %b
+  ret i1 %r
 }
 
 define i1 @foo2(i1 %a, i1 %b) {
-  %A = mul i1 %a, %b
-  ret i1 %A
+; CHECK-LABEL: define i1 @foo2(
+; CHECK-SAME: i1 [[A:%.*]], i1 [[B:%.*]]) {
+; CHECK-NEXT:    [[R:%.*]] = and i1 [[A]], [[B]]
+; CHECK-NEXT:    ret i1 [[R]]
+;
+  %r = mul i1 %a, %b
+  ret i1 %r
 }
 
 define i1 @foo3(i1 %a, i1 %b) {
-  %A = udiv i1 %a, %b
-  ret i1 %A
+; CHECK-LABEL: define i1 @foo3(
+; CHECK-SAME: i1 [[A:%.*]], i1 [[B:%.*]]) {
+; CHECK-NEXT:    ret i1 [[A]]
+;
+  %r = udiv i1 %a, %b
+  ret i1 %r
 }
 
 define i1 @foo4(i1 %a, i1 %b) {
-  %A = sdiv i1 %a, %b
-  ret i1 %A
+; CHECK-LABEL: define i1 @foo4(
+; CHECK-SAME: i1 [[A:%.*]], i1 [[B:%.*]]) {
+; CHECK-NEXT:    ret i1 [[A]]
+;
+  %r = sdiv i1 %a, %b
+  ret i1 %r
 }