AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1347718 by kzhuravl@kzhuravl-fiji-oclhsa on 2016/11/30 13:40:59

Browse Source 
SWDEV-76911 - Bring loader in sync with git (integration of CL 1347664) + necessary updates for runtimes

	ReviewBoardURL: http://ocltc.amd.com/reviews/r/11425/
	Testing: Dev/SCDevUtil build, smoke, some opencl sc stg builds/tests, precheckin (http://ocltc:8111/viewModification.html?modId=79218&personal=true&init=1&tab=vcsModificationBuilds)

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/amdhsacod/amdhsacod.cpp#17 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/executable.cpp#33 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/executable.hpp#18 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/ext/loader/loaders.hpp#12 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_elf_image.hpp#9 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/amd_hsa_loader.hpp#15 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/hsa.h#5 integrate
... //depot/stg/opencl/drivers/opencl/compiler/sc/HSAIL/include/hsa_ext_image.h#5 integrate
... //depot/stg/opencl/drivers/opencl/runtime/device/gpu/gpuprogram.cpp#229 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/pal/palprogram.cpp#25 edit
This commit is contained in:
foreman
2016-11-30 13:47:21 -05:00
parent 71f5fb7e8f
commit bc904d8335
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/gpu/gpuprogram.cpp
+1 -1
View File
@@ -2200,7 +2200,7 @@ HSAILProgram::linkImpl(amd::option::Options* options)
HSAILKernel *aKernel = new HSAILKernel(kernelName, this, options->origOptionStr + hsailOptions(),
md.numHiddenKernelArgs);
kernels()[kernelName] = aKernel;
amd::hsa::loader::Symbol *sym = executable_->GetSymbol("", openclKernelName.c_str(), agent, 0);
amd::hsa::loader::Symbol *sym = executable_->GetSymbol(openclKernelName.c_str(), &agent);
if (!sym) {
buildLog_ += "Error: Getting kernel ISA code symbol '" + openclKernelName +
"' from AMD HSA Code Object failed. Kernel initialization failed.\n";