diff --git a/llvm/test/CodeGen/VE/addition.ll b/llvm/test/CodeGen/VE/addition.ll
--- a/llvm/test/CodeGen/VE/addition.ll
+++ b/llvm/test/CodeGen/VE/addition.ll
@@ -156,15 +156,6 @@
   ret i64 %2
 }
 
-define i32 @func25(i32 %0) {
-; CHECK-LABEL: func25:
-; CHECK:       .LBB{{[0-9]+}}_2:
-; CHECK-NEXT:    xor %s0, %s0, (33)1
-; CHECK-NEXT:    or %s11, 0, %s9
-  %2 = xor i32 %0, -2147483648
-  ret i32 %2
-}
-
 define i64 @func26(i64 %0) {
 ; CHECK-LABEL: func26:
 ; CHECK:       .LBB{{[0-9]+}}_2:
diff --git a/llvm/test/CodeGen/VE/and.ll b/llvm/test/CodeGen/VE/and.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/VE/and.ll
@@ -0,0 +1,147 @@
+; RUN: llc < %s -mtriple=ve-unknown-unknown | FileCheck %s
+
+define signext i8 @func8s(i8 signext %a, i8 signext %b) {
+; CHECK-LABEL: func8s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i8 %a, %b
+  ret i8 %res
+}
+
+define zeroext i8 @func8z(i8 zeroext %a, i8 zeroext %b) {
+; CHECK-LABEL: func8z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i8 %b, %a
+  ret i8 %res
+}
+
+define signext i8 @funci8s(i8 signext %a) {
+; CHECK-LABEL: funci8s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, 5, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i8 %a, 5
+  ret i8 %res
+}
+
+define zeroext i8 @funci8z(i8 zeroext %a) {
+; CHECK-LABEL: funci8z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    lea %s1, 251
+; CHECK-NEXT:    and %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i8 -5, %a
+  ret i8 %res
+}
+
+define signext i16 @func16s(i16 signext %a, i16 signext %b) {
+; CHECK-LABEL: func16s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i16 %a, %b
+  ret i16 %res
+}
+
+define zeroext i16 @func16z(i16 zeroext %a, i16 zeroext %b) {
+; CHECK-LABEL: func16z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i16 %b, %a
+  ret i16 %res
+}
+
+define signext i16 @funci16s(i16 signext %a) {
+; CHECK-LABEL: funci16s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i16 %a, 65535
+  ret i16 %res
+}
+
+define zeroext i16 @funci16z(i16 zeroext %a) {
+; CHECK-LABEL: funci16z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, (52)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i16 4095, %a
+  ret i16 %res
+}
+
+define signext i32 @func32s(i32 signext %a, i32 signext %b) {
+; CHECK-LABEL: func32s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i32 %a, %b
+  ret i32 %res
+}
+
+define zeroext i32 @func32z(i32 zeroext %a, i32 zeroext %b) {
+; CHECK-LABEL: func32z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i32 %a, %b
+  ret i32 %res
+}
+
+define signext i32 @funci32s(i32 signext %a) {
+; CHECK-LABEL: funci32s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, (36)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i32 %a, 268435455
+  ret i32 %res
+}
+
+define zeroext i32 @funci32z(i32 zeroext %a) {
+; CHECK-LABEL: funci32z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, (36)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i32 %a, 268435455
+  ret i32 %res
+}
+
+define i64 @func64(i64 %a, i64 %b) {
+; CHECK-LABEL: func64:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i64 %a, %b
+  ret i64 %res
+}
+
+define i64 @func64i(i64 %a) {
+; CHECK-LABEL: func64i:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s0, (24)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i64 %a, 1099511627775
+  ret i64 %res
+}
+
+define i128 @func128(i128 %a, i128 %b) {
+; CHECK-LABEL: func128:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, %s2, %s0
+; CHECK-NEXT:    and %s1, %s3, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i128 %b, %a
+  ret i128 %res
+}
+
+define i128 @funci128(i128 %a) {
+; CHECK-LABEL: funci128:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    and %s0, 5, %s0
+; CHECK-NEXT:    or %s1, 0, (0)1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = and i128 %a, 5
+  ret i128 %res
+}
diff --git a/llvm/test/CodeGen/VE/or.ll b/llvm/test/CodeGen/VE/or.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/VE/or.ll
@@ -0,0 +1,147 @@
+; RUN: llc < %s -mtriple=ve-unknown-unknown | FileCheck %s
+
+define signext i8 @func8s(i8 signext %a, i8 signext %b) {
+; CHECK-LABEL: func8s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i8 %a, %b
+  ret i8 %res
+}
+
+define zeroext i8 @func8z(i8 zeroext %a, i8 zeroext %b) {
+; CHECK-LABEL: func8z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i8 %b, %a
+  ret i8 %res
+}
+
+define signext i8 @funci8s(i8 signext %a) {
+; CHECK-LABEL: funci8s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, 5, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i8 %a, 5
+  ret i8 %res
+}
+
+define zeroext i8 @funci8z(i8 zeroext %a) {
+; CHECK-LABEL: funci8z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    lea %s1, 251
+; CHECK-NEXT:    or %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i8 -5, %a
+  ret i8 %res
+}
+
+define signext i16 @func16s(i16 signext %a, i16 signext %b) {
+; CHECK-LABEL: func16s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i16 %a, %b
+  ret i16 %res
+}
+
+define zeroext i16 @func16z(i16 zeroext %a, i16 zeroext %b) {
+; CHECK-LABEL: func16z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i16 %b, %a
+  ret i16 %res
+}
+
+define signext i16 @funci16s(i16 signext %a) {
+; CHECK-LABEL: funci16s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, -1, (0)1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i16 %a, 65535
+  ret i16 %res
+}
+
+define zeroext i16 @funci16z(i16 zeroext %a) {
+; CHECK-LABEL: funci16z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, (52)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i16 4095, %a
+  ret i16 %res
+}
+
+define signext i32 @func32s(i32 signext %a, i32 signext %b) {
+; CHECK-LABEL: func32s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i32 %a, %b
+  ret i32 %res
+}
+
+define zeroext i32 @func32z(i32 zeroext %a, i32 zeroext %b) {
+; CHECK-LABEL: func32z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i32 %a, %b
+  ret i32 %res
+}
+
+define signext i32 @funci32s(i32 signext %a) {
+; CHECK-LABEL: funci32s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, (36)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i32 %a, 268435455
+  ret i32 %res
+}
+
+define zeroext i32 @funci32z(i32 zeroext %a) {
+; CHECK-LABEL: funci32z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, (36)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i32 %a, 268435455
+  ret i32 %res
+}
+
+define i64 @func64(i64 %a, i64 %b) {
+; CHECK-LABEL: func64:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i64 %a, %b
+  ret i64 %res
+}
+
+define i64 @func64i(i64 %a) {
+; CHECK-LABEL: func64i:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s0, (24)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i64 %a, 1099511627775
+  ret i64 %res
+}
+
+define i128 @func128(i128 %a, i128 %b) {
+; CHECK-LABEL: func128:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, %s2, %s0
+; CHECK-NEXT:    or %s1, %s3, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i128 %b, %a
+  ret i128 %res
+}
+
+define i128 @funci128(i128 %a) {
+; CHECK-LABEL: funci128:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    or %s0, 5, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = or i128 %a, 5
+  ret i128 %res
+}
diff --git a/llvm/test/CodeGen/VE/subtraction.ll b/llvm/test/CodeGen/VE/subtraction.ll
--- a/llvm/test/CodeGen/VE/subtraction.ll
+++ b/llvm/test/CodeGen/VE/subtraction.ll
@@ -156,15 +156,6 @@
   ret i64 %3
 }
 
