From 263edb99ab81d8d9087278b58a39197fb18ff495 Mon Sep 17 00:00:00 2001
From: Kit Barton <kbarton@ca.ibm.com>
Date: Fri, 20 Feb 2015 15:54:58 +0000
Subject: [PATCH] I incorrectly marked the VORC instruction as isCommutable
 when I added it. This fix removes the VORC instruction definition from the
 isCommutable block.

Phabricator review: http://reviews.llvm.org/D7772

llvm-svn: 230020
---
 llvm/lib/Target/PowerPC/PPCInstrAltivec.td       |  3 ++-
 llvm/test/CodeGen/PowerPC/vec_veqv_vnand_vorc.ll | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/llvm/lib/Target/PowerPC/PPCInstrAltivec.td b/llvm/lib/Target/PowerPC/PPCInstrAltivec.td
index 1548c82..f6acd6e 100644
--- a/llvm/lib/Target/PowerPC/PPCInstrAltivec.td
+++ b/llvm/lib/Target/PowerPC/PPCInstrAltivec.td
@@ -986,9 +986,10 @@ def VEQV  : VXForm_1<1668, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
 def VNAND : VXForm_1<1412, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
                      "vnand $vD, $vA, $vB", IIC_VecGeneral,
                      [(set v4i32:$vD, (vnot_ppc (and v4i32:$vA, v4i32:$vB)))]>;
+} // isCommutable
+
 def VORC : VXForm_1<1348, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),
                       "vorc $vD, $vA, $vB", IIC_VecGeneral,
                       [(set v4i32:$vD, (or v4i32:$vA,
                                            (vnot_ppc v4i32:$vB)))]>;
-} // isCommutable
 } // end HasP8Altivec
diff --git a/llvm/test/CodeGen/PowerPC/vec_veqv_vnand_vorc.ll b/llvm/test/CodeGen/PowerPC/vec_veqv_vnand_vorc.ll
index b4fa06d..f7d5a51 100644
--- a/llvm/test/CodeGen/PowerPC/vec_veqv_vnand_vorc.ll
+++ b/llvm/test/CodeGen/PowerPC/vec_veqv_vnand_vorc.ll
@@ -17,10 +17,13 @@ define <4 x i32> @test_vnand(<4 x i32> %x, <4 x i32> %y) nounwind {
 ; CHECK: vnand 2, 2, 3
 }
 
-; Test x vorc y
+; Test x vorc y and variants
 define <4 x i32> @test_vorc(<4 x i32> %x, <4 x i32> %y) nounwind {
-       %tmp = xor <4 x i32> %y, <i32 -1, i32 -1, i32 -1, i32 -1>
-       %ret_val = or <4 x i32> %x, %tmp
-       ret <4 x i32> %ret_val
-; CHECK: vorc 2, 2, 3      
+       %tmp1 = xor <4 x i32> %y, <i32 -1, i32 -1, i32 -1, i32 -1>
+       %tmp2 = or <4 x i32> %x, %tmp1
+; CHECK: vorc 3, 2, 3      
+       %tmp3 = xor <4 x i32> %tmp2, <i32 -1, i32 -1, i32 -1, i32 -1>
+       %tmp4 = or <4 x i32> %tmp3, %x
+; CHECK: vorc 2, 2, 3
+       ret <4 x i32> %tmp4
 }
-- 
2.7.4