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

fixing hsa intercept test

Browse Source 
Change-Id: I2671dfc6a9bd3e01a0c926aa3ea367b8c7a0279e


[ROCm/rocprofiler commit: 7be9a42ab3]
This commit is contained in:
Evgeny
2020-03-28 17:24:16 -05:00
parent 67e1502ce5
commit 943b92d4c7
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocprofiler/src/core/intercept_queue.h
+12 -12
View File
@@ -141,23 +141,23 @@ class InterceptQueue {
const hsa_kernel_dispatch_packet_t* dispatch_packet =
reinterpret_cast<const hsa_kernel_dispatch_packet_t*>(packet);
const char* kernel_name = NULL;
if (GetHeaderType(packet) == HSA_PACKET_TYPE_KERNEL_DISPATCH) {
uint64_t kernel_object = dispatch_packet->kernel_object;
const amd_kernel_code_t* kernel_code = GetKernelCode(kernel_object);
const char* kernel_name = (GetHeaderType(packet) == HSA_PACKET_TYPE_KERNEL_DISPATCH) ?
kernel_name = (GetHeaderType(packet) == HSA_PACKET_TYPE_KERNEL_DISPATCH) ?
QueryKernelName(kernel_object, kernel_code) : NULL;
// Prepareing submit callback data
rocprofiler_hsa_callback_data_t data{};
data.submit.packet = (void*)packet;
data.submit.kernel_name = kernel_name;
data.submit.queue = obj->queue_;
data.submit.device_type = obj->agent_info_->dev_type;
data.submit.device_id = obj->agent_info_->dev_index;
callback_fun(ROCPROFILER_HSA_CB_ID_SUBMIT, &data, callback_arg);
} else {
callback_fun(ROCPROFILER_HSA_CB_ID_SUBMIT, NULL, callback_arg);
}
// Prepareing submit callback data
rocprofiler_hsa_callback_data_t data{};
data.submit.packet = (void*)packet;
data.submit.kernel_name = kernel_name;
data.submit.queue = obj->queue_;
data.submit.device_type = obj->agent_info_->dev_type;
data.submit.device_id = obj->agent_info_->dev_index;
callback_fun(ROCPROFILER_HSA_CB_ID_SUBMIT, &data, callback_arg);
}
}
}
projects/rocprofiler/test/tool/tool.cpp
+1
View File
@@ -836,6 +836,7 @@ hsa_status_t hsa_unified_callback(
void* arg)
{
printf("hsa_unified_callback(%d, %p, %p):\n", (int)id, data, arg);
if (data == NULL) abort();
switch (id) {
case ROCPROFILER_HSA_CB_ID_ALLOCATE: