ATT API changes - add user_data field and separation of dispatch vs agent profiling (#893)

* DRM Issue Fix for SLES 15 (#897) * DRM Issue Fix * Formatting Fix * PC sampling: CID manager unit test (#898) * Adding per-dispatch userdata field to ATT * Clang tidy * Formatting * Update source/lib/rocprofiler-sdk/hsa/aql_packet.hpp Co-authored-by: Vladimir Indic <139573562+vlaindic@users.noreply.github.com> * Adding dispatch_id, fixing user_data and update aql_profile_v2 * Formatting * Tidy fixes * Second fix for userdata * removing assert for union * Adding serialization. Created agent profiling-like thread trace * Implemented agent thread trace * Update source/lib/rocprofiler-sdk/hsa/aql_packet.hpp Co-authored-by: Vladimir Indic <139573562+vlaindic@users.noreply.github.com> * Restructured thread trace packets * Added agent API tests * Fixing multigpu for agent test * Formatting * Formatting * Improving header locations * Fixing merge conflicts * Tidy * Tidy * Tidy --------- Co-authored-by: Ammar ELWazir <ammar.elwazir@amd.com> Co-authored-by: Vladimir Indic <139573562+vlaindic@users.noreply.github.com> [ROCm/rocprofiler-sdk commit: 9676295d3d]
2024-06-13 15:29:29 -03:00
Commit 37b0cfd7dc
@@ -55,11 +55,14 @@ dispatch_callback(rocprofiler_queue_id_t /* queue_id  */,
                  const rocprofiler_agent_t* /* agent  */,
                  rocprofiler_correlation_id_t /* correlation_id  */,
                  rocprofiler_kernel_id_t kernel_id,
-                  void*                   userdata)
+                  rocprofiler_dispatch_id_t /* dispatch_id */,
+                  rocprofiler_user_data_t* dispatch_userdata,
+                  void*                    userdata)
 {
    C_API_BEGIN
    assert(userdata && "Dispatch callback passed null!");
-    ToolData& tool = *reinterpret_cast<ToolData*>(userdata);
+    ToolData& tool         = *reinterpret_cast<ToolData*>(userdata);
+    dispatch_userdata->ptr = userdata;

    static std::atomic<int> call_id{0};
    static std::string_view desired_func_name = "branching_kernel";
@@ -102,15 +105,15 @@ tool_init(rocprofiler_client_finalize_t /* fini_func */, void* tool_data)
        "code object tracing service configure");

    std::vector<rocprofiler_att_parameter_t> params{};
-    params.push_back({ROCPROFILER_ATT_PARAMETER_CODE_OBJECT_TRACE_ENABLE, {1}});

-    ROCPROFILER_CALL(rocprofiler_configure_thread_trace_service(client_ctx,
-                                                                params.data(),
-                                                                params.size(),
-                                                                dispatch_callback,
-                                                                Callbacks::shader_data_callback,
-                                                                tool_data),
-                     "thread trace service configure");
+    ROCPROFILER_CALL(
+        rocprofiler_configure_dispatch_thread_trace_service(client_ctx,
+                                                            params.data(),
+                                                            params.size(),
+                                                            dispatch_callback,
+                                                            Callbacks::shader_data_callback,
+                                                            tool_data),
+        "thread trace service configure");

    int valid_ctx = 0;
    ROCPROFILER_CALL(rocprofiler_context_is_valid(client_ctx, &valid_ctx),