[llvm] r271567 - AMDGPU: Temporary fix for broken store combine

[Matt Arsenault via llvm-commits]

Author: arsenm
Date: Thu Jun  2 14:00:55 2016
New Revision: 271567

URL: http://llvm.org/viewvc/llvm-project?rev=271567&view=rev
Log:
AMDGPU: Temporary fix for broken store combine

Modified:
    llvm/trunk/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
    llvm/trunk/test/CodeGen/AMDGPU/load.ll

Modified: llvm/trunk/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AMDGPU/AMDGPUISelLowering.cpp?rev=271567&r1=271566&r2=271567&view=diff
==============================================================================
--- llvm/trunk/lib/Target/AMDGPU/AMDGPUISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/AMDGPU/AMDGPUISelLowering.cpp Thu Jun  2 14:00:55 2016
@@ -2192,6 +2192,8 @@ SDValue AMDGPUTargetLowering::performSto
     return SDValue();
 
   EVT MemVT = LoadVal->getMemoryVT();
+  if (!MemVT.isRound())
+    return SDValue();
 
   SDLoc SL(N);
   SelectionDAG &DAG = DCI.DAG;

Modified: llvm/trunk/test/CodeGen/AMDGPU/load.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/AMDGPU/load.ll?rev=271567&r1=271566&r2=271567&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/AMDGPU/load.ll (original)
+++ llvm/trunk/test/CodeGen/AMDGPU/load.ll Thu Jun  2 14:00:55 2016
@@ -181,6 +181,19 @@ entry:
   ret void
 }
 
+; FUNC-LABEL: {{^}}global_load_v3i16:
+; SI-NOHSA: buffer_load_dwordx2 v
+; SI-HSA: flat_load_dwordx2 v
+
+; R600-DAG: VTX_READ_32
+; R600-DAG: VTX_READ_16
+define void @global_load_v3i16(<3 x i16> addrspace(1)* %out, <3 x i16> addrspace(1)* %in) {
+entry:
+  %ld = load <3 x i16>, <3 x i16> addrspace(1)* %in
+  store <3 x i16> %ld, <3 x i16> addrspace(1)* %out
+  ret void
+}
+
 ; FUNC-LABEL: {{^}}load_v4i16:
 ; R600: VTX_READ_16
 ; R600: VTX_READ_16