[Hexagon] Make sure to zero-extend bytes before building a vector

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319204 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/Hexagon/HexagonISelLowering.cpp b/lib/Target/Hexagon/HexagonISelLowering.cpp
index 3ecc286..2005ca6 100644 (file)
--- a/lib/Target/Hexagon/HexagonISelLowering.cpp
+++ b/lib/Target/Hexagon/HexagonISelLowering.cpp
@@ -2499,16 +2499,18 @@ HexagonTargetLowering::buildVector32(ArrayRef<SDValue> Elem, const SDLoc &dl,
   //   (zxtb(Elem[0]) | (zxtb(Elem[1]) << 8)) |
   //   (zxtb(Elem[2]) | (zxtb(Elem[3]) << 8)) << 16
   SDValue S8 = DAG.getConstant(8, dl, MVT::i32);
-  SDValue S16 = DAG.getConstant(16, dl, MVT::i32);
-  SDValue V0 = DAG.getZExtOrTrunc(Elem[0], dl, MVT::i32);
-  SDValue V1 = DAG.getZExtOrTrunc(Elem[2], dl, MVT::i32);
-  SDValue V2 = DAG.getNode(ISD::SHL, dl, MVT::i32, {Elem[1], S8});
-  SDValue V3 = DAG.getNode(ISD::SHL, dl, MVT::i32, {Elem[3], S8});
-  SDValue V4 = DAG.getNode(ISD::OR, dl, MVT::i32, {V0, V2});
-  SDValue V5 = DAG.getNode(ISD::OR, dl, MVT::i32, {V1, V3});
-  SDValue V6 = DAG.getNode(ISD::SHL, dl, MVT::i32, {V5, S16});
-  SDValue V7 = DAG.getNode(ISD::OR, dl, MVT::i32, {V4, V6});
-  return DAG.getBitcast(MVT::v4i8, V7);
+  SDValue V0 = DAG.getZeroExtendInReg(Elem[0], dl, MVT::i8);
+  SDValue V1 = DAG.getZeroExtendInReg(Elem[1], dl, MVT::i8);
+  SDValue V2 = DAG.getZeroExtendInReg(Elem[2], dl, MVT::i8);
+  SDValue V3 = DAG.getZeroExtendInReg(Elem[3], dl, MVT::i8);
+
+  SDValue V4 = DAG.getNode(ISD::SHL, dl, MVT::i32, {V1, S8});
+  SDValue V5 = DAG.getNode(ISD::SHL, dl, MVT::i32, {V3, S8});
+  SDValue V6 = DAG.getNode(ISD::OR, dl, MVT::i32, {V0, V4});
+  SDValue V7 = DAG.getNode(ISD::OR, dl, MVT::i32, {V2, V5});
+  SDNode *T0 = DAG.getMachineNode(Hexagon::A2_combine_ll, dl, MVT::i32,
+                                  {V7, V6});
+  return DAG.getBitcast(MVT::v4i8, SDValue(T0,0));
 }
 
 SDValue

diff --git a/test/CodeGen/Hexagon/build-vector-v4i8-zext.ll b/test/CodeGen/Hexagon/build-vector-v4i8-zext.ll
new file mode 100644 (file)
index 0000000..b39426a
--- /dev/null
+++ b/test/CodeGen/Hexagon/build-vector-v4i8-zext.ll
@@ -0,0 +1,17 @@
+; RUN: llc -march=hexagon < %s | FileCheck %s
+
+; Check that we generate zero-extends, instead of just shifting and oring
+; registers (which can contain sign-extended negative values).
+; CHECK: and(r{{[0-9]+}},#255)
+
+define i32 @fred(i8 %a0, i8 %a1, i8 %a2, i8 %a3) #0 {
+b4:
+  %v5 = insertelement <4 x i8> undef, i8 %a0, i32 0
+  %v6 = insertelement <4 x i8> %v5, i8 %a1, i32 1
+  %v7 = insertelement <4 x i8> %v6, i8 %a2, i32 2
+  %v8 = insertelement <4 x i8> %v7, i8 %a3, i32 3
+  %v9 = bitcast <4 x i8> %v8 to i32
+  ret i32 %v9
+}
+
+attributes #0 = { nounwind readnone }