Gbaraldi/threadtrace2 (#724)

* Added first ATT API * Finalizing thread trace API * Fixing more rebase conflicts * Added codeobj disassembly sample * Fixing merge issues with rebase [2] * Adding ATT packets * Implemented thread trace intercept * Moved codeobj parser to same repo as rocprofiler * Moved thread trace to new API * Fixing merge conflicts * Fixing more merge conflicts * Adding thread trace packet reuse * Merged aql_profile_v2 headers * Linked ATT sample to aqlprofile * Updated decoder to include non-loaded codeobjs * Implemented ISA decoder into ATT sample * Added marker_id to vaddr * Updating aql_profile_v2 API to memcpy * Updating thread trace API to include 64bit markers. Using the result of ISA matching. * Added instruction type and cycles summary * Updated sample with selection of kernel by kernel_object * Added option to copy from memory kernels * Moved tool_data in thread_trace to dynamic alloc * Restoring hsa.cpp * Fixed ATT sample crash. General improvements. * Moved codeobj library to outside src/ * Updated license header * Moved codeobj_capture to camelcase * Solving some more merge conflicts * Update samples/advanced_thread_trace/CMakeLists.txt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update samples/advanced_thread_trace/CMakeLists.txt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update samples/code_object_isa_decode/CMakeLists.txt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update source/lib/rocprofiler-sdk/thread_trace/CMakeLists.txt * Removing unused parameter check * Adding const to isEmpty * Removing unused warning * Adding libdw-dev to requirements * Running clang-format * Commenting out new aql calls * Clang format * Unused variable fix * Adding codeobj-decoder coverage * Commenting out threadtrace * Update samples/CMakeLists.txt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * P * WOverloaded * Addressing clang-tidy * Virtual destructor on ttracer class * Corr id * Fixing code source format * Update CMakeLists.txt * Build fixes * Update source/lib/rocprofiler-sdk-codeobj/code_object_track.cpp Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fix shadowing * Update CMakeLists.txt * Update samples/CMakeLists.txt Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ammar ELWazir <ammar.elwazir@amd.com> Co-authored-by: Ammar ELWazir <aelwazir@amd.com> Co-authored-by: Benjamin Welton <bewelton@amd.com>
2024-04-08 12:43:02 -07:00
@@ -30,10 +30,12 @@
 #include <hsa/hsa_api_trace.h>
 #include <hsa/hsa_ven_amd_aqlprofile.h>

+#include "lib/rocprofiler-sdk/aql/aql_profile_v2.h"
 #include "lib/rocprofiler-sdk/aql/helpers.hpp"
 #include "lib/rocprofiler-sdk/counters/metrics.hpp"
 #include "lib/rocprofiler-sdk/hsa/agent_cache.hpp"
 #include "lib/rocprofiler-sdk/hsa/queue.hpp"
+#include "lib/rocprofiler-sdk/thread_trace/att_core.hpp"

 namespace rocprofiler
 {
@@ -47,21 +49,27 @@ namespace aql
 * consturcted start/stop/read packets along with allocated buffers needed
 * to collect the counter data.
 */
-class AQLPacketConstruct
+class CounterPacketConstruct
 {
 public:
-    AQLPacketConstruct(const hsa::AgentCache& agent, const std::vector<counters::Metric>& metrics);
-    std::unique_ptr<hsa::AQLPacket> construct_packet(const AmdExtTable&) const;
+    CounterPacketConstruct(const hsa::AgentCache&               agent,
+                           const std::vector<counters::Metric>& metrics);
+    std::unique_ptr<hsa::CounterAQLPacket> construct_packet(const AmdExtTable&);

    const counters::Metric* event_to_metric(const hsa_ven_amd_aqlprofile_event_t& event) const;
    std::vector<hsa_ven_amd_aqlprofile_event_t> get_all_events() const;
+    hsa_agent_t                                 hsa_agent() const { return _agent.get_hsa_agent(); }

    const std::vector<hsa_ven_amd_aqlprofile_event_t>& get_counter_events(
        const counters::Metric&) const;

-    hsa_agent_t hsa_agent() const { return _agent.get_hsa_agent(); }
-
 private:
+    const hsa::AgentCache&  _agent;
+    static constexpr size_t MEM_PAGE_ALIGN = 0x1000;
+    static constexpr size_t MEM_PAGE_MASK  = MEM_PAGE_ALIGN - 1;
+    static size_t getPageAligned(size_t p) { return (p + MEM_PAGE_MASK) & ~MEM_PAGE_MASK; }
+
+protected:
    struct AQLProfileMetric
    {
        counters::Metric                            metric;
@@ -70,12 +78,26 @@ private:

    void can_collect();

-    const hsa::AgentCache&                      _agent;
    std::vector<AQLProfileMetric>               _metrics;
    std::vector<hsa_ven_amd_aqlprofile_event_t> _events;
    std::map<std::tuple<hsa_ven_amd_aqlprofile_block_name_t, uint32_t, uint32_t>, counters::Metric>
        _event_to_metric;
 };

+class ThreadTraceAQLPacketFactory
+{
+public:
+    ThreadTraceAQLPacketFactory(const hsa::AgentCache&                    agent,
+                                std::shared_ptr<thread_trace_parameters>& params,
+                                const CoreApiTable&                       coreapi,
+                                const AmdExtTable&                        ext);
+    std::unique_ptr<hsa::TraceAQLPacket> construct_packet();
+
+private:
+    std::shared_ptr<hsa::TraceMemoryPool>           tracepool;
+    std::vector<hsa_ven_amd_aqlprofile_parameter_t> aql_params;
+    aqlprofile_att_profile_t                        profile;
+};
+
 }  // namespace aql
 }  // namespace rocprofiler