summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-05-16 00:27:04 +0000
committerBill Wendling <isanbard@gmail.com>2013-05-16 00:27:04 +0000
commit717969d98fe62ff6ddddfb8df4ae42845859d6df (patch)
tree91f56f4a865a27445a69e3f4a31609ba198973d5 /lib
parent89b909942ff4c3753e8895c2a04e25610f2cde77 (diff)
downloadllvm-717969d98fe62ff6ddddfb8df4ae42845859d6df.tar.gz
llvm-717969d98fe62ff6ddddfb8df4ae42845859d6df.tar.bz2
llvm-717969d98fe62ff6ddddfb8df4ae42845859d6df.tar.xz
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@amd.com> Signed-off-by: Aaron Watry <awatry@gmail.com> NOTE: This is a candidate for the 3.3 branch. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_33@181950 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Target/R600/R600ISelLowering.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Target/R600/R600ISelLowering.cpp b/lib/Target/R600/R600ISelLowering.cpp
index c6e2136ff4..6dec4d1dbe 100644
--- a/lib/Target/R600/R600ISelLowering.cpp
+++ b/lib/Target/R600/R600ISelLowering.cpp
@@ -78,6 +78,9 @@ R600TargetLowering::R600TargetLowering(TargetMachine &TM) :
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);