summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2016-08-31 18:46:07 +0000
committerTom Stellard <thomas.stellard@amd.com>2016-08-31 18:46:07 +0000
commitba5730884bf0cb345f03bedc4a8fce3f13b9962a (patch)
tree3071568c00cc47e77e2534d834f9c4b14cbbb737 /llvm/lib
parent1c06a73a7c300105e9f685d4388e0f2d6c0021a1 (diff)
downloadbcm5719-llvm-ba5730884bf0cb345f03bedc4a8fce3f13b9962a.tar.gz
bcm5719-llvm-ba5730884bf0cb345f03bedc4a8fce3f13b9962a.zip
AMDGPU/SI: Make sure llvm.amdgcn.implicitarg.ptr() is at least 4-byte aligned
Summary: This fixes some OpenCV tests that were broken by libclc commit r276443. Reviewers: arsenm, jvesely Subscribers: arsenm, wdng, llvm-commits Differential Revision: https://reviews.llvm.org/D24051 llvm-svn: 280274
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
index 11f31563924..32e40a2c7a7 100644
--- a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
@@ -2683,7 +2683,7 @@ SDValue AMDGPUTargetLowering::CreateLiveInRegister(SelectionDAG &DAG,
uint32_t AMDGPUTargetLowering::getImplicitParameterOffset(
const AMDGPUMachineFunction *MFI, const ImplicitParameter Param) const {
- uint64_t ArgOffset = MFI->getABIArgOffset();
+ uint64_t ArgOffset = alignTo(MFI->getABIArgOffset(), 4);
switch (Param) {
case GRID_DIM:
return ArgOffset;
OpenPOWER on IntegriCloud