Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions libkineto/src/MuptiActivity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,9 @@ inline const std::string RuntimeActivity::metadataJson() const {
}

inline bool isKernelLaunchApi(const MUpti_ActivityAPI& activity_) {
return activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernel;
return activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernel ||
activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernelEx ||
activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernelEx_ptsz;
}

inline bool DriverActivity::flowStart() const {
Expand All @@ -381,14 +383,17 @@ inline const std::string DriverActivity::metadataJson() const {
}

inline const std::string DriverActivity::name() const {
// currently only muLaunchKernel is expected
assert(isKernelLaunchApi(activity_));
// not yet implementing full name matching
if (activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernel) {
return "muLaunchKernel";
} else {
return "Unknown"; // should not reach here
}
if (activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernelEx) {
return "muLaunchKernelEx";
}
if (activity_.cbid == MUPTI_DRIVER_TRACE_CBID_muLaunchKernelEx_ptsz) {
return "muLaunchKernelEx_ptsz";
}
return "Unknown"; // should not reach here
}

template<class T>
Expand Down
27 changes: 18 additions & 9 deletions libkineto/src/mupti_strings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ static const char* runtimeCbidNames[] = {
"musaStreamGetCaptureInfo_ptsz",
"musaGraphExecKernelNodeSetParams",
"musaThreadExchangeStreamCaptureMode",
"musaDeviceGetNvSciSyncAttributes",
"musaDeviceGetMtSciSyncAttributes",
"musaOccupancyAvailableDynamicSMemPerBlock",
"musaStreamSetFlags",
"musaStreamSetFlags_ptsz",
Expand Down Expand Up @@ -547,10 +547,10 @@ static const char* runtimeCbidNames[] = {
"musaMemPoolImportPointer",
"musaMallocFromPoolAsync",
"musaMallocFromPoolAsync_ptsz",
"musaSignalExternalSemaphoresAsync",
"musaSignalExternalSemaphoresAsync",
"musaWaitExternalSemaphoresAsync",
"musaWaitExternalSemaphoresAsync",
"musaSignalExternalSemaphoresAsync_v2",
"musaSignalExternalSemaphoresAsync_v2_ptsz",
"musaWaitExternalSemaphoresAsync_v2",
"musaWaitExternalSemaphoresAsync_v2_ptsz",
"musaGraphAddExternalSemaphoresSignalNode",
"musaGraphExternalSemaphoresSignalNodeGetParams",
"musaGraphExternalSemaphoresSignalNodeSetParams",
Expand Down Expand Up @@ -634,7 +634,7 @@ static const char* runtimeCbidNames[] = {
"musa477",
"musa478",
"musa479",
"musaStr",
"musaStreamGetDevice",
"musaStreamGetDevice_ptsz",
"musaMemcpyBatchAsync",
"musaMemcpyBatchAsync_ptsz",
Expand All @@ -660,14 +660,23 @@ static const char* runtimeCbidNames[] = {
"musaGetExportTable",
"musaMemoryTransfer",
"musaMemoryTransfer_ptds",
"musaMemoryTransferAsync ",
"musaMemoryTransferAsync",
"musaMemoryTransferAsync_ptsz",
"musaGraphAddMemTransferNode",
"musaGraphMemTransferNodeGetParams",
"musaGraphMemTransferNodeSetParams",
"musaGraphExecMemTransferNodeSetParams",
"SIZE",
"FORCE_INT"
"musaKernelSetAttributeForDevice",
"musaLibraryEnumerateKernels",
"musaLibraryGetGlobal",
"musaLibraryGetKernel",
"musaLibraryGetKernelCount",
"musaLibraryGetManaged",
"musaLibraryGetUnifiedFunction",
"musaLibraryLoadData",
"musaLibraryLoadFromFile",
"musaLibraryUnload",
"SIZE"
};

const char* runtimeCbidName(MUpti_CallbackId cbid) {
Expand Down
Loading