From da83b6bcd767da18dfdc8cd0384c525d1f2066f6 Mon Sep 17 00:00:00 2001 From: foreman Date: Thu, 24 Mar 2016 16:51:03 -0400 Subject: [PATCH] P4 to Git Change 1251133 by gandryey@gera-w8 on 2016/03/24 16:36:52 SWDEV-90618 - cl_kernel_info_amd always returns 0 when working via HSAIL path - Don't access GPU device specific data for offline compilation Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpukernel.cpp#313 edit --- rocclr/runtime/device/gpu/gpukernel.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp index 74dc4c39e7..ac51292852 100644 --- a/rocclr/runtime/device/gpu/gpukernel.cpp +++ b/rocclr/runtime/device/gpu/gpukernel.cpp @@ -3374,7 +3374,8 @@ HSAILKernel::HSAILKernel(std::string name, , codeSize_(0) , hwMetaData_(NULL) , extraArgumentsNum_(extraArgsNum) - , waveLimiter_(this, dev().getAttribs().numberOfCUsperShaderArray * dev().hwInfo()->simdPerCU_) + , waveLimiter_(this, (prog->isNull() ? 1 : + dev().getAttribs().numberOfCUsperShaderArray) * dev().hwInfo()->simdPerCU_) { hsa_ = true; } @@ -3456,7 +3457,8 @@ HSAILKernel::init(amd::hsa::loader::Symbol *sym, bool finalize) } // Copy wavefront size - workGroupInfo_.wavefrontSize_ = dev().getAttribs().wavefrontSize; + workGroupInfo_.wavefrontSize_ = prog().isNull() ? 64 : dev().getAttribs().wavefrontSize; + // Find total workgroup size if (workGroupInfo_.compileSize_[0] != 0) { workGroupInfo_.size_ =