summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2016-01-05 03:40:16 +0000
committerTom Stellard <thomas.stellard@amd.com>2016-01-05 03:40:16 +0000
commit5cd09ade383557a2ff2ad828ad3e00e024cef131 (patch)
treeb61caf66f3946dff75ea26d64c19b8c57a128f11 /llvm/lib
parent0d808888c141971d8750cf151029db2131aca5a1 (diff)
downloadbcm5719-llvm-5cd09ade383557a2ff2ad828ad3e00e024cef131.tar.gz
bcm5719-llvm-5cd09ade383557a2ff2ad828ad3e00e024cef131.zip
AMDGPU/SI: Select non-uniform constant addrspace loads to flat instructions for HSA
Summary: This fixes a regression caused by r256282. Reviewers: arsenm, cfang Subscribers: arsenm, llvm-commits Differential Revision: http://reviews.llvm.org/D15736 llvm-svn: 256810
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/AMDGPU/SIInstrInfo.td3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIInstrInfo.td b/llvm/lib/Target/AMDGPU/SIInstrInfo.td
index 84a386d8872..8735277149a 100644
--- a/llvm/lib/Target/AMDGPU/SIInstrInfo.td
+++ b/llvm/lib/Target/AMDGPU/SIInstrInfo.td
@@ -141,7 +141,8 @@ def SIconstdata_ptr : SDNode<
class flat_ld <SDPatternOperator ld> : PatFrag<(ops node:$ptr),
(ld node:$ptr), [{
return isFlatLoad(dyn_cast<LoadSDNode>(N)) ||
- isGlobalLoad(dyn_cast<LoadSDNode>(N));
+ isGlobalLoad(dyn_cast<LoadSDNode>(N)) ||
+ isConstantLoad(cast<LoadSDNode>(N), -1);
}]>;
def flat_load : flat_ld <load>;
OpenPOWER on IntegriCloud