P4 to Git Change 2024314 by kjayapra@0_HIPWS_LNX1_ROCM on 2019/11/04 11:44:45

SWDEV-206759 - Fixing Compilation error.

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#47 edit
This commit is contained in:
foreman
2019-11-04 11:53:27 -05:00
parent 33038437b3
commit 60e81906f5
-12
View File
@@ -183,25 +183,13 @@ hipError_t ihipModuleLoadData(hipModule_t *module, const void *image)
program->setVarInfoCallBack(&getSvarInfo);
if (CL_SUCCESS != program->addDeviceProgram(*hip::getCurrentContext()->devices()[0], image, ElfSize(image))) {
>>>> ORIGINAL //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#44
return hipErrorUnknown;
==== THEIRS //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#45
return hipErrorInvalidKernelFile;
==== YOURS //0_HIPWS_LNX1_ROCM/main/drivers/opencl/api/hip/hip_module.cpp
return hipErrorUnknown;
<<<<
}
*module = reinterpret_cast<hipModule_t>(as_cl(program));
if (!ihipModuleRegisterGlobal(program, module)) {
>>>> ORIGINAL //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#44
return hipErrorUnknown;
==== THEIRS //depot/stg/opencl/drivers/opencl/api/hip/hip_module.cpp#45
return hipErrorSharedObjectSymbolNotFound;
==== YOURS //0_HIPWS_LNX1_ROCM/main/drivers/opencl/api/hip/hip_module.cpp
return hipErrorUnknown;
<<<<
}
if (!ihipModuleRegisterUndefined(program, module)) {