[llvm-branch-commits] [llvm-branch] r181950 - Merging r181576:

[Bill Wendling]

Author: void
Date: Wed May 15 19:27:04 2013
New Revision: 181950

URL: http://llvm.org/viewvc/llvm-project?rev=181950&view=rev
Log:
Merging r181576:
------------------------------------------------------------------------
r181576 | tstellar | 2013-05-09 19:09:24 -0700 (Thu, 09 May 2013) | 10 lines

R600: Expand vselect for v4i32 and v2i32

v2: Add vselect v4i32 test

Patch by: Aaron Watry

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
Signed-off-by: Aaron Watry <awatry at gmail.com>

NOTE: This is a candidate for the 3.3 branch.
------------------------------------------------------------------------

Added:
    llvm/branches/release_33/test/CodeGen/R600/vselect.ll
      - copied unchanged from r181576, llvm/trunk/test/CodeGen/R600/vselect.ll
Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/Target/R600/R600ISelLowering.cpp

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 15 19:27:04 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181586,181792,181800,181842
+/llvm/trunk:155241,181286,181296,181313,181397,181423,181450,181524,181576,181586,181792,181800,181842

Modified: llvm/branches/release_33/lib/Target/R600/R600ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/Target/R600/R600ISelLowering.cpp?rev=181950&r1=181949&r2=181950&view=diff
==============================================================================
--- llvm/branches/release_33/lib/Target/R600/R600ISelLowering.cpp (original)
+++ llvm/branches/release_33/lib/Target/R600/R600ISelLowering.cpp Wed May 15 19:27:04 2013
@@ -78,6 +78,9 @@ R600TargetLowering::R600TargetLowering(T
   setOperationAction(ISD::SELECT, MVT::i32, Custom);
   setOperationAction(ISD::SELECT, MVT::f32, Custom);
 
+  setOperationAction(ISD::VSELECT, MVT::v4i32, Expand);
+  setOperationAction(ISD::VSELECT, MVT::v2i32, Expand);
+
   // Legalize loads and stores to the private address space.
   setOperationAction(ISD::LOAD, MVT::i32, Custom);
   setOperationAction(ISD::LOAD, MVT::v2i32, Custom);