-define i32 @func25(i32 %0, i32 %1) {
-; CHECK-LABEL: func25:
-; CHECK:       .LBB{{[0-9]+}}_2:
-; CHECK-NEXT:    xor %s0, %s0, (33)1
-; CHECK-NEXT:    or %s11, 0, %s9
-  %3 = xor i32 %0, -2147483648
-  ret i32 %3
-}
-
 define i64 @func26(i64 %0, i64 %1) {
 ; CHECK-LABEL: func26:
 ; CHECK:       .LBB{{[0-9]+}}_2:
diff --git a/llvm/test/CodeGen/VE/xor.ll b/llvm/test/CodeGen/VE/xor.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/CodeGen/VE/xor.ll
@@ -0,0 +1,157 @@
+; RUN: llc < %s -mtriple=ve-unknown-unknown | FileCheck %s
+
+define signext i8 @func8s(i8 signext %a, i8 signext %b) {
+; CHECK-LABEL: func8s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i8 %a, %b
+  ret i8 %res
+}
+
+define zeroext i8 @func8z(i8 zeroext %a, i8 zeroext %b) {
+; CHECK-LABEL: func8z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i8 %b, %a
+  ret i8 %res
+}
+
+define signext i8 @funci8s(i8 signext %a) {
+; CHECK-LABEL: funci8s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, 5, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i8 %a, 5
+  ret i8 %res
+}
+
+define zeroext i8 @funci8z(i8 zeroext %a) {
+; CHECK-LABEL: funci8z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    lea %s1, 251
+; CHECK-NEXT:    xor %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i8 -5, %a
+  ret i8 %res
+}
+
+define signext i16 @func16s(i16 signext %a, i16 signext %b) {
+; CHECK-LABEL: func16s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i16 %a, %b
+  ret i16 %res
+}
+
+define zeroext i16 @func16z(i16 zeroext %a, i16 zeroext %b) {
+; CHECK-LABEL: func16z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i16 %b, %a
+  ret i16 %res
+}
+
+define signext i16 @funci16s(i16 signext %a) {
+; CHECK-LABEL: funci16s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, -1, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i16 %a, 65535
+  ret i16 %res
+}
+
+define zeroext i16 @funci16z(i16 zeroext %a) {
+; CHECK-LABEL: funci16z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, (52)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i16 4095, %a
+  ret i16 %res
+}
+
+define signext i32 @func32s(i32 signext %a, i32 signext %b) {
+; CHECK-LABEL: func32s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i32 %a, %b
+  ret i32 %res
+}
+
+define zeroext i32 @func32z(i32 zeroext %a, i32 zeroext %b) {
+; CHECK-LABEL: func32z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i32 %a, %b
+  ret i32 %res
+}
+
+define signext i32 @funci32s(i32 signext %a) {
+; CHECK-LABEL: funci32s:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, (36)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i32 %a, 268435455
+  ret i32 %res
+}
+
+define zeroext i32 @funci32z(i32 zeroext %a) {
+; CHECK-LABEL: funci32z:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, (36)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i32 %a, 268435455
+  ret i32 %res
+}
+
+define i32 @funci32_another(i32 %0) {
+; CHECK-LABEL: funci32_another:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, (33)1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %2 = xor i32 %0, -2147483648
+  ret i32 %2
+}
+
+
+define i64 @func64(i64 %a, i64 %b) {
+; CHECK-LABEL: func64:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i64 %a, %b
+  ret i64 %res
+}
+
+define i64 @func64i(i64 %a) {
+; CHECK-LABEL: func64i:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s0, (24)0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i64 %a, 1099511627775
+  ret i64 %res
+}
+
+define i128 @func128(i128 %a, i128 %b) {
+; CHECK-LABEL: func128:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, %s2, %s0
+; CHECK-NEXT:    xor %s1, %s3, %s1
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i128 %b, %a
+  ret i128 %res
+}
+
+define i128 @funci128(i128 %a) {
+; CHECK-LABEL: funci128:
+; CHECK:       .LBB{{[0-9]+}}_2:
+; CHECK-NEXT:    xor %s0, 5, %s0
+; CHECK-NEXT:    or %s11, 0, %s9
+  %res = xor i128 %a, 5
+  ret i128 %res
+}