2
0

SWDEV-277566 - Fix HIP/PAL build

Change-Id: Ib460ac70423ebc3aceab22829cd2606d0db20f59


[ROCm/clr commit: e1b226588f]
Este cometimento está contido em:
Jason Tang
2021-05-15 12:21:00 -04:00
cometido por Jason Tang
ascendente b4e2b455f3
cometimento 6f2e1cec35
2 ficheiros modificados com 5 adições e 2 eliminações
+3 -2
Ver ficheiro
@@ -86,6 +86,7 @@ bool HSAILKernel::setKernelCode(amd::hsa::loader::Symbol* sym, amd_kernel_code_t
}
bool HSAILKernel::aqlCreateHWInfo() {
#if defined(WITH_COMPILER_LIB)
hsa_agent_t agent = {amd::Device::toHandle(&(device()))};
std::string openclKernelName = device::Kernel::openclMangledName(name());
amd::hsa::loader::Symbol* sym = prog().getSymbol(openclKernelName.c_str(), &agent);
@@ -114,7 +115,7 @@ bool HSAILKernel::aqlCreateHWInfo() {
workgroupGroupSegmentByteSize_ = workGroupInfo_.usedLDSSize_;
kernargSegmentByteSize_ = akc->kernarg_segment_byte_size;
#endif // defined(WITH_COMPILER_LIB)
return true;
}
@@ -134,7 +135,7 @@ bool HSAILKernel::postLoad() {
if (!aqlCreateHWInfo()) {
return false;
}
#endif
#endif // defined(WITH_COMPILER_LIB)
return true;
}
+2
Ver ficheiro
@@ -245,6 +245,7 @@ inline static std::vector<std::string> splitSpaceSeparatedString(char* str) {
bool HSAILProgram::createKernels(void* binary, size_t binSize, bool useUniformWorkGroupSize,
bool internalKernel) {
#if defined(WITH_COMPILER_LIB)
size_t kernelNamesSize = 0;
acl_error errorCode = amd::Hsail::QueryInfo(palNullDevice().compiler(), binaryElf_,
RT_KERNEL_NAMES, nullptr, nullptr, &kernelNamesSize);
@@ -277,6 +278,7 @@ bool HSAILProgram::createKernels(void* binary, size_t binSize, bool useUniformWo
aKernel->setUniformWorkGroupSize(useUniformWorkGroupSize);
}
}
#endif // defined(WITH_COMPILER_LIB)
return true;
}