SWDEV-273235 - Windows PAL/LC fixes
HIP should be built with HSAIL support disabled. Currently HSAILProgram::info() and VirtualGPU::buildKernelInfo() expose ACL interfaces directly. This should not be allowed. Change-Id: Iae15d4f19be16806826f2f6cb600752c11f97fc1
Этот коммит содержится в:
@@ -360,17 +360,17 @@ bool HSAILProgram::allocKernelTable() {
|
|||||||
|
|
||||||
void HSAILProgram::fillResListWithKernels(VirtualGPU& gpu) const { gpu.addVmMemory(&codeSegGpu()); }
|
void HSAILProgram::fillResListWithKernels(VirtualGPU& gpu) const { gpu.addVmMemory(&codeSegGpu()); }
|
||||||
|
|
||||||
const aclTargetInfo& HSAILProgram::info() {
|
|
||||||
#if defined(WITH_COMPILER_LIB)
|
#if defined(WITH_COMPILER_LIB)
|
||||||
|
const aclTargetInfo& HSAILProgram::info() {
|
||||||
acl_error err;
|
acl_error err;
|
||||||
info_ = amd::Hsail::GetTargetInfo(palNullDevice().settings().use64BitPtr_ ? "hsail64" : "hsail",
|
info_ = amd::Hsail::GetTargetInfo(palNullDevice().settings().use64BitPtr_ ? "hsail64" : "hsail",
|
||||||
device().isa().hsailName(), &err);
|
device().isa().hsailName(), &err);
|
||||||
if (err != ACL_SUCCESS) {
|
if (err != ACL_SUCCESS) {
|
||||||
LogWarning("aclGetTargetInfo failed");
|
LogWarning("aclGetTargetInfo failed");
|
||||||
}
|
}
|
||||||
#endif // defined(WITH_COMPILER_LIB)
|
|
||||||
return info_;
|
return info_;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
bool HSAILProgram::saveBinaryAndSetType(type_t type) {
|
bool HSAILProgram::saveBinaryAndSetType(type_t type) {
|
||||||
#if defined(WITH_COMPILER_LIB)
|
#if defined(WITH_COMPILER_LIB)
|
||||||
|
|||||||
@@ -3617,6 +3617,7 @@ void VirtualGPU::writeVQueueHeader(VirtualGPU& hostQ, const Memory* kernelTable)
|
|||||||
|
|
||||||
void VirtualGPU::buildKernelInfo(const HSAILKernel& hsaKernel, hsa_kernel_dispatch_packet_t* aqlPkt,
|
void VirtualGPU::buildKernelInfo(const HSAILKernel& hsaKernel, hsa_kernel_dispatch_packet_t* aqlPkt,
|
||||||
HwDbgKernelInfo& kernelInfo, amd::Event* enqueueEvent) {
|
HwDbgKernelInfo& kernelInfo, amd::Event* enqueueEvent) {
|
||||||
|
#if defined(WITH_COMPILER_LIB)
|
||||||
amd::HwDebugManager* dbgManager = dev().hwDebugMgr();
|
amd::HwDebugManager* dbgManager = dev().hwDebugMgr();
|
||||||
assert(dbgManager && "No HW Debug Manager!");
|
assert(dbgManager && "No HW Debug Manager!");
|
||||||
|
|
||||||
@@ -3707,6 +3708,7 @@ void VirtualGPU::buildKernelInfo(const HSAILKernel& hsaKernel, hsa_kernel_dispat
|
|||||||
InvalidateSqCaches();
|
InvalidateSqCaches();
|
||||||
*/
|
*/
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void VirtualGPU::assignDebugTrapHandler(const DebugToolInfo& dbgSetting,
|
void VirtualGPU::assignDebugTrapHandler(const DebugToolInfo& dbgSetting,
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user