Update comgr_utils for October 2025 RDTS release.

Author: amimulay

CMakeLists.txt

@@ -1,3 +1,8 @@
+#######################################################################################################################
+### Copyright (c) 2018-2025 Advanced Micro Devices, Inc. All rights reserved.
+### @author AMD Developer Tools Team
+#######################################################################################################################
+
 cmake_minimum_required (VERSION 3.5.1)
 project (ComgrUtils)
 

source/comgr_utils.cpp

@@ -125,6 +125,15 @@ namespace amdt
     const char* kPalMdTagUserDataRegMap         = ".user_data_reg_map";
     const char* kPalMdTagUsesCps                = ".uses_cps";
     const char* kPalMdTagThreadGroupDimensions  = ".threadgroup_dimensions";
+    const char* kPalMdTagComputeRegisters       = ".compute_registers";
+    const char* kPalMdTagDynamicVgprEn          = ".dynamic_vgpr_en";
+    const char* kPalMdTagTgSizeEn               = ".tg_size_en";
+    const char* kPalMdTagTgidXEn                = ".tgid_x_en";
+    const char* kPalMdTagTgidYEn                = ".tgid_y_en";
+    const char* kPalMdTagTgidZEn                = ".tgid_z_en";
+    const char* kPalMdTagTidigCompCnt           = ".tidig_comp_cnt";
+    const char* kPalMdTagXInterleave            = ".x_interleave";
+    const char* kPalMdTagYInterleave            = ".y_interleave";
     // Graphics register metadata.
     const char* kPalMdTagGraphicsRegisters          = ".graphics_registers";
     const char* kPalMdTagAaCoverageToShaderSelect   = ".aa_coverage_to_shader_select";
@@ -804,6 +813,8 @@ namespace amdt
                 }
             }
 
+            ExtractPalMDComputeRegisters(*pipeline_data, ppln);
+
             // Uses CPS (Continuation Passing Shader).
             MDNode uses_cps = ppln[kPalMdTagUsesCps];
             if (uses_cps.IsValid())
@@ -2074,6 +2085,53 @@ namespace amdt
         return true;
     }
 
+    bool CodeObj::ExtractPalMDComputeRegisters(Pipeline &md_pipeline_data, MDNode &ppln)
+    {
+        MDNode compute_registers = ppln[kPalMdTagComputeRegisters];
+        auto &compute_registers_info = md_pipeline_data.compute_registers_info;
+
+        if (!compute_registers.IsValid())
+        {
+            ReportInvalidRequiredPalMDMapItem(compute_registers);
+            return false;
+        }
+
+        MDNode dynamic_vgpr_en = compute_registers[kPalMdTagDynamicVgprEn];
+        compute_registers_info.dynamic_vgpr_en = dynamic_vgpr_en.value<bool>();
+        dynamic_vgpr_en.Destroy();
+
+        MDNode tg_size_en = compute_registers[kPalMdTagTgSizeEn];
+        compute_registers_info.tg_size_en = tg_size_en.value<bool>();
+        tg_size_en.Destroy();
+
+        MDNode tgid_x_en = compute_registers[kPalMdTagTgidXEn];
+        compute_registers_info.tgid_x_en = tgid_x_en.value<bool>();
+        tgid_x_en.Destroy();
+
+        MDNode tgid_y_en = compute_registers[kPalMdTagTgidYEn];
+        compute_registers_info.tgid_y_en = tgid_y_en.value<bool>();
+        tgid_y_en.Destroy();
+
+        MDNode tgid_z_en = compute_registers[kPalMdTagTgidZEn];
+        compute_registers_info.tgid_z_en = tgid_z_en.value<bool>();
+        tgid_z_en.Destroy();
+
+        MDNode tidig_comp_cnt = compute_registers[kPalMdTagTidigCompCnt];
+        compute_registers_info.tidig_comp_cnt = tidig_comp_cnt.value<uint32_t>();
+        tidig_comp_cnt.Destroy();
+
+        MDNode x_interleave = compute_registers[kPalMdTagXInterleave];
+        compute_registers_info.x_interleave = x_interleave.value<uint32_t>();
+        x_interleave.Destroy();
+
+        MDNode y_interleave = compute_registers[kPalMdTagYInterleave];
+        compute_registers_info.y_interleave = y_interleave.value<uint32_t>();
+        y_interleave.Destroy();
+
+        compute_registers.Destroy();
+        return true;
+    }
+
     bool CodeObj::ExtractPalMdGraphicsRegisterInfo(Pipeline& md_pipeline_data, MDNode& pp_in)
     {
         MDNode graphics_registers     = pp_in[kPalMdTagGraphicsRegisters];

source/comgr_utils.h

@@ -149,7 +149,7 @@ namespace amdt
         {
 #ifdef COMGR_DYNAMIC_LINKING
 #ifdef _WIN32
-            module_ = LoadLibrary(_T("amd_comgr_2.dll"));
+            module_ = LoadLibrary(_T("amd_comgr_3.dll"));
 #elif defined(__APPLE__)
             module_ = dlopen("libamd_comgr.1.dylib", RTLD_LAZY);
 #else
@@ -987,7 +987,20 @@ namespace amdt
         kComgrUtilsRaw,                 ///< Output the scan converter's internal mask, unchanged.
     };
 
-    /// Abstracted graphics-only register values.
+    /// @brief Abstracted compute-only register values.
+    struct ComputeRegistersInfo
+    {
+        bool     dynamic_vgpr_en;  ///< Flag indicating if dynamic VGPR allocation is enabled.
+        bool     tg_size_en;
+        bool     tgid_x_en;
+        bool     tgid_y_en;
+        bool     tgid_z_en;
+        uint32_t tidig_comp_cnt;
+        uint32_t x_interleave;
+        uint32_t y_interleave;
+    };
+
+    /// @brief Abstracted graphics-only register values.
     struct GraphicsRegisterInfo
     {
         /// How many LS VGPR components to load.
@@ -1235,7 +1248,8 @@ namespace amdt
         HWStageInfo*         stage_list;              ///< Stage list.
         RegisterData*        register_data_list;      ///< Register data list.
         ShaderFunctionInfo*  shader_function_list;    ///< Shader function list.
-        GraphicsRegisterInfo graphics_register_info;  ///< graphics register info.
+        GraphicsRegisterInfo graphics_register_info;  ///< Graphics register info.
+        ComputeRegistersInfo compute_registers_info;  ///< Compute register info.
     };
 
     /// @brief HSA kernel arguments info.
@@ -1678,6 +1692,13 @@ namespace amdt
         /// @return true if successful, false otherwise.
         bool ExtractPalMDRegisterInfo(Pipeline& md_pipeline_data, MDNode& pp_in);
 
+        /// @brief Helper function for extracting PAL metadata for compute register info.
+        ///
+        /// @param [in] md_pipeline_data The pipeline data.
+        /// @param [in] pp_in            The metadata node.
+        /// @return true if successful, false otherwise.
+        bool ExtractPalMDComputeRegisters(Pipeline& md_pipeline_data, MDNode& pp_in);
+
         /// @brief Helper function for extracting PAL metadata for graphics register info.
         ///
         /// @param [in] md_pipeline_data The pipeline data.