From f0bb49bbaaa74611ce7a2edcab4bf7205d6ea8d4 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 26 Oct 2016 14:22:44 -0400 Subject: [PATCH] P4 to Git Change 1332211 by lmoriche@lmoriche_opencl_lc on 2016/10/26 13:58:55 SWDEV-105604 - OpenCL program manager for LC on PAL - Another tentative fix for the Windows build Affected files ... ... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#15 edit --- rocclr/runtime/device/pal/palprogram.cpp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/rocclr/runtime/device/pal/palprogram.cpp b/rocclr/runtime/device/pal/palprogram.cpp index f3e1cd5147..f6d7fb3a2a 100644 --- a/rocclr/runtime/device/pal/palprogram.cpp +++ b/rocclr/runtime/device/pal/palprogram.cpp @@ -578,22 +578,13 @@ HSAILProgram::linkImpl(amd::option::Options* options) delete kernelNames; std::vector::iterator it = vKernels.begin(); bool dynamicParallelism = false; - aclMetadata md; - md.numHiddenKernelArgs = 0; - size_t sizeOfnumHiddenKernelArgs = sizeof(md.numHiddenKernelArgs); for (it; it != vKernels.end(); ++it) { std::string kernelName(*it); std::string openclKernelName = device::Kernel::openclMangledName(kernelName); - errorCode = aclQueryInfo(dev().compiler(), binaryElf_, RT_NUM_KERNEL_HIDDEN_ARGS, - openclKernelName.c_str(), &md.numHiddenKernelArgs, &sizeOfnumHiddenKernelArgs); - if (errorCode != ACL_SUCCESS) { - buildLog_ += "Error: Querying of kernel '" + openclKernelName + - "' extra arguments count from AMD HSA Code Object failed. Kernel initialization failed.\n"; - return false; - } - HSAILKernel *aKernel = new HSAILKernel(kernelName, this, options->origOptionStr + hsailOptions(), - md.numHiddenKernelArgs); + + HSAILKernel *aKernel = new HSAILKernel(kernelName, this, options->origOptionStr + hsailOptions()); kernels()[kernelName] = aKernel; + amd::hsa::loader::Symbol *sym = executable_->GetSymbol("", openclKernelName.c_str(), agent, 0); if (!sym) { buildLog_ += "Error: Getting kernel ISA code symbol '" + openclKernelName +