P4 to Git Change 1347718 by kzhuravl@kzhuravl-fiji-oclhsa on 2016/11/30 13:40:59
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
[ROCm/clr commit: bc904d8335]
Este commit está contenido en:
@@ -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";
|
||||
|
||||
@@ -685,7 +685,7 @@ HSAILProgram::linkImpl(amd::option::Options* options)
|
||||
HSAILKernel *aKernel = new HSAILKernel(kernelName, this, options->origOptionStr + hsailOptions(options));
|
||||
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";
|
||||
@@ -1637,7 +1637,7 @@ LightningProgram::setKernels(
|
||||
|
||||
kernels()[kernelName] = kernel;
|
||||
|
||||
auto symbol = executable_->GetSymbol("", kernelName.c_str(), agent, 0);
|
||||
auto symbol = executable_->GetSymbol(kernelName.c_str(), &agent);
|
||||
if (!symbol) {
|
||||
buildLog_ += "Error: Getting kernel symbol '" + kernelName
|
||||
+ "' from AMD HSA Code Object failed. " \
|
||||
|
||||
Referencia en una nueva incidencia
Block a user