From fc5992d539ad7008c30dc9a2d64fce237baea873 Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 18 Jun 2018 14:15:59 -0400 Subject: [PATCH] P4 to Git Change 1569647 by gandryey@gera-lnx-rcf-lc on 2018/06/18 14:04:00 SWDEV-79445 - OCL generic changes and code clean-up -Following CL#1568521. Correct LDS size look-up. Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocvirtual.cpp#57 edit [ROCm/clr commit: 1e1aa59aedc3faa17d6d7c23fa3e27c45f2e5fc7] --- projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp b/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp index 569a516942..5319e85b12 100644 --- a/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp +++ b/projects/clr/rocclr/runtime/device/rocm/rocvirtual.cpp @@ -1920,7 +1920,11 @@ bool VirtualGPU::submitKernelInternal(const amd::NDRangeContainer& sizes, const // Align the LDS on the alignment requirement of type pointed to ldsUsage = amd::alignUp(ldsUsage, arg->pointeeAlignment_); argPtr = addArg(argPtr, &ldsUsage, arg->size_, arg->alignment_); - ldsUsage += *reinterpret_cast(srcArgPtr); + if (sizeof(uint64_t) == arg->size_) { + ldsUsage += *reinterpret_cast(srcArgPtr); + } else { + ldsUsage += *reinterpret_cast(srcArgPtr); + } break; } assert((arg->addrQual_ == ROC_ADDRESS_GLOBAL || arg->addrQual_ == ROC_ADDRESS_CONSTANT) &&