introduce new interface to kineto for PTI-0.11 and PTI-0.12 (#1066)

Summary:
This PR is used to change the interface for XPTI in kineto to be compatible with the PTI 0.11 release

Pull Request resolved: #1066

Reviewed By: davidberard98

Differential Revision: D73046750

Pulled By: sraikund16

fbshipit-source-id: f7b669e70d1492f327badfe04094b93cb6633612

Author: zejun-chen

libkineto/src/plugin/xpupti/XpuptiActivityApi.cpp

@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 #include "XpuptiActivityApi.h"
 
 #include <assert.h>
@@ -170,6 +178,43 @@ void XpuptiActivityApi::bufferCompleted(
 }
 #endif
 
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+static void enableSpecifcRuntimeAPIsTracing() {
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueUSMFill_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueUSMFill2D_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueUSMMemcpy_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueUSMMemcpy2D_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueKernelLaunch_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1,
+      pti_api_group_id::PTI_API_GROUP_SYCL,
+      urEnqueueKernelLaunchCustomExp_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1,
+      pti_api_group_id::PTI_API_GROUP_SYCL,
+      urEnqueueCooperativeKernelLaunchExp_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueMemBufferFill_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueMemBufferRead_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueMemBufferWrite_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urEnqueueMemBufferCopy_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urUSMHostAlloc_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urUSMSharedAlloc_id));
+  XPUPTI_CALL(ptiViewEnableRuntimeApi(
+      1, pti_api_group_id::PTI_API_GROUP_SYCL, urUSMDeviceAlloc_id));
+}
+#endif
+
 void XpuptiActivityApi::enableXpuptiActivities(
     const std::set<ActivityType>& selected_activities) {
 #ifdef HAS_XPUPTI
@@ -192,7 +237,16 @@ void XpuptiActivityApi::enableXpuptiActivities(
       externalCorrelationEnabled_ = true;
     }
     if (activity == ActivityType::XPU_RUNTIME) {
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 11
+      XPUPTI_CALL(ptiViewEnable(PTI_VIEW_RUNTIME_API));
+      XPUPTI_CALL(ptiViewEnableRuntimeApiClass(
+          1, PTI_API_CLASS_GPU_OPERATION_CORE, PTI_API_GROUP_ALL));
+#elif PTI_VERSION_MAJOR == 0 && PTI_VERSION_MINOR == 11
+      XPUPTI_CALL(ptiViewEnable(PTI_VIEW_RUNTIME_API));
+      enableSpecifcRuntimeAPIsTracing();
+#else
       XPUPTI_CALL(ptiViewEnable(PTI_VIEW_SYCL_RUNTIME_CALLS));
+#endif
     }
     if (activity == ActivityType::OVERHEAD) {
       XPUPTI_CALL(ptiViewEnable(PTI_VIEW_COLLECTION_OVERHEAD));
@@ -222,7 +276,12 @@ void XpuptiActivityApi::disablePtiActivities(
       XPUPTI_CALL(ptiViewDisable(PTI_VIEW_EXTERNAL_CORRELATION));
     }
     if (activity == ActivityType::XPU_RUNTIME) {
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+      XPUPTI_CALL(ptiViewDisable(PTI_VIEW_RUNTIME_API));
+#else
+
       XPUPTI_CALL(ptiViewDisable(PTI_VIEW_SYCL_RUNTIME_CALLS));
+#endif
     }
     if (activity == ActivityType::OVERHEAD) {
       XPUPTI_CALL(ptiViewDisable(PTI_VIEW_COLLECTION_OVERHEAD));

libkineto/src/plugin/xpupti/XpuptiActivityHandlers.cpp

@@ -98,16 +98,29 @@ inline void XpuptiActivityProfilerSession::handleCorrelationActivity(
 }
 
 void XpuptiActivityProfilerSession::handleRuntimeActivity(
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+    const pti_view_record_api* activity,
+#else
     const pti_view_record_sycl_runtime* activity,
+#endif
     ActivityLogger* logger) {
   traceBuffer_.span.opCount += 1;
   traceBuffer_.gpuOpCount += 1;
   const ITraceActivity* linked =
       linkedActivity(activity->_correlation_id, cpuCorrelationMap_);
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+  const char* api_name = nullptr;
+  XPUPTI_CALL(
+      ptiViewGetApiIdName(activity->_api_group, activity->_api_id, &api_name));
+#endif
   traceBuffer_.emplace_activity(
       traceBuffer_.span,
       ActivityType::XPU_RUNTIME,
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+      std::string(api_name));
+#else
       std::string(activity->_name));
+#endif
   auto& runtime_activity = traceBuffer_.activities.back();
   runtime_activity->startTime = activity->_start_timestamp;
   runtime_activity->endTime = activity->_end_timestamp;
@@ -331,9 +344,15 @@ void XpuptiActivityProfilerSession::handlePtiActivity(
           reinterpret_cast<const pti_view_record_external_correlation*>(
               record));
       break;
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+    case PTI_VIEW_RUNTIME_API:
+      handleRuntimeActivity(
+          reinterpret_cast<const pti_view_record_api*>(record),
+#else
     case PTI_VIEW_SYCL_RUNTIME_CALLS:
       handleRuntimeActivity(
           reinterpret_cast<const pti_view_record_sycl_runtime*>(record),
+#endif
           logger);
       break;
     case PTI_VIEW_DEVICE_GPU_KERNEL:

libkineto/src/plugin/xpupti/XpuptiActivityProfiler.h

@@ -52,7 +52,11 @@ class XpuptiActivityProfilerSession
   void handleCorrelationActivity(
       const pti_view_record_external_correlation* correlation);
   void handleRuntimeActivity(
+#if PTI_VERSION_MAJOR > 0 || PTI_VERSION_MINOR > 10
+      const pti_view_record_api* activity,
+#else
       const pti_view_record_sycl_runtime* activity,
+#endif
       ActivityLogger* logger);
   void handleKernelActivity(
       const pti_view_record_kernel* activity,