[llvm-branch-commits] [llvm-branch] r259891 - Merging r259886 and r259888:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Fri Feb  5 10:30:31 2016
New Revision: 259891

URL: http://llvm.org/viewvc/llvm-project?rev=259891&view=rev
Log:
Merging r259886 and r259888:

------------------------------------------------------------------------
r259886 | nemanjai | 2016-02-05 06:50:29 -0800 (Fri, 05 Feb 2016) | 5 lines

Fix for PR 26193

This is a simple fix for a PowerPC intrinsic that was incorrectly defined
(the return type was incorrect).
------------------------------------------------------------------------

------------------------------------------------------------------------
r259888 | nemanjai | 2016-02-05 07:03:17 -0800 (Fri, 05 Feb 2016) | 3 lines

Add the missing test case for PR26193
------------------------------------------------------------------------

Added:
    llvm/branches/release_38/test/CodeGen/PowerPC/pr26193.ll
      - copied unchanged from r259888, llvm/trunk/test/CodeGen/PowerPC/pr26193.ll
Modified:
    llvm/branches/release_38/   (props changed)
    llvm/branches/release_38/include/llvm/IR/IntrinsicsPowerPC.td
    llvm/branches/release_38/lib/Target/PowerPC/PPCInstrAltivec.td

Propchange: llvm/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb  5 10:30:31 2016
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,257645,257648,257730,257775,257791,257875,257886,257902,257905,257925,257929-257930,257940,257942,257977,257979,257997,258168,258184,258207,258221,258273,258325,258406,258416,258428,258436,258471,258690,258729,258891,258971,259177-259178,259228,259236,259342,259346,259375,259645,259649,259695,259740,259798,259835,259840
+/llvm/trunk:155241,257645,257648,257730,257775,257791,257875,257886,257902,257905,257925,257929-257930,257940,257942,257977,257979,257997,258168,258184,258207,258221,258273,258325,258406,258416,258428,258436,258471,258690,258729,258891,258971,259177-259178,259228,259236,259342,259346,259375,259645,259649,259695,259740,259798,259835,259840,259886,259888

Modified: llvm/branches/release_38/include/llvm/IR/IntrinsicsPowerPC.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/include/llvm/IR/IntrinsicsPowerPC.td?rev=259891&r1=259890&r2=259891&view=diff
==============================================================================
--- llvm/branches/release_38/include/llvm/IR/IntrinsicsPowerPC.td (original)
+++ llvm/branches/release_38/include/llvm/IR/IntrinsicsPowerPC.td Fri Feb  5 10:30:31 2016
@@ -484,7 +484,7 @@ let TargetPrefix = "ppc" in {  // All PP
             Intrinsic<[llvm_v16i8_ty], [llvm_v8i16_ty, llvm_v8i16_ty],
                       [IntrNoMem]>;
   def int_ppc_altivec_vpkswss : GCCBuiltin<"__builtin_altivec_vpkswss">,
-            Intrinsic<[llvm_v16i8_ty], [llvm_v4i32_ty, llvm_v4i32_ty],
+            Intrinsic<[llvm_v8i16_ty], [llvm_v4i32_ty, llvm_v4i32_ty],
                       [IntrNoMem]>;
   def int_ppc_altivec_vpkswus : GCCBuiltin<"__builtin_altivec_vpkswus">,
             Intrinsic<[llvm_v8i16_ty], [llvm_v4i32_ty, llvm_v4i32_ty],

Modified: llvm/branches/release_38/lib/Target/PowerPC/PPCInstrAltivec.td
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/lib/Target/PowerPC/PPCInstrAltivec.td?rev=259891&r1=259890&r2=259891&view=diff
==============================================================================
--- llvm/branches/release_38/lib/Target/PowerPC/PPCInstrAltivec.td (original)
+++ llvm/branches/release_38/lib/Target/PowerPC/PPCInstrAltivec.td Fri Feb  5 10:30:31 2016
@@ -736,7 +736,7 @@ def VPKSHSS : VX1_Int_Ty2<398, "vpkshss"
 def VPKSHUS : VX1_Int_Ty2<270, "vpkshus", int_ppc_altivec_vpkshus,
                           v16i8, v8i16>;
 def VPKSWSS : VX1_Int_Ty2<462, "vpkswss", int_ppc_altivec_vpkswss,
-                          v16i8, v4i32>;
+                          v8i16, v4i32>;
 def VPKSWUS : VX1_Int_Ty2<334, "vpkswus", int_ppc_altivec_vpkswus,
                           v8i16, v4i32>;
 def VPKUHUM : VXForm_1<14, (outs vrrc:$vD), (ins vrrc:$vA, vrrc:$vB),