From 10d29ca45b4301adddb73c989d5160797c377ff0 Mon Sep 17 00:00:00 2001
From: Sam Wu <sam.wu2@amd.com>
Date: Wed, 17 Apr 2024 12:52:19 -0600
Subject: [PATCH] Update manifest for ROCm 6.1.0 (#3022)

* Reorganize default.xml by group and alphabetically

* Add rocDecode to default.xml

* Add rocDecode to included names in tag script

* update tag to 6.1.0

---------

Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com>
---
 default.xml                 | 73 +++++++++++++++++++------------------
 tools/autotag/tag_script.py |  5 ++-
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/default.xml b/default.xml
index 3389e920d..1dcfd6c35 100644
--- a/default.xml
+++ b/default.xml
@@ -2,69 +2,70 @@
 <manifest>
     <remote name="rocm-org" fetch="https://github.com/ROCm/" />
     <remote name="KhronosGroup" fetch="https://github.com/KhronosGroup/" />
-    <default revision="refs/tags/rocm-6.0.2"
+    <default revision="refs/tags/rocm-6.1.0"
      remote="rocm-org"
      sync-c="true"
      sync-j="4" />
 <!--list of projects for ROCm-->
-    <project name="ROCK-Kernel-Driver" />
-    <project name="ROCT-Thunk-Interface" />
-    <project name="ROCR-Runtime" />
-    <project name="amdsmi" />
-    <project name="rocm_smi_lib" />
-    <project name="rocm-core" />
-    <project name="rocm-cmake" />
-    <project name="rocminfo" />
-    <project name="rocm_bandwidth_test" />
-    <project name="rocprofiler" />
-    <project name="roctracer" />
     <project path="ROCm-OpenCL-Runtime/api/opencl/khronos/icd" name="OpenCL-ICD-Loader" remote="KhronosGroup" revision="6c03f8b58fafd9dd693eaac826749a5cfad515f8" />
+    <project name="ROCK-Kernel-Driver" />
+    <project name="ROCR-Runtime" />
+    <project name="ROCT-Thunk-Interface" />
+    <project name="amdsmi" />
     <project name="clang-ocl" />
     <project name="rdc" />
+    <project name="rocm_bandwidth_test" />
+    <project name="rocm_smi_lib" />
+    <project name="rocm-cmake" />
+    <project name="rocm-core" />
+    <project name="rocminfo" />
+    <project name="rocprofiler" />
+    <project name="roctracer" />
 <!--HIP Projects-->
     <project name="HIP" />
     <project name="HIP-Examples" />
+    <project name="HIPCC" />
+    <project name="HIPIFY" />
     <project name="clr" />
     <project name="hipother" />
-    <project name="HIPIFY" />
-    <project name="HIPCC" />
 <!-- The following projects are all associated with the AMDGPU LLVM compiler -->
-    <project name="llvm-project" />
-    <project name="ROCm-Device-Libs" />
     <project name="ROCm-CompilerSupport" />
+    <project name="ROCm-Device-Libs" />
     <project name="half" revision="37742ce15b76b44e4b271c1e66d13d2fa7bd003e" />
+    <project name="llvm-project" />
 <!-- gdb projects -->
-    <project name="ROCgdb" />
     <project name="ROCdbgapi" />
+    <project name="ROCgdb" />
     <project name="rocr_debug_agent" />
 <!-- ROCm Libraries -->
-    <project groups="mathlibs" name="rocBLAS" />
+    <project name="AMDMIGraphX" />
+    <project name="MIOpen" />
+    <project name="MIVisionX" />
+    <project name="ROCmValidationSuite" />
+    <project name="composable_kernel" />
+    <project name="hipfort" />
+    <project name="rocDecode" />
+    <project name="rpp" />
     <project groups="mathlibs" name="Tensile" />
-    <project groups="mathlibs" name="hipTensor" />
     <project groups="mathlibs" name="hipBLAS" />
     <project groups="mathlibs" name="hipBLASLt" />
-    <project groups="mathlibs" name="rocFFT" />
+    <project groups="mathlibs" name="hipCUB" />
     <project groups="mathlibs" name="hipFFT" />
-    <project groups="mathlibs" name="rocRAND" />
     <project groups="mathlibs" name="hipRAND" />
-    <project groups="mathlibs" name="rocSPARSE" />
-    <project groups="mathlibs" name="hipSPARSELt" />
-    <project groups="mathlibs" name="rocSOLVER" />
     <project groups="mathlibs" name="hipSOLVER" />
     <project groups="mathlibs" name="hipSPARSE" />
-    <project groups="mathlibs" name="rocALUTION" />
-    <project groups="mathlibs" name="rocThrust" />
-    <project groups="mathlibs" name="hipCUB" />
-    <project groups="mathlibs" name="rocPRIM" />
-    <project groups="mathlibs" name="rocWMMA" />
+    <project groups="mathlibs" name="hipSPARSELt" />
+    <project groups="mathlibs" name="hipTensor" />
     <project groups="mathlibs" name="rccl" />
-    <project name="MIOpen" />
-    <project name="composable_kernel" />
-    <project name="MIVisionX" />
-    <project name="rpp" />
-    <project name="hipfort" />
-    <project name="AMDMIGraphX" />
-    <project name="ROCmValidationSuite" />
+    <project groups="mathlibs" name="rocALUTION" />
+    <project groups="mathlibs" name="rocBLAS" />
+    <project groups="mathlibs" name="rocFFT" />
+    <project groups="mathlibs" name="rocPRIM" />
+    <project groups="mathlibs" name="rocRAND" />
+    <project groups="mathlibs" name="rocSOLVER" />
+    <project groups="mathlibs" name="rocSPARSE" />
+    <project groups="mathlibs" name="rocThrust" />
+    <project groups="mathlibs" name="rocWMMA" />
 <!-- Projects for OpenMP-Extras -->
     <project name="aomp" path="openmp-extras/aomp" />
     <project name="aomp-extras" path="openmp-extras/aomp-extras" />
diff --git a/tools/autotag/tag_script.py b/tools/autotag/tag_script.py
index b1b04031f..219d4ef99 100755
--- a/tools/autotag/tag_script.py
+++ b/tools/autotag/tag_script.py
@@ -236,9 +236,10 @@ def run_tagging():
 
     # Find all the math libraries and their remotes.
     included_names = [
-        "rocm-cmake",
-        "MIOpen",
         "AMDMIGraphX",
+        "MIOpen",
+        "rocDecode",
+        "rocm-cmake",
         "rocprofiler"
     ]
     included_groups = [