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

SWDEV-547108 - Fix compilation errors under Windows (#1085)

Browse Source 
Also correct AQL print under Windows
This commit is contained in:
German Andryeyev
2025-09-26 09:42:50 -04:00
committed by GitHub
parent 3fd56bfefc
commit bb1295bcdf
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/clr/rocclr/device/device.cpp
+6
View File
@@ -695,6 +695,8 @@ bool Device::init() {
// Ignore the failure and assume KFD is not installed. // Ignore the failure and assume KFD is not installed.
// abort(); // abort();
DevLogError("KFD is not installed \n"); DevLogError("KFD is not installed \n");
// Disable direct dispatch if ROC initialization wasn't successful
AMD_DIRECT_DISPATCH = flagIsDefault(AMD_DIRECT_DISPATCH) ? false : AMD_DIRECT_DISPATCH;
} }
if (!amd::IS_HIP) { if (!amd::IS_HIP) {
ret |= roc::NullDevice::init(); ret |= roc::NullDevice::init();
@@ -703,6 +705,10 @@ bool Device::init() {
#endif // WITH_HSA_DEVICE #endif // WITH_HSA_DEVICE
#if defined(WITH_PAL_DEVICE) #if defined(WITH_PAL_DEVICE)
if (GPU_ENABLE_PAL != 0) { if (GPU_ENABLE_PAL != 0) {
if (GPU_ENABLE_PAL == 1) {
// PAL path can't support direct dispatch, unless it's forced
AMD_DIRECT_DISPATCH = flagIsDefault(AMD_DIRECT_DISPATCH) ? false : AMD_DIRECT_DISPATCH;
}
ret |= PalDeviceLoad(); ret |= PalDeviceLoad();
} }
#endif // WITH_PAL_DEVICE #endif // WITH_PAL_DEVICE
projects/clr/rocclr/device/rocm/rocvirtual.cpp
+4 -4
View File
@@ -1079,8 +1079,8 @@ bool VirtualGPU::dispatchGenericAqlPacket(AqlPacket* packet, uint16_t header, ui
ClPrint(amd::LOG_DEBUG, amd::LOG_AQL, ClPrint(amd::LOG_DEBUG, amd::LOG_AQL,
"SWq=0x%zx, HWq=0x%zx, id=%d, Dispatch Header = " "SWq=0x%zx, HWq=0x%zx, id=%d, Dispatch Header = "
"0x%x (type=%d, barrier=%d, acquire=%d, release=%d), " "0x%x (type=%d, barrier=%d, acquire=%d, release=%d), "
"setup=%d, grid=[%zu, %zu, %zu], workgroup=[%zu, %zu, %zu], private_seg_size=%zu, " "setup=%d, grid=[%u, %u, %u], workgroup=[%u, %u, %u], private_seg_size=%u, "
"group_seg_size=%zu, kernel_obj=0x%zx, kernarg_address=0x%zx, completion_signal=0x%zx, " "group_seg_size=%u, kernel_obj=0x%zx, kernarg_address=0x%zx, completion_signal=0x%zx, "
"correlation_id=%zu, rptr=%u, wptr=%u", "correlation_id=%zu, rptr=%u, wptr=%u",
gpu_queue_, gpu_queue_->base_address, gpu_queue_->id, header, gpu_queue_, gpu_queue_->base_address, gpu_queue_->id, header,
extractAqlBits(header, HSA_PACKET_HEADER_TYPE, HSA_PACKET_HEADER_WIDTH_TYPE), extractAqlBits(header, HSA_PACKET_HEADER_TYPE, HSA_PACKET_HEADER_WIDTH_TYPE),
@@ -1294,8 +1294,8 @@ bool VirtualGPU::dispatchGenericAqlPacketBatch(const std::vector<AqlPacket*>& pa
ClPrint(amd::LOG_DETAIL_DEBUG, amd::LOG_AQL, ClPrint(amd::LOG_DETAIL_DEBUG, amd::LOG_AQL,
"SWq=0x%zx, HWq=0x%zx, id=%d, Dispatch Header = " "SWq=0x%zx, HWq=0x%zx, id=%d, Dispatch Header = "
"0x%x (type=%d, barrier=%d, acquire=%d, release=%d), " "0x%x (type=%d, barrier=%d, acquire=%d, release=%d), "
"setup=%d, grid=[%zu, %zu, %zu], workgroup=[%zu, %zu, %zu], " "setup=%d, grid=[%u, %u, %u], workgroup=[%u, %u, %u], "
"private_seg_size=%zu, group_seg_size=%zu, kernel_obj=0x%zx, " "private_seg_size=%u, group_seg_size=%u, kernel_obj=0x%zx, "
"kernarg_address=0x%zx, completion_signal=0x%zx, correlation_id=%zu, " "kernarg_address=0x%zx, completion_signal=0x%zx, correlation_id=%zu, "
"rptr=%u, wptr=%u", "rptr=%u, wptr=%u",
gpu_queue_, gpu_queue_->base_address, gpu_queue_->id, header, packetType, gpu_queue_, gpu_queue_->base_address, gpu_queue_->id, header, packetType,