Merge pull request #3828 from samjwu/tag

Update tags to 6.2.2 (#3827)
Update tags to 6.2.2 (#3827 )
2026-01-10 15:18:11 -05:00 · 2024-09-27 13:12:19 -08:00 · 2024-09-27 15:00:53 -06:00 · 2024-09-27 12:03:39 -08:00 · 2024-09-27 15:21:11 -04:00 · 2024-09-27 12:57:18 -06:00
89 changed files with 2876 additions and 601 deletions
--- a/.azuredevops/components/AMDMIGraphX.yml
+++ b/.azuredevops/components/AMDMIGraphX.yml
@@ -8,20 +8,21 @@ parameters:
 - name: aptPackages
  type: object
  default:
-    - git
    - cmake
-    - ninja-build
+    - git
+    - libdnnl-dev
    - libdrm-dev
-    - libnuma-dev
-    - python3-pip
-    - python3-venv
-    - libtbb-dev
-    - nlohmann-json3-dev
    - libmsgpack-dev
-    - libsqlite3-dev
+    - libnuma-dev
    - libprotobuf-dev
+    - libsqlite3-dev
+    - libtbb-dev
+    - ninja-build
+    - nlohmann-json3-dev
    - protobuf-compiler
+    - python3-pip
    - python3-pybind11
+    - python3-venv
 - name: pipModules
  type: object
  default:
@@ -95,14 +96,12 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
-        -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
-        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
        -DCMAKE_BUILD_TYPE=Release
        -DGPU_TARGETS=$(JOB_GPU_TARGET)
        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
+        -DCMAKE_MODULE_PATH=$(Agent.BuildDirectory)/rocm/lib/cmake/hip
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm/llvm;$(Agent.BuildDirectory)/rocm
        -DHALF_INCLUDE_DIR=$(Agent.BuildDirectory)/rocm/include
-        -DMIGRAPHX_USE_COMPOSABLEKERNEL=OFF
        -DBUILD_TESTING=ON
        -GNinja
 # REFERENCE: https://github.com/ROCm/composable_kernel/issues/782
--- a/.azuredevops/components/ROCR-Runtime.yml
+++ b/.azuredevops/components/ROCR-Runtime.yml
@@ -8,15 +8,21 @@ parameters:
 - name: aptPackages
  type: object
  default:
-    - libelf-dev
    - g++
    - libdrm-dev
+    - libelf-dev
    - libnuma-dev
 - name: rocmDependencies
  type: object
  default:
    - llvm-project
    - rocprofiler-register
+- name: rocmTestDependencies
+  type: object
+  default:
+    - llvm-project
+    - rocm_smi_lib
+    - rocprofiler-register

 jobs:
 - job: ROCR_Runtime
@@ -50,3 +56,120 @@ jobs:
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
        -DBUILD_SHARED_LIBS=ON
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+
+- job: ROCR_Runtime_testing
+  dependsOn: ROCR_Runtime
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - task: Bash@3
+    displayName: Install libhwloc5
+    inputs:
+      targetType: 'inline'
+      script: |
+        wget http://ftp.us.debian.org/debian/pool/main/h/hwloc/libhwloc5_1.11.12-3_amd64.deb
+        wget http://ftp.us.debian.org/debian/pool/main/h/hwloc/libhwloc-dev_1.11.12-3_amd64.deb
+        sudo apt install -y --allow-downgrades ./libhwloc5_1.11.12-3_amd64.deb ./libhwloc-dev_1.11.12-3_amd64.deb
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - task: Bash@3
+    displayName: Build kfdtest
+    inputs:
+      targetType: 'inline'
+      workingDirectory: $(Build.SourcesDirectory)/libhsakmt/tests/kfdtest
+      script: |
+        mkdir build && cd build
+        cmake -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm ..
+        make
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: kfdtest
+      testExecutable: BIN_DIR=$(Build.SourcesDirectory)/libhsakmt/tests/kfdtest/build ./run_kfdtest.sh
+      testParameters: '-p core --gtest_output=xml:./test_output.xml --gtest_color=yes'
+      testDir: $(Build.SourcesDirectory)/libhsakmt/tests/kfdtest/scripts
+  - task: Bash@3
+    displayName: Build rdmatest app
+    inputs:
+      targetType: 'inline'
+      workingDirectory: $(Build.SourcesDirectory)/libhsakmt/tests/rdma/simple/app
+      script: |
+        cmake -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm -DLIBHSAKMT_PATH=$(Agent.BuildDirectory)/rocm -DDRM_AMDGPU_INCLUDE_DIRS=$(Agent.BuildDirectory)/rocm/include .
+        cmake --build .
+  - task: Bash@3
+    displayName: Build rdmatest driver
+    inputs:
+      targetType: 'inline'
+      workingDirectory: $(Build.SourcesDirectory)/libhsakmt/tests/rdma/simple/drv
+      script: |
+        sed -i 's/HSAKMT_PAGE_SHIFT/PAGE_SHIFT/g' amdp2ptest.c
+        sed -i 's/"MIT"/"GPL"/' amdp2ptest.c
+        RDMA_HEADER_DIR=/usr/src/amdgpu-*/include make all
+  - task: Bash@3
+    displayName: Install rdmatest driver
+    inputs:
+      targetType: 'inline'
+      workingDirectory: $(Build.SourcesDirectory)/libhsakmt/tests/rdma/simple/drv
+      script: |
+        sudo rmmod amdp2ptest.ko
+        sudo insmod amdp2ptest.ko
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rdmatest
+      testExecutable: yes | ./rdma_test
+      testParameters: ''
+      testDir: $(Build.SourcesDirectory)/libhsakmt/tests/rdma/simple/app
+      testPublishResults: false
+  - task: Bash@3
+    displayName: Build rocrtst
+    inputs:
+      targetType: 'inline'
+      workingDirectory: $(Build.SourcesDirectory)/rocrtst/suites/test_common
+      script: |
+        sudo rm -rf $(Agent.BuildDirectory)/external/llvm-project
+        mkdir -p $(Agent.BuildDirectory)/external/llvm-project/clang/lib
+        sudo ln -s $(Agent.BuildDirectory)/rocm/llvm/lib/clang/20/include $(Agent.BuildDirectory)/external/llvm-project/clang/lib/Headers
+        mkdir build && cd build
+        cmake .. \
+          -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm \
+          -DTARGET_DEVICES=$(JOB_GPU_TARGET) \
+          -DROCM_DIR=$(Agent.BuildDirectory)/rocm \
+          -DLLVM_DIR=$(Agent.BuildDirectory)/rocm/llvm/bin \
+          -DOPENCL_DIR=$(Agent.BuildDirectory)/rocm/llvm/bin
+        make
+        make rocrtst_kernels
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rocrtst
+      testExecutable: ./rocrtst64
+      testParameters: '--gtest_filter="-rocrtstNeg.Memory_Negative_Tests" --gtest_output=xml:./test_output.xml --gtest_color=yes'
+      testDir: $(Build.SourcesDirectory)/rocrtst/suites/test_common/build/$(JOB_GPU_TARGET)
--- a/.azuredevops/components/ROCmValidationSuite.yml
+++ b/.azuredevops/components/ROCmValidationSuite.yml
@@ -43,6 +43,7 @@ parameters:
    - rocprofiler-register
    - ROCR-Runtime
    - rocRAND
+    - roctracer

 jobs:
 - job: ROCmValidationSuite
--- a/.azuredevops/components/composable_kernel.yml
+++ b/.azuredevops/components/composable_kernel.yml
@@ -90,6 +90,8 @@ jobs:
        -DCMAKE_C_COMPILER_LAUNCHER=ccache
        -DCMAKE_HIP_FLAGS="-Wno-missing-include-dirs"
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
+        -DCK_BUILD_JIT_LIB=ON
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
        -DCMAKE_BUILD_TYPE=Release
        -DGPU_TARGETS=$(JOB_GPU_TARGET)
        -GNinja
--- a/.azuredevops/components/hip-tests.yml
+++ b/.azuredevops/components/hip-tests.yml
@@ -89,7 +89,7 @@ jobs:
      gpuTarget: $(JOB_GPU_TARGET)

 - job: hip_tests_testing
-  timeoutInMinutes: 180
+  timeoutInMinutes: 240
  dependsOn: hip_tests
  condition: succeeded()
  variables:
@@ -130,6 +130,7 @@ jobs:
    inputs:
      targetType: inline
      script: |
+        sudo rm -rf /opt/rocm
        sudo mkdir -p /opt/rocm/bin
        sudo ln -s $(Agent.BuildDirectory)/rocm/bin/rocm_agent_enumerator /opt/rocm/bin/rocm_agent_enumerator
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
--- a/.azuredevops/components/hipSPARSE.yml
+++ b/.azuredevops/components/hipSPARSE.yml
@@ -37,6 +37,7 @@ parameters:
    - rocprofiler-register
    - ROCR-Runtime
    - rocSPARSE
+    - roctracer

 jobs:
 - job: hipSPARSE
--- a/.azuredevops/components/omnitrace.yml
+++ b/.azuredevops/components/omnitrace.yml
@@ -0,0 +1,141 @@
+# largely referenced from: https://github.com/ROCm/omnitrace/blob/main/.github/workflows/ubuntu-jammy.yml
+parameters:
+- name: checkoutRepo
+  type: string
+  default: 'self'
+- name: checkoutRef
+  type: string
+  default: ''
+- name: aptPackages
+  type: object
+  default:
+    - autoconf
+    - autotools-dev
+    - bison
+    - build-essential
+    - bzip2
+    - clang
+    - cmake
+    - environment-modules
+    - g++-12
+    - libdrm-dev
+    - libfabric-dev
+    - libiberty-dev
+    - libpapi-dev
+    - libpfm4-dev
+    - libtool
+    - libopenmpi-dev
+    - m4
+    - openmpi-bin
+    - software-properties-common
+    - python3-pip
+    - texinfo
+    - zlib1g-dev
+- name: pipModules
+  type: object
+  default:
+    - numpy
+    - perfetto
+    - dataclasses
+- name: rocmDependencies
+  type: object
+  default:
+    - clr
+    - llvm-project
+    - rccl
+    - rocm-core
+    - rocm_smi_lib
+    - rocminfo
+    - ROCR-Runtime
+    - rocprofiler
+    - rocprofiler-register
+    - roctracer
+
+jobs:
+- job: omnitrace
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: ${{ variables.MEDIUM_BUILD_POOL }}
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+      gfx90a:
+        JOB_GPU_TARGET: gfx90a
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: ROCm symbolic link
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+  - task: Bash@3
+    displayName: Add ROCm binaries to PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/bin"
+  - task: Bash@3
+    displayName: Add ROCm compilers to PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/llvm/bin"
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+    parameters:
+# build flags reference: https://rocm.docs.amd.com/projects/omnitrace/en/latest/install/install.html
+      extraBuildFlags: >-
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
+        -DOMNITRACE_BUILD_TESTING=ON
+        -DOMNITRACE_BUILD_DYNINST=ON
+        -DOMNITRACE_BUILD_LIBUNWIND=ON
+        -DDYNINST_BUILD_TBB=ON
+        -DDYNINST_BUILD_ELFUTILS=ON
+        -DDYNINST_BUILD_LIBIBERTY=ON
+        -DDYNINST_BUILD_BOOST=ON
+        -DOMNITRACE_USE_PAPI=ON
+        -DOMNITRACE_USE_MPI=ON
+        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
+      multithreadFlag: -- -j32
+  - task: Bash@3
+    displayName: Set up omnitrace env
+    inputs:
+      targetType: inline
+      script: source share/omnitrace/setup-env.sh
+      workingDirectory: build
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: omnitrace
+  - task: Bash@3
+    displayName: Remove ROCm binaries from PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/bin;;' -e 's;^/;;' -e 's;/$;;')"
+  - task: Bash@3
+    displayName: Remove ROCm compilers from PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/llvm/bin;;' -e 's;^/;;' -e 's;/$;;')"
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
--- a/.azuredevops/components/rocALUTION.yml
+++ b/.azuredevops/components/rocALUTION.yml
@@ -43,6 +43,7 @@ parameters:
    - ROCR-Runtime
    - rocRAND
    - rocSPARSE
+    - roctracer

 jobs:
 - job: rocALUTION
--- a/.azuredevops/components/rocBLAS.yml
+++ b/.azuredevops/components/rocBLAS.yml
@@ -52,6 +52,7 @@ parameters:
    - rocprofiler-register
    - rocm_smi_lib
    - ROCR-Runtime
+    - roctracer

 jobs:
 - job: rocBLAS
--- a/.azuredevops/components/rocMLIR.yml
+++ b/.azuredevops/components/rocMLIR.yml
@@ -105,7 +105,9 @@ jobs:
    displayName: ROCm symbolic link
    inputs:
      targetType: inline
-      script: sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      installEnabled: false
--- a/.azuredevops/components/rocPyDecode.yml
+++ b/.azuredevops/components/rocPyDecode.yml
@@ -73,6 +73,13 @@ jobs:
      # manual build case: triggered by ROCm/ROCm repo
      ${{ elseif ne(parameters.checkoutRef, '') }}:
        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: 'ROCm symbolic link'
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
@@ -85,6 +92,24 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+      publish: false
+  - task: Bash@3
+    displayName: Create wheel file
+    inputs:
+      targetType: inline
+      script: python setup.py bdist_wheel
+      workingDirectory: $(Build.SourcesDirectory)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-prepare-package.yml
+    parameters:
+      sourceDir: $(Build.SourcesDirectory)/dist
+      contentsString: '*.whl'
+      targetDir: $(Build.ArtifactStagingDirectory)
+      clean: false
+  - task: PublishPipelineArtifact@1
+    displayName: 'wheel file Publish'
+    retryCountOnTaskFailure: 3
+    inputs:
+      targetPath: $(Build.ArtifactStagingDirectory)

 - job: rocPyDecode_testing
  dependsOn: rocPyDecode
--- a/.azuredevops/components/rocSPARSE.yml
+++ b/.azuredevops/components/rocSPARSE.yml
@@ -40,6 +40,7 @@ parameters:
    - rocminfo
    - rocprofiler-register
    - ROCR-Runtime
+    - roctracer

 jobs:
 - job: rocSPARSE
--- a/.azuredevops/components/rocprofiler-sdk.yml
+++ b/.azuredevops/components/rocprofiler-sdk.yml
@@ -0,0 +1,95 @@
+parameters:
+- name: checkoutRepo
+  type: string
+  default: 'self'
+- name: checkoutRef
+  type: string
+  default: ''
+- name: aptPackages
+  type: object
+  default:
+    - cmake
+    - python3-pip
+    - libdrm-dev
+    - libdw-dev
+    - libelf-dev
+- name: pipModules
+  type: object
+  default:
+    - black
+    - clang-format
+    - clang-tidy
+    - cmake
+    - cmake-format
+    - dataclasses
+    - numpy
+    - otf2
+    - pandas
+    - perfetto
+    - pycobertura
+    - pytest
+    - pyyaml
+- name: rocmDependencies
+  type: object
+  default:
+    - clr
+    - llvm-project
+    - rccl
+    - rocm-cmake
+    - rocm-core
+    - rocminfo
+    - ROCR-Runtime
+    - rocprofiler-register
+    - roctracer
+
+jobs:
+- job: rocprofilersdk
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool:
+    vmImage: ${{ variables.BASE_BUILD_POOL }}
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+      gfx90a:
+        JOB_GPU_TARGET: gfx90a
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+    parameters:
+      extraBuildFlags: >-
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
+        -DROCPROFILER_BUILD_TESTS=ON
+        -DROCPROFILER_BUILD_SAMPLES=OFF
+        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
+      multithreadFlag: -- -j2
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
--- a/.azuredevops/components/rpp.yml
+++ b/.azuredevops/components/rpp.yml
@@ -9,8 +9,18 @@ parameters:
  type: object
  default:
    - cmake
+    - libopencv-dev
+    - libsndfile1-dev
+    - libstdc++-12-dev
+    - imagemagick
    - ninja-build
    - clang
+- name: pipModules
+  type: object
+  default:
+    - openpyxl
+    - pandas
+    - sphinx
 - name: rocmDependencies
  type: object
  default:
@@ -20,6 +30,18 @@ parameters:
    - llvm-project
    - rocminfo
    - ROCR-Runtime
+- name: rocmTestDependencies
+  type: object
+  default:
+    - aomp
+    - clr
+    - half
+    - hipTensor
+    - llvm-project
+    - rocm-cmake
+    - rocminfo
+    - rocprofiler-register
+    - ROCR-Runtime

 jobs:
 - job: rpp
@@ -68,3 +90,92 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: rpp_testing
+  dependsOn: rpp
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  - name: LD_LIBRARY_PATH
+    value: $(Agent.BuildDirectory)/rocm/lib;$(Agent.BuildDirectory)/rocm/llvm/lib
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  # Dependencies from: https://github.com/ROCm/rpp/blob/develop/utilities/test_suite/README.md
+  - task: Bash@3
+    displayName: Build and install Turbo JPEG
+    inputs:
+      targetType: 'inline'
+      script: |
+        sudo apt-get install nasm
+        sudo apt-get install wget
+        git clone -b 3.0.2 https://github.com/libjpeg-turbo/libjpeg-turbo.git 
+        cd libjpeg-turbo
+        mkdir build
+        cd build
+        cmake -DCMAKE_INSTALL_PREFIX=/usr \
+              -DCMAKE_BUILD_TYPE=RELEASE  \
+              -DENABLE_STATIC=FALSE       \
+              -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib  \
+              -DWITH_JPEG8=TRUE           \
+              ..
+        make -j$nproc
+        sudo make install
+  - task: Bash@3
+    displayName: Build and install Nifti
+    inputs:
+      targetType: 'inline'
+      script: |
+        git clone https://github.com/NIFTI-Imaging/nifti_clib.git
+        cd nifti_clib
+        mkdir build
+        cd build
+        cmake ..
+        sudo make -j$nproc install
+  - task: Bash@3
+    displayName: Build rpp tests
+    inputs:
+      targetType: 'inline'
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+        mkdir rpp-tests
+        cd rpp-tests
+        cmake /opt/rocm/share/rpp/test \
+          -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++ \
+          -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rpp
+      testExecutable: 'export PATH=$(Agent.BuildDirectory)/rocm/llvm/bin:$PATH; CC=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang CMAKE_VERBOSE_MAKEFILE=ON VERBOSE=1 ctest'
+      testDir: 'rpp-tests'
+  - script: sudo rm /opt/rocm
--- a/.azuredevops/nightly/pytorch.yml
+++ b/.azuredevops/nightly/pytorch.yml
@@ -62,6 +62,8 @@ parameters:
    - ffmpeg
    - libopenblas-dev
    - liblapack-dev
+    - libswscale-dev
+    - libavformat-dev
 - name: pipModules
  type: object
  default:
@@ -87,6 +89,9 @@ parameters:
  # list for vision
    - auditwheel
    - future
+    - pytest
+    - pytest-azurepipelines
+    - pillow
 # list from https://github.com/pytorch/builder/blob/main/manywheel/build_rocm.sh
 - name: rocmDependencies
  type: object
@@ -117,6 +122,24 @@ parameters:
    - hipCUB
    - rocThrust
    - hipBLAS-common
+- name: rocmTestDependencies
+  type: object
+  default:
+    - rocminfo
+# Reference on what tests to run for torchvision found in private repo:
+# https://github.com/ROCm/rocAutomation/blob/jenkins-pipelines/pytorch/pytorch_ci/test_pytorch_test1.sh#L54
+# Will iterate through this list using pytest
+- name: torchTestList
+  type: object
+  default:
+    - nn
+    - torch
+#    - cuda seg faults and might need cuda installed on test system
+#    - ops takes too long
+    - unary_ufuncs
+    - binary_ufuncs
+    - autograd
+#    - inductor/torchinductor takes too long

 trigger: none
 pr: none
@@ -295,12 +318,22 @@ jobs:
      targetType: inline
      script: git clone https://github.com/pytorch/vision.git --depth=1 --recurse-submodules
      workingDirectory: $(Build.SourcesDirectory)
+  - task: Bash@3
+    displayName: Apply vision patch
+    inputs:
+      targetType: inline
+      script: |
+        git apply $(Build.SourcesDirectory)/.azuredevops/patches/torchvision-package-name.patch
+      workingDirectory: $(Build.SourcesDirectory)/vision
  - task: Bash@3
    displayName: Build vision
    inputs:
      targetType: inline
      script: >-
-        BUILD_VERSION=$(ROCM_BRANCH).$(JOB_GPU_TARGET)-$(cat $(Build.SourcesDirectory)/pytorch/version.txt | cut -da -f1)$(date -u +%Y%m%d)
+        TORCH_PACKAGE_NAME=torch.$(ROCM_BRANCH).$(JOB_GPU_TARGET)
+        TORCHVISION_PACKAGE_NAME=torchvision.$(ROCM_BRANCH).$(JOB_GPU_TARGET)
+        PYTORCH_VERSION=$(cat $(Build.SourcesDirectory)/pytorch/version.txt | cut -da -f1)post$(date -u +%Y%m%d)
+        BUILD_VERSION=$(cat $(Build.SourcesDirectory)/vision/version.txt | cut -da -f1)post$(date -u +%Y%m%d)
        python3 setup.py bdist_wheel
      workingDirectory: $(Build.SourcesDirectory)/vision
  - task: Bash@3
@@ -319,3 +352,192 @@ jobs:
    retryCountOnTaskFailure: 3
    inputs:
      targetPath: $(Build.BinariesDirectory)
+
+- job: torchvision_testing
+  dependsOn: pytorch
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  - name: PYTORCH_TEST_WITH_ROCM
+    value: 1
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - task: Bash@3
+    displayName: 'Register libjpeg-turbo packages'
+    inputs:
+      targetType: inline
+      script: |
+        sudo mkdir --parents --mode=0755 /etc/apt/keyrings
+        wget -q -O- https://packagecloud.io/dcommander/libjpeg-turbo/gpgkey | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/libjpeg-turbo.gpg > /dev/null
+        echo "deb [signed-by=/etc/apt/trusted.gpg.d/libjpeg-turbo.gpg] https://packagecloud.io/dcommander/libjpeg-turbo/any/ any main" | sudo tee /etc/apt/sources.list.d/libjpeg-turbo.list
+        sudo apt update
+        apt-cache show libjpeg-turbo-official | grep Version
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-cmake-latest.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - task: DownloadPipelineArtifact@2
+    displayName: 'Download Pipeline Wheel Files'
+    inputs:
+      itemPattern: '**/*$(JOB_GPU_TARGET)*.whl'
+      targetPath: $(Agent.BuildDirectory)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      dependencySource: staging
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      dependencySource: staging
+      skipLlvmSymlink: true
+# get sources to run test scripts
+  - task: Bash@3
+    displayName: git clone upstream pytorch
+    inputs:
+      targetType: inline
+      script: git clone https://github.com/pytorch/pytorch.git --depth=1 --recurse-submodules
+      workingDirectory: $(Build.SourcesDirectory)
+  - task: Bash@3
+    displayName: git clone pytorch vision
+    inputs:
+      targetType: inline
+      script: git clone https://github.com/pytorch/vision.git --depth=1 --recurse-submodules
+      workingDirectory: $(Build.SourcesDirectory)
+  - task: Bash@3
+    displayName: Install Wheel Files
+    inputs:
+      targetType: inline
+      script: find . -name "*.whl" -exec pip install --no-index --find-links=. --no-dependencies -v {} \;
+      workingDirectory: $(Agent.BuildDirectory)
+  - task: Bash@3
+    displayName: Show Updated pip List
+    inputs:
+      targetType: inline
+      script: pip list -v
+      workingDirectory: $(Agent.BuildDirectory)
+  - task: Bash@3
+    displayName: Add ROCm binaries to PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/bin"
+  - task: Bash@3
+    displayName: Add Python site-packages binaries to path
+    inputs:
+      targetType: inline
+      script: |
+        USER_BASE=$(python3 -m site --user-base)
+        echo "##vso[task.prependpath]$USER_BASE/bin"
+  - task: Bash@3
+    displayName: Add torch libs to ldconfig
+    inputs:
+      targetType: inline
+      script: |
+        echo $(python3 -m site --user-site)/torch/lib | sudo tee /etc/ld.so.conf.d/torch.conf
+        sudo ldconfig -v
+        ldconfig -p
+# https://pytorch.org/get-started/locally/#linux-verification
+# https://rocm.docs.amd.com/projects/install-on-linux/en/latest/how-to/3rd-party/pytorch-install.html#testing-the-pytorch-installation
+  - task: Bash@3
+    displayName: Simple Import Torch Tests
+    inputs:
+      targetType: inline
+      script: |
+        python3 -c 'import torch' 2> /dev/null && echo 'Success' || echo 'Failure'
+        python3 -c 'import torch; print(torch.cuda.is_available())'
+        python3 -c 'import torch; x = torch.rand(5, 3); print(x)'
+# Test artifact build script has too many if statements for different environments
+# Based off the snippet of interest for this environment, with some adjustments
+# https://github.com/pytorch/pytorch/blob/main/.ci/pytorch/build.sh#L335-L375
+# Removing in-line comments since it does not fit with the yaml markup
+  - task: Bash@3
+    displayName: Build Pytorch Test Artifacts
+    continueOnError: true
+    inputs:
+      targetType: inline
+      script: |
+        CUSTOM_TEST_ARTIFACT_BUILD_DIR="build/custom_test_artifacts"
+        CUSTOM_TEST_USE_ROCM=ON
+        CUSTOM_TEST_MODULE_PATH="${PWD}/cmake/public"
+        mkdir -pv "${CUSTOM_TEST_ARTIFACT_BUILD_DIR}"
+
+        CUSTOM_OP_BUILD="${CUSTOM_TEST_ARTIFACT_BUILD_DIR}/custom-op-build"
+        CUSTOM_OP_TEST="${PWD}/test/custom_operator"
+        python --version
+        SITE_PACKAGES="$(python -c 'import site; print(";".join([x for x in site.getsitepackages()] + [x + "/torch" for x in site.getsitepackages()]))')"
+
+        mkdir -p "$CUSTOM_OP_BUILD"
+        pushd "$CUSTOM_OP_BUILD"
+        cmake "$CUSTOM_OP_TEST" -DCMAKE_PREFIX_PATH="$SITE_PACKAGES" -DPython_EXECUTABLE="$(which python)" \
+              -DCMAKE_MODULE_PATH="$CUSTOM_TEST_MODULE_PATH" -DUSE_ROCM="$CUSTOM_TEST_USE_ROCM"
+        make VERBOSE=1
+        popd
+
+        JIT_HOOK_BUILD="${CUSTOM_TEST_ARTIFACT_BUILD_DIR}/jit-hook-build"
+        JIT_HOOK_TEST="$PWD/test/jit_hooks"
+        python --version
+        SITE_PACKAGES="$(python -c 'import site; print(";".join([x for x in site.getsitepackages()] + [x + "/torch" for x in site.getsitepackages()]))')"
+        mkdir -p "$JIT_HOOK_BUILD"
+        pushd "$JIT_HOOK_BUILD"
+        cmake "$JIT_HOOK_TEST" -DCMAKE_PREFIX_PATH="$SITE_PACKAGES" -DPython_EXECUTABLE="$(which python)" \
+              -DCMAKE_MODULE_PATH="$CUSTOM_TEST_MODULE_PATH" -DUSE_ROCM="$CUSTOM_TEST_USE_ROCM"
+        make VERBOSE=1
+        popd
+
+        CUSTOM_BACKEND_BUILD="${CUSTOM_TEST_ARTIFACT_BUILD_DIR}/custom-backend-build"
+        CUSTOM_BACKEND_TEST="${PWD}/test/custom_backend"
+        python --version
+        mkdir -p "$CUSTOM_BACKEND_BUILD"
+        pushd "$CUSTOM_BACKEND_BUILD"
+        cmake "$CUSTOM_BACKEND_TEST" -DCMAKE_PREFIX_PATH="$SITE_PACKAGES" -DPython_EXECUTABLE="$(which python)" \
+              -DCMAKE_MODULE_PATH="$CUSTOM_TEST_MODULE_PATH" -DUSE_ROCM="$CUSTOM_TEST_USE_ROCM"
+        make VERBOSE=1
+        popd
+      workingDirectory: $(Build.SourcesDirectory)/pytorch
+  - ${{ each torchTest in parameters.torchTestList }}:
+    - task: Bash@3
+      displayName: Test ${{ torchTest }}
+      continueOnError: true
+      inputs:
+        targetType: inline
+        workingDirectory: $(Build.SourcesDirectory)/pytorch
+        ${{ if contains(torchTest, '/') }}:
+          script: pytest test/${{ split(torchTest, '/')[0] }}/test_${{ split(torchTest, '/')[1] }}.py
+        ${{ else }}:
+          script: pytest test/test_${{ torchTest }}.py
+# Reference on what tests to run for torchvision found in private repo:
+# https://github.com/ROCm/rocAutomation/blob/jenkins-pipelines/pytorch/pytorch_ci/test_torchvision.sh#L51
+  - task: Bash@3
+    displayName: Test vision/transforms
+    continueOnError: true
+    inputs:
+      targetType: inline
+      script: pytest test/test_transforms.py
+      workingDirectory: $(Build.SourcesDirectory)/vision
+  - task: Bash@3
+    displayName: Uninstall Wheel Files
+    inputs:
+      targetType: inline
+      script: find . -name "*.whl" -exec pip uninstall -y {} \;
+      workingDirectory: $(Agent.BuildDirectory)
+  - task: Bash@3
+    displayName: Remove Python site-packages binaries from path
+    inputs:
+      targetType: inline
+      script: |
+        USER_BASE=$(python3 -m site --user-base)
+        echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$USER_BASE/bin;;' -e 's;^/;;' -e 's;/$;;')"
+  - task: Bash@3
+    displayName: Remove ROCm binaries from PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/bin;;' -e 's;^/;;' -e 's;/$;;')"
--- a/.azuredevops/nightly/rocm-nightly.yml
+++ b/.azuredevops/nightly/rocm-nightly.yml
@@ -101,6 +101,7 @@ jobs:
      dependencyList: ${{ parameters.rocmDependencies }}
      dependencySource: staging
      skipLibraryLinking: true
+      skipLlvmSymlink: true
      gpuTarget: $(JOB_GPU_TARGET)
  - script: df -h
    displayName: System disk space after ROCm
--- a/.azuredevops/patches/torchvision-package-name.patch
+++ b/.azuredevops/patches/torchvision-package-name.patch
@@ -0,0 +1,34 @@
+From 036307033d5c187b3123dae46477feacbd06d0ab Mon Sep 17 00:00:00 2001
+From: Joseph Macaranas <Joseph.Macaranas@amd.com>
+Date: Sun, 22 Sep 2024 23:03:48 -0400
+Subject: [PATCH] Allow custom package name for CI builds of torchvision
+
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 4b0525d8e4..2c51ce04f2 100644
+--- a/setup.py
+++ b/setup.py
+@@ -42,7 +42,7 @@ CSRS_DIR = ROOT_DIR / "torchvision/csrc"
+ IS_ROCM = (torch.version.hip is not None) and (ROCM_HOME is not None)
+ BUILD_CUDA_SOURCES = (torch.cuda.is_available() and ((CUDA_HOME is not None) or IS_ROCM)) or FORCE_CUDA
+
+-PACKAGE_NAME = "torchvision"
+PACKAGE_NAME = os.getenv("TORCHVISION_PACKAGE_NAME", "torchvision")
+
+ print("Torchvision build configuration:")
+ print(f"{FORCE_CUDA = }")
+@@ -98,7 +98,7 @@ def get_requirements():
+         except DistributionNotFound:
+             return None
+
+-    pytorch_dep = "torch"
+    pytorch_dep = os.getenv("TORCH_PACKAGE_NAME", "torch")
+     if os.getenv("PYTORCH_VERSION"):
+         pytorch_dep += "==" + os.getenv("PYTORCH_VERSION")
+
+--
+2.44.0.windows.1
+
--- a/.azuredevops/tag-builds/omnitrace.yml
+++ b/.azuredevops/tag-builds/omnitrace.yml
@@ -0,0 +1,29 @@
+variables:
+- group: common
+- template: /.azuredevops/variables-global.yml
+
+parameters:
+- name: checkoutRef
+  type: string
+  default: refs/tags/$(LATEST_RELEASE_TAG)
+
+resources:
+  repositories:
+  - repository: pipelines_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/ROCm
+  - repository: release_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/omnitrace
+    ref: ${{ parameters.checkoutRef }}
+
+trigger: none
+pr: none
+
+jobs:
+  - template: ${{ variables.CI_COMPONENT_PATH }}/omnitrace.yml
+    parameters:
+      checkoutRepo: release_repo
+      checkoutRef: ${{ parameters.checkoutRef }}
--- a/.azuredevops/tag-builds/rocprofiler-sdk.yml
+++ b/.azuredevops/tag-builds/rocprofiler-sdk.yml
@@ -0,0 +1,29 @@
+variables:
+- group: common
+- template: /.azuredevops/variables-global.yml
+
+parameters:
+- name: checkoutRef
+  type: string
+  default: refs/tags/$(LATEST_RELEASE_TAG)
+
+resources:
+  repositories:
+  - repository: pipelines_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/ROCm
+  - repository: release_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/rocprofiler-sdk
+    ref: ${{ parameters.checkoutRef }}
+
+trigger: none
+pr: none
+
+jobs:
+  - template: ${{ variables.CI_COMPONENT_PATH }}/rocprofiler-sdk.yml
+    parameters:
+      checkoutRepo: release_repo
+      checkoutRef: ${{ parameters.checkoutRef }}
--- a/.azuredevops/templates/steps/artifact-download.yml
+++ b/.azuredevops/templates/steps/artifact-download.yml
@@ -29,6 +29,7 @@ parameters:
    composable_kernel: develop
    half: rocm
    HIP: amd-staging
+    hip-tests: amd-staging
    hipBLAS: develop
    hipBLASLt: develop
    hipBLAS-common: develop
@@ -44,6 +45,7 @@ parameters:
    llvm-project: amd-staging
    MIOpen: develop
    MIVisionX: develop
+    omniperf: amd-staging
    rccl: develop
    rdc: develop
    rocAL: develop
@@ -64,6 +66,7 @@ parameters:
    rocPRIM: develop
    rocprofiler-register: amd-mainline
    rocprofiler: amd-staging
+    rocPyDecode: develop
    ROCR-Runtime: amd-staging
    rocRAND: develop
    rocr_debug_agent: amd-staging
@@ -79,12 +82,14 @@ parameters:
    - amdsmi
    - aomp
    - HIPIFY
+    - MIVisionX
+    - omniperf
    - rccl
    - rdc
    - rocm-cmake
    - rocm_smi_lib
    - rocFFT
-    - MIVisionX
+    - rpp
 # BELOW REQUIRED IF useDefaultBranch false
 - name: branchName
  type: string
--- a/.azuredevops/templates/steps/dependencies-rocm.yml
+++ b/.azuredevops/templates/steps/dependencies-rocm.yml
@@ -37,6 +37,7 @@ parameters:
    composable_kernel: $(COMPOSABLE_KERNEL_PIPELINE_ID)
    half: $(HALF_PIPELINE_ID)
    HIP: $(HIP_PIPELINE_ID)
+    hip-tests: $(HIP_TESTS_PIPELINE_ID)
    hipBLAS: $(HIPBLAS_PIPELINE_ID)
    hipBLAS-common: $(HIPBLAS_COMMON_PIPELINE_ID)
    hipBLASLt: $(HIPBLASLT_PIPELINE_ID)
@@ -73,6 +74,7 @@ parameters:
    rocPRIM: $(ROCPRIM_PIPELINE_ID)
    rocprofiler-register: $(ROCPROFILER_REGISTER_PIPELINE_ID)
    rocprofiler: $(ROCPROFILER_PIPELINE_ID)
+    rocPyDecode: $(ROCPYDECODE_PIPELINE_ID)
    ROCR-Runtime: $(ROCR_RUNTIME_PIPELINE_ID)
    rocRAND: $(ROCRAND_PIPELINE_ID)
    rocr_debug_agent: $(ROCR_DEBUG_AGENT_PIPELINE_ID)
@@ -94,6 +96,7 @@ parameters:
    composable_kernel: $(COMPOSABLE_KERNEL_TAGGED_PIPELINE_ID)
    half: $(HALF_TAGGED_PIPELINE_ID)
    HIP: $(HIP_TAGGED_PIPELINE_ID)
+    hip-tests: $(HIP_TESTS_TAGGED_PIPELINE_ID)
    hipBLAS: $(HIPBLAS_TAGGED_PIPELINE_ID)
    hipBLAS-common: $(HIPBLAS_COMMON_TAGGED_PIPELINE_ID)
    hipBLASLt: $(HIPBLASLT_TAGGED_PIPELINE_ID)
@@ -130,6 +133,7 @@ parameters:
    rocPRIM: $(ROCPRIM_TAGGED_PIPELINE_ID)
    rocprofiler-register: $(ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID)
    rocprofiler: $(ROCPROFILER_TAGGED_PIPELINE_ID)
+    rocPyDecode: $(ROCPYDECODE_TAGGED_PIPELINE_ID)
    ROCR-Runtime: $(ROCR_RUNTIME_TAGGED_PIPELINE_ID)
    rocRAND: $(ROCRAND_TAGGED_PIPELINE_ID)
    rocr_debug_agent: $(ROCR_DEBUG_AGENT_TAGGED_PIPELINE_ID)
@@ -175,6 +179,7 @@ parameters:
    - rocm-examples
    - rocPRIM
    - rocprofiler
+    - rocPyDecode
    - rocRAND
    - rocSOLVER
    - rocSPARSE
--- a/.azuredevops/variables-global.yml
+++ b/.azuredevops/variables-global.yml
@@ -79,6 +79,10 @@ variables:
  value: 93
 - name: HIP_TAGGED_PIPELINE_ID
  value: 31
+- name: HIP_TESTS_PIPELINE_ID
+  value: 233
+- name: HIP_TESTS_TAGGED_PIPELINE_ID
+  value: 220
 - name: HIPBLAS_COMMON_PIPELINE_ID
  value: 223
 - name: HIPBLAS_COMMON_TAGGED_PIPELINE_ID
@@ -223,6 +227,10 @@ variables:
  value: 22
 - name: ROCM_EXAMPLES_GFX942_TEST_PIPELINE_ID
  value: 204
+- name: ROCM_EXAMPLES_PIPELINE_ID
+  value: 216
+- name: ROCM_EXAMPLES_TAGGED_PIPELINE_ID
+  value: 245
 - name: ROCM_SMI_LIB_PIPELINE_ID
  value: 96
 - name: ROCM_SMI_LIB_TAGGED_PIPELINE_ID
@@ -247,14 +255,18 @@ variables:
  value: 20
 - name: ROCPROFILER_GFX942_TEST_PIPELINE_ID
  value: 190
- name: ROCPROFILER_PIPELINE_ID
-  value: 143
 - name: ROCPROFILER_REGISTER_PIPELINE_ID
  value: 1
 - name: ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID
  value: 25
+- name: ROCPROFILER_PIPELINE_ID
+  value: 143
 - name: ROCPROFILER_TAGGED_PIPELINE_ID
  value: 28
+- name: ROCPYDECODE_PIPELINE_ID
+  value: 239
+- name: ROCPYDECODE_TAGGED_PIPELINE_ID
+  value: 232
 - name: ROCR_DEBUG_AGENT_PIPELINE_ID
  value: 136
 - name: ROCR_DEBUG_AGENT_TAGGED_PIPELINE_ID
--- a/CHANGELOG-tmp.md
+++ b/CHANGELOG-tmp.md
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ The Build time will reduce significantly if we limit the GPU Architecture/s agai

 mkdir -p ~/WORKSPACE/      # Or any folder name other than WORKSPACE
 cd ~/WORKSPACE/
-export ROCM_VERSION=6.2.0
+export ROCM_VERSION=6.2.2 # Or 6.2.0 or 6.2.1
 ~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.2.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml
 ~/bin/repo sync

--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,43 @@
-# ROCm 6.2.1 release notes
+# ROCm 6.2.2 release notes

-The release notes provide a summary of notable changes since the previous ROCm release.
+These release notes provide a summary of notable changes since the previous ROCm release.
+
+```{note}
+As ROCm 6.2.2 was released shortly after 6.2.1, the changes between these versions
+are minimal. For a comprehensive overview of recent updates, the ROCm 6.2.1 release
+notes are appended to the end of this document.
+
+For detailed information about the changes in ROCm 6.2.1, refer to the appended
+section: [ROCm 6.2.1 release notes](rocm-6-2-1-release-notes).
+```
+
+The [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.2/compatibility/compatibility-matrix.html)
+provides the full list of supported hardware, operating systems, ecosystems, third-party components, and ROCm components
+for each ROCm release.
+
+Release notes for previous ROCm releases are available in earlier versions of the documentation.
+See the [ROCm documentation release history](https://rocm.docs.amd.com/en/latest/release/versions.html).
+
+## Release highlights
+
+The following is a significant fix introduced in ROCm 6.2.2.
+
+### Fixed Instinct MI300X error recovery failure
+
+Improved the reliability of AMD Instinct MI300X accelerators in scenarios involving
+uncorrectable errors. Previously, error recovery did not occur as expected,
+potentially leaving the system in an undefined state. This fix ensures that error
+recovery functions as expected, maintaining system stability.
+
+See the [original issue](#instinct-mi300x-gpu-recovery-failure-on-uncorrectable-errors)
+noted in the ROCm 6.2.1 release notes.
+
+---
+
+## ROCm 6.2.1 release notes
+
+The ROCm 6.2.1 release notes document newly added ecosystem support, ROCm Offline Installer Creator updates,
+and improvements to several ROCm libraries and tools.

 - [Release highlights](release-highlights)

@@ -14,31 +51,25 @@ The release notes provide a summary of notable changes since the previous ROCm r

 - [ROCm upcoming changes](rocm-upcoming-changes)

-The [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.1/compatibility/compatibility-matrix.html)
-provides the full list of supported hardware, operating systems, ecosystems, third-party components, and ROCm components for each ROCm release.
-
-Release notes for previous ROCm releases are available in earlier versions of the documentation.
-See the [ROCm documentation release history](https://rocm.docs.amd.com/en/latest/release/versions.html).
-
-## Release highlights
+### Release highlights

 The following are notable new features and improvements in ROCm 6.2.1. For changes to individual components, see [Detailed component changes](#detailed-component-changes).

-### rocAL major version change
+#### rocAL major version change

 The new version of rocAL introduces many new features, but does not modify any of the existing public API functions. However, the version number was incremented from 1.3 to 2.0.
 Applications linked to version 1.3 must be recompiled to link against version 2.0.

 See [the rocAL detailed changes](#rocal-2-0-0) for more information.

-### New support for FBGEMM (Facebook General Matrix Multiplication)
+#### New support for FBGEMM (Facebook General Matrix Multiplication)

 As of ROCm 6.2.1, ROCm supports Facebook General Matrix Multiplication (FBGEMM) and the related FBGEMM_GPU library. 

 FBGEMM is a low-precision, high-performance CPU kernel library for convolution and matrix multiplication. It is used for server-side inference and as a back end for PyTorch quantized operators. FBGEMM_GPU includes a collection of PyTorch GPU operator libraries for training and inference. For more information, see the ROCm [Model acceleration libraries guide](https://rocm.docs.amd.com/en/docs-6.2.1/how-to/llm-fine-tuning-optimization/model-acceleration-libraries.html)
 and [PyTorch's FBGEMM GitHub repository](https://github.com/pytorch/FBGEMM).

-### ROCm Offline Installer Creator changes
+#### ROCm Offline Installer Creator changes

 The [ROCm Offline Installer Creator 6.2.1](https://rocm.docs.amd.com/projects/install-on-linux/en/docs-6.2.1/install/rocm-offline-installer.html) introduces several new features and improvements including:

@@ -47,7 +78,7 @@ The [ROCm Offline Installer Creator 6.2.1](https://rocm.docs.amd.com/projects/in
 * Updated prerequisite repositories
 * Fixed CTest issues

-### ROCm documentation changes 
+#### ROCm documentation changes 

 There have been no changes to supported hardware or operating systems from ROCm 6.2.0 to ROCm 6.2.1.

@@ -59,13 +90,13 @@ There have been no changes to supported hardware or operating systems from ROCm
 The ROCm documentation, like all ROCm projects, is open source and available on GitHub. To contribute to ROCm documentation, see the [ROCm documentation contribution guidelines](https://rocm.docs.amd.com/en/latest/contribute/contributing.html).
 ```

-## Operating system and hardware support changes
+### Operating system and hardware support changes

-There are no changes to supported hardware or operating systems from ROCm 6.2.0 to ROCm 6.2.1.
+ROCm 6.2.1 adds support for Ubuntu 24.04.1 (kernel: 6.8 [GA]).

 See the [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.1/compatibility/compatibility-matrix.html) for the full list of supported operating systems and hardware architectures.

-## ROCm components
+### ROCm components

 The following table lists the versions of ROCm components for ROCm 6.2.1, including any version changes from 6.2.0 to 6.2.1. 

@@ -420,37 +451,37 @@ Click the component's updated version to go to a detailed list of its changes. C
    </table>
 </div>

-## Detailed component changes
+### Detailed component changes

 The following sections describe key changes to ROCm components.

-### **AMD SMI** (24.6.3)
+#### **AMD SMI** (24.6.3)

-#### Changes
+##### Changes

 * Added `amd-smi static --ras` on Guest VMs. Guest VMs can view enabled/disabled RAS features on Host cards.

-#### Removals
+##### Removals

 * Removed `amd-smi metric --ecc` & `amd-smi metric --ecc-blocks` on Guest VMs. Guest VMs do not support getting current ECC counts from the Host cards.

-#### Resolved issues
+##### Resolved issues

 * Fixed TypeError in `amd-smi process -G`.
 * Updated CLI error strings to handle empty and invalid GPU/CPU inputs.
 * Fixed Guest VM showing passthrough options.
 * Fixed firmware formatting where leading 0s were missing.

-### **HIP** (6.2.1)
+#### **HIP** (6.2.1)

-#### Resolved issues
+##### Resolved issues

 * Soft hang when using `AMD_SERIALIZE_KERNEL`
 * Memory leak in `hipIpcCloseMemHandle`

-### **HIPIFY** (18.0.0)
+#### **HIPIFY** (18.0.0)

-#### Changes
+##### Changes

 * Added CUDA 12.5.1 support
 * Added cuDNN 9.2.1 support
@@ -458,17 +489,17 @@ The following sections describe key changes to ROCm components.
 * Added `hipBLAS` 64-bit APIs support
 * Added Support for math constants `math_constants.h`

-### **Omnitrace** (1.11.2)
+#### **Omnitrace** (1.11.2)

-#### Known issues
+##### Known issues

 Perfetto can no longer open Omnitrace proto files. Loading Perfetto trace output `.proto` files in the latest version of `ui.perfetto.dev` can result in a dialog with the message, "Oops, something went wrong! Please file a bug." The information in the dialog will refer to an "Unknown field type." The workaround is to open the files with the previous version of the Perfetto UI found at [https://ui.perfetto.dev/v46.0-35b3d9845/#!/](https://ui.perfetto.dev/v46.0-35b3d9845/#!/).

 See [issue #3767](https://github.com/ROCm/ROCm/issues/3767) on GitHub.

-### **RCCL** (2.20.5)
+#### **RCCL** (2.20.5)

-#### Known issues
+##### Known issues

 On systems running Linux kernel 6.8.0, such as Ubuntu 24.04, Direct Memory Access (DMA) transfers between the GPU and NIC are disabled and impacts multi-node RCCL performance.
 This issue was reproduced with RCCL 2.20.5 (ROCm 6.2.0 and 6.2.1) on systems with Broadcom Thor-2 NICs and affects other systems with RoCE networks using Linux 6.8.0 or newer.
@@ -478,9 +509,9 @@ This issue will be addressed in a future ROCm release.

 See [issue #3772](https://github.com/ROCm/ROCm/issues/3772) on GitHub.

-### **rocAL** (2.0.0)
+#### **rocAL** (2.0.0)

-#### Changes
+##### Changes
 
 * The new version of rocAL introduces many new features, but does not modify any of the existing public API functions.However, the version number was incremented from 1.3 to 2.0.
  Applications linked to version 1.3 must be recompiled to link against version 2.0.
@@ -501,37 +532,37 @@ See [issue #3772](https://github.com/ROCm/ROCm/issues/3772) on GitHub.
 * Image to tensor updates
 * ROCm install - use case graphics removed

-#### Known issues
+##### Known issues
 
 * Dependencies are not installed with the rocAL package installer. Dependencies must be installed with the prerequisite setup script provided. See the [rocAL README on GitHub](https://github.com/ROCm/rocAL/blob/docs/6.2.1/README.md#prerequisites-setup-script) for details.

-### **rocBLAS** (4.2.1)
+#### **rocBLAS** (4.2.1)

-#### Removals
+##### Removals

 * Removed Device_Memory_Allocation.pdf link in documentation.

-#### Resolved issues
+##### Resolved issues

 * Fixed error/warning message during `rocblas_set_stream()` call.

-### **rocFFT** (1.0.29)
+#### **rocFFT** (1.0.29)

-#### Optimizations
+##### Optimizations

 * Implemented 1D kernels for factorizable sizes less than 1024.

-### **ROCm SMI** (7.3.0)
+#### **ROCm SMI** (7.3.0)

-#### Optimizations
+##### Optimizations

 * Improved handling of UnicodeEncodeErrors with non UTF-8 locales. Non UTF-8 locales were causing crashes on UTF-8 special characters.

-#### Resolved issues
+##### Resolved issues

 * Fixed an issue where the Compute Partition tests segfaulted when AMDGPU was loaded with optional parameters.

-#### Known issues
+##### Known issues

 * When setting CPX as a partition mode, there is a DRM node limit of 64. This is a known limitation when multiple drivers are using the DRM nodes. The `ls /sys/class/drm` command can be used to see the number of DRM nodes, and the following steps can be used to remove unnecessary drivers:
        
@@ -539,18 +570,18 @@ See [issue #3772](https://github.com/ROCm/ROCm/issues/3772) on GitHub.
    2. Remove any unnecessary drivers using `rmmod`. For example, to remove an AST driver, run `sudo rmmod ast`.
    3. Reload AMDGPU using `modprobe`: `sudo modprobe amdgpu`.

-### **rocPRIM** (3.2.1)
+#### **rocPRIM** (3.2.1)

-#### Optimizations
+##### Optimizations

 * Improved performance of `block_reduce_warp_reduce` when warp size equals block size.

-## ROCm known issues
+### ROCm known issues

 ROCm known issues are tracked on [GitHub](https://github.com/ROCm/ROCm/labels/Verified%20Issue). Known issues related to
 individual components are listed in the [Detailed component changes](detailed-component-changes) section.

-### Instinct MI300X GPU recovery failure on uncorrectable errors
+#### Instinct MI300X GPU recovery failure on uncorrectable errors

 For the AMD Instinct MI300X accelerator, GPU recovery resets triggered by uncorrectable errors (UE) might not complete
 successfully, which can result in the system being left in an undefined state. A system reboot is needed to recover from
@@ -560,14 +591,14 @@ This issue is under investigation and will be resolved in a future ROCm release.

 See [issue #3766](https://github.com/ROCm/ROCm/issues/3766) on GitHub.

-## ROCm upcoming changes
+### ROCm upcoming changes

 The following changes to the ROCm software stack are anticipated for future releases.

-### rocm-llvm-alt
+#### rocm-llvm-alt

 The `rocm-llvm-alt` package will be removed in an upcoming release. Users relying on the functionality provided by the closed-source compiler should transition to the open-source compiler. Once the `rocm-llvm-alt` package is removed, any compilation requesting functionality provided by the closed-source compiler will result in a Clang warning: "*[AMD] proprietary optimization compiler has been removed*".

-### rccl-rdma-sharp-plugins
+#### rccl-rdma-sharp-plugins

 The RCCL plugin package, `rccl-rdma-sharp-plugins`, will be removed in an upcoming ROCm release. 
--- a/default.xml
+++ b/default.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.2.1"
+    <default revision="refs/tags/rocm-6.2.2"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
--- a/docs/about/license.md
+++ b/docs/about/license.md
@@ -91,8 +91,7 @@ additional licenses. Please review individual repositories for more information.

 Open sourced ROCm components are released via public GitHub
 repositories, packages on [https://repo.radeon.com](https://repo.radeon.com) and other distribution channels.
-Proprietary products are only available on [https://repo.radeon.com](https://repo.radeon.com). Currently, only
-one component of ROCm, `rocm-llvm-alt` is governed by a proprietary license.
+Proprietary products are only available on [https://repo.radeon.com](https://repo.radeon.com).
 Proprietary components are organized in a proprietary subdirectory in the package
 repositories to distinguish from open sourced packages.

--- a/docs/compatibility/compatibility-matrix-historical-6.0.csv
+++ b/docs/compatibility/compatibility-matrix-historical-6.0.csv
@@ -1,117 +1,117 @@
-ROCm Version,6.2.1,6.2.0, 6.1.2, 6.1.1, 6.1.0, 6.0.2, 6.0.0
-      :ref:`Operating Systems & kernels <OS-kernel-versions>`,Ubuntu 24.04,Ubuntu 24.04,,,,,
-      ,"Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.4, 22.04.3","Ubuntu 22.04.4, 22.04.3","Ubuntu 22.04.4, 22.04.3","Ubuntu 22.04.4, 22.04.3, 22.04.2","Ubuntu 22.04.4, 22.04.3, 22.04.2"
-      ,,,"Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5"
-      ,"RHEL 9.4, 9.3","RHEL 9.4, 9.3","RHEL 9.4 [#red-hat94-past-60]_, 9.3, 9.2","RHEL 9.4 [#red-hat94-past-60]_, 9.3, 9.2","RHEL 9.4 [#red-hat94-past-60]_, 9.3, 9.2","RHEL 9.3, 9.2","RHEL 9.3, 9.2"
-      ,"RHEL 8.10, 8.9","RHEL 8.10, 8.9","RHEL 8.9, 8.8","RHEL 8.9, 8.8","RHEL 8.9, 8.8","RHEL 8.9, 8.8","RHEL 8.9, 8.8"
-      ,"SLES 15 SP6, SP5","SLES 15 SP6, SP5","SLES 15 SP5, SP4","SLES 15 SP5, SP4","SLES 15 SP5, SP4","SLES 15 SP5, SP4","SLES 15 SP5, SP4"
-      ,,,CentOS 7.9,CentOS 7.9,CentOS 7.9,CentOS 7.9,CentOS 7.9
-      ,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,,,
-      ,.. _architecture-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`Architecture <rocm-install-on-linux:reference/system-requirements>`,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3
-      ,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2
-      ,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA
-      ,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3
-      ,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2
-      ,.. _gpu-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`GPU / LLVM target <rocm-install-on-linux:reference/system-requirements>`,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100
-      ,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030
-      ,gfx942 [#mi300_621-past-60]_,gfx942 [#mi300_620-past-60]_, gfx942 [#mi300_612-past-60]_, gfx942 [#mi300_611-past-60]_, gfx942 [#mi300_610-past-60]_, gfx942 [#mi300_602-past-60]_, gfx942 [#mi300_600-past-60]_
-      ,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a
-      ,gfx908,gfx908,gfx908,gfx908,gfx908,gfx908,gfx908
-      ,,,,,,,
-      FRAMEWORK SUPPORT,.. _framework-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`PyTorch <rocm-install-on-linux:install/3rd-party/pytorch-install>`,"2.3, 2.2, 2.1, 2.0, 1.13","2.3, 2.2, 2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13"
-      :doc:`TensorFlow <rocm-install-on-linux:install/3rd-party/tensorflow-install>`,"2.16.1, 2.15.1, 2.14.1","2.16.1, 2.15.1, 2.14.1","2.15.0, 2.14.0, 2.13.1","2.15.0, 2.14.0, 2.13.1","2.15.0, 2.14.0, 2.13.1","2.14.0, 2.13.1, 2.12.1","2.14.0, 2.13.1, 2.12.1"
-      :doc:`JAX <rocm-install-on-linux:install/3rd-party/jax-install>`,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26
-      `ONNX Runtime <https://onnxruntime.ai/docs/build/eps.html#amd-migraphx>`_,1.17.3,1.17.3,1.17.3,1.17.3,1.17.3,1.14.1,1.14.1
-      ,,,,,,,
-      THIRD PARTY COMMS,.. _thirdpartycomms-support-compatibility-matrix-past-60:,,,,,,
-      `UCC <https://github.com/ROCm/ucc>`_,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.2.0,>=1.2.0
-      `UCX <https://github.com/ROCm/ucx>`_,>=1.15.0,>=1.15.0,>=1.14.1,>=1.14.1,>=1.14.1,>=1.14.1,>=1.14.1
-      ,,,,,,,
-      THIRD PARTY ALGORITHM,.. _thirdpartyalgorithm-support-compatibility-matrix-past-60:,,,,,,
-      Thrust,2.2.0,2.2.0,2.1.0,2.1.0,2.1.0,2.0.1,2.0.1
-      CUB,2.2.0,2.2.0,2.1.0,2.1.0,2.1.0,2.0.1,2.0.1
-      ,,,,,,,
-      KFD & USER SPACE [#kfd_support-past-60]_,.. _kfd-userspace-support-compatibility-matrix-past-60:,,,,,,
-      Tested user space versions,"6.1.x, 6.0.x","6.1.x, 6.0.x","6.2.x, 6.0.x, 5.7.x","6.2.x, 6.0.x, 5.7.x","6.2.x, 6.0.x, 5.7.x","6.2.x, 6.0.x, 5.7.x, 5.6.x","6.2.x, 6.0.x, 5.7.x, 5.6.x"
-      ,,,,,,,
-      ML & COMPUTER VISION,.. _mllibs-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`Composable Kernel <composable_kernel:index>`,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0
-      :doc:`MIGraphX <amdmigraphx:index>`,2.10.0,2.10.0,2.9.0,2.9.0,2.9.0,2.8.0,2.8.0
-      :doc:`MIOpen <miopen:index>`,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
-      :doc:`MIVisionX <mivisionx:index>`,3.0.0,3.0.0,2.5.0,2.5.0,2.5.0,2.5.0,2.5.0
-      :doc:`rocAL <rocal:index>`,2.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
-      :doc:`rocDecode <rocdecode:index>`,0.6.0,0.6.0,0.6.0,0.5.0,0.5.0,N/A,N/A
-      :doc:`rocPyDecode <rocpydecode:index>`,0.1.0,0.1.0,N/A,N/A,N/A,N/A,N/A
-      :doc:`RPP <rpp:index>`,1.8.0,1.8.0,1.5.0,1.5.0,1.5.0,1.4.0,1.4.0
-      ,,,,,,,
-      COMMUNICATION,.. _commlibs-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`RCCL <rccl:index>`,2.20.5,2.20.5,2.18.6,2.18.6,2.18.6,2.18.3,2.18.3
-      ,,,,,,,
-      MATH LIBS,.. _mathlibs-support-compatibility-matrix-past-60:,,,,,,
-      `half <https://github.com/ROCm/half>`_ ,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0
-      :doc:`hipBLAS <hipblas:index>`,2.2.0,2.2.0,2.1.0,2.1.0,2.1.0,2.0.0,2.0.0
-      :doc:`hipBLASLt <hipblaslt:index>`,0.8.0,0.8.0,0.7.0,0.7.0,0.7.0,0.6.0,0.6.0
-      :doc:`hipFFT <hipfft:index>`,1.0.15,1.0.14,1.0.14,1.0.14,1.0.14,1.0.13,1.0.13
-      :doc:`hipFORT <hipfort:index>`,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0
-      :doc:`hipRAND <hiprand:index>`,2.11.0,2.11.0,2.10.16,2.10.16,2.10.16,2.10.16,2.10.16
-      :doc:`hipSOLVER <hipsolver:index>`,2.2.0,2.2.0,2.1.1,2.1.1,2.1.0,2.0.0,2.0.0
-      :doc:`hipSPARSE <hipsparse:index>`,3.1.1,3.1.1,3.0.1,3.0.1,3.0.1,3.0.0,3.0.0
-      :doc:`hipSPARSELt <hipsparselt:index>`,0.2.1,0.2.1,0.2.0,0.1.0,0.1.0,0.1.0,0.1.0
-      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.2.0,3.1.1,3.1.1,3.1.1,3.0.3,3.0.3
-      :doc:`rocBLAS <rocblas:index>`,4.2.1,4.2.0,4.1.2,4.1.0,4.1.0,4.0.0,4.0.0
-      :doc:`rocFFT <rocfft:index>`,1.0.29,1.0.28,1.0.27,1.0.27,1.0.26,1.0.25,1.0.23
-      :doc:`rocRAND <rocrand:index>`,3.1.0,3.1.0,3.0.1,3.0.1,3.0.1,3.0.0,2.10.17
-      :doc:`rocSOLVER <rocsolver:index>`,3.26.0,3.26.0,3.25.0,3.25.0,3.25.0,3.24.0,3.24.0
-      :doc:`rocSPARSE <rocsparse:index>`,3.2.0,3.2.0,3.1.2,3.1.2,3.1.2,3.0.2,3.0.2
-      :doc:`rocWMMA <rocwmma:index>`,1.5.0,1.5.0,1.4.0,1.4.0,1.4.0,1.3.0,1.3.0
-      `Tensile <https://github.com/ROCm/Tensile>`_,4.40.0,4.40.0,4.40.0,4.40.0,4.40.0,4.39.0,4.39.0
-      ,,,,,,,
-      PRIMITIVES,.. _primitivelibs-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`hipCUB <hipcub:index>`,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
-      :doc:`hipTensor <hiptensor:index>`,1.3.0,1.3.0,1.2.0,1.2.0,1.2.0,1.1.0,1.1.0
-      :doc:`rocPRIM <rocprim:index>`,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
-      :doc:`rocThrust <rocthrust:index>`,3.1.0,3.0.1,3.0.1,3.0.1,3.0.1,3.0.0,3.0.0
-      ,,,,,,,
-      SUPPORT LIBS,,,,,,,
-      `hipother <https://github.com/ROCm/hipother>`_,6.2.41134,6.2.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
-      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.1,6.2.0,6.1.2,6.1.1,6.1.0,6.0.2,6.0.0
-      `ROCT-Thunk-Interface <https://github.com/ROCm/ROCT-Thunk-Interface>`_,20240607.4.05,20240607.1.4246,20240125.5.08,20240125.5.08,20240125.3.30,20231016.2.245,20231016.2.245
-      ,,,,,,,
-      SYSTEM MGMT TOOLS,.. _tools-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`AMD SMI <amdsmi:index>`,24.6.3,24.6.2,24.5.1,24.5.1,24.4.1,23.4.2,23.4.2
-      :doc:`ROCm Data Center Tool <rdc:index>`,1.0.0,1.0.0,0.3.0,0.3.0,0.3.0,0.3.0,0.3.0
-      :doc:`rocminfo <rocminfo:index>`,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
-      :doc:`ROCm SMI <rocm_smi_lib:index>`,7.3.0,7.3.0,7.2.0,7.0.0,7.0.0,6.0.2,6.0.0
-      :doc:`ROCm Validation Suite <rocmvalidationsuite:index>`,rocm-6.2.1,rocm-6.2.0,rocm-6.1.2,rocm-6.1.1,rocm-6.1.0,rocm-6.0.2,rocm-6.0.0
-      ,,,,,,,
-      PERFORMANCE TOOLS,,,,,,,
-      :doc:`Omniperf <omniperf:index>`,2.0.1,2.0.1,N/A,N/A,N/A,N/A,N/A
-      :doc:`Omnitrace <omnitrace:index>`,1.11.2,1.11.2,N/A,N/A,N/A,N/A,N/A
-      :doc:`ROCm Bandwidth Test <rocm_bandwidth_test:index>`,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0
-      :doc:`ROCProfiler <rocprofiler:index>`,2.0.60201,2.0.60200,2.0.60102,2.0.60101,2.0.60100,2.0.60002,2.0.60000
-      :doc:`ROCprofiler-SDK <rocprofiler-sdk:index>`,0.4.0,0.4.0,N/A,N/A,N/A,N/A,N/A
-      :doc:`ROCTracer <roctracer:index>`,4.1.60201,4.1.60200,4.1.60102,4.1.60101,4.1.60100,4.1.60002,4.1.60000
-      ,,,,,,,
-      DEVELOPMENT TOOLS,,,,,,,
-      :doc:`HIPIFY <hipify:index>`,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
-      :doc:`ROCm CMake <rocmcmakebuildtools:index>`,0.13.0,0.13.0,0.12.0,0.12.0,0.12.0,0.11.0,0.11.0
-      :doc:`ROCdbgapi <rocdbgapi:index>`,0.76.0,0.76.0,0.71.0,0.71.0,0.71.0,0.71.0,0.71.0
-      :doc:`ROCm Debugger (ROCgdb) <rocgdb:index>`,14.2.0,14.2.0,14.1.0,14.1.0,14.1.0,13.2.0,13.2.0
-      `rocprofiler-register <https://github.com/ROCm/rocprofiler-register>`_,0.4.0,0.4.0,0.3.0,0.3.0,0.3.0,N/A,N/A
-      :doc:`ROCr Debug Agent <rocr_debug_agent:index>`,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3
-      ,,,,,,,
-      COMPILERS,.. _compilers-support-compatibility-matrix-past-60:,,,,,,
-      `clang-ocl <https://github.com/ROCm/clang-ocl>`_,N/A,N/A,0.5.0,0.5.0,0.5.0,0.5.0,0.5.0
-      :doc:`hipCC <hipcc:index>`,1.1.1,1.1.1,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
-      `Flang <https://github.com/ROCm/flang>`_,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
-      :doc:`llvm-project <llvm-project:index>`,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
-      `OpenMP <https://github.com/ROCm/llvm-project/tree/amd-staging/openmp>`_,18.0.0.24332,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
-      ,,,,,,,
-      RUNTIMES,.. _runtime-support-compatibility-matrix-past-60:,,,,,,
-      :doc:`AMD CLR <hip:understand/amd_clr>`,6.2.41134,6.2.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
-      :doc:`HIP <hip:index>`,6.2.41134,6.2.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
-      `OpenCL Runtime <https://github.com/ROCm/clr/tree/develop/opencl>`_,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0
-      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.13.0,1.13.0,1.13.0,1.13.0,1.12.0,1.12.0
+ROCm Version,6.2.2,6.2.1,6.2.0, 6.1.2, 6.1.1, 6.1.0, 6.0.2, 6.0.0
+      :ref:`Operating systems & kernels <OS-kernel-versions>`,"Ubuntu 24.04.1, 24.04","Ubuntu 24.04.1, 24.04",Ubuntu 24.04,,,,,
+      ,"Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.4, 22.04.3","Ubuntu 22.04.4, 22.04.3","Ubuntu 22.04.4, 22.04.3","Ubuntu 22.04.4, 22.04.3, 22.04.2","Ubuntu 22.04.4, 22.04.3, 22.04.2"
+      ,,,,"Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5","Ubuntu 20.04.6, 20.04.5"
+      ,"RHEL 9.4, 9.3","RHEL 9.4, 9.3","RHEL 9.4, 9.3","RHEL 9.4 [#red-hat94-past-60]_, 9.3, 9.2","RHEL 9.4 [#red-hat94-past-60]_, 9.3, 9.2","RHEL 9.4 [#red-hat94-past-60]_, 9.3, 9.2","RHEL 9.3, 9.2","RHEL 9.3, 9.2"
+      ,"RHEL 8.10, 8.9","RHEL 8.10, 8.9","RHEL 8.10, 8.9","RHEL 8.9, 8.8","RHEL 8.9, 8.8","RHEL 8.9, 8.8","RHEL 8.9, 8.8","RHEL 8.9, 8.8"
+      ,"SLES 15 SP6, SP5","SLES 15 SP6, SP5","SLES 15 SP6, SP5","SLES 15 SP5, SP4","SLES 15 SP5, SP4","SLES 15 SP5, SP4","SLES 15 SP5, SP4","SLES 15 SP5, SP4"
+      ,,,,CentOS 7.9,CentOS 7.9,CentOS 7.9,CentOS 7.9,CentOS 7.9
+      ,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,,,
+      ,.. _architecture-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`Architecture <rocm-install-on-linux:reference/system-requirements>`,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3
+      ,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2
+      ,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA
+      ,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3
+      ,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2
+      ,.. _gpu-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`GPU / LLVM target <rocm-install-on-linux:reference/system-requirements>`,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100
+      ,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030
+      ,gfx942 [#mi300_622-past-60]_,gfx942 [#mi300_621-past-60]_,gfx942 [#mi300_620-past-60]_, gfx942 [#mi300_612-past-60]_, gfx942 [#mi300_611-past-60]_, gfx942 [#mi300_610-past-60]_, gfx942 [#mi300_602-past-60]_, gfx942 [#mi300_600-past-60]_
+      ,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a,gfx90a
+      ,gfx908,gfx908,gfx908,gfx908,gfx908,gfx908,gfx908,gfx908
+      ,,,,,,,,
+      FRAMEWORK SUPPORT,.. _framework-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`PyTorch <rocm-install-on-linux:install/3rd-party/pytorch-install>`,"2.3, 2.2, 2.1, 2.0, 1.13","2.3, 2.2, 2.1, 2.0, 1.13","2.3, 2.2, 2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13"
+      :doc:`TensorFlow <rocm-install-on-linux:install/3rd-party/tensorflow-install>`,"2.16.1, 2.15.1, 2.14.1","2.16.1, 2.15.1, 2.14.1","2.16.1, 2.15.1, 2.14.1","2.15.0, 2.14.0, 2.13.1","2.15.0, 2.14.0, 2.13.1","2.15.0, 2.14.0, 2.13.1","2.14.0, 2.13.1, 2.12.1","2.14.0, 2.13.1, 2.12.1"
+      :doc:`JAX <rocm-install-on-linux:install/3rd-party/jax-install>`,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26
+      `ONNX Runtime <https://onnxruntime.ai/docs/build/eps.html#amd-migraphx>`_,1.17.3,1.17.3,1.17.3,1.17.3,1.17.3,1.17.3,1.14.1,1.14.1
+      ,,,,,,,,
+      THIRD PARTY COMMS,.. _thirdpartycomms-support-compatibility-matrix-past-60:,,,,,,,
+      `UCC <https://github.com/ROCm/ucc>`_,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.2.0,>=1.2.0
+      `UCX <https://github.com/ROCm/ucx>`_,>=1.15.0,>=1.15.0,>=1.15.0,>=1.14.1,>=1.14.1,>=1.14.1,>=1.14.1,>=1.14.1
+      ,,,,,,,,
+      THIRD PARTY ALGORITHM,.. _thirdpartyalgorithm-support-compatibility-matrix-past-60:,,,,,,,
+      Thrust,2.2.0,2.2.0,2.2.0,2.1.0,2.1.0,2.1.0,2.0.1,2.0.1
+      CUB,2.2.0,2.2.0,2.2.0,2.1.0,2.1.0,2.1.0,2.0.1,2.0.1
+      ,,,,,,,,
+      KFD & USER SPACE [#kfd_support-past-60]_,.. _kfd-userspace-support-compatibility-matrix-past-60:,,,,,,,
+      Tested user space versions,"6.1.x, 6.0.x","6.1.x, 6.0.x","6.1.x, 6.0.x","6.2.x, 6.0.x, 5.7.x","6.2.x, 6.0.x, 5.7.x","6.2.x, 6.0.x, 5.7.x","6.2.x, 6.0.x, 5.7.x, 5.6.x","6.2.x, 6.0.x, 5.7.x, 5.6.x"
+      ,,,,,,,,
+      ML & COMPUTER VISION,.. _mllibs-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`Composable Kernel <composable_kernel:index>`,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0,1.1.0
+      :doc:`MIGraphX <amdmigraphx:index>`,2.10.0,2.10.0,2.10.0,2.9.0,2.9.0,2.9.0,2.8.0,2.8.0
+      :doc:`MIOpen <miopen:index>`,3.2.0,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
+      :doc:`MIVisionX <mivisionx:index>`,3.0.0,3.0.0,3.0.0,2.5.0,2.5.0,2.5.0,2.5.0,2.5.0
+      :doc:`rocAL <rocal:index>`,2.0.0,2.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
+      :doc:`rocDecode <rocdecode:index>`,0.6.0,0.6.0,0.6.0,0.6.0,0.5.0,0.5.0,N/A,N/A
+      :doc:`rocPyDecode <rocpydecode:index>`,0.1.0,0.1.0,0.1.0,N/A,N/A,N/A,N/A,N/A
+      :doc:`RPP <rpp:index>`,1.8.0,1.8.0,1.8.0,1.5.0,1.5.0,1.5.0,1.4.0,1.4.0
+      ,,,,,,,,
+      COMMUNICATION,.. _commlibs-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`RCCL <rccl:index>`,2.20.5,2.20.5,2.20.5,2.18.6,2.18.6,2.18.6,2.18.3,2.18.3
+      ,,,,,,,,
+      MATH LIBS,.. _mathlibs-support-compatibility-matrix-past-60:,,,,,,,
+      `half <https://github.com/ROCm/half>`_ ,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0
+      :doc:`hipBLAS <hipblas:index>`,2.2.0,2.2.0,2.2.0,2.1.0,2.1.0,2.1.0,2.0.0,2.0.0
+      :doc:`hipBLASLt <hipblaslt:index>`,0.8.0,0.8.0,0.8.0,0.7.0,0.7.0,0.7.0,0.6.0,0.6.0
+      :doc:`hipFFT <hipfft:index>`,1.0.15,1.0.15,1.0.14,1.0.14,1.0.14,1.0.14,1.0.13,1.0.13
+      :doc:`hipFORT <hipfort:index>`,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0
+      :doc:`hipRAND <hiprand:index>`,2.11.0,2.11.0,2.11.0,2.10.16,2.10.16,2.10.16,2.10.16,2.10.16
+      :doc:`hipSOLVER <hipsolver:index>`,2.2.0,2.2.0,2.2.0,2.1.1,2.1.1,2.1.0,2.0.0,2.0.0
+      :doc:`hipSPARSE <hipsparse:index>`,3.1.1,3.1.1,3.1.1,3.0.1,3.0.1,3.0.1,3.0.0,3.0.0
+      :doc:`hipSPARSELt <hipsparselt:index>`,0.2.1,0.2.1,0.2.1,0.2.0,0.1.0,0.1.0,0.1.0,0.1.0
+      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.2.0,3.2.0,3.1.1,3.1.1,3.1.1,3.0.3,3.0.3
+      :doc:`rocBLAS <rocblas:index>`,4.2.1,4.2.1,4.2.0,4.1.2,4.1.0,4.1.0,4.0.0,4.0.0
+      :doc:`rocFFT <rocfft:index>`,1.0.29,1.0.29,1.0.28,1.0.27,1.0.27,1.0.26,1.0.25,1.0.23
+      :doc:`rocRAND <rocrand:index>`,3.1.0,3.1.0,3.1.0,3.0.1,3.0.1,3.0.1,3.0.0,2.10.17
+      :doc:`rocSOLVER <rocsolver:index>`,3.26.0,3.26.0,3.26.0,3.25.0,3.25.0,3.25.0,3.24.0,3.24.0
+      :doc:`rocSPARSE <rocsparse:index>`,3.2.0,3.2.0,3.2.0,3.1.2,3.1.2,3.1.2,3.0.2,3.0.2
+      :doc:`rocWMMA <rocwmma:index>`,1.5.0,1.5.0,1.5.0,1.4.0,1.4.0,1.4.0,1.3.0,1.3.0
+      `Tensile <https://github.com/ROCm/Tensile>`_,4.40.0,4.40.0,4.40.0,4.40.0,4.40.0,4.40.0,4.39.0,4.39.0
+      ,,,,,,,,
+      PRIMITIVES,.. _primitivelibs-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`hipCUB <hipcub:index>`,3.2.0,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
+      :doc:`hipTensor <hiptensor:index>`,1.3.0,1.3.0,1.3.0,1.2.0,1.2.0,1.2.0,1.1.0,1.1.0
+      :doc:`rocPRIM <rocprim:index>`,3.2.0,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
+      :doc:`rocThrust <rocthrust:index>`,3.1.0,3.1.0,3.0.1,3.0.1,3.0.1,3.0.1,3.0.0,3.0.0
+      ,,,,,,,,
+      SUPPORT LIBS,,,,,,,,
+      `hipother <https://github.com/ROCm/hipother>`_,6.2.41134,6.2.41134,6.2.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
+      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.2,6.2.1,6.2.0,6.1.2,6.1.1,6.1.0,6.0.2,6.0.0
+      `ROCT-Thunk-Interface <https://github.com/ROCm/ROCT-Thunk-Interface>`_,20240607.4.05,20240607.4.05,20240607.1.4246,20240125.5.08,20240125.5.08,20240125.3.30,20231016.2.245,20231016.2.245
+      ,,,,,,,,
+      SYSTEM MGMT TOOLS,.. _tools-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`AMD SMI <amdsmi:index>`,24.6.3,24.6.3,24.6.2,24.5.1,24.5.1,24.4.1,23.4.2,23.4.2
+      :doc:`ROCm Data Center Tool <rdc:index>`,1.0.0,1.0.0,1.0.0,0.3.0,0.3.0,0.3.0,0.3.0,0.3.0
+      :doc:`rocminfo <rocminfo:index>`,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
+      :doc:`ROCm SMI <rocm_smi_lib:index>`,7.3.0,7.3.0,7.3.0,7.2.0,7.0.0,7.0.0,6.0.2,6.0.0
+      :doc:`ROCm Validation Suite <rocmvalidationsuite:index>`,rocm-6.2.2,rocm-6.2.1,rocm-6.2.0,rocm-6.1.2,rocm-6.1.1,rocm-6.1.0,rocm-6.0.2,rocm-6.0.0
+      ,,,,,,,,
+      PERFORMANCE TOOLS,,,,,,,,
+      :doc:`Omniperf <omniperf:index>`,2.0.1,2.0.1,2.0.1,N/A,N/A,N/A,N/A,N/A
+      :doc:`Omnitrace <omnitrace:index>`,1.11.2,1.11.2,1.11.2,N/A,N/A,N/A,N/A,N/A
+      :doc:`ROCm Bandwidth Test <rocm_bandwidth_test:index>`,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0
+      :doc:`ROCProfiler <rocprofiler:index>`,2.0.60202,2.0.60201,2.0.60200,2.0.60102,2.0.60101,2.0.60100,2.0.60002,2.0.60000
+      :doc:`ROCprofiler-SDK <rocprofiler-sdk:index>`,0.4.0,0.4.0,0.4.0,N/A,N/A,N/A,N/A,N/A
+      :doc:`ROCTracer <roctracer:index>`,4.1.60202,4.1.60201,4.1.60200,4.1.60102,4.1.60101,4.1.60100,4.1.60002,4.1.60000
+      ,,,,,,,,
+      DEVELOPMENT TOOLS,,,,,,,,
+      :doc:`HIPIFY <hipify:index>`,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
+      :doc:`ROCm CMake <rocmcmakebuildtools:index>`,0.13.0,0.13.0,0.13.0,0.12.0,0.12.0,0.12.0,0.11.0,0.11.0
+      :doc:`ROCdbgapi <rocdbgapi:index>`,0.76.0,0.76.0,0.76.0,0.71.0,0.71.0,0.71.0,0.71.0,0.71.0
+      :doc:`ROCm Debugger (ROCgdb) <rocgdb:index>`,14.2.0,14.2.0,14.2.0,14.1.0,14.1.0,14.1.0,13.2.0,13.2.0
+      `rocprofiler-register <https://github.com/ROCm/rocprofiler-register>`_,0.4.0,0.4.0,0.4.0,0.3.0,0.3.0,0.3.0,N/A,N/A
+      :doc:`ROCr Debug Agent <rocr_debug_agent:index>`,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3,2.0.3
+      ,,,,,,,,
+      COMPILERS,.. _compilers-support-compatibility-matrix-past-60:,,,,,,,
+      `clang-ocl <https://github.com/ROCm/clang-ocl>`_,N/A,N/A,N/A,0.5.0,0.5.0,0.5.0,0.5.0,0.5.0
+      :doc:`hipCC <hipcc:index>`,1.1.1,1.1.1,1.1.1,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
+      `Flang <https://github.com/ROCm/flang>`_,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
+      :doc:`llvm-project <llvm-project:index>`,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
+      `OpenMP <https://github.com/ROCm/llvm-project/tree/amd-staging/openmp>`_,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,17.0.0.24154,17.0.0.24103,17.0.0.24012,17.0.0.23483
+      ,,,,,,,,
+      RUNTIMES,.. _runtime-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`AMD CLR <hip:understand/amd_clr>`,6.2.41134,6.2.41134,6.2.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
+      :doc:`HIP <hip:index>`,6.2.41134,6.2.41134,6.2.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
+      `OpenCL Runtime <https://github.com/ROCm/clr/tree/develop/opencl>`_,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0,2.0.0
+      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.14.0,1.13.0,1.13.0,1.13.0,1.13.0,1.12.0,1.12.0
--- a/docs/compatibility/compatibility-matrix.rst
+++ b/docs/compatibility/compatibility-matrix.rst
@@ -17,10 +17,10 @@ You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-
 .. container:: format-big-table

  .. csv-table:: 
-      :header: "ROCm Version", "6.2.1", "6.2.0", "6.1.0"
+      :header: "ROCm Version", "6.2.2", "6.2.1", "6.1.0"
      :stub-columns: 1

-      :ref:`Operating Systems & kernels <OS-kernel-versions>`,Ubuntu 24.04,Ubuntu 24.04,
+      :ref:`Operating systems & kernels <OS-kernel-versions>`,"Ubuntu 24.04.1, 24.04","Ubuntu 24.04.1, 24.04",Ubuntu 24.04
      ,"Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.4, 22.04.3"
      ,,,"Ubuntu 20.04.6, 20.04.5"
      ,"RHEL 9.4, 9.3","RHEL 9.4, 9.3","RHEL 9.4 [#red-hat94]_, 9.3, 9.2"
@@ -37,7 +37,7 @@ You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-
      ,.. _gpu-support-compatibility-matrix:,,
      :doc:`GPU / LLVM target <rocm-install-on-linux:reference/system-requirements>`,gfx1100,gfx1100,gfx1100
      ,gfx1030,gfx1030,gfx1030
-      ,gfx942 [#mi300_621]_,gfx942 [#mi300_620]_, gfx942 [#mi300_610]_
+      ,gfx942 [#mi300_622]_,gfx942 [#mi300_621]_, gfx942 [#mi300_610]_
      ,gfx90a,gfx90a,gfx90a
      ,gfx908,gfx908,gfx908
      ,,,
@@ -63,7 +63,7 @@ You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-
      :doc:`MIGraphX <amdmigraphx:index>`,2.10.0,2.10.0,2.9.0
      :doc:`MIOpen <miopen:index>`,3.2.0,3.2.0,3.1.0
      :doc:`MIVisionX <mivisionx:index>`,3.0.0,3.0.0,2.5.0
-      :doc:`rocAL <rocal:index>`,2.0.0,1.0.0,1.0.0
+      :doc:`rocAL <rocal:index>`,2.0.0,2.0.0,1.0.0
      :doc:`rocDecode <rocdecode:index>`,0.6.0,0.6.0,0.5.0
      :doc:`rocPyDecode <rocpydecode:index>`,0.1.0,0.1.0,N/A
      :doc:`RPP <rpp:index>`,1.8.0,1.8.0,1.5.0
@@ -75,15 +75,15 @@ You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-
      `half <https://github.com/ROCm/half>`_ ,1.12.0,1.12.0,1.12.0
      :doc:`hipBLAS <hipblas:index>`,2.2.0,2.2.0,2.1.0
      :doc:`hipBLASLt <hipblaslt:index>`,0.8.0,0.8.0,0.7.0
-      :doc:`hipFFT <hipfft:index>`,1.0.15,1.0.14,1.0.14
+      :doc:`hipFFT <hipfft:index>`,1.0.15,1.0.15,1.0.14
      :doc:`hipFORT <hipfort:index>`,0.4.0,0.4.0,0.4.0
      :doc:`hipRAND <hiprand:index>`,2.11.0,2.11.0,2.10.16
      :doc:`hipSOLVER <hipsolver:index>`,2.2.0,2.2.0,2.1.0
      :doc:`hipSPARSE <hipsparse:index>`,3.1.1,3.1.1,3.0.1
      :doc:`hipSPARSELt <hipsparselt:index>`,0.2.1,0.2.1,0.1.0
      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.2.0,3.1.1
-      :doc:`rocBLAS <rocblas:index>`,4.2.1,4.2.0,4.1.0
-      :doc:`rocFFT <rocfft:index>`,1.0.29,1.0.28,1.0.26
+      :doc:`rocBLAS <rocblas:index>`,4.2.1,4.2.1,4.1.0
+      :doc:`rocFFT <rocfft:index>`,1.0.29,1.0.29,1.0.26
      :doc:`rocRAND <rocrand:index>`,3.1.0,3.1.0,3.0.1
      :doc:`rocSOLVER <rocsolver:index>`,3.26.0,3.26.0,3.25.0
      :doc:`rocSPARSE <rocsparse:index>`,3.2.0,3.2.0,3.1.2
@@ -94,30 +94,30 @@ You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-
      :doc:`hipCUB <hipcub:index>`,3.2.0,3.2.0,3.1.0
      :doc:`hipTensor <hiptensor:index>`,1.3.0,1.3.0,1.2.0
      :doc:`rocPRIM <rocprim:index>`,3.2.0,3.2.0,3.1.0
-      :doc:`rocThrust <rocthrust:index>`,3.1.0,3.0.1,3.0.1
+      :doc:`rocThrust <rocthrust:index>`,3.1.0,3.1.0,3.0.1
      ,,,
      SUPPORT LIBS,,,
-      `hipother <https://github.com/ROCm/hipother>`_,6.2.41134,6.2.41133,6.1.40091
-      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.1,6.2.0,6.1.0
-      `ROCT-Thunk-Interface <https://github.com/ROCm/ROCT-Thunk-Interface>`_,20240607.4.05,20240607.1.4246,20240125.3.30
+      `hipother <https://github.com/ROCm/hipother>`_,6.2.41134,6.2.41134,6.1.40091
+      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.2,6.2.1,6.1.0
+      `ROCT-Thunk-Interface <https://github.com/ROCm/ROCT-Thunk-Interface>`_,20240607.4.05,20240607.4.05,20240125.3.30
      ,,,
      SYSTEM MGMT TOOLS,.. _tools-support-compatibility-matrix:,,
-      :doc:`AMD SMI <amdsmi:index>`,24.6.3,24.6.2,24.4.1
+      :doc:`AMD SMI <amdsmi:index>`,24.6.3,24.6.3,24.4.1
      :doc:`ROCm Data Center Tool <rdc:index>`,1.0.0,1.0.0,0.3.0
      :doc:`rocminfo <rocminfo:index>`,1.0.0,1.0.0,1.0.0
      :doc:`ROCm SMI <rocm_smi_lib:index>`,7.3.0,7.3.0,7.0.0
-      :doc:`ROCm Validation Suite <rocmvalidationsuite:index>`,rocm-6.2.1,rocm-6.2.0,rocm-6.1.0
+      :doc:`ROCm Validation Suite <rocmvalidationsuite:index>`,rocm-6.2.2,rocm-6.2.1,rocm-6.1.0
      ,,,
      PERFORMANCE TOOLS,,,
      :doc:`Omniperf <omniperf:index>`,2.0.1,2.0.1,N/A
      :doc:`Omnitrace <omnitrace:index>`,1.11.2,1.11.2,N/A
      :doc:`ROCm Bandwidth Test <rocm_bandwidth_test:index>`,1.4.0,1.4.0,1.4.0
-      :doc:`ROCProfiler <rocprofiler:index>`,2.0.60201,2.0.60200,2.0.60100
+      :doc:`ROCProfiler <rocprofiler:index>`,2.0.60202,2.0.60201,2.0.60100
      :doc:`ROCprofiler-SDK <rocprofiler-sdk:index>`,0.4.0,0.4.0,N/A
-      :doc:`ROCTracer <roctracer:index>`,4.1.60201,4.1.60200,4.1.60100
+      :doc:`ROCTracer <roctracer:index>`,4.1.60202,4.1.60201,4.1.60100
      ,,,
      DEVELOPMENT TOOLS,,,
-      :doc:`HIPIFY <hipify:index>`,18.0.0.24355,18.0.0.24232,17.0.0.24103
+      :doc:`HIPIFY <hipify:index>`,18.0.0.24355,18.0.0.24355,17.0.0.24103
      :doc:`ROCm CMake <rocmcmakebuildtools:index>`,0.13.0,0.13.0,0.12.0
      :doc:`ROCdbgapi <rocdbgapi:index>`,0.76.0,0.76.0,0.71.0
      :doc:`ROCm Debugger (ROCgdb) <rocgdb:index>`,14.2.0,14.2.0,14.1.0
@@ -127,23 +127,23 @@ You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-
      COMPILERS,.. _compilers-support-compatibility-matrix:,,
      `clang-ocl <https://github.com/ROCm/clang-ocl>`_,N/A,N/A,0.5.0
      :doc:`hipCC <hipcc:index>`,1.1.1,1.1.1,1.0.0
-      `Flang <https://github.com/ROCm/flang>`_,18.0.0.24355,18.0.0.24232,17.0.0.24103
-      :doc:`llvm-project <llvm-project:index>`,18.0.0.24355,18.0.0.24232,17.0.0.24103
-      `OpenMP <https://github.com/ROCm/llvm-project/tree/amd-staging/openmp>`_,18.0.0.24332,18.0.0.24232,17.0.0.24103
+      `Flang <https://github.com/ROCm/flang>`_,18.0.0.24355,18.0.0.24355,17.0.0.24103
+      :doc:`llvm-project <llvm-project:index>`,18.0.0.24355,18.0.0.24355,17.0.0.24103
+      `OpenMP <https://github.com/ROCm/llvm-project/tree/amd-staging/openmp>`_,18.0.0.24355,18.0.0.24355,17.0.0.24103
      ,,,
      RUNTIMES,.. _runtime-support-compatibility-matrix:,,
-      :doc:`AMD CLR <hip:understand/amd_clr>`,6.2.41134,6.2.41133,6.1.40091
-      :doc:`HIP <hip:index>`,6.2.41134,6.2.41133,6.1.40091
+      :doc:`AMD CLR <hip:understand/amd_clr>`,6.2.41134,6.2.41134,6.1.40091
+      :doc:`HIP <hip:index>`,6.2.41134,6.2.41134,6.1.40091
      `OpenCL Runtime <https://github.com/ROCm/clr/tree/develop/opencl>`_,2.0.0,2.0.0,2.0.0
-      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.13.0,1.13.0
+      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.14.0,1.13.0


 .. rubric:: Footnotes

 .. [#red-hat94] RHEL 9.4 is supported only on AMD Instinct MI300A.
 .. [#oracle89] Oracle Linux is supported only on AMD Instinct MI300X.
+.. [#mi300_622] **For ROCm 6.2.2** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
 .. [#mi300_621] **For ROCm 6.2.1** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
-.. [#mi300_620] **For ROCm 6.2.0** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
 .. [#mi300_610] **For ROCm 6.1.0** - MI300A (gfx942) is supported on Ubuntu 22.04.4, RHEL 9.4, RHEL 9.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.4.
 .. [#kfd_support] ROCm provides forward and backward compatibility between the Kernel Fusion Driver (KFD) and its user space software for +/- 2 releases. These are the compatibility combinations that are currently supported.

@@ -160,7 +160,8 @@ Use this look up table to confirm which operating system and kernel versions are
   :widths: 40, 20, 40
   :stub-columns: 1

-   `Ubuntu <https://ubuntu.com/about/release-cycle#ubuntu-kernel-release-cycle>`_, 24.04, "6.8 GA"
+   `Ubuntu <https://ubuntu.com/about/release-cycle#ubuntu-kernel-release-cycle>`_, 24.04.1, "6.8 GA"
+   , 24.04, "6.8 GA"
   `Ubuntu <https://ubuntu.com/about/release-cycle#ubuntu-kernel-release-cycle>`_, 22.04.05, "5.15 GA, 6.8 HWE"
   , 22.04.04, "5.15 GA, 6.5 HWE"
   , 22.04.03, "5.15 GA, 6.2 HWE"
@@ -206,7 +207,6 @@ Expand for full historical view of:

   .. csv-table::
      :file: compatibility-matrix-historical-6.0.csv
-      :widths: 20,10,10,10,10,10,10,10
      :header-rows: 1
      :stub-columns: 1
   
@@ -214,6 +214,7 @@ Expand for full historical view of:

   .. [#red-hat94-past-60] RHEL 9.4 is supported only on AMD Instinct MI300A.
   .. [#oracle89-past-60] Oracle Linux is supported only on AMD Instinct MI300X.
+   .. [#mi300_622-past-60] **For ROCm 6.2.2** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
   .. [#mi300_621-past-60] **For ROCm 6.2.1** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
   .. [#mi300_620-past-60] **For ROCm 6.2.0** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
   .. [#mi300_612-past-60] **For ROCm 6.1.2** - MI300A (gfx942) is supported on Ubuntu 22.04.4, RHEL 9.4, RHEL 9.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.4 and Oracle Linux.
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -30,16 +30,15 @@ if os.environ.get("READTHEDOCS", "") == "True":
 project = "ROCm Documentation"
 author = "Advanced Micro Devices, Inc."
 copyright = "Copyright (c) 2024 Advanced Micro Devices, Inc. All rights reserved."
-version = "6.2.1"
-release = "6.2.1"
+version = "6.2.2"
+release = "6.2.2"
 setting_all_article_info = True
 all_article_info_os = ["linux", "windows"]
 all_article_info_author = ""

 # pages with specific settings
 article_pages = [
-    {"file": "about/release-notes", "os": ["linux", "windows"], "date": "2024-09-20"},
-    {"file": "about/changelog", "os": ["linux", "windows"], "date": "2024-09-20"},
+    {"file": "about/release-notes", "os": ["linux", "windows"], "date": "2024-09-27"},
    {"file": "how-to/deep-learning-rocm", "os": ["linux"]},
    {"file": "how-to/rocm-for-ai/index", "os": ["linux"]},
    {"file": "how-to/rocm-for-ai/install", "os": ["linux"]},
--- a/docs/release/versions.md
+++ b/docs/release/versions.md
@@ -8,6 +8,7 @@

 | Version | Release date |
 | ------- | ------------ |
+| [6.2.2](https://rocm.docs.amd.com/en/docs-6.2.2/) | September 27, 2024 |
 | [6.2.1](https://rocm.docs.amd.com/en/docs-6.2.1/) | September 20, 2024 |
 | [6.2.0](https://rocm.docs.amd.com/en/docs-6.2.0/) | August 2, 2024 |
 | [6.1.2](https://rocm.docs.amd.com/en/docs-6.1.2/) | June 4, 2024 |
--- a/tools/autotag/components.xml
+++ b/tools/autotag/components.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.1.1"
+    <default revision="refs/tags/rocm-6.2.2"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
--- a/tools/autotag/templates/highlights/6.2.0.md
+++ b/tools/autotag/templates/highlights/6.2.0.md
@@ -1,3 +1,28 @@
+The release notes provide a comprehensive summary of changes since the previous ROCm release.
+
+- [Release highlights](release-highlights)
+
+- [Operating system and hardware support changes](operating-system-and-hardware-support-changes)
+
+- [ROCm components versioning](rocm-components)
+
+- [Detailed component changes](detailed-component-changes)
+
+- [ROCm known issues](rocm-known-issues)
+
+- [ROCm upcoming changes](rocm-upcoming-changes)
+
+The [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.0/compatibility/compatibility-matrix.html)
+provides an overview of operating system, hardware, ecosystem, and ROCm component support across ROCm releases.
+
+Release notes for previous ROCm releases are available in earlier versions of the documentation.
+See the [ROCm documentation release history](https://rocm.docs.amd.com/en/latest/release/versions.html).
+
+## Release highlights
+
+This section introduces notable new features and improvements in ROCm 6.2. See the
+[Detailed component changes](#detailed-component-changes) for individual component changes.
+
 ### New components

 ROCm 6.2.0 introduces the following new components to the ROCm software stack.
--- a/tools/autotag/templates/highlights/6.2.1.md
+++ b/tools/autotag/templates/highlights/6.2.1.md
@@ -1,6 +1,30 @@
+The release notes provide a summary of notable changes since the previous ROCm release.
+
+- [Release highlights](release-highlights)
+
+- [Operating system and hardware support changes](operating-system-and-hardware-support-changes)
+
+- [ROCm components versioning](rocm-components)
+
+- [Detailed component changes](detailed-component-changes)
+
+- [ROCm known issues](rocm-known-issues)
+
+- [ROCm upcoming changes](rocm-upcoming-changes)
+
+The [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.1/compatibility/compatibility-matrix.html)
+provides the full list of supported hardware, operating systems, ecosystems, third-party components, and ROCm components for each ROCm release.
+
+Release notes for previous ROCm releases are available in earlier versions of the documentation.
+See the [ROCm documentation release history](https://rocm.docs.amd.com/en/latest/release/versions.html).
+
+## Release highlights
+
+The following are notable new features and improvements in ROCm 6.2.1. For changes to individual components, see [Detailed component changes](#detailed-component-changes).
+
 ### rocAL major version change

-The new version of rocAL introduces many new features, but does not modify any of the existing public API functions.However, the version number was incremented from 1.3 to 2.0.
+The new version of rocAL introduces many new features, but does not modify any of the existing public API functions. However, the version number was incremented from 1.3 to 2.0.
 Applications linked to version 1.3 must be recompiled to link against version 2.0.

 See [the rocAL detailed changes](#rocal-2-0-0) for more information.
@@ -9,12 +33,12 @@ See [the rocAL detailed changes](#rocal-2-0-0) for more information.

 As of ROCm 6.2.1, ROCm supports Facebook General Matrix Multiplication (FBGEMM) and the related FBGEMM_GPU library. 

-FBGEMM is a low-precision, high-performance CPU kernel library for convolution and matrix multiplication. It is used for server-side inference and as a back end for PyTorch quantized operators. FBGEMM_GPU includes a collection of PyTorch GPU operator libraries for training and inference. For more information, see the ROCm [Model acceleration libraries guide](https://rocm.docs.amd.com/en/6.2.1/how-to/llm-fine-tuning-optimization/model-acceleration-libraries.html)
+FBGEMM is a low-precision, high-performance CPU kernel library for convolution and matrix multiplication. It is used for server-side inference and as a back end for PyTorch quantized operators. FBGEMM_GPU includes a collection of PyTorch GPU operator libraries for training and inference. For more information, see the ROCm [Model acceleration libraries guide](https://rocm.docs.amd.com/en/docs-6.2.1/how-to/llm-fine-tuning-optimization/model-acceleration-libraries.html)
 and [PyTorch's FBGEMM GitHub repository](https://github.com/pytorch/FBGEMM).

 ### ROCm Offline Installer Creator changes

-The [ROCm Offline Installer Creator 6.2.1](https://rocm.docs.amd.com/projects/install-on-linux/en/6.2.1/install/rocm-offline-installer.html) introduces several new features and improvements including:
+The [ROCm Offline Installer Creator 6.2.1](https://rocm.docs.amd.com/projects/install-on-linux/en/docs-6.2.1/install/rocm-offline-installer.html) introduces several new features and improvements including:

 * Logging support for create and install logs
 * More stringent checks for Linux versions and distributions
@@ -26,8 +50,8 @@ The [ROCm Offline Installer Creator 6.2.1](https://rocm.docs.amd.com/projects/in
 There have been no changes to supported hardware or operating systems from ROCm 6.2.0 to ROCm 6.2.1.

 * The Programming Model Reference and Understanding the Programming Model topics in HIP have been consolidated into one topic,
-[HIP programming model (conceptual)](https://rocm.docs.amd.com/projects/HIP/en/6.2.1/understand/programming_model.html). 
-* The [HIP virtual memory management](https://rocm.docs.amd.com/projects/HIP/en/6.2.1/how-to/virtual_memory.html) and [HIP virtual memory management API](https://rocm.docs.amd.com/projects/HIP/en/6.2.1/reference/virtual_memory_reference.html) topics have been added.
+[HIP programming model (conceptual)](https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.1/understand/programming_model.html). 
+* The [HIP virtual memory management](https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.1/how-to/virtual_memory.html) and [HIP virtual memory management API](https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.1/reference/virtual_memory_reference.html) topics have been added.

 ```{note}
 The ROCm documentation, like all ROCm projects, is open source and available on GitHub. To contribute to ROCm documentation, see the [ROCm documentation contribution guidelines](https://rocm.docs.amd.com/en/latest/contribute/contributing.html).
--- a/tools/autotag/templates/highlights/6.2.2.md
+++ b/tools/autotag/templates/highlights/6.2.2.md
@@ -0,0 +1,31 @@
+These release notes provide a summary of notable changes since the previous ROCm release.
+
+```{note}
+As ROCm 6.2.2 was released shortly after 6.2.1, the changes between these versions
+are minimal. For a comprehensive overview of recent updates, the ROCm 6.2.1 release
+notes are appended to the end of this document.
+
+For detailed information about the changes in ROCm 6.2.1, refer to the appended
+section: [ROCm 6.2.1 release notes](rocm-6-2-1-release-notes).
+```
+
+The [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.2/compatibility/compatibility-matrix.html)
+provides the full list of supported hardware, operating systems, ecosystems, third-party components, and ROCm components
+for each ROCm release.
+
+Release notes for previous ROCm releases are available in earlier versions of the documentation.
+See the [ROCm documentation release history](https://rocm.docs.amd.com/en/latest/release/versions.html).
+
+## Release highlights
+
+The following is a significant fix introduced in ROCm 6.2.2.
+
+### Fixed Instinct MI300X error recovery failure
+
+Improved the reliability of AMD Instinct MI300X accelerators in scenarios involving
+uncorrectable errors. Previously, error recovery did not occur as expected,
+potentially leaving the system in an undefined state. This fix ensures that error
+recovery functions as expected, maintaining system stability.
+
+See the [original issue](#instinct-mi300x-gpu-recovery-failure-on-uncorrectable-errors)
+noted in the ROCm 6.2.1 release notes.
--- a/tools/autotag/templates/known_issues/6.2.0.md
+++ b/tools/autotag/templates/known_issues/6.2.0.md
@@ -0,0 +1,86 @@
+## ROCm known issues
+
+ROCm known issues are noted on {fab}`github` [GitHub](https://github.com/ROCm/ROCm/labels/Verified%20Issue). For known
+issues related to individual components, review the [Detailed component changes](detailed-component-changes).
+
+### Default processor affinity behavior for helper threads 
+
+Processor affinity is a critical setting to ensure that ROCm helper threads run on the correct cores. By default, ROCm
+helper threads are spawned on all available cores, ignoring the parent thread’s processor affinity. This can lead to
+threads competing for available cores, which may result in suboptimal performance. This behavior occurs by default if
+the environment variable `HSA_OVERRIDE_CPU_AFFINITY_DEBUG` is not set or is set to `1`. If
+`HSA_OVERRIDE_CPU_AFFINITY_DEBUG` is set to `0`, the ROCr runtime uses the parent process's core affinity mask when
+creating helper threads. The parent’s affinity mask should then be set to account for the presence of additional threads
+by ensuring the affinity mask contains enough cores. Depending on the affinity settings of the software environment,
+batch system, launch commands like `numactl`/`taskset`, or explicit mask manipulation by the application itself, changing
+the setting may be advantageous to performance.
+
+To ensure the parent's core affinity mask is honored by the ROCm helper threads, set the
+`HSA_OVERRIDE_CPU_AFFINITY_DEBUG` environment variable as follows:
+
+```{code} shell
+export HSA_OVERRIDE_CPU_AFFINITY_DEBUG=0
+```
+
+To ensure ROCm helper threads run on all available cores, set the `HSA_OVERRIDE_CPU_AFFINITY_DEBUG` environment variable
+as follows:
+
+``` shell
+export HSA_OVERRIDE_CPU_AFFINITY_DEBUG=1
+```
+
+Or the default:
+
+``` shell
+
+unset HSA_OVERRIDE_CPU_AFFINITY_DEBUG
+```
+
+If unsure of the default processor affinity settings for your environment, run the following command from the shell:
+
+``` shell
+
+bash -c "echo taskset -p \$\$" 
+```
+
+See [issue #3493](https://github.com/ROCm/ROCm/issues/3493) on GitHub.
+
+### Display issues on servers with Instinct MI300-series accelerators when loading AMDGPU driver
+
+AMD Instinct MI300-series accelerators and third-party GPUs such as the Matrox G200 have an issue impacting video
+output. The issue was reproduced on a Dell server model PowerEdge XE9680. Servers from other vendors utilizing Matrox
+G200 cards may be impacted as well. This issue was found with ROCm 6.2.0 but is present in older ROCm versions.
+
+The AMDGPU driver shipped with ROCm interferes with the operation of the display card video output. On Dell systems,
+this includes both the local video output and remote access via iDRAC. The display appears blank (black) after loading
+the `amdgpu` driver modules. Video output impacts both terminal access when running in `runlevel 3` and GUI access when
+running in `runlevel 5`. Server functionality can still be accessed via SSH or other remote connection methods.
+
+See [issue #3494](https://github.com/ROCm/ROCm/issues/3494) on GitHub.
+
+### KFDTest failure on Instinct MI300X with Oracle Linux 8.9
+
+The `KFDEvictTest.QueueTest` is failing on the MI300X platform during KFD (Kernel Fusion Driver) tests, causing the full
+suite to not execute properly. This issue is suspected to be hardware-related.
+
+See [issue #3495](https://github.com/ROCm/ROCm/issues/3495) on GitHub.
+
+### Bandwidth limitation in gang and non-gang modes on Instinct MI300A
+
+Expected target peak non-gang performance (~60GB/s) and target peak gang performance (~90GB/s) are not achieved. Both gang
+and non-gang performance are observed to be limited at 45GB/s.
+
+This issue will be addressed in a future ROCm release.
+
+See [issue #3496](https://github.com/ROCm/ROCm/issues/3496) on GitHub.
+
+### rocm-llvm-alt
+
+ROCm provides an optional package -- `rocm-llvm-alt` -- that provides a closed-source compiler for
+users interested in additional closed-source CPU optimizations. This feature is not functional in
+the ROCm 6.2.0 release. Users who attempt to invoke the closed-source compiler will experience an
+LLVM consumer-producer mismatch and the compilation will fail. There is no workaround that allows
+use of the closed-source compiler. It is recommended to compile using the default open-source
+compiler, which generates high-quality AMD CPU and AMD GPU code.
+
+See [issue #3492](https://github.com/ROCm/ROCm/issues/3492) on GitHub.
--- a/tools/autotag/templates/known_issues/6.2.1.md
+++ b/tools/autotag/templates/known_issues/6.2.1.md
@@ -1,3 +1,8 @@
+## ROCm known issues
+
+ROCm known issues are tracked on [GitHub](https://github.com/ROCm/ROCm/labels/Verified%20Issue). Known issues related to
+individual components are listed in the [Detailed component changes](detailed-component-changes) section.
+
 ### Instinct MI300X GPU recovery failure on uncorrectable errors

 For the AMD Instinct MI300X accelerator, GPU recovery resets triggered by uncorrectable errors (UE) might not complete
--- a/tools/autotag/templates/support/6.2.1.md
+++ b/tools/autotag/templates/support/6.2.1.md
@@ -1,2 +1,5 @@
-There are no changes to supported hardware or operating systems from ROCm 6.2.0 to ROCm 6.2.1.
+## Operating system and hardware support changes

+ROCm 6.2.1 adds support for Ubuntu 24.04.1 (kernel: 6.8 [GA]).
+
+See the [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.1/compatibility/compatibility-matrix.html) for the full list of supported operating systems and hardware architectures.
--- a/tools/autotag/templates/upcoming_changes/6.2.0.md
+++ b/tools/autotag/templates/upcoming_changes/6.2.0.md
@@ -1,85 +1,3 @@
-### Default processor affinity behavior for helper threads 
-
-Processor affinity is a critical setting to ensure that ROCm helper threads run on the correct cores. By default, ROCm
-helper threads are spawned on all available cores, ignoring the parent thread’s processor affinity. This can lead to
-threads competing for available cores, which may result in suboptimal performance. This behavior occurs by default if
-the environment variable `HSA_OVERRIDE_CPU_AFFINITY_DEBUG` is not set or is set to `1`. If
-`HSA_OVERRIDE_CPU_AFFINITY_DEBUG` is set to `0`, the ROCr runtime uses the parent process's core affinity mask when
-creating helper threads. The parent’s affinity mask should then be set to account for the presence of additional threads
-by ensuring the affinity mask contains enough cores. Depending on the affinity settings of the software environment,
-batch system, launch commands like `numactl`/`taskset`, or explicit mask manipulation by the application itself, changing
-the setting may be advantageous to performance.
-
-To ensure the parent's core affinity mask is honored by the ROCm helper threads, set the
-`HSA_OVERRIDE_CPU_AFFINITY_DEBUG` environment variable as follows:
-
-```{code} shell
-export HSA_OVERRIDE_CPU_AFFINITY_DEBUG=0
-```
-
-To ensure ROCm helper threads run on all available cores, set the `HSA_OVERRIDE_CPU_AFFINITY_DEBUG` environment variable
-as follows:
-
-``` shell
-export HSA_OVERRIDE_CPU_AFFINITY_DEBUG=1
-```
-
-Or the default:
-
-``` shell
-
-unset HSA_OVERRIDE_CPU_AFFINITY_DEBUG
-```
-
-If unsure of the default processor affinity settings for your environment, run the following command from the shell:
-
-``` shell
-
-bash -c "echo taskset -p \$\$" 
-```
-
-See [issue #3493](https://github.com/ROCm/ROCm/issues/3493) on GitHub.
-
-### Display issues on servers with Instinct MI300-series accelerators when loading AMDGPU driver
-
-AMD Instinct MI300-series accelerators and third-party GPUs such as the Matrox G200 have an issue impacting video
-output. The issue was reproduced on a Dell server model PowerEdge XE9680. Servers from other vendors utilizing Matrox
-G200 cards may be impacted as well. This issue was found with ROCm 6.2.0 but is present in older ROCm versions.
-
-The AMDGPU driver shipped with ROCm interferes with the operation of the display card video output. On Dell systems,
-this includes both the local video output and remote access via iDRAC. The display appears blank (black) after loading
-the `amdgpu` driver modules. Video output impacts both terminal access when running in `runlevel 3` and GUI access when
-running in `runlevel 5`. Server functionality can still be accessed via SSH or other remote connection methods.
-
-See [issue #3494](https://github.com/ROCm/ROCm/issues/3494) on GitHub.
-
-### KFDTest failure on Instinct MI300X with Oracle Linux 8.9
-
-The `KFDEvictTest.QueueTest` is failing on the MI300X platform during KFD (Kernel Fusion Driver) tests, causing the full
-suite to not execute properly. This issue is suspected to be hardware-related.
-
-See [issue #3495](https://github.com/ROCm/ROCm/issues/3495) on GitHub.
-
-### Bandwidth limitation in gang and non-gang modes on Instinct MI300A
-
-Expected target peak non-gang performance (~60GB/s) and target peak gang performance (~90GB/s) are not achieved. Both gang
-and non-gang performance are observed to be limited at 45GB/s.
-
-This issue will be addressed in a future ROCm release.
-
-See [issue #3496](https://github.com/ROCm/ROCm/issues/3496) on GitHub.
-
-### rocm-llvm-alt
-
-ROCm provides an optional package -- `rocm-llvm-alt` -- that provides a closed-source compiler for
-users interested in additional closed-source CPU optimizations. This feature is not functional in
-the ROCm 6.2.0 release. Users who attempt to invoke the closed-source compiler will experience an
-LLVM consumer-producer mismatch and the compilation will fail. There is no workaround that allows
-use of the closed-source compiler. It is recommended to compile using the default open-source
-compiler, which generates high-quality AMD CPU and AMD GPU code.
-
-See [issue #3492](https://github.com/ROCm/ROCm/issues/3492) on GitHub.
-
 ## ROCm upcoming changes

 The section notes upcoming changes to the ROCm software stack. For upcoming changes related to individual components, review
--- a/tools/autotag/templates/upcoming_changes/6.2.1.md
+++ b/tools/autotag/templates/upcoming_changes/6.2.1.md
@@ -1,3 +1,7 @@
+## ROCm upcoming changes
+
+The following changes to the ROCm software stack are anticipated for future releases.
+
 ### rocm-llvm-alt

 The `rocm-llvm-alt` package will be removed in an upcoming release. Users relying on the functionality provided by the closed-source compiler should transition to the open-source compiler. Once the `rocm-llvm-alt` package is removed, any compilation requesting functionality provided by the closed-source compiler will result in a Clang warning: "*[AMD] proprietary optimization compiler has been removed*".
--- a/tools/rocm-build/ROCm.mk
+++ b/tools/rocm-build/ROCm.mk
@@ -67,16 +67,18 @@ endef

 $(call adddep,amd_smi_lib,${ASAN_DEP})
 $(call adddep,aqlprofile,${ASAN_DEP} hsa)
-$(call adddep,clang-ocl,lightning rocm-cmake)
 $(call adddep,comgr,lightning devicelibs)
 $(call adddep,dbgapi,hsa comgr)
 $(call adddep,devicelibs,lightning)
-$(call adddep,hip_on_rocclr,${ASAN_DEP} rocclr rocprofiler-register)
+$(call adddep,hip_on_rocclr,${ASAN_DEP} hsa comgr hipcc rocprofiler-register)
 $(call adddep,hipcc,)
 $(call adddep,hipify_clang,hip_on_rocclr lightning)
 $(call adddep,hsa,${ASAN_DEP} thunk lightning devicelibs rocprofiler-register)
 $(call adddep,lightning,)
-$(call adddep,opencl_on_rocclr,${ASAN_DEP} rocclr)
+$(call adddep,omniperf,${ASAN_DEP})
+$(call adddep,omnitrace,hipcc hsa hip_on_rocclr rocm_smi_lib rocprofiler roctracer)
+$(call adddep,opencl_icd_loader,)
+$(call adddep,opencl_on_rocclr,${ASAN_DEP} hsa comgr opencl_icd_loader)
 $(call adddep,openmp_extras,thunk lightning devicelibs hsa)
 $(call adddep,rdc,${ASAN_DEP} rocm_smi_lib hsa rocprofiler)
 $(call adddep,rocclr,${ASAN_DEP} hsa comgr hipcc rocprofiler-register)
@@ -87,14 +89,15 @@ $(call adddep,rocm-core,${ASAN_DEP})
 $(call adddep,rocm-gdb,dbgapi)
 $(call adddep,rocminfo,${ASAN_DEP} hsa)
 $(call adddep,rocprofiler-register,${ASAN_DEP})
-$(call adddep,rocprofiler,${ASAN_DEP} hsa roctracer aqlprofile opencl_on_rocclr hip_on_rocclr comgr dbgapi rocm_smi_lib)
+$(call adddep,rocprofiler-sdk,${ASAN_DEP} hsa aqlprofile opencl_on_rocclr hip_on_rocclr comgr)
+$(call adddep,rocprofiler,${ASAN_DEP} hsa roctracer aqlprofile opencl_on_rocclr hip_on_rocclr comgr)
 $(call adddep,rocr_debug_agent,${ASAN_DEP} hip_on_rocclr hsa dbgapi)
 $(call adddep,roctracer,${ASAN_DEP} hsa hip_on_rocclr)
 $(call adddep,thunk,${ASAN_DEP})

 # rocm-dev points to all possible last finish components of Stage1 build.
 rocm-dev-components :=rdc hipify_clang openmp_extras \
-	rocm-core amd_smi_lib hipcc clang-ocl \
+	omniperf omnitrace rocm-core amd_smi_lib hipcc \
 	rocm_bandwidth_test rocr_debug_agent rocm-gdb
 $(call adddep,rocm-dev,$(filter-out ${NOBUILD},${rocm-dev-components}))

@@ -117,6 +120,7 @@ $(call adddep,mivisionx,amdmigraphx miopen-hip rpp lightning hipcc)
 $(call adddep,rccl,hip_on_rocclr hsa lightning hipcc rocm_smi_lib hipify_clang)
 $(call adddep,rocalution,rocblas rocsparse rocrand lightning hipcc)
 $(call adddep,rocblas,hip_on_rocclr openmp_extras lightning hipcc)
+$(call adddep,rocal,mivisionx)
 $(call adddep,rocdecode,hip_on_rocclr lightning hipcc)
 $(call adddep,rocfft,hip_on_rocclr rocrand hiprand lightning hipcc openmp_extras)
 $(call adddep,rocmvalidationsuite,hip_on_rocclr hsa rocblas rocm-core lightning hipcc rocm_smi_lib)
@@ -221,7 +225,7 @@ rocm-dev: T_rocm-dev

 ${OUT_DIR}/logs:
 	sudo mkdir -p -m 775 "${ROCM_INSTALL_PATH}" && \
-	sudo chown -R "$(shell id -u):$(shell id -g)" "${ROCM_INSTALL_PATH}"
+	sudo chown -R "$(shell id -u):$(shell id -g)" "/opt"
 	sudo chown -R "$(shell id -u):$(shell id -g)" "/home/$(shell id -un)"
 	mkdir -p "${@}"
 	mkdir -p ${HOME}/.ccache
--- a/tools/rocm-build/build_amdmigraphx.sh
+++ b/tools/rocm-build/build_amdmigraphx.sh
@@ -22,12 +22,13 @@ build_amdmigraphx() {
    else
        GPU_TARGETS="gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi
+    init_rocm_common_cmake_params

    mkdir -p ${BUILD_DIR} && rm -rf ${BUILD_DIR}/* && mkdir -p ${HOME}/amdmigraphx && rm -rf ${HOME}/amdmigraphx/*
    rbuild package -d "${HOME}/amdmigraphx" -B "${BUILD_DIR}" \
        --cxx="${ROCM_PATH}/llvm/bin/clang++" \
        --cc="${ROCM_PATH}/llvm/bin/clang" \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--enable-new-dtags -Wl,--rpath,$ROCM_LIB_RPATH" \
 	    -DGPU_TARGETS="${GPU_TARGETS}" \
        -DCMAKE_INSTALL_RPATH=""
--- a/tools/rocm-build/build_composable_kernel.sh
+++ b/tools/rocm-build/build_composable_kernel.sh
@@ -17,9 +17,7 @@ build_miopen_ck() {
    mkdir "$BUILD_DIR" && cd "$BUILD_DIR"

    if [ -n "$GPU_ARCHS" ]; then
-        GPU_TARGETS="$GPU_ARCHS"
-    else
-        GPU_TARGETS="gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
+        GPU_TARGETS="-DAMDGPU_TARGETS=${GPU_ARCHS}"
    fi

    if [ "${ASAN_CMAKE_PARAMS}" == "true" ] ; then
@@ -43,7 +41,7 @@ build_miopen_ck() {
            ${LAUNCHER_FLAGS} \
            -DINSTANCES_ONLY=ON \
            -DENABLE_ASAN_PACKAGING=true \
-            -DAMDGPU_TARGETS=${GPU_TARGETS} \
+            "${GPU_TARGETS}" \
            "$COMPONENT_SRC"
    else
        cmake -DBUILD_DEV=OFF \
@@ -63,9 +61,11 @@ build_miopen_ck() {
            -DROCM_DISABLE_LDCONFIG=ON \
            -DROCM_PATH=${ROCM_PATH} \
            -DCPACK_GENERATOR="${PKGTYPE^^}" \
+            -DCMAKE_CXX_COMPILER="${ROCM_PATH}/llvm/bin/clang++" \
+            -DCMAKE_C_COMPILER="${ROCM_PATH}/llvm/bin/clang" \
            ${LAUNCHER_FLAGS} \
            -DINSTANCES_ONLY=ON \
-            -DAMDGPU_TARGETS=${GPU_TARGETS} \
+            "${GPU_TARGETS}" \
            "$COMPONENT_SRC"
    fi

@@ -106,8 +106,6 @@ build_miopen_ckProf() {
    architectures='gfx10 gfx11 gfx90 gfx94'
    if [ -n "$GPU_ARCHS" ]; then
        architectures=$(echo ${GPU_ARCHS} | awk -F';' '{for(i=1;i<=NF;i++) a[substr($i,1,5)]} END{for(i in a) printf i" "}')
-    else
-        architectures='gfx10 gfx11 gfx90 gfx94'
    fi

    for arch in ${architectures}
--- a/tools/rocm-build/build_hipblas.sh
+++ b/tools/rocm-build/build_hipblas.sh
@@ -28,9 +28,10 @@ build_hipblas() {
       rebuild_lapack
    fi

+    init_rocm_common_cmake_params
    cmake \
        ${LAUNCHER_FLAGS} \
-	$(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DUSE_CUDA=OFF \
        -DBUILD_CLIENTS_TESTS=ON \
        -DBUILD_CLIENTS_BENCHMARKS=ON \
--- a/tools/rocm-build/build_hipblaslt.sh
+++ b/tools/rocm-build/build_hipblaslt.sh
@@ -27,11 +27,12 @@ build_hipblaslt() {
        GPU_TARGETS=all
    fi

+    init_rocm_common_cmake_params
    CXX=$(set_build_variables CXX)\
    cmake \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
-         $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DTensile_LOGIC= \
        -DTensile_CODE_OBJECT_VERSION=default \
        -DTensile_CPU_THREADS= \
--- a/tools/rocm-build/build_hipcub.sh
+++ b/tools/rocm-build/build_hipcub.sh
@@ -17,6 +17,7 @@ build_hipcub() {
    fi

    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -27,7 +28,7 @@ build_hipcub() {
    CXX=$(set_build_variables CXX)\
    cmake \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip;${ROCM_PATH}/hip/cmake" \
        -Drocprim_DIR="${ROCM_PATH}/rocprim"  \
        -DBUILD_TEST=ON \
--- a/tools/rocm-build/build_hipfft.sh
+++ b/tools/rocm-build/build_hipfft.sh
@@ -16,6 +16,7 @@ build_hipfft() {

    cd $COMPONENT_SRC
    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -26,7 +27,7 @@ build_hipfft() {
    cmake \
        -DCMAKE_CXX_COMPILER=$(set_build_variables CXX) \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip" \
        -DCMAKE_SKIP_BUILD_RPATH=TRUE \
--- a/tools/rocm-build/build_hiprand.sh
+++ b/tools/rocm-build/build_hiprand.sh
@@ -61,7 +61,6 @@ build_hiprand() {
    rm -rf _CPack_Packages/  && find -name '*.o' -delete
    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR

-    $SCCACHE_BIN -s || echo "Unable to display sccache stats"
 }

 clean_hiprand() {
--- a/tools/rocm-build/build_hipsolver.sh
+++ b/tools/rocm-build/build_hipsolver.sh
@@ -27,10 +27,11 @@ build_hipsolver() {
       rebuild_lapack
    fi

+    init_rocm_common_cmake_params
    cmake \
        -DUSE_CUDA=OFF \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DBUILD_CLIENTS_TESTS=ON \
        -DBUILD_CLIENTS_BENCHMARKS=ON \
        -DBUILD_CLIENTS_SAMPLES=ON \
--- a/tools/rocm-build/build_hipsparse.sh
+++ b/tools/rocm-build/build_hipsparse.sh
@@ -22,11 +22,12 @@ build_hipsparse() {
    echo "CXX compiler: $CXX"

    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params

    cmake \
        -DCPACK_SET_DESTDIR=OFF \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DUSE_CUDA=OFF  \
        -DBUILD_CLIENTS_SAMPLES=ON \
        -DBUILD_CLIENTS_TESTS=ON \
--- a/tools/rocm-build/build_hipsparselt.sh
+++ b/tools/rocm-build/build_hipsparselt.sh
@@ -28,6 +28,7 @@ build_hipsparselt() {

    cd $COMPONENT_SRC
    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -41,7 +42,7 @@ build_hipsparselt() {
    cmake \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
-         $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DTensile_LOGIC= \
        -DTensile_CODE_OBJECT_VERSION=default \
        -DTensile_CPU_THREADS= \
--- a/tools/rocm-build/build_hiptensor.sh
+++ b/tools/rocm-build/build_hiptensor.sh
@@ -16,6 +16,8 @@ build_hiptensor() {

    cd "$COMPONENT_SRC"
    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params
+

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -25,7 +27,7 @@ build_hiptensor() {

    cmake \
        -B "${BUILD_DIR}" \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        $(set_build_variables CMAKE_C_CXX) \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
--- a/tools/rocm-build/build_lightning.sh
+++ b/tools/rocm-build/build_lightning.sh
@@ -17,7 +17,8 @@ printUsage() {
    echo "  -r,  --release               Build a release version of the package"
    echo "  -a,  --address_sanitizer     Enable address sanitizer (enabled by default)"
    echo "  -A   --no_address_sanitizer  Disable address sanitizer"
-    echo "  -s,  --static                Supports static CI by accepting this param & not bailing out. No effect of the param though"
+    echo "  -s,  --static                Build static lib (.a).  build instead of dynamic/shared(.so) "
+    echo "  -w,  --wheel                 Creates python wheel package of rocm-llvm. It needs to be used along with -r option"
    echo "  -l,  --build_llvm_static     Build LLVM libraries statically linked.  Default is to build dynamic linked libs"
    echo "  -o,  --outdir <pkg_type>     Print path of output directory containing packages of
                            type referred to by pkg_type"
@@ -42,6 +43,7 @@ DEB_PATH="$(getDebPath lightning)"
 RPM_PATH="$(getRpmPath lightning)"
 INSTALL_PATH="${ROCM_INSTALL_PATH}/lib/llvm"
 LLVM_ROOT_LCL="${LLVM_ROOT}"
+ROCM_WHEEL_DIR="${BUILD_PATH}/_wheel"

 TARGET="all"
 MAKEOPTS="$DASH_JAY"
@@ -69,14 +71,29 @@ ASSERT_LLVM_VERSION_MINOR=""

 SKIP_LIT_TESTS=0
 BUILD_MANPAGES="ON"
+STATIC_FLAG=

 SANITIZER_AMDGPU=1
 HSA_INC_PATH="$WORK_ROOT/ROCR-Runtime/src/inc"
 COMGR_INC_PATH="$WORK_ROOT/llvm-project/amd/comgr/include"

-VALID_STR=`getopt -o htcV:v:draAslo:BPNM --long help,alt,clean,assert_llvm_ver_major:,assert_llvm_ver_minor:,debug,release,address_sanitizer,no_address_sanitizer,static,build_llvm_static,build,package,skip_lit_tests,skip_man_pages,outdir: -- "$@"`
+VALID_STR=`getopt -o htcV:v:draAswlo:BPNM --long help,alt,clean,assert_llvm_ver_major:,assert_llvm_ver_minor:,debug,release,address_sanitizer,no_address_sanitizer,static,build_llvm_static,wheel,build,package,skip_lit_tests,skip_man_pages,outdir: -- "$@"`
 eval set -- "$VALID_STR"

+set_dwarf_version(){
+  case "$DISTRO_ID" in
+    (sles*|rhel*)
+       SET_DWARF_VERSION_4="-gdwarf-4"
+       ;;
+    (*)
+       SET_DWARF_VERSION_4=""
+       ;;
+  esac
+  export CFLAGS="$CFLAGS $SET_DWARF_VERSION_4  "
+  export CXXFLAGS="$CXXFLAGS $SET_DWARF_VERSION_4 "
+  export ASMFLAGS="$ASMFLAGS $SET_DWARF_VERSION_4 "
+}
+
 while true ;
 do
    case "$1" in
@@ -95,6 +112,7 @@ do
        (-r | --release)
                BUILD_TYPE="Release" ; shift ;;
        (-a | --address_sanitizer)
+                set_dwarf_version
                SANITIZER_AMDGPU=1 ;
                HSA_INC_PATH="$WORK_ROOT/hsa/runtime/opensrc/hsa-runtime/inc" ;
                COMGR_INC_PATH="$WORK_ROOT/external/llvm-project/amd/comgr/include" ; shift ;;
@@ -103,9 +121,12 @@ do
                unset HSA_INC_PATH ;
                unset COMGR_INC_PATH ; shift ;;
        (-s | --static)
-                SHARED_LIBS="OFF" ; shift ;;
+                SHARED_LIBS="OFF" ;
+                STATIC_FLAG="-DBUILD_SHARED_LIBS=$SHARED_LIBS" ; shift ;;
        (-l | --build_llvm_static)
                BUILD_LLVM_DYLIB="OFF"; shift ;;
+        (-w | --wheel)
+                WHEEL_PACKAGE=true ; shift ;;
        (-o | --outdir)
                TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
        (-B | --build)
@@ -151,6 +172,7 @@ else
 fi

 clean_lightning() {
+    rm -rf "$ROCM_WHEEL_DIR"
    rm -rf "$BUILD_PATH"
    rm -rf "$DEB_PATH"
    rm -rf "$RPM_PATH"
@@ -196,7 +218,10 @@ LLVM_VERSION_MINOR=""
 LLVM_VERSION_PATCH=""
 LLVM_VERSION_SUFFIX=""
 get_llvm_version() {
-    local LLVM_VERSIONS=($(awk '/set\(LLVM_VERSION/ {print substr($2,1,length($2)-1)}' ${LLVM_ROOT_LCL}/CMakeLists.txt))
+    local LLVM_VERSIONS=($(awk '/set\(LLVM_VERSION/ {print substr($2,1,length($2)-1)}' ${LLVM_ROOT_LCL}/../cmake/Modules/LLVMVersion.cmake))
+    if [ ${#LLVM_VERSIONS[@]} -eq 0 ]; then
+        LLVM_VERSIONS=($(awk '/set\(LLVM_VERSION/ {print substr($2,1,length($2)-1)}' ${LLVM_ROOT_LCL}/CMakeLists.txt))
+    fi
    LLVM_VERSION_MAJOR=${LLVM_VERSIONS[0]}
    LLVM_VERSION_MINOR=${LLVM_VERSIONS[1]}
    LLVM_VERSION_PATCH=${LLVM_VERSIONS[2]}
@@ -260,15 +285,22 @@ build_lightning() {

    if [ ! -e Makefile ]; then
        echo "Building LLVM CMake environment"
-	if [ -e "$LLVM_ROOT_LCL/../flang/docs/AssumedRank.md" ]; then
-          FLANG_NEW=1
-	  LLVM_PROJECTS="$LLVM_PROJECTS;flang;mlir"
-	else
-	  echo "NOT building project flang"
-	fi
+        if [ -e "$LLVM_ROOT_LCL/../flang/AFARrelease" ]; then
+            FLANG_NEW=1
+            LLVM_PROJECTS="$LLVM_PROJECTS;flang;mlir"
+            ENABLE_RUNTIMES="$ENABLE_RUNTIMES;openmp";
+        else

+          if [[ "${JOB_NAME}" != *afar* ]] && [ -e "$LLVM_ROOT_LCL/../flang/DoROCmRelease" ]; then
+            FLANG_NEW=1
+            LLVM_PROJECTS="$LLVM_PROJECTS;flang;mlir"
+          else
+            echo "NOT building project flang"
+          fi
+        fi
        set -x
        cmake $(rocm_cmake_params) ${GEN_NINJA} \
+              ${STATIC_FLAG} \
              -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" \
              -DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" \
              -DLLVM_ENABLE_PROJECTS="$LLVM_PROJECTS" \
@@ -307,9 +339,9 @@ build_lightning() {
              -DCMAKE_SHARED_LINKER_FLAGS=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_LLVM_LIB_RPATH \
              -DROCM_LLVM_BACKWARD_COMPAT_LINK="$ROCM_INSTALL_PATH/llvm" \
              -DROCM_LLVM_BACKWARD_COMPAT_LINK_TARGET="./lib/llvm" \
-	      -DCLANG_LINK_FLANG_LEGACY=ON \
-	      -DCMAKE_CXX_STANDARD=17 \
-	      -DFLANG_INCLUDE_DOCS=OFF \
+              -DCLANG_LINK_FLANG_LEGACY=ON \
+              -DCMAKE_CXX_STANDARD=17 \
+              -DFLANG_INCLUDE_DOCS=OFF \
              "$LLVM_ROOT_LCL"
        set +x
        echo "CMake complete"
@@ -326,8 +358,23 @@ build_lightning() {
    echo "End Workaround for race condition"
    cmake --build . -- $MAKEOPTS

+    case "$DISTRO_ID" in
+    (rhel*|centos*)
+       RHEL_BUILD=1
+       ;;
+    (*)
+       RHEL_BUILD=0
+       ;;
+     esac
+
    if [ $SKIP_LIT_TESTS -eq 0 ]; then
-        if [ "$DISTRO_NAME" != "sles" ] && [ $BUILD_ALT != 1 ]; then
+        if [ $RHEL_BUILD -eq 1 ] && [ $BUILD_ALT != 1 ]; then
+            if [ $FLANG_NEW -eq 1 ]; then
+                cmake --build . -- $MAKEOPTS check-lld check-mlir
+            else
+                cmake --build . -- $MAKEOPTS check-lld
+            fi
+        elif [ "$DISTRO_NAME" != "sles" ] && [ $BUILD_ALT != 1 ]; then
            if [ $FLANG_NEW -eq 1 ]; then
                cmake --build . -- $MAKEOPTS check-llvm check-clang check-lld check-mlir
            else
@@ -733,7 +780,7 @@ package_lightning_static() {
    local amd_compiler_commands=("amdclang" "amdclang++" "amdclang-cl" "amdclang-cpp" "amdflang" "amdlld" "offload-arch")
    local amd_man_pages=("amdclang.1.gz" "flang.1.gz" "amdflang.1.gz")
    local core_bin=("amdgpu-arch" "amdgpu-offload-arch" "amdlld" "amdllvm" "clang" "clang++" "clang-${LLVM_VERSION_MAJOR}" "clang-cl"
-                    "clang-cpp" "clang-build-select-link" "clang-offload-bundler" "clang-offload-packager" "clang-offload-wrapper" "flang" "flang-new"
+                    "clang-cpp" "clang-build-select-link" "clang-offload-bundler" "clang-offload-packager" "clang-offload-wrapper" "clang-linker-wrapper" "clang-nvlink-wrapper" "flang" "flang-new"
                    "ld64.lld" "ld.lld" "llc" "lld" "lld-link" "llvm-ar" "llvm-bitcode-strip" "llvm-dwarfdump" "llvm-install-name-tool"
                    "llvm-link" "llvm-mc" "llvm-objcopy" "llvm-objdump" "llvm-otool" "llvm-ranlib" "llvm-readelf" "llvm-readobj" "llvm-strip"
                    "nvidia-arch" "nvptx-arch" "offload-arch" "opt" "wasm-ld" "amdclang" "amdclang++" "amdclang-${LLVM_VERSION_MAJOR}" "amdclang-cl"
@@ -934,7 +981,7 @@ package_lightning_static() {

        if [ $BUILD_ALT -eq 0 ]; then
            echo "cp -R $LLVM_ROOT_LCL/LICENSE.TXT \$RPM_BUILD_ROOT/$licenseDir" >> $specFile
-			echo "cp -P $backwardsCompatibleSymlink \$RPM_BUILD_ROOT/$ROCM_INSTALL_PATH" >> $specFile
+            echo "cp -P $backwardsCompatibleSymlink \$RPM_BUILD_ROOT/$ROCM_INSTALL_PATH" >> $specFile
        else
            echo "cp -R $LLVM_PROJECT_ALT_ROOT/EULA \$RPM_BUILD_ROOT/$licenseDir" >> $specFile
            echo "cp -R $LLVM_PROJECT_ALT_ROOT/DISCLAIMER.txt \$RPM_BUILD_ROOT/$licenseDir" >> $specFile
@@ -948,7 +995,6 @@ package_lightning_static() {

        echo "cp -d \"$distBin/flang\" \$RPM_BUILD_ROOT/$installPath/bin/" >> $specFile

-        # Copy the config files
        if [ $BUILD_ALT -eq 0 ]; then
            echo "cp -d \"$distBin\"/*.cfg \$RPM_BUILD_ROOT/$installPath/bin/" >> $specFile
        fi
@@ -970,14 +1016,12 @@ package_lightning_static() {
        if [ "$BUILD_MANPAGES" == "ON" ]; then
            if [ $BUILD_ALT -eq 0 ]; then
                echo "mkdir -p  \$RPM_BUILD_ROOT/$installPath/share/man/man1" >> $specFile
-
                for i in "${core_man_pages[@]}"; do
                    if [ -f "$distMan/man1/$i" ]; then
                        echo "gzip -f $distMan/man1/$i" >> $specFile
                        echo "cp -d $distMan/man1/${i}.gz \$RPM_BUILD_ROOT/$installPath/share/man/man1/" >> $specFile
                    fi
                done
-
                if [ -f "$distMan/man1/clang.1.gz" ]; then
                    for i in "${amd_man_pages[@]}"; do
                        echo "ln -sf clang.1.gz \"$distMan/man1/$i\"" >> $specFile
@@ -1064,7 +1108,6 @@ package_lightning_static() {
            contains "$bin" "${core_bin[@]}" "${amd_compiler_commands[@]}" && continue
            echo "cp -d \"$i\" \$RPM_BUILD_ROOT/$installPath/bin/" >> $specFileExtra
        done
-
        for i in "$distLib"/*; do
            lib=$(basename "$i")
            contains "$lib" "${core_lib[@]}" && continue
@@ -1072,18 +1115,15 @@ package_lightning_static() {
        done

        echo "cp -R $distInc \$RPM_BUILD_ROOT/$installPath" >> $specFileExtra
-
        echo "rm -rf \$RPM_BUILD_ROOT/$installPath/lib/clang" >> $specFileExtra

        if [ $FLANG_NEW -eq 1 ]; then
-
          echo "rm -rf \$RPM_BUILD_ROOT/$installPath/include/flang" >> $specFileExtra
        fi

        if [ "$BUILD_MANPAGES" == "ON" ]; then
            if [ $BUILD_ALT -eq 0 ]; then
                echo "mkdir -p  \$RPM_BUILD_ROOT/$installPath/share/man/man1" >> $specFileExtra
-
                for i in "${extra_man_pages[@]}"; do
                    if [ -f "$distMan/man1/$i" ]; then
                        echo "gzip -f $distMan/man1/$i" >> $specFileExtra
@@ -1125,34 +1165,34 @@ package_docs() {
    local packageName="rocm-llvm-docs"
    local packageSummary="ROCm LLVM compiler documentation"
    local packageSummaryLong="Documenation for LLVM $llvmParsedVersion"
-    local installPath="$ROCM_INSTALL_PATH/lib/llvm/share"

    local packageArch="amd64"
    local packageVersion="${llvmParsedVersion}.${LLVM_COMMIT_GITDATE}"
    local packageMaintainer="ROCm Compiler Support <rocm.compiler.support@amd.com>"
-    local distDoc="$INSTALL_PATH/share/doc"
+    local distDoc="$INSTALL_PATH/share/doc/LLVM"

    local licenseDir="$ROCM_INSTALL_PATH/share/doc/$packageName"
    local packageDir="$BUILD_PATH/package"

    local packageDeb="$packageDir/deb"
    local controlFile="$packageDeb/DEBIAN/control"
+    local debDependencies="rocm-core"

    local packageRpm="$packageDir/rpm"
    local specFile="$packageDir/$packageName.spec"
+    local rpmRequires="rocm-core"

    rm -rf "$packageDir"
    echo "rm -rf $packageDir"

    if [ "$PACKAGEEXT" = "deb" ]; then

-        mkdir -p "$packageDeb/$installPath"
-        mkdir "${controlFile%/*}"
        mkdir -p "$packageDeb/$licenseDir"
+        mkdir "${controlFile%/*}"

        cp -r "$LLVM_ROOT_LCL/LICENSE.TXT" "$packageDeb/$licenseDir"

-        cp -r "$distDoc" "$packageDeb/$installPath/doc"
+        cp -r "$distDoc" "$packageDeb/$licenseDir"

        {
            echo "Package: $packageName"
@@ -1162,6 +1202,7 @@ package_docs() {
            echo "Maintainer: $packageMaintainer"
            echo "Version: ${packageVersion}.${ROCM_LIBPATCH_VERSION}-${JOB_DESIGNATOR}${BUILD_ID}~${DISTRO_RELEASE}"
            echo "Release:    ${JOB_DESIGNATOR}${BUILD_ID}~${DISTRO_RELEASE}"
+            echo "Depends: $debDependencies"
            echo "Recommends: $debRecommends"
            echo "Description: $packageSummary"
            echo "  $packageSummaryLong"
@@ -1182,6 +1223,7 @@ package_docs() {
        echo "Summary:    $packageSummary" >> $specFile
        echo "Group:      System Environment/Libraries" >> $specFile
        echo "License:    ASL 2.0 with exceptions" >> $specFile
+        echo "Requires:   $rpmRequires" >> $specFile

        echo "%description" >> $specFile
        echo "$packageSummaryLong" >> $specFile
@@ -1190,16 +1232,13 @@ package_docs() {
        echo "%setup -T -D -c -n $packageName" >> $specFile

        echo "%install" >> $specFile
-        echo "rm -rf \$RPM_BUILD_ROOT/$installPath" >> $specFile
-        echo "mkdir -p  \$RPM_BUILD_ROOT/$installPath/doc" >> $specFile
        echo "mkdir -p  \$RPM_BUILD_ROOT/$licenseDir" >> $specFile

        echo "cp -R $LLVM_ROOT_LCL/LICENSE.TXT \$RPM_BUILD_ROOT/$licenseDir" >> $specFile

-        echo "cp -R \"$distDoc\" \$RPM_BUILD_ROOT/$installPath" >> $specFile
+        echo "cp -R \"$distDoc\" \$RPM_BUILD_ROOT/$licenseDir" >> $specFile

        echo "%clean" >> $specFile
-        echo "rm -rf \$RPM_BUILD_ROOT/$installPath" >> $specFile
        echo "%files " >> $specFile
        echo "%defattr(-,root,root,-)" >> $specFile

@@ -1232,6 +1271,18 @@ build() {
    fi
 }

+create_wheel_package() {
+    echo "Creating rocm-llvm wheel package"
+    mkdir -p "$ROCM_WHEEL_DIR"
+    cp -f $SCRIPT_ROOT/generate_setup_py.py $ROCM_WHEEL_DIR
+    cp -f $SCRIPT_ROOT/repackage_wheel.sh $ROCM_WHEEL_DIR
+    cd $ROCM_WHEEL_DIR
+    # Currently only supports python3.6
+    ./repackage_wheel.sh $RPM_PATH/rocm-llvm*.rpm python3.6
+    # Copy the wheel created to RPM folder which will be uploaded to artifactory
+    mv "$ROCM_WHEEL_DIR"/dist/*.whl "$RPM_PATH"
+}
+
 case $TARGET in
    (clean) clean_lightning ;;
    (all)
@@ -1250,4 +1301,9 @@ case $TARGET in
    (*) die "Invalid target $TARGET" ;;
 esac

+if [[ $WHEEL_PACKAGE == true ]]; then
+    echo "Wheel Package build started !!!!"
+    create_wheel_package
+fi
+
 echo "Operation complete"
--- a/tools/rocm-build/build_miopen-deps.sh
+++ b/tools/rocm-build/build_miopen-deps.sh
@@ -44,7 +44,7 @@ build_miopen_deps() {
    cd "$COMPONENT_SRC"

    # Commenting the rocMLIR & composable_kernel from requirements.txt
-    sed -i '/ROCmSoftwarePlatform\/rocMLIR@\|ROCmSoftwarePlatform\/composable_kernel@/s/^/#/' requirements.txt
+    sed -i '/ROCm\/rocMLIR@\|ROCm\/composable_kernel@/s/^/#/' requirements.txt
    # Extract MLIR commit from requirements.txt
    MLIR_COMMIT="$(awk '/rocMLIR/ {split($1, s, "@"); print s[2]}' requirements.txt)"

--- a/tools/rocm-build/build_miopen-hip.sh
+++ b/tools/rocm-build/build_miopen-hip.sh
@@ -13,7 +13,7 @@ build_miopen_hip() {
    echo "Start build"

    cd $COMPONENT_SRC
-
+    git config --global --add safe.directory "$COMPONENT_SRC"
    checkout_lfs

    if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
@@ -22,8 +22,9 @@ build_miopen_hip() {
   fi

    mkdir "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params
    cmake \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DMIOPEN_BACKEND=HIP \
        -DCMAKE_CXX_COMPILER="${ROCM_PATH}/llvm/bin/clang++" \
        -DCMAKE_C_COMPILER="${ROCM_PATH}/llvm/bin/clang" \
--- a/tools/rocm-build/build_mivisionx.sh
+++ b/tools/rocm-build/build_mivisionx.sh
@@ -16,6 +16,8 @@ build_mivisionx() {
       BUILD_DEV=OFF
    fi

+    init_rocm_common_cmake_params
+
    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
    else
@@ -23,7 +25,7 @@ build_mivisionx() {
    fi

    cmake \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DROCM_PATH="$ROCM_PATH" \
        -DBUILD_DEV=$BUILD_DEV \
        -DCMAKE_INSTALL_LIBDIR=$(getInstallLibDir) \
@@ -34,6 +36,7 @@ build_mivisionx() {
        "$COMPONENT_SRC"

    cmake --build "$BUILD_DIR" -- -j${PROC}
+    cmake --build "$BUILD_DIR" -- install
    cpack -G ${PKGTYPE^^}

    rm -rf _CPack_Packages/ && find -name '*.o' -delete
--- a/tools/rocm-build/build_omniperf.sh
+++ b/tools/rocm-build/build_omniperf.sh
@@ -0,0 +1,171 @@
+#!/bin/bash
+
+source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
+
+printUsage() {
+    echo
+    echo "Usage: ${BASH_SOURCE##*/} [options ...]"
+    echo
+    echo "Options:"
+    echo "  -c,  --clean              Clean output and delete all intermediate work"
+    echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
+    echo "  -p,  --package <type>     Specify packaging format"
+    echo "  -r,  --release            Make a release build instead of a debug build"
+    echo "  -a,  --address_sanitizer  Enable address sanitizer"
+    echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
+                                      type referred to by pkg_type"
+    echo "  -w,  --wheel              Creates python wheel package of omniperf.
+                                      It needs to be used along with -r option"
+    echo "  -h,  --help               Prints this help"
+    echo
+    echo "Possible values for <type>:"
+    echo "  deb -> Debian format (default)"
+    echo "  rpm -> RPM format"
+    echo
+
+    return 0
+}
+
+API_NAME="omniperf"
+PROJ_NAME="$API_NAME"
+LIB_NAME="lib${API_NAME}"
+TARGET="build"
+MAKETARGET="deb"
+PACKAGE_ROOT="$(getPackageRoot)"
+PACKAGE_LIB="$(getLibPath)"
+BUILD_DIR="$(getBuildPath $API_NAME)"
+PACKAGE_DEB="$(getPackageRoot)/deb/$API_NAME"
+PACKAGE_RPM="$(getPackageRoot)/rpm/$API_NAME"
+ROCM_WHEEL_DIR="${BUILD_DIR}/_wheel"
+BUILD_TYPE="Debug"
+MAKE_OPTS="$DASH_JAY -C $BUILD_DIR"
+SHARED_LIBS="ON"
+CLEAN_OR_OUT=0;
+MAKETARGET="deb"
+PKGTYPE="deb"
+WHEEL_PACKAGE=false
+
+
+#parse the arguments
+VALID_STR=$(getopt -o hcraso:p:w --long help,clean,release,static,address_sanitizer,outdir:,package:,wheel -- "$@")
+eval set -- "$VALID_STR"
+
+while true ;
+do
+    case "$1" in
+        -h | --help)
+                printUsage ; exit 0;;
+        -c | --clean)
+                TARGET="clean" ; ((CLEAN_OR_OUT|=1)) ; shift ;;
+        -r | --release)
+                BUILD_TYPE="Release" ; shift ;;
+        -a | --address_sanitizer)
+                set_asan_env_vars
+                set_address_sanitizer_on ; shift ;;
+        -s | --static)
+                SHARED_LIBS="OFF" ; shift ;;
+        -o | --outdir)
+                TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
+        -p | --package)
+                MAKETARGET="$2" ; shift 2 ;;
+        -w | --wheel)
+                WHEEL_PACKAGE=true ; shift ;;
+        --)     shift; break;; # end delimiter
+        *)
+                echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] ">&2 ; exit 20;;
+    esac
+
+done
+
+RET_CONFLICT=1
+check_conflicting_options "$CLEAN_OR_OUT" "$PKGTYPE" "$MAKETARGET"
+if [ $RET_CONFLICT -ge 30 ]; then
+   print_vars "$API_NAME" "$TARGET" "$BUILD_TYPE" "$SHARED_LIBS" "$CLEAN_OR_OUT" "$PKGTYPE" "$MAKETARGET"
+   exit $RET_CONFLICT
+fi
+
+clean() {
+    echo "Cleaning $PROJ_NAME"
+    rm -rf "$ROCM_WHEEL_DIR"
+    rm -rf "$BUILD_DIR"
+    rm -rf "$PACKAGE_DEB"
+    rm -rf "$PACKAGE_RPM"
+    rm -rf "$PACKAGE_ROOT/${PROJ_NAME:?}"
+    rm -rf "$PACKAGE_LIB/${LIB_NAME:?}"*
+}
+
+build() {
+    echo "Building $PROJ_NAME"
+    if [ "$DISTRO_ID" = centos-7 ]; then
+        echo "Skip make and uploading packages for Omniperf on Centos7 distro, due to python dependency"
+        exit 0
+    fi
+
+    if [ ! -d "$BUILD_DIR" ]; then
+        mkdir -p "$BUILD_DIR"
+        pushd "$BUILD_DIR" || exit
+
+        echo "ROCm CMake Params: $(rocm_cmake_params)"
+        echo "ROCm Common CMake Params: $(rocm_common_cmake_params)"
+
+        print_lib_type $SHARED_LIBS
+        cmake \
+            $(rocm_cmake_params) \
+            $(rocm_common_cmake_params) \
+            -DCHECK_PYTHON_DEPS=NO \
+            -DPYTHON_DEPS=${BUILD_DIR}/python-libs \
+            -DMOD_INSTALL_PATH=${BUILD_DIR}/modulefiles \
+            "$OMNIPERF_ROOT"
+    fi
+
+    make $MAKE_OPTS
+    make $MAKE_OPTS install
+    make $MAKE_OPTS package
+
+    copy_if DEB "${CPACKGEN:-"DEB;RPM"}" "$PACKAGE_DEB" "$BUILD_DIR/${API_NAME}"*.deb
+    copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "$PACKAGE_RPM" "$BUILD_DIR/${API_NAME}"*.rpm
+}
+
+create_wheel_package() {
+    echo "Creating Omniperf wheel package"
+
+    # Copy the setup.py generator to build folder
+    mkdir -p "$ROCM_WHEEL_DIR"
+    cp -f "$SCRIPT_ROOT"/generate_setup_py.py "$ROCM_WHEEL_DIR"
+    cp -f "$SCRIPT_ROOT"/repackage_wheel.sh "$ROCM_WHEEL_DIR"
+    cd "$ROCM_WHEEL_DIR" || exit
+
+    # Currently only supports python3.6
+    ./repackage_wheel.sh "$BUILD_DIR"/*.rpm python3.6
+
+    # Copy the wheel created to RPM folder which will be uploaded to artifactory
+    copy_if WHL "WHL" "$PACKAGE_RPM" "$ROCM_WHEEL_DIR"/dist/*.whl
+}
+
+print_output_directory() {
+    case ${PKGTYPE} in
+        ("deb")
+            echo "${PACKAGE_DEB}";;
+        ("rpm")
+            echo "${PACKAGE_RPM}";;
+        (*)
+            echo "Invalid package type \"${PKGTYPE}\" provided for -o" >&2; exit 1;;
+    esac
+    exit
+}
+
+verifyEnvSetup
+
+case "$TARGET" in
+    (clean) clean ;;
+    (build) build ;;
+    (outdir) print_output_directory ;;
+    (*) die "Invalid target $TARGET" ;;
+esac
+
+if [[ $WHEEL_PACKAGE == true ]]; then
+    echo "Wheel Package build started !!!!"
+    create_wheel_package
+fi
+
+echo "Operation complete"
--- a/tools/rocm-build/build_omnitrace.sh
+++ b/tools/rocm-build/build_omnitrace.sh
@@ -0,0 +1,191 @@
+#!/bin/bash
+
+source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
+
+printUsage() {
+    echo
+    echo "Usage: ${BASH_SOURCE##*/} [options ...]"
+    echo
+    echo "Options:"
+    echo "  -c,  --clean              Clean output and delete all intermediate work"
+    echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
+    echo "  -p,  --package <type>     Specify packaging format"
+    echo "  -r,  --release            Make a release build instead of a debug build"
+    echo "  -a,  --address_sanitizer  Enable address sanitizer"
+    echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
+                                      type referred to by pkg_type"
+    echo "  -w,  --wheel              Creates python wheel package of omnitrace.
+                                      It needs to be used along with -r option"
+    echo "  -h,  --help               Prints this help"
+    echo
+    echo "Possible values for <type>:"
+    echo "  deb -> Debian format (default)"
+    echo "  rpm -> RPM format"
+    echo
+
+    return 0
+}
+
+API_NAME="omnitrace"
+PROJ_NAME="$API_NAME"
+LIB_NAME="lib${API_NAME}"
+TARGET="build"
+MAKETARGET="deb"
+PACKAGE_ROOT="$(getPackageRoot)"
+PACKAGE_LIB="$(getLibPath)"
+BUILD_DIR="$(getBuildPath $API_NAME)"
+PACKAGE_DEB="$(getPackageRoot)/deb/$API_NAME"
+PACKAGE_RPM="$(getPackageRoot)/rpm/$API_NAME"
+BUILD_TYPE="Debug"
+MAKE_OPTS="-j 8"
+SHARED_LIBS="ON"
+CLEAN_OR_OUT=0
+MAKETARGET="deb"
+PKGTYPE="deb"
+ASAN=0
+
+#parse the arguments
+VALID_STR=$(getopt -o hcraso:p:w --long help,clean,release,address_sanitizer,static,outdir:,package:,wheel -- "$@")
+eval set -- "$VALID_STR"
+
+while true; do
+    case "$1" in
+    -h | --help)
+        printUsage
+        exit 0
+        ;;
+    -c | --clean)
+        TARGET="clean"
+        ((CLEAN_OR_OUT |= 1))
+        shift
+        ;;
+    -r | --release)
+        BUILD_TYPE="RelWithDebInfo"
+        shift
+        ;;
+    -a | --address_sanitizer)
+        ack_and_ignore_asan
+
+        ASAN=1
+        shift
+        ;;
+    -s | --static)
+        SHARED_LIBS="OFF"
+        shift
+        ;;
+    -o | --outdir)
+        TARGET="outdir"
+        PKGTYPE=$2
+        ((CLEAN_OR_OUT |= 2))
+        shift 2
+        ;;
+    -p | --package)
+        MAKETARGET="$2"
+        shift 2
+        ;;
+    -w | --wheel)
+	   echo "omnitrace: wheel build option accepted and ignored"
+       shift
+       ;;
+    --)
+        shift
+        break
+        ;;
+    *)
+        echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] " >&2
+        exit 20
+        ;;
+    esac
+
+done
+
+RET_CONFLICT=1
+check_conflicting_options $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
+if [ $RET_CONFLICT -ge 30 ]; then
+    print_vars $API_NAME $TARGET $BUILD_TYPE $SHARED_LIBS $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
+    exit $RET_CONFLICT
+fi
+
+clean() {
+    echo "Cleaning $PROJ_NAME"
+    rm -rf "$BUILD_DIR"
+    rm -rf "$PACKAGE_DEB"
+    rm -rf "$PACKAGE_RPM"
+    rm -rf "$PACKAGE_ROOT/${PROJ_NAME:?}"
+    rm -rf "$PACKAGE_LIB/${LIB_NAME:?}"*
+}
+
+build_omnitrace() {
+    echo "Building $PROJ_NAME"
+    if [ "$DISTRO_ID" = "mariner-2.0" ] || [ "$DISTRO_ID" = "ubuntu-24.04" ] || [ "$DISTRO_ID" = "azurelinux-3.0" ]; then
+        echo "Skip make and uploading packages for Omnitrace on \"${DISTRO_ID}\" distro"
+        exit 0
+    fi
+
+    if [ $ASAN == 1 ]; then
+        echo "Skip make and uploading packages for Omnitrace on ASAN build"
+        exit 0
+    fi
+    if [ ! -d "$BUILD_DIR" ]; then
+        mkdir -p "$BUILD_DIR"
+        echo "Created build directory: $BUILD_DIR"
+    fi
+
+    echo "Build directory: $BUILD_DIR"
+    pushd "$BUILD_DIR" || exit
+    print_lib_type $SHARED_LIBS
+
+    echo "ROCm CMake Params: $(rocm_cmake_params)"
+    echo "ROCm Common CMake Params: $(rocm_common_cmake_params)"
+
+
+    if [ $ASAN == 1 ]; then
+        echo "Address Sanitizer path"
+
+    else
+        cmake \
+            $(rocm_cmake_params) \
+            $(rocm_common_cmake_params) \
+            -DOMNITRACE_BUILD_{LIBUNWIND,DYNINST}=ON \
+            -DDYNINST_BUILD_{TBB,BOOST,ELFUTILS,LIBIBERTY}=ON \
+            "$OMNITRACE_ROOT"
+    fi
+
+
+    popd || exit
+
+    echo "Make Options: $MAKE_OPTS"
+    cmake --build "$BUILD_DIR" --target all -- $MAKE_OPTS
+    cmake --build "$BUILD_DIR" --target install -- $MAKE_OPTS
+    cmake --build "$BUILD_DIR" --target package -- $MAKE_OPTS
+
+    copy_if DEB "${CPACKGEN:-"DEB;RPM"}" "$PACKAGE_DEB" "$BUILD_DIR/${API_NAME}"*.deb
+    copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "$PACKAGE_RPM" "$BUILD_DIR/${API_NAME}"*.rpm
+}
+
+print_output_directory() {
+    case ${PKGTYPE} in
+    "deb")
+        echo "${PACKAGE_DEB}"
+        ;;
+    "rpm")
+        echo "${PACKAGE_RPM}"
+        ;;
+    *)
+        echo "Invalid package type \"${PKGTYPE}\" provided for -o" >&2
+        exit 1
+        ;;
+    esac
+    exit
+}
+
+verifyEnvSetup
+
+case "$TARGET" in
+clean) clean ;;
+build) build_omnitrace ;;
+outdir) print_output_directory ;;
+*) die "Invalid target $TARGET" ;;
+esac
+
+echo "Operation complete"
--- a/tools/rocm-build/build_opencl_icd_loader.sh
+++ b/tools/rocm-build/build_opencl_icd_loader.sh
@@ -0,0 +1,141 @@
+#!/bin/bash
+
+source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
+PROJ_NAME=OpenCL-ICD-Loader
+TARGET="build"
+MAKEOPTS="$DASH_JAY"
+BUILD_TYPE="Debug"
+PACKAGE_ROOT="$(getPackageRoot)"
+PACKAGE_DEB="$PACKAGE_ROOT/deb/${PROJ_NAME,,}"
+PACKAGE_RPM="$PACKAGE_ROOT/rpm/${PROJ_NAME,,}"
+CLEAN_OR_OUT=0;
+PKGTYPE="deb"
+MAKETARGET="deb"
+API_NAME="rocm-opencl-icd-loader"
+
+printUsage() {
+    echo
+    echo "Usage: $(basename "${BASH_SOURCE}") [options ...]"
+    echo
+    echo "Options:"
+    echo "  -c,  --clean              Clean output and delete all intermediate work"
+    echo "  -p,  --package <type>     Specify packaging format"
+    echo "  -r,  --release            Make a release build instead of a debug build"
+    echo "  -h,  --help               Prints this help"
+    echo "  -o,  --outdir             Print path of output directory containing packages"
+    echo "  -s,  --static             Component/Build does not support static builds just accepting this param & ignore. No effect of the param on this build"
+    echo
+    echo "Possible values for <type>:"
+    echo "  deb -> Debian format (default)"
+    echo "  rpm -> RPM format"
+    echo
+    return 0
+}
+
+RET_CONFLICT=1
+check_conflicting_options $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
+if [ $RET_CONFLICT -ge 30 ]; then
+   print_vars $TARGET $BUILD_TYPE $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
+   exit $RET_CONFLICT
+fi
+
+clean_opencl_icd_loader() {
+    echo "Cleaning $PROJ_NAME"
+    rm -rf "$PACKAGE_DEB"
+    rm -rf "$PACKAGE_RPM"
+    rm -rf "$PACKAGE_ROOT/${PROJ_NAME,,}"
+}
+
+copy_pkg_files_to_rocm() {
+    local comp_folder=$1
+    local comp_pkg_name=$2
+
+    cd "${OUT_DIR}/${PKGTYPE}/${comp_folder}"|| exit 2
+    if [ "${PKGTYPE}" = 'deb' ]; then
+        dpkg-deb -x ${comp_pkg_name}_*.deb pkg/
+    else
+        mkdir pkg && pushd pkg/ || exit 2
+        if [[ "${comp_pkg_name}" != *-dev* ]]; then
+            rpm2cpio ../${comp_pkg_name}-*.rpm | cpio -idmv
+        else
+            rpm2cpio ../${comp_pkg_name}el-*.rpm | cpio -idmv
+        fi
+        popd || exit 2
+    fi
+    ls ./pkg -alt
+    cp -r ./pkg/*/rocm*/* "${ROCM_PATH}" || exit 2
+    rm -rf pkg/
+}
+
+build_opencl_icd_loader() {
+    echo "Downloading $PROJ_NAME" package
+    if [ "$DISTRO_NAME" = ubuntu ]; then
+        mkdir -p "$PACKAGE_DEB"
+        local rocm_ver=${ROCM_VERSION}
+        if [ ${ROCM_VERSION##*.} = 0 ]; then
+            rocm_ver=${ROCM_VERSION%.*}
+        fi
+        local url="https://repo.radeon.com/rocm/apt/${rocm_ver}/pool/main/r/${API_NAME}/"
+        local package
+        package=$(curl -s "$url" | grep -Po 'href="\K[^"]*' | grep "${DISTRO_RELEASE}" | head -n 1)
+
+        if [ -z "$package" ]; then
+            echo "No package found for Ubuntu version $DISTRO_RELEASE"
+            exit 1
+        fi
+
+        wget -t3 -P "$PACKAGE_DEB" "${url}${package}"
+        copy_pkg_files_to_rocm ${PROJ_NAME,,} ${API_NAME}
+    else
+        echo "$DISTRO_ID is not supported..."
+        exit 2
+    fi
+
+    echo "Installing $PROJ_NAME" package
+}
+
+print_output_directory() {
+    case ${PKGTYPE} in
+        ("deb")
+            echo ${PACKAGE_DEB};;
+        ("rpm")
+            echo ${PACKAGE_RPM};;
+        (*)
+            echo "Invalid package type \"${PKGTYPE}\" provided for -o" >&2; exit 1;;
+    esac
+    exit
+}
+
+VALID_STR=`getopt -o hcraswlo:p: --long help,clean,release,outdir:,package: -- "$@"`
+eval set -- "$VALID_STR"
+while true ;
+do
+    case "$1" in
+        (-c  | --clean )
+            TARGET="clean" ; ((CLEAN_OR_OUT|=1)) ; shift ;;
+        (-r  | --release )
+            BUILD_TYPE="RelWithDebInfo" ; shift ;;
+        (-h  | --help )
+            printUsage ; exit 0 ;;
+        (-a  | --address_sanitizer)
+            ack_and_ignore_asan ; shift ;;
+        (-o  | --outdir)
+            TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
+        (-p | --package)
+            MAKETARGET="$2" ; shift 2;;
+	(-s | --static)
+            echo "-s parameter accepted but ignored" ; shift ;;
+        --)     shift; break;;
+        (*)
+            echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] ">&2 ; exit 20;;
+    esac
+done
+
+case $TARGET in
+    (clean) clean_opencl_icd_loader ;;
+    (build) build_opencl_icd_loader ;;
+    (outdir) print_output_directory ;;
+    (*) die "Invalid target $TARGET" ;;
+esac
+
+echo "Operation complete"
--- a/tools/rocm-build/build_rccl.sh
+++ b/tools/rocm-build/build_rccl.sh
@@ -26,14 +26,16 @@ build_rccl() {
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi

+    init_rocm_common_cmake_params

    CC=${ROCM_PATH}/bin/amdclang \
    CXX=$(set_build_variables CXX) \
    cmake \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DHIP_COMPILER=clang \
        -DCMAKE_PREFIX_PATH="${ROCM_PATH};${ROCM_PATH}/share/rocm/cmake/" \
+        ${LAUNCHER_FLAGS} \
        -DCPACK_GENERATOR="${PKGTYPE^^}" \
        -DROCM_PATCH_VERSION=$ROCM_LIBPATCH_VERSION \
        -DBUILD_ADDRESS_SANITIZER="${ADDRESS_SANITIZER}" \
--- a/tools/rocm-build/build_rocal.sh
+++ b/tools/rocm-build/build_rocal.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+set -ex
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
+
+set_component_src rocAL
+
+build_rocal() {
+
+    if [ "$DISTRO_ID" = "mariner-2.0" ] ; then
+     echo "Not building rocal for ${DISTRO_ID}. Exiting..."
+     return 0
+    fi
+
+    echo "Start build"
+
+    # Enable ASAN
+    if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
+        set_asan_env_vars
+        set_address_sanitizer_on
+    fi
+
+#    python3 ${COMPONENT_SRC}/rocAL-setup.py
+    pushd /tmp
+    # PyBind11
+    git clone -b v2.11.1  https://github.com/pybind/pybind11
+    cd pybind11 && mkdir build && cd build
+    cmake -DDOWNLOAD_CATCH=ON -DDOWNLOAD_EIGEN=ON ../
+    make -j$(nproc) && sudo make install
+    cd ../..
+    # Turbo JPEG
+    git clone -b 3.0.2 https://github.com/libjpeg-turbo/libjpeg-turbo.git
+    cd libjpeg-turbo && mkdir build && cd build
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib -DWITH_JPEG8=TRUE ..
+    make -j$(nproc) && sudo make install
+    cd ../..
+    # RapidJSON
+    git clone https://github.com/Tencent/rapidjson.git
+    cd rapidjson && mkdir build && cd build
+    cmake .. && make -j$(nproc) && sudo make install
+    popd
+
+    mkdir -p $BUILD_DIR && cd $BUILD_DIR
+
+    cmake -DAMDRPP_PATH=$ROCM_PATH ${COMPONENT_SRC}
+    make -j${PROC}
+    cmake --build . --target PyPackageInstall
+    sudo make install
+    sudo make package
+    sudo chown -R $(id -u):$(id -g) ${BUILD_DIR}
+
+    rm -rf _CPack_Packages/ && find -name '*.o' -delete
+    mkdir -p $PACKAGE_DIR
+    cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
+    show_build_cache_stats
+}
+
+clean_rocal() {
+    echo "Cleaning rocAL build directory: ${BUILD_DIR} ${PACKAGE_DIR}"
+    rm -rf "$BUILD_DIR" "$PACKAGE_DIR"
+    echo "Done!"
+}
+
+stage2_command_args "$@"
+
+case $TARGET in
+    build) build_rocal ;;
+    outdir) print_output_directory ;;
+    clean) clean_rocal ;;
+    *) die "Invalid target $TARGET" ;;
+esac
--- a/tools/rocm-build/build_rocalution.sh
+++ b/tools/rocm-build/build_rocalution.sh
@@ -22,6 +22,7 @@ build_rocalution() {
    echo "CXX compiler: $CXX"

    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -32,7 +33,7 @@ build_rocalution() {
    cmake \
        -DSUPPORT_HIP=ON \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DCPACK_SET_DESTDIR=OFF \
        -DBUILD_CLIENTS_SAMPLES=ON \
--- a/tools/rocm-build/build_rocblas.sh
+++ b/tools/rocm-build/build_rocblas.sh
@@ -28,11 +28,12 @@ build_rocblas() {
    else
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi
+    init_rocm_common_cmake_params

    cmake \
        -DCMAKE_TOOLCHAIN_FILE=toolchain-linux.cmake \
        -DBUILD_DIR="${BUILD_DIR}" \
-        $(rocm_common_cmake_params) \
+	"${rocm_math_common_cmake_params[@]}" \
        -DROCM_DIR="${ROCM_PATH}" \
        ${LAUNCHER_FLAGS} \
        -DCMAKE_PREFIX_PATH="${DEPS_DIR};${ROCM_PATH}" \
--- a/tools/rocm-build/build_rocdecode.sh
+++ b/tools/rocm-build/build_rocdecode.sh
@@ -4,15 +4,16 @@ source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 set_component_src rocDecode
 BUILD_DEV=ON
 build_rocdecode() {
-    if [ "$DISTRO_ID" = "centos-7" ] ; then
+    if [ "$DISTRO_ID" = "centos-7" ] || [ "$DISTRO_ID" = "sles-15.4" ] ; then
     echo "Not building rocDecode for ${DISTRO_ID}. Exiting..." 
     return 0
    fi

    echo "Start build"
    mkdir -p $BUILD_DIR && cd $BUILD_DIR
+    python3 ${COMPONENT_SRC}/rocDecode-setup.py --developer OFF
    
-    cmake ${COMPONENT_SRC}
+    cmake -DROCM_DEP_ROCMCORE=ON ${COMPONENT_SRC}
    make -j8
    make install
    make package
--- a/tools/rocm-build/build_rocfft.sh
+++ b/tools/rocm-build/build_rocfft.sh
@@ -16,6 +16,7 @@ build_rocfft() {
         set_address_sanitizer_on
    fi
    mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
+    init_rocm_common_cmake_params

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -26,7 +27,7 @@ build_rocfft() {
    CXX="${ROCM_PATH}/bin/hipcc" \
    cmake \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DUSE_HIP_CLANG=ON \
        -DHIP_COMPILER=clang  \
--- a/tools/rocm-build/build_rocm-cmake.sh
+++ b/tools/rocm-build/build_rocm-cmake.sh
@@ -10,11 +10,13 @@ printUsage() {
    echo "  -c,  --clean              Clean output and delete all intermediate work"
    echo "  -r,  --release            Build a release version of the package"
    echo "  -a,  --address_sanitizer  Enable address sanitizer"
-    echo "  -s,  --static             Supports static CI by accepting this param & not bailing out. No effect of the param though"
+    echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
+    echo "  -w,  --wheel              Creates python wheel package of rocm-cmake. 
+                                      It needs to be used along with -r option"
    echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
    type referred to by pkg_type"
    echo "  -p,  --package <type>     Specify packaging format"
-    echo "  -h,  --help             Prints this help"
+    echo "  -h,  --help               Prints this help"
    echo
    echo

@@ -30,6 +32,7 @@ ROCM_CMAKE_BUILD_DIR="$(getBuildPath rocm-cmake)"
 ROCM_CMAKE_BUILD_DIR="$(getBuildPath rocm-cmake)"
 ROCM_CMAKE_PACKAGE_DEB="$(getPackageRoot)/deb/rocm-cmake"
 ROCM_CMAKE_PACKAGE_RPM="$(getPackageRoot)/rpm/rocm-cmake"
+ROCM_WHEEL_DIR="${ROCM_CMAKE_BUILD_DIR}/_wheel"
 ROCM_CMAKE_BUILD_TYPE="debug"
 BUILD_TYPE="Debug"
 SHARED_LIBS="ON"
@@ -37,7 +40,7 @@ CLEAN_OR_OUT=0;
 PKGTYPE="deb"
 MAKETARGET="deb"

-VALID_STR=`getopt -o hcraso:p: --long help,clean,release,static,address_sanitizer,outdir:,package: -- "$@"`
+VALID_STR=`getopt -o hcraswo:p: --long help,clean,release,static,wheel,address_sanitizer,outdir:,package: -- "$@"`
 eval set -- "$VALID_STR"

 while true ;
@@ -53,6 +56,8 @@ do
                ack_and_ignore_asan ; shift ;;
        (-s | --static)
                SHARED_LIBS="OFF" ; shift ;;
+        (-w | --wheel)
+            WHEEL_PACKAGE=true ; shift ;;
        (-o | --outdir)
                TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
        (-p | --package)
@@ -73,6 +78,7 @@ fi


 clean_rocm_cmake() {
+    rm -rf "$ROCM_WHEEL_DIR"
    rm -rf $ROCM_CMAKE_BUILD_DIR
    rm -rf $ROCM_CMAKE_PACKAGE_DEB
    rm -rf $ROCM_CMAKE_PACKAGE_RPM
@@ -87,6 +93,7 @@ build_rocm_cmake() {

        cmake \
            $(rocm_cmake_params) \
+            -DBUILD_SHARED_LIBS=$SHARED_LIBS \
            -DCPACK_SET_DESTDIR="OFF" \
            -DROCM_DISABLE_LDCONFIG=ON \
            $ROCM_CMAKE_ROOT
@@ -99,6 +106,19 @@ build_rocm_cmake() {
    copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "$ROCM_CMAKE_PACKAGE_RPM" $ROCM_CMAKE_BUILD_DIR/rocm-cmake*.rpm
 }

+create_wheel_package() {
+    echo "Creating rocm-cmake wheel package"
+    # Copy the setup.py generator to build folder
+    mkdir -p $ROCM_WHEEL_DIR
+    cp -f $SCRIPT_ROOT/generate_setup_py.py $ROCM_WHEEL_DIR
+    cp -f $SCRIPT_ROOT/repackage_wheel.sh $ROCM_WHEEL_DIR
+    cd $ROCM_WHEEL_DIR
+    # Currently only supports python3.6
+    ./repackage_wheel.sh $ROCM_CMAKE_BUILD_DIR/rocm-cmake*.rpm python3.6
+    # Copy the wheel created to RPM folder which will be uploaded to artifactory
+    copy_if WHL "WHL" "$ROCM_CMAKE_PACKAGE_RPM" "$ROCM_WHEEL_DIR"/dist/*.whl
+}
+
 print_output_directory() {
    case ${PKGTYPE} in
        ("deb")
@@ -118,4 +138,9 @@ case $TARGET in
    (*) die "Invalid target $TARGET" ;;
 esac

+if [[ $WHEEL_PACKAGE == true ]]; then
+    echo "Wheel Package build started !!!!"
+    create_wheel_package
+fi
+
 echo "Operation complete"
--- a/tools/rocm-build/build_rocprim.sh
+++ b/tools/rocm-build/build_rocprim.sh
@@ -24,13 +24,14 @@ build_rocprim() {
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi

+    init_rocm_common_cmake_params
    CXX="${ROCM_PATH}/bin/hipcc" \
    cmake \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DBUILD_BENCHMARK=OFF \
-        -DBUILD_BENCHMARK=OFF \
+	-DBUILD_SHARED_LIBS=ON \
        -DBUILD_TEST=ON \
        -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip;${ROCM_PATH}/hip/cmake" \
        "$COMPONENT_SRC"
--- a/tools/rocm-build/build_rocprofiler-sdk.sh
+++ b/tools/rocm-build/build_rocprofiler-sdk.sh
@@ -0,0 +1,222 @@
+#!/bin/bash
+
+source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
+
+printUsage() {
+    echo
+    echo "Usage: ${BASH_SOURCE##*/} [options ...]"
+    echo
+    echo "Options:"
+    echo "  -c,  --clean              Clean output and delete all intermediate work"
+    echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
+    echo "  -w,  --wheel              Creates python wheel package of rocprofiler-sdk. 
+                                      It needs to be used along with -r option"
+    echo "  -p,  --package <type>     Specify packaging format"
+    echo "  -r,  --release            Make a release build instead of a debug build"
+    echo "  -a,  --address_sanitizer  Enable address sanitizer"
+    echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
+    type referred to by pkg_type"
+    echo "  -h,  --help               Prints this help"
+    echo
+    echo "Possible values for <type>:"
+    echo "  deb -> Debian format (default)"
+    echo "  rpm -> RPM format"
+    echo
+
+    return 0
+}
+
+API_NAME="rocprofiler-sdk"
+PROJ_NAME="$API_NAME"
+LIB_NAME="lib${API_NAME}"
+TARGET="build"
+MAKETARGET="deb"
+PACKAGE_ROOT="$(getPackageRoot)"
+PACKAGE_LIB="$(getLibPath)"
+PACKAGE_INCLUDE="$(getIncludePath)"
+BUILD_DIR="$(getBuildPath $API_NAME)"
+PACKAGE_DEB="$(getPackageRoot)/deb/$API_NAME"
+PACKAGE_RPM="$(getPackageRoot)/rpm/$API_NAME"
+ROCM_WHEEL_DIR="${BUILD_DIR}/_wheel"
+PACKAGE_PREFIX="$ROCM_INSTALL_PATH"
+BUILD_TYPE="Debug"
+MAKE_OPTS="$DASH_JAY"
+SHARED_LIBS="ON"
+CLEAN_OR_OUT=0
+MAKETARGET="deb"
+PKGTYPE="deb"
+
+GPU_LIST="gfx900;gfx906;gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1031;gfx1100;gfx1101;gfx1102"
+ASAN=0
+
+VALID_STR=$(getopt -o hcrawso:p: --long help,clean,release,static,address_sanitizer,wheel,outdir:,package: -- "$@")
+eval set -- "$VALID_STR"
+
+while true; do
+    case "$1" in
+        -h | --help)
+            printUsage
+            exit 0
+        ;;
+        -c | --clean)
+            TARGET="clean"
+            ((CLEAN_OR_OUT |= 1))
+            shift
+        ;;
+        -r | --release)
+            BUILD_TYPE="RelWithDebInfo"
+            shift
+        ;;
+        -a | --address_sanitizer)
+            set_address_sanitizer_on
+	        set_asan_env_vars
+            ASAN=1
+            shift
+        ;;
+        -s | --static)
+            SHARED_LIBS="OFF"
+            shift
+        ;;
+        -w | --wheel)
+            WHEEL_PACKAGE=true
+            shift
+        ;;
+        -o | --outdir)
+            TARGET="outdir"
+            PKGTYPE=$2
+            OUT_DIR_SPECIFIED=1
+            ((CLEAN_OR_OUT |= 2))
+            shift 2
+        ;;
+        -p | --package)
+            MAKETARGET="$2"
+            shift 2
+        ;;
+        --)
+            shift
+            break
+        ;; # end delimiter
+        *)
+            echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] " >&2
+            exit 20
+        ;;
+    esac
+
+done
+
+RET_CONFLICT=1
+check_conflicting_options $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
+if [ $RET_CONFLICT -ge 30 ]; then
+    print_vars $API_NAME $TARGET $BUILD_TYPE $SHARED_LIBS $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
+    exit $RET_CONFLICT
+fi
+
+clean() {
+    echo "Cleaning $PROJ_NAME"
+    rm -rf "$ROCM_WHEEL_DIR"
+    rm -rf "$BUILD_DIR"
+    rm -rf "$PACKAGE_DEB"
+    rm -rf "$PACKAGE_RPM"
+    rm -rf "$PACKAGE_ROOT/${PROJ_NAME}"
+    rm -rf "$PACKAGE_ROOT/libexec/${PROJ_NAME}"
+    rm -rf "$PACKAGE_INCLUDE/${PROJ_NAME}"
+    rm -rf "$PACKAGE_LIB/${LIB_NAME}"*
+    rm -rf "$PACKAGE_LIB/${PROJ_NAME}"
+}
+
+build_rocprofiler-sdk() {
+    if [ ! -f "${ROCPROFILER_SDK_ROOT}/CMakeLists.txt" ]; then
+        echo "Warning: $ROCPROFILER_SDK_ROOT not found"
+    else
+        echo "Building $PROJ_NAME"
+        PACKAGE_CMAKE="$(getCmakePath)"
+        if [ ! -d "$BUILD_DIR" ]; then
+            mkdir -p "$BUILD_DIR"
+            pushd "$BUILD_DIR"
+            print_lib_type $SHARED_LIBS
+
+            if [ $ASAN == 1 ]; then
+                cmake \
+                $(rocm_cmake_params) \
+                $(rocm_common_cmake_params) \
+                -DAMDDeviceLibs_DIR="${ROCM_INSTALL_PATH}/lib/asan/cmake/AMDDeviceLibs" \
+                -Dhip_DIR="${ROCM_INSTALL_PATH}/lib/asan/cmake/hip" \
+                -Dhip-lang_DIR="${ROCM_INSTALL_PATH}/lib/asan/cmake/hip-lang" \
+                -Damd_comgr_DIR="${ROCM_INSTALL_PATH}/lib/asan/cmake/amd_comgr" \
+                -Dhsa-runtime64_DIR="${ROCM_INSTALL_PATH}/lib/asan/cmake/hsa-runtime64" \
+                -Dhsakmt_DIR="${ROCM_INSTALL_PATH}/lib/asan/cmake/hsakmt" \
+                -DCMAKE_HIP_COMPILER_ROCM_ROOT="${ROCM_INSTALL_PATH}" \
+                -DCMAKE_PREFIX_PATH="${ROCM_INSTALL_PATH};${ROCM_INSTALL_PATH}/lib/asan" \
+                -DBUILD_SHARED_LIBS=$SHARED_LIBS \
+                -DGPU_TARGETS="$GPU_LIST" \
+                -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=OFF \
+                -DPython3_EXECUTABLE=$(which python3) \
+                "$ROCPROFILER_SDK_ROOT"
+            else
+                cmake \
+                $(rocm_cmake_params) \
+                $(rocm_common_cmake_params) \
+                -DCMAKE_PREFIX_PATH="${ROCM_INSTALL_PATH}" \
+                -DBUILD_SHARED_LIBS=$SHARED_LIBS \
+                -DGPU_TARGETS="$GPU_LIST" \
+                -DROCPROFILER_BUILD_SAMPLES=ON \
+                -DROCPROFILER_BUILD_TESTS=ON \
+                -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=OFF \
+                -DPython3_EXECUTABLE=$(which python3) \
+                "$ROCPROFILER_SDK_ROOT"
+            fi
+
+            popd
+        fi
+        cmake --build "$BUILD_DIR" --target all -- $MAKE_OPTS
+        cmake --build "$BUILD_DIR" --target install -- $MAKE_OPTS
+        cmake --build "$BUILD_DIR" --target package -- $MAKE_OPTS
+
+        copy_if DEB "${CPACKGEN:-"DEB;RPM"}" "$PACKAGE_DEB" "$BUILD_DIR/${API_NAME}"*.deb
+        copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "$PACKAGE_RPM" "$BUILD_DIR/${API_NAME}"*.rpm
+    fi
+}
+
+create_wheel_package() {
+    echo "Creating rocprofiler sdk wheel package"
+    mkdir -p "$ROCM_WHEEL_DIR"
+    cp -f "$SCRIPT_ROOT"/generate_setup_py.py "$ROCM_WHEEL_DIR"
+    cp -f "$SCRIPT_ROOT"/repackage_wheel.sh "$ROCM_WHEEL_DIR"
+    cd "$ROCM_WHEEL_DIR"
+    # Currently only supports python3.6
+    ./repackage_wheel.sh "$BUILD_DIR"/*.rpm python3.6
+    # Copy the wheel created to RPM folder which will be uploaded to artifactory
+    copy_if WHL "WHL" "$PACKAGE_RPM" "$ROCM_WHEEL_DIR"/dist/*.whl
+}
+
+print_output_directory() {
+    case ${PKGTYPE} in
+        "deb")
+            echo ${PACKAGE_DEB}
+        ;;
+        "rpm")
+            echo ${PACKAGE_RPM}
+        ;;
+        *)
+            echo "Invalid package type \"${PKGTYPE}\" provided for -o" >&2
+            exit 1
+        ;;
+    esac
+    exit
+}
+
+verifyEnvSetup
+
+case "$TARGET" in
+    clean) clean ;;
+    build) build_rocprofiler-sdk ;;
+    outdir) print_output_directory ;;
+    *) die "Invalid target $TARGET" ;;
+esac
+
+if [[ $WHEEL_PACKAGE == true ]]; then
+    echo "Wheel Package build started !!!!"
+    create_wheel_package
+fi
+
+echo "Operation complete"
--- a/tools/rocm-build/build_rocrand.sh
+++ b/tools/rocm-build/build_rocrand.sh
@@ -25,10 +25,12 @@ build_rocrand() {
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi

+    init_rocm_common_cmake_params
+
    CXX=$(set_build_variables CXX)\
    cmake \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DBUILD_TEST=ON \
        -DBUILD_BENCHMARK=ON \
--- a/tools/rocm-build/build_rocsolver.sh
+++ b/tools/rocm-build/build_rocsolver.sh
@@ -28,11 +28,13 @@ build_rocsolver() {
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi

+    init_rocm_common_cmake_params
+
    CXX="${ROCM_PATH}/bin/hipcc" \
    cmake \
        -DCPACK_SET_DESTDIR=OFF \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -Drocblas_DIR="${ROCM_PATH}/rocblas/lib/cmake/rocblas" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DBUILD_CLIENTS_TESTS=ON \
--- a/tools/rocm-build/build_rocsparse.sh
+++ b/tools/rocm-build/build_rocsparse.sh
@@ -27,12 +27,14 @@ build_rocsparse() {
    fi

    ROCSPARSE_TEST_MIRROR=$MIRROR \
-    CXX=$(set_build_variables CXX)\
-    CC=$(set_build_variables CC)\
+    export CXX=$(set_build_variables CXX)\
+    export CC=$(set_build_variables CC)\
+
+    init_rocm_common_cmake_params
    cmake \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}"\
        -DBUILD_CLIENTS_SAMPLES=ON \
        -DBUILD_CLIENTS_TESTS=ON \
        -DBUILD_CLIENTS_BENCHMARKS=ON \
--- a/tools/rocm-build/build_rocthrust.sh
+++ b/tools/rocm-build/build_rocthrust.sh
@@ -27,10 +27,12 @@ build_rocthrust() {
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101"
    fi

+    init_rocm_common_cmake_params
+
    CXX=$(set_build_variables CXX)\
    cmake \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip;${ROCM_PATH}/hip/cmake" \
        -DROCPRIM_ROOT="${ROCM_PATH}/rocprim" \
--- a/tools/rocm-build/build_rocwmma.sh
+++ b/tools/rocm-build/build_rocwmma.sh
@@ -27,9 +27,11 @@ build_rocwmma() {
        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1100;gfx1101"
    fi

+    init_rocm_common_cmake_params
+
    CXX=$(set_build_variables CXX)\
    cmake \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        ${LAUNCHER_FLAGS} \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DROCWMMA_BUILD_VALIDATION_TESTS=ON \
--- a/tools/rocm-build/build_rpp.sh
+++ b/tools/rocm-build/build_rpp.sh
@@ -12,7 +12,7 @@ ROCM_LLVM_LIB_RPATH="\$ORIGIN/llvm/lib"
 rpp_specific_cmake_params() {
    local rpp_cmake_params
    if [ "${ASAN_CMAKE_PARAMS}" == "true" ] ; then
-        rpp_cmake_params="-DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--rpath,$ROCM_ASAN_EXE_RPATH:$LLVM_LIBDIR"
+        rpp_cmake_params="-DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_ASAN_EXE_RPATH:$LLVM_LIBDIR"
    else
        rpp_cmake_params=""
    fi
@@ -41,14 +41,16 @@ build_rpp() {
        GPU_TARGETS="gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1100"
    fi

+    init_rocm_common_cmake_params
+
    cmake \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        ${LAUNCHER_FLAGS} \
        -DBACKEND=HIP \
        -DCMAKE_INSTALL_LIBDIR=$(getInstallLibDir) \
        $(rpp_specific_cmake_params) \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
-        -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fno-openmp-implicit-rpath -Wl,--enable-new-dtags,--rpath,${ROCM_LIB_RPATH}:${DEPS_DIR}/lib:${ROCM_LLVM_LIB_RPATH}" \
+        -DCMAKE_SHARED_LINKER_FLAGS_INIT="-fno-openmp-implicit-rpath -Wl,--enable-new-dtags,--build-id=sha1,--rpath,${ROCM_LIB_RPATH}:${DEPS_DIR}/lib:${ROCM_LLVM_LIB_RPATH}" \
        -DCMAKE_PREFIX_PATH="${DEPS_DIR};${ROCM_PATH}" \
        "$COMPONENT_SRC"

--- a/tools/rocm-build/compute_helper.sh
+++ b/tools/rocm-build/compute_helper.sh
@@ -189,6 +189,65 @@ echo " PKGTYPE= $6 "
 echo " MAKETARGET = $7 "
 }

+rocm_math_common_cmake_params=()
+init_rocm_common_cmake_params(){
+  local retCmakeParams=${1:-rocm_math_common_cmake_params}
+  local SET_BUILD_TYPE=${BUILD_TYPE:-'RelWithDebInfo'}
+  local ASAN_LIBDIR="lib/asan"
+  local CMAKE_PATH=$(getCmakePath)
+# Common cmake parameters can be set
+# component build scripts can use this function
+  local cmake_params
+  if [ "${ASAN_CMAKE_PARAMS}" == "true" ] ; then
+    cmake_params=(
+        "-DCMAKE_PREFIX_PATH=$CMAKE_PATH;${ROCM_PATH}/$ASAN_LIBDIR;$ROCM_PATH/llvm;$ROCM_PATH"
+        "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_ASAN_LIB_RPATH"
+        "-DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_ASAN_EXE_RPATH"
+        "-DENABLE_ASAN_PACKAGING=true"
+    )
+  else
+    cmake_params=(
+        "-DCMAKE_PREFIX_PATH=${ROCM_PATH}/llvm;${ROCM_PATH}"
+        "-DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_LIB_RPATH"
+        "-DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_EXE_RPATH"
+    )
+  fi
+
+  cmake_params+=(
+      "-DCMAKE_VERBOSE_MAKEFILE=1"
+      "-DCMAKE_BUILD_TYPE=${SET_BUILD_TYPE}"
+      "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE"
+      "-DCMAKE_INSTALL_PREFIX=${ROCM_PATH}"
+      "-DCMAKE_PACKAGING_INSTALL_PREFIX=${ROCM_PATH}"
+      "-DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF"
+      "-DROCM_SYMLINK_LIBS=OFF"
+      "-DCPACK_PACKAGING_INSTALL_PREFIX=${ROCM_PATH}"
+      "-DROCM_DISABLE_LDCONFIG=ON"
+      "-DROCM_PATH=${ROCM_PATH}"
+  )
+
+  #TODO :remove if clause once debug related issues are fixed
+  if [ "${DISABLE_DEBUG_PACKAGE}" == "true" ] ; then
+    SET_BUILD_TYPE=${BUILD_TYPE:-'Release'}
+    cmake_params+=(
+        "-DCPACK_DEBIAN_DEBUGINFO_PACKAGE=FALSE"
+        "-DCPACK_RPM_DEBUGINFO_PACKAGE=FALSE"
+        "-DCPACK_RPM_INSTALL_WITH_EXEC=FALSE"
+        "-DCMAKE_BUILD_TYPE=${SET_BUILD_TYPE}"
+    )
+  elif [ "$SET_BUILD_TYPE" == "RelWithDebInfo" ] || [ "$SET_BUILD_TYPE" == "Debug" ]; then
+    # RelWithDebinfo optimization level -O2 is having performance impact
+    # So overriding the same to -O3
+    cmake_params+=(
+        "-DCPACK_DEBIAN_DEBUGINFO_PACKAGE=TRUE"
+        "-DCPACK_RPM_DEBUGINFO_PACKAGE=TRUE"
+        "-DCPACK_RPM_INSTALL_WITH_EXEC=TRUE"
+        "-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O3 -g -DNDEBUG"
+    )
+  fi
+    eval "${retCmakeParams}=( \"\${cmake_params[@]}\" ) "
+}
+
 # Common cmake parameters can be set
 # component build scripts can use this function
 rocm_common_cmake_params() {
--- a/tools/rocm-build/docker/ubuntu20/install-prerequisites.sh
+++ b/tools/rocm-build/docker/ubuntu20/install-prerequisites.sh
@@ -2,7 +2,6 @@

 set -ex

-
 apt-get update 
 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y $(grep -v '^#' /tmp/packages)
 apt-get clean 
@@ -105,7 +104,7 @@ git clone --recurse-submodules -b v1.61.0 https://github.com/grpc/grpc
 cd grpc
 mkdir -p cmake/build
 cd cmake/build
-cmake -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF  -DCMAKE_INSTALL_PREFIX=/usr/grpc   -DCMAKE_CXX_STANDARD=14  ../.. 
+cmake -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF  -DCMAKE_INSTALL_PREFIX=/usr/grpc   -DCMAKE_CXX_STANDARD=14  -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' ../.. 
 make -j$(nproc)
 make install 
 cd  / 
@@ -120,11 +119,11 @@ mv amd-blis-mt /usr/blis
 cd / 
 rm -rf /tmp/blis

-## Download aocl-linux-aocc-4.0_1_amd64.deb
+## Download aocl-linux-gcc-4.2.0_1_amd64.deb
 mkdir -p /tmp/aocl 
 cd /tmp/aocl 
-wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-0/aocl-linux-aocc-4.0_1_amd64.deb 
-apt install ./aocl-linux-aocc-4.0_1_amd64.deb
+wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb 
+apt install ./aocl-linux-gcc-4.2.0_1_amd64.deb
 rm -rf /tmp/aocl

 ## lapack(3.9.1v)
@@ -180,8 +179,7 @@ cd ninja-1.11.1.g95dee.kitware.jobserver-1
 cp ninja /usr/local/bin/ 
 rm -rf /tmp/ninja

-# Install pre-built FFmpeg and dependencies
-# See docker/build-deps for instructions on how to build these packages
+# Install FFmpeg from source
 wget -qO- https://www.ffmpeg.org/releases/ffmpeg-4.4.2.tar.gz | tar -xzv -C /usr/local

 command -v lbzip2 
--- a/tools/rocm-build/docker/ubuntu20/packages
+++ b/tools/rocm-build/docker/ubuntu20/packages
@@ -8,6 +8,7 @@ bison
 bridge-utils
 build-essential
 bzip2
+ccache
 check
 chrpath
 cifs-utils
@@ -97,6 +98,7 @@ libva-dev
 libvirt-clients
 libvirt-daemon-system
 libyaml-cpp-dev
+libzstd-dev
 llvm
 llvm-6.0-dev
 llvm-dev
@@ -119,9 +121,11 @@ python3-yaml
 python3.8-dev
 re2c
 redis-tools
+# Eventually we should be able to remove rpm for debian builds.
 rpm
 rsync
 ssh
+# This makes life more pleasent inside the container
 strace
 sudo
 systemtap-sdt-dev
--- a/tools/rocm-build/docker/ubuntu22/install-prerequisities.sh
+++ b/tools/rocm-build/docker/ubuntu22/install-prerequisities.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/bash

-set -ex
+set -x

 apt-get -y update 
 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y $(sed 's/#.*//' /tmp/packages)
@@ -60,7 +60,6 @@ apt install -y sharp
 apt clean
 rm -rf /var/cache/apt/ /var/lib/apt/lists/* mlnx /etc/apt/sources.list.d/sharp.list

-
 apt update
 apt -y install libunwind-dev
 apt -y install libgoogle-glog-dev
@@ -118,12 +117,12 @@ git clone --recurse-submodules -b v1.61.0 https://github.com/grpc/grpc
 cd grpc
 mkdir -p build 
 cd build
-cmake  -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr/grpc -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 .. 
+cmake  -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr/grpc -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' .. 
 make -j $(nproc) install 
 rm -rf /tmp/grpc

 ## rocBLAS Pre-requisites
-## Download prebuilt AMD multithreaded   (2.0)
+## Download prebuilt AMD multithreaded blis (2.0)
 ## Reference : https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/install.sh#L403
 mkdir -p /tmp/blis 
 cd /tmp/blis
@@ -131,12 +130,13 @@ wget -O - https://github.com/amd/blis/releases/download/2.0/aocl-blis-mt-ubuntu-
 mv amd-blis-mt /usr/blis 
 cd / 
 rm -rf /tmp/blis
+
 ## rocBLAS Pre-requisites(SWDEV-404612)
-## Download aocl-linux-aocc-4.0_1_amd64
+## Download aocl-linux-gcc-4.2.0_1_amd64.deb
 mkdir -p /tmp/aocl 
 cd /tmp/aocl 
-wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-0/aocl-linux-aocc-4.0_1_amd64.deb 
-apt install ./aocl-linux-aocc-4.0_1_amd64.deb 
+wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb 
+apt install ./aocl-linux-gcc-4.2.0_1_amd64.deb 
 rm -rf /tmp/aocl

 ## hipBLAS Pre-requisites
@@ -194,9 +194,62 @@ cd ninja-1.11.1.g95dee.kitware.jobserver-1
 cp ninja /usr/local/bin/ 
 rm -rf /tmp/ninja

-# Install pre-built FFmpeg and dependencies
-# See docker/build-deps for instructions on how to build these packages
-wget -qO- https://www.ffmpeg.org/releases/ffmpeg-4.4.2.tar.gz  | tar -xzv -C /usr/local
+# Install  FFmpeg and dependencies
+# Build NASM
+mkdir -p /tmp/nasm-2.15.05 
+cd /tmp
+wget -qO- "https://distfiles.macports.org/nasm/nasm-2.15.05.tar.bz2" | tar -xvj 
+cd nasm-2.15.05
+./autogen.sh
+./configure --prefix="/usr/local"
+make -j$(nproc) install
+rm -rf /tmp/nasm-2.15.05
+
+# Build YASM
+mkdir -p /tmp/yasm-1.3.0 
+cd /tmp
+wget -qO- "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" | tar -xvz 
+cd yasm-1.3.0
+./configure --prefix="/usr/local"
+make -j$(nproc) install
+rm -rf /tmp/yasm-1.3.0
+
+# Build x264
+mkdir -p /tmp/x264-snapshot-20191217-2245-stable
+cd /tmp
+wget -qO-  "https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20191217-2245-stable.tar.bz2" | tar -xvj
+cd /tmp/x264-snapshot-20191217-2245-stable
+PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" ./configure --prefix="/usr/local" --enable-shared
+make -j$(nproc) install
+rm -rf /tmp/x264-snapshot-20191217-2245-stable
+
+# Build x265
+mkdir -p /tmp/x265_2.7
+cd /tmp
+wget -qO- "https://get.videolan.org/x265/x265_2.7.tar.gz" | tar -xvz
+cd  /tmp/x265_2.7/build/linux
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="/usr/local" -DENABLE_SHARED:bool=on ../../source
+make -j$(nproc) install
+rm -rf /tmp/x265_2.7
+
+# Build fdk-aac
+mkdir -p /tmp/fdk-aac-2.0.2
+cd /tmp
+wget -qO- "https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.2.tar.gz" | tar -xvz
+cd /tmp/fdk-aac-2.0.2
+autoreconf -fiv
+./configure --prefix="/usr/local" --enable-shared --disable-static
+make -j$(nproc) install
+rm -rf /tmp/fdk-aac-2.0.2
+
+# Build FFmpeg
+cd /tmp
+git clone -b release/4.4 https://git.ffmpeg.org/ffmpeg.git ffmpeg
+cd ffmpeg
+PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+./configure  --prefix="/usr/local" --extra-cflags="-I/usr/local/include"   --extra-ldflags="-L/usr/local/lib"  --extra-libs=-lpthread  --extra-libs=-lm  --enable-shared   --disable-static   --enable-libx264  --enable-libx265  --enable-libfdk-aac  --enable-gpl --enable-nonfree
+make -j$(nproc) install
+rm -rf /tmp/ffmpeg

 cp /tmp/local-pin-600 /etc/apt/preferences.d

@@ -212,21 +265,21 @@ make -j -C build
 cd /tmp/Gbenchmark/build
 make install

-# Build boost-1.82.0 from source for RPP
+# Build boost-1.85.0 from source for RPP
 # Installing in a non-standard location since the test packages of hipFFT and rocFFT pick up the version of
 # the installed Boost library and declare a package dependency on that specific version of Boost.
-# For example, if this was installed in the standard location it would declare a dependency on libboost-dev(el)1.82.0
+# For example, if this was installed in the standard location it would declare a dependency on libboost-dev(el)1.85.0
 # which is not available as a package in any distro.
 # Once this is fixed, we can remove the Boost package from the requirements list and install this
 # in the standard location
-mkdir -p /tmp/boost-1.82.0 
-cd /tmp/boost-1.82.0 
-wget -nv https://sourceforge.net/projects/boost/files/boost/1.82.0/boost_1_82_0.tar.bz2 -O ./boost_1_82_0.tar.bz2 
-tar -xf boost_1_82_0.tar.bz2 --use-compress-program="/usr/local/bin/compressor" 
-cd boost_1_82_0 
+mkdir -p /tmp/boost-1.85.0 
+cd /tmp/boost-1.85.0 
+wget -nv https://sourceforge.net/projects/boost/files/boost/1.85.0/boost_1_85_0.tar.bz2 -O ./boost_1_85_0.tar.bz2 
+tar -xf boost_1_85_0.tar.bz2 --use-compress-program="/usr/local/bin/compressor" 
+cd boost_1_85_0 
 ./bootstrap.sh --prefix=${RPP_DEPS_LOCATION} --with-python=python3 
 ./b2 stage -j$(nproc) threading=multi link=shared cxxflags="-std=c++11" 
 ./b2 install threading=multi link=shared --with-system --with-filesystem 
 ./b2 stage -j$(nproc) threading=multi link=static cxxflags="-std=c++11 -fpic" cflags="-fpic"
 ./b2 install threading=multi link=static --with-system --with-filesystem 
-rm -rf /tmp/boost-1.82.0
+rm -rf /tmp/boost-1.85.0
--- a/tools/rocm-build/docker/ubuntu22/packages
+++ b/tools/rocm-build/docker/ubuntu22/packages
@@ -8,6 +8,7 @@ bison
 bridge-utils
 build-essential
 bzip2
+ccache
 check
 chrpath
 cifs-utils
@@ -99,6 +100,7 @@ libva-dev
 libvirt-clients
 libvirt-daemon-system
 libyaml-cpp-dev
+libzstd-dev
 llvm
 llvm-dev
 llvm-runtime
@@ -137,3 +139,4 @@ unzip
 vim
 wget
 xsltproc
+zlib1g-dev
--- a/tools/rocm-build/docker/ubuntu24/Dockerfile
+++ b/tools/rocm-build/docker/ubuntu24/Dockerfile
@@ -0,0 +1,11 @@
+FROM ubuntu:noble as builder	
+COPY packages /tmp/packages
+COPY local-pin-600 /tmp/local-pin-600
+COPY install-prerequisities.sh /tmp/install-prerequisities.sh
+RUN chmod +x /tmp/install-prerequisities.sh
+ENV KBUILD_PKG_ROOTCMD=
+ENV RPP_DEPS_LOCATION=/usr/local/rpp-deps
+ENV PATH="/opt/venv/bin:$PATH"
+ENV PATH=$PATH:"/usr/local/bin"
+RUN  /tmp/install-prerequisities.sh
+WORKDIR /src
--- a/tools/rocm-build/docker/ubuntu24/README.md
+++ b/tools/rocm-build/docker/ubuntu24/README.md
@@ -0,0 +1,27 @@
+## Steps to build the Docker Image
+
+1. Clone this repositry
+
+   ```bash
+   git clone https://github.com/ROCm/rocm-build.git
+   ```
+
+2. Go into the OS specific docker directory in build-infra
+
+    ```bash
+    cd rocm-build/build/docker/ubuntu24
+    ```
+
+3. Build the docker image
+
+    ```bash
+    docker build -t <docker Image Name> .
+    ```
+
+    replace the `<docker Image Name>` with the new Docker image Name of your choice,
+
+4. After successful build, verify your \<docker Image Name\> in the list all available docker images.
+
+    ```bash
+    docker images
+    ```
--- a/tools/rocm-build/docker/ubuntu24/install-prerequisites.sh
+++ b/tools/rocm-build/docker/ubuntu24/install-prerequisites.sh
@@ -0,0 +1,237 @@
+
+#! /usr/bin/bash
+set -ex
+
+# The following assumes that you have a cache, e.g.
+# https://docs.docker.com/engine/examples/apt-cacher-ng/
+# Comment out if it breaks things
+echo 'Acquire::http { Proxy "http://rocm-ci-services.amd.com:3142";  };' > /etc/apt/apt.conf.d/01proxy
+
+apt-get update 
+DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y $(sed 's/#.*//' /tmp/packages)
+update-ccache-symlinks
+apt-get upgrade
+apt-get clean 
+rm -rf /var/cache/apt/ /var/lib/apt/lists/* /etc/apt/apt.conf.d/01proxy
+
+#Install  2.17.1 version of git as we are seeing issues with 2.25 , where it was not allowing to add git submodules if the user is different for parent git directory
+curl -o git.tar.gz https://cdn.kernel.org/pub/software/scm/git/git-2.17.1.tar.gz 
+tar -zxf git.tar.gz 
+cd git-* 
+make prefix=/usr/local all    
+make prefix=/usr/local install
+git --version
+
+# venv for python to be able to run pip3 without --break-system-packages
+python3 -m venv /opt/venv
+
+pip3 install --no-cache-dir setuptools wheel tox
+pip3 install --no-cache-dir --pre CppHeaderParser argparse requests lxml barectf recommonmark jinja2==3.0.0 websockets matplotlib numpy scipy minimal msgpack pytest sphinx joblib PyYAML==5.3.1 rocm-docs-core cmake==3.25.2 pandas myst-parser
+
+# Allow sudo for everyone user
+echo 'ALL ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/everyone
+
+# Install OCaml packages to build LLVM's OCaml bindings to be used in lightning compiler test pipeline
+wget -nv https://sourceforge.net/projects/opam.mirror/files/2.1.4/opam-2.1.4-x86_64-linux -O /usr/local/bin/opam 
+chmod +x /usr/local/bin/opam
+opam init --yes --disable-sandboxing
+opam install ctypes --yes
+
+# Install and modify git-repo (#!/usr/bin/env python -> #!/usr/bin/env python3)
+curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/bin/repo
+chmod a+x /usr/bin/repo
+
+# Build ccache from the source
+cd /tmp 
+git clone https://github.com/ccache/ccache -b v4.7.5 
+cd ccache 
+mkdir build 
+cd build 
+cmake -DCMAKE_BUILD_TYPE=Release .. 
+make 
+make install 
+cd /tmp 
+rm -rf ccache
+
+#Install older version of hwloc-devel package for rocrtst
+curl -lO https://download.open-mpi.org/release/hwloc/v1.11/hwloc-1.11.13.tar.bz2
+tar -xvf hwloc-1.11.13.tar.bz2
+cd hwloc-1.11.13
+./configure
+make
+make install
+cp /usr/local/lib/libhwloc.so.5 /usr/lib
+hwloc-info --version
+
+# Install gtest
+mkdir -p /tmp/gtest
+cd /tmp/gtest
+wget https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip -O googletest.zip
+unzip googletest.zip
+cd googletest-1.14.0/ 
+mkdir build
+cd build
+cmake .. 
+make -j$(nproc) 
+make install
+rm -rf /tmp/gtest
+
+## Install gRPC from source
+## RDC Pre-requisites
+GRPC_ARCHIVE=grpc-1.61.0.tar.gz
+mkdir /tmp/grpc
+mkdir /usr/grpc 
+cd /tmp 
+git clone --recurse-submodules -b v1.61.0 https://github.com/grpc/grpc
+cd grpc
+mkdir -p build 
+cd build
+cmake  -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr/grpc -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' .. 
+make -j $(nproc) install 
+rm -rf /tmp/grpc
+
+## rocBLAS Pre-requisites(ROCMOPS-3856)
+## Download prebuilt AMD multithreaded blis (2.0)
+## Reference : https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/install.sh#L403
+mkdir -p /tmp/blis 
+cd /tmp/blis
+wget -O - https://github.com/amd/blis/releases/download/2.0/aocl-blis-mt-ubuntu-2.0.tar.gz | tar xfz - 
+mv amd-blis-mt /usr/blis 
+cd / 
+rm -rf /tmp/blis
+
+## rocBLAS Pre-requisites(SWDEV-404612)
+## Download aocl-linux-gcc-4.2.0_1_amd64.deb
+mkdir -p /tmp/aocl 
+cd /tmp/aocl 
+wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb 
+apt install ./aocl-linux-gcc-4.2.0_1_amd64.deb 
+rm -rf /tmp/aocl
+
+## hipBLAS Pre-requisites
+## lapack(3.9.1v)
+## Reference https://github.com/ROCmSoftwarePlatform/rocSOLVER/blob/develop/install.sh#L174
+lapack_version=3.9.1
+lapack_srcdir=lapack-$lapack_version
+lapack_blddir=lapack-$lapack_version-bld
+mkdir -p /tmp/lapack
+cd /tmp/lapack
+rm -rf "$lapack_srcdir" "$lapack_blddir" 
+wget -O - https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz | tar xzf - 
+cmake -H$lapack_srcdir -B$lapack_blddir -DCMAKE_BUILD_TYPE=Release -DCMAKE_Fortran_FLAGS=-fno-optimize-sibling-calls -DBUILD_TESTING=OFF -DCBLAS=ON -DLAPACKE=OFF
+make -j$(nproc) -C "$lapack_blddir"
+make -C "$lapack_blddir" install
+cd $lapack_blddir
+cp -r ./include/* /usr/local/include/ 
+cp -r ./lib/* /usr/local/lib 
+cd / 
+rm -rf /tmp/lapack
+
+## rocSOLVER Pre-requisites
+## FMT(7.1.3v)
+## Reference https://github.com/ROCmSoftwarePlatform/rocSOLVER/blob/develop/install.sh#L152
+fmt_version=7.1.3
+fmt_srcdir=fmt-$fmt_version
+fmt_blddir=fmt-$fmt_version-bld
+mkdir -p /tmp/fmt
+cd /tmp/fmt
+rm -rf "$fmt_srcdir" "$fmt_blddir"
+wget -O - https://github.com/fmtlib/fmt/archive/refs/tags/7.1.3.tar.gz | tar xzf -
+cmake -H$fmt_srcdir -B$fmt_blddir -DCMAKE_BUILD_TYPE=Release -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_EXTENSIONS=OFF -DCMAKE_CXX_STANDARD_REQUIRED=ON -DFMT_DOC=OFF -DFMT_TEST=OFF
+make -j$(nproc) -C "$fmt_blddir"
+make -C "$fmt_blddir" install
+
+# Build and install libjpeg-turbo
+mkdir -p /tmp/libjpeg-turbo 
+cd /tmp/libjpeg-turbo 
+wget -nv https://github.com/rrawther/libjpeg-turbo/archive/refs/heads/2.0.6.2.zip -O libjpeg-turbo-2.0.6.2.zip
+unzip libjpeg-turbo-2.0.6.2.zip 
+cd libjpeg-turbo-2.0.6.2
+mkdir build
+cd build
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib .. 
+make -j$(nproc) install 
+rm -rf /tmp/libjpeg-turbo
+
+# Get released ninja from source
+mkdir -p /tmp/ninja 
+cd /tmp/ninja 
+wget -nv https://codeload.github.com/Kitware/ninja/zip/refs/tags/v1.11.1.g95dee.kitware.jobserver-1 -O ninja.zip
+unzip ninja.zip
+cd ninja-1.11.1.g95dee.kitware.jobserver-1
+./configure.py --bootstrap 
+cp ninja /usr/local/bin/ 
+rm -rf /tmp/ninja
+
+# Install  FFmpeg and dependencies
+# Build NASM
+mkdir -p /tmp/nasm-2.15.05 
+cd /tmp
+wget -qO- "https://distfiles.macports.org/nasm/nasm-2.15.05.tar.bz2" | tar -xvj 
+cd nasm-2.15.05
+./autogen.sh
+./configure --prefix="/usr/local"
+make -j$(nproc) install
+rm -rf /tmp/nasm-2.15.05
+
+# Build YASM
+mkdir -p /tmp/yasm-1.3.0 
+cd /tmp
+wget -qO- "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" | tar -xvz 
+cd yasm-1.3.0
+./configure --prefix="/usr/local"
+make -j$(nproc) install
+rm -rf /tmp/yasm-1.3.0
+
+# Build x264
+mkdir -p /tmp/x264-snapshot-20191217-2245-stable
+cd /tmp
+wget -qO-  "https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20191217-2245-stable.tar.bz2" | tar -xvj
+cd /tmp/x264-snapshot-20191217-2245-stable
+PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" ./configure --prefix="/usr/local" --enable-shared
+make -j$(nproc) install
+rm -rf /tmp/x264-snapshot-20191217-2245-stable
+
+# Build x265
+mkdir -p /tmp/x265_2.7
+cd /tmp
+wget -qO- "https://get.videolan.org/x265/x265_2.7.tar.gz" | tar -xvz
+cd  /tmp/x265_2.7/build/linux
+cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="/usr/local" -DENABLE_SHARED:bool=on ../../source
+make -j$(nproc) install
+rm -rf /tmp/x265_2.7
+
+
+# Build fdk-aac
+mkdir -p /tmp/fdk-aac-2.0.2
+cd /tmp
+wget -qO- "https://sourceforge.net/projects/opencore-amr/files/fdk-aac/fdk-aac-2.0.2.tar.gz" | tar -xvz
+cd /tmp/fdk-aac-2.0.2
+autoreconf -fiv
+./configure --prefix="/usr/local" --enable-shared --disable-static
+make -j$(nproc) install
+rm -rf /tmp/fdk-aac-2.0.2
+
+# Build FFmpeg
+cd /tmp
+rm -rf ffmpeg
+git clone -b release/4.4 https://git.ffmpeg.org/ffmpeg.git ffmpeg
+cd ffmpeg
+PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+./configure  --prefix="/usr/local" --extra-cflags="-I/usr/local/include"   --extra-ldflags="-L/usr/local/lib"  --extra-libs=-lpthread  --extra-libs=-lm  --enable-shared   --disable-static   --enable-libx264  --enable-libx265  --enable-libfdk-aac  --enable-gpl --enable-nonfree
+make -j$(nproc) install
+rm -rf /tmp/ffmpeg
+
+cp /tmp/local-pin-600 /etc/apt/preferences.d
+
+command -v lbzip2 
+ln -sf $(command -v lbzip2) /usr/local/bin/compressor || ln -sf $(command -v bzip2) /usr/local/bin/compressor
+
+# Install Google Benchmark (ROCMOPS-5283)
+mkdir -p /tmp/Gbenchmark 
+cd /tmp/Gbenchmark 
+wget -qO- https://github.com/google/benchmark/archive/refs/tags/v1.6.1.tar.gz | tar xz 
+cmake -Sbenchmark-1.6.1 -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_CXX_STANDARD=14 
+make -j -C build 
+cd /tmp/Gbenchmark/build
+make install
--- a/tools/rocm-build/docker/ubuntu24/local-pin-60
+++ b/tools/rocm-build/docker/ubuntu24/local-pin-60
@@ -0,0 +1,3 @@
+Package: *
+Pin: origin ""
+Pin-Priority: 600
--- a/tools/rocm-build/docker/ubuntu24/packages
+++ b/tools/rocm-build/docker/ubuntu24/packages
@@ -0,0 +1,140 @@
+# List of packages needed for stage1 build
+apt-utils
+aria2
+autoconf
+automake
+bc
+bison
+bridge-utils
+build-essential
+bzip2
+ccache
+check
+chrpath
+cifs-utils
+cmake
+cpio
+curl
+devscripts
+dos2unix
+doxygen
+fakeroot
+flex
+freeglut3-dev
+g++
+g++-multilib
+# gawk is needed for aomp
+gawk
+gcc
+gcc-multilib
+gfortran
+git-lfs
+gnupg
+googletest
+graphviz
+kernel-wedge
+# kmod for kernel build
+kmod
+lbzip2
+# less is needed by repo
+less
+libass-dev
+libatlas-base-dev
+libbabeltrace-dev
+libboost-all-dev
+libboost-dev
+libboost-filesystem-dev
+libboost-program-options-dev
+libboost-system-dev
+libbz2-dev
+libc++-dev
+libc++1
+libc++abi-dev
+libc++abi1
+libc6-dev-i386
+libcap-dev
+libcurl4-openssl-dev
+libdrm-dev
+libdw-dev
+libdw1
+libdwarf-dev
+libelf-dev
+libelf1
+libexpat1-dev
+libfftw3-dev
+libfile-find-rule-perl
+libgflags-dev
+libglew-dev
+libgmp-dev
+libgoogle-glog-dev
+libgtk2.0-dev
+libhdf5-dev
+libjpeg-dev
+libleveldb-dev
+liblmdb-dev
+liblzma-dev
+libmpfr-dev
+libmpich-dev
+libmsgpack-dev
+libncurses-dev
+libnuma-dev
+libomp-dev
+libopenblas-dev
+libpci-dev
+libpci3
+libpciaccess-dev
+libpciaccess0
+libprotobuf-dev
+libpython3-dev
+libreadline-dev
+libsnappy-dev
+libssl-dev
+libsuitesparse-dev
+libsystemd-dev
+libtool
+liburi-encode-perl
+libva-dev
+libvirt-clients
+libvirt-daemon-system
+libyaml-cpp-dev
+llvm
+llvm-dev
+llvm-runtime
+mesa-common-dev
+mpich
+ocaml
+ocaml-findlib
+patchelf
+pigz
+pkg-config
+protobuf-compiler
+python-is-python3
+python3-barectf
+python3-dev
+python3-pip
+python3-pip-whl
+python3-requests
+python3-venv
+python3-yaml
+python3-yaml
+re2c
+redis-tools
+# hipclang needs rpm
+rpm
+rsync
+ssh
+# This makes life more pleasent inside the container
+strace
+sudo
+systemtap-sdt-dev
+texinfo
+texlive
+texlive-extra-utils
+texlive-plain-generic
+texlive-xetex
+unzip
+vim
+wget
+xsltproc
+xxd
+zlib1g-dev
--- a/tools/rocm-build/envsetup.sh
+++ b/tools/rocm-build/envsetup.sh
@@ -123,9 +123,12 @@ if [ -d "$HSA_OPENSOURCE_ROOT/ROCT-Thunk-Interface" ]; then
 	export THUNK_ROOT=$HSA_OPENSOURCE_ROOT/ROCT-Thunk-Interface
 fi
 export AQLPROFILE_ROOT=$WORK_ROOT/hsa/aqlprofile
+export OMNIPERF_ROOT=$WORK_ROOT/omniperf
 export ROCPROFILER_ROOT=$WORK_ROOT/rocprofiler
 export ROCTRACER_ROOT=$WORK_ROOT/roctracer
 export ROCPROFILER_REGISTER_ROOT=$WORK_ROOT/rocprofiler-register
+export ROCPROFILER_SDK_ROOT=$WORK_ROOT/rocprofiler-sdk
+export OMNITRACE_ROOT=$WORK_ROOT/omnitrace
 export RDC_ROOT=$WORK_ROOT/rdc
 export RDCTST_ROOT=$RDC_ROOT/tests/rdc_tests
 export UTILS_ROOT=$WORK_ROOT/rocm-utils
@@ -147,7 +150,6 @@ export ROCM_CORE_ROOT=$WORK_ROOT/rocm-core
 export ROCM_CMAKE_ROOT=$WORK_ROOT/rocm-cmake
 export ROCM_BANDWIDTH_TEST_ROOT=$WORK_ROOT/rocm_bandwidth_test
 export ROCMINFO_ROOT=$WORK_ROOT/rocminfo
-export CLANG_OCL_ROOT=$WORK_ROOT/clang-ocl
 export ROCR_DEBUG_AGENT_ROOT=$WORK_ROOT/rocr_debug_agent
 export COMGR_ROOT=$LLVM_PROJECT_ROOT/amd/comgr
 export COMGR_LIB_PATH=$OUT_DIR/build/amd_comgr
@@ -179,7 +181,7 @@ export BUILD_ARTIFACTS=$OUT_DIR/$PACKAGEEXT
 export HIPCC_COMPILE_FLAGS_APPEND="-O3 -Wno-format-nonliteral -parallel-jobs=4"
 export HIPCC_LINK_FLAGS_APPEND="-O3 -parallel-jobs=4"

-export PATH="${ROCM_PATH}/lib/llvm/bin:${PATH}"
+export PATH="${ROCM_PATH}/bin:${ROCM_PATH}/lib/llvm/bin:${PATH}"

 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
--- a/tools/rocm-build/rocm-6.1.1.xml
+++ b/tools/rocm-build/rocm-6.1.1.xml
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.1.1"
-     remote="rocm-org"
-     sync-c="true"
-     sync-j="4" />
-<!--list of projects for ROCm-->
-    <project name="ROCm" revision="roc-6.1.x" />
-    <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="rocprofiler-register" />
-    <project name="roctracer" />
-    <project name="clang-ocl" />
-    <project name="rdc" />
-<!--HIP Projects-->
-    <project name="HIP" />
-    <project name="hip-tests" />
-    <project name="HIP-Examples" />
-    <project name="clr" />
-    <project name="hipother" />
-    <project name="HIPIFY" />
-<!-- The following projects are all associated with the AMDGPU LLVM compiler -->
-    <project name="llvm-project" />
-    <project name="half" />
-<!-- gdb projects -->
-    <project name="ROCgdb" />
-    <project name="ROCdbgapi" />
-    <project name="rocr_debug_agent" />
-<!-- ROCm Libraries -->
-    <project groups="mathlibs" name="rocBLAS" />
-    <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="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="rccl" />
-    <project groups="mathlibs" name="MIOpen" />
-    <project groups="mathlibs" name="MIVisionX" />
-    <project groups="mathlibs" name="ROCmValidationSuite" />
-    <project groups="mathlibs" name="composable_kernel" />
-    <project groups="mathlibs" name="hipfort" />
-    <project groups="mathlibs" name="rocDecode" />
-    <project groups="mathlibs" name="AMDMIGraphX" />
-    <project groups="mathlibs" name="rpp" />
-<!-- Projects for OpenMP-Extras -->
-    <project name="aomp" path="openmp-extras/aomp" />
-    <project name="aomp-extras" path="openmp-extras/aomp-extras" />
-    <project name="flang" path="openmp-extras/flang" />
-</manifest>
--- a/tools/rocm-build/rocm-6.1.2.xml
+++ b/tools/rocm-build/rocm-6.1.2.xml
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest>
-    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.1.2"
-     remote="rocm-org"
-     sync-c="true"
-     sync-j="4" />
-<!--list of projects for ROCm-->
-    <project name="ROCm" revision="roc-6.1.x" />
-    <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="rocprofiler-register" />
-    <project name="roctracer" />
-    <project name="clang-ocl" />
-    <project name="rdc" />
-<!--HIP Projects-->
-    <project name="HIP" />
-    <project name="hip-tests" />
-    <project name="HIP-Examples" />
-    <project name="clr" />
-    <project name="hipother" />
-    <project name="HIPIFY" />
-<!-- The following projects are all associated with the AMDGPU LLVM compiler -->
-    <project name="llvm-project" />
-    <project name="half" />
-<!-- gdb projects -->
-    <project name="ROCgdb" />
-    <project name="ROCdbgapi" />
-    <project name="rocr_debug_agent" />
-<!-- ROCm Libraries -->
-    <project groups="mathlibs" name="rocBLAS" />
-    <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="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="rccl" />
-    <project groups="mathlibs" name="MIOpen" />
-    <project groups="mathlibs" name="MIVisionX" />
-    <project groups="mathlibs" name="ROCmValidationSuite" />
-    <project groups="mathlibs" name="composable_kernel" />
-    <project groups="mathlibs" name="hipfort" />
-    <project groups="mathlibs" name="rocDecode" />
-    <project groups="mathlibs" name="AMDMIGraphX" />
-    <project groups="mathlibs" name="rpp" />
-<!-- Projects for OpenMP-Extras -->
-    <project name="aomp" path="openmp-extras/aomp" />
-    <project name="aomp-extras" path="openmp-extras/aomp-extras" />
-    <project name="flang" path="openmp-extras/flang" />
-</manifest>
--- a/tools/rocm-build/rocm-6.2.0.xml
+++ b/tools/rocm-build/rocm-6.2.0.xml
@@ -6,30 +6,29 @@
     sync-c="true"
     sync-j="4" />
 <!--list of projects for ROCm-->
+    <project name="ROCm" revision="roc-6.2.x" />
+    <project name="ROCK-Kernel-Driver" />
+    <project name="ROCR-Runtime" />
+    <project name="ROCT-Thunk-Interface" />
    <project name="amdsmi" />
    <project name="omniperf" />
    <project name="omnitrace" />
    <project name="rdc" />
-    <project name="roc-core" />
    <project name="rocm_bandwidth_test" />
    <project name="rocm_smi_lib" />
+    <project name="rocm-core" />
    <project name="rocminfo" />
-    <project name="rocm-examples" />
-    <project name="rocm-prof" />
-    <project name="rocm-prof-register" />
-    <project name="rocm-prof-sdk" />
-    <project name="rocm-tracer" />
-    <project name="ROCK-Kernel-Driver" />
-    <project name="ROCR-Runtime" />
-    <project name="ROCT-Thunk-Interface" />
-    <project name="ROCm" revision="roc-6.2.x" />
+    <project name="rocprofiler" />
+    <project name="rocprofiler-register" />
+    <project name="rocprofiler-sdk" />
+    <project name="roctracer" />
 <!--HIP Projects-->
-    <project name="clr" />
-    <project name="HIPIFY" />
    <project name="HIP" />
-    <project name="hip-other" />
    <project name="hip-tests" />
    <project name="HIP-Examples" />
+    <project name="HIPIFY" />
+    <project name="clr" />
+    <project name="hipother" />
 <!-- The following projects are all associated with the AMDGPU LLVM compiler -->
    <project name="half" />
    <project name="llvm-project" />
@@ -72,5 +71,4 @@
    <project name="aomp" path="openmp-extras/aomp" />
    <project name="aomp-extras" path="openmp-extras/aomp-extras" />
    <project name="flang" path="openmp-extras/flang" />
-</manifest>
-
+</manifest>
--- a/tools/rocm-build/rocm-6.2.1.xml
+++ b/tools/rocm-build/rocm-6.2.1.xml
@@ -1,71 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.1.0"
+    <default revision="refs/tags/rocm-6.2.1"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
 <!--list of projects for ROCm-->
-    <project name="ROCm" revision="roc-6.1.x" />
+    <project name="ROCm" revision="roc-6.2.x" />
    <project name="ROCK-Kernel-Driver" />
-    <project name="ROCT-Thunk-Interface" />
    <project name="ROCR-Runtime" />
+    <project name="ROCT-Thunk-Interface" />
    <project name="amdsmi" />
+    <project name="omniperf" />
+    <project name="omnitrace" />
+    <project name="rdc" />
+    <project name="rocm_bandwidth_test" />
    <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="rocprofiler-register" />
+    <project name="rocprofiler-sdk" />
    <project name="roctracer" />
-    <project name="clang-ocl" />
-    <project name="rdc" />
 <!--HIP Projects-->
    <project name="HIP" />
    <project name="hip-tests" />
    <project name="HIP-Examples" />
+    <project name="HIPIFY" />
    <project name="clr" />
    <project name="hipother" />
-    <project name="HIPIFY" />
 <!-- The following projects are all associated with the AMDGPU LLVM compiler -->
-    <project name="llvm-project" />
    <project name="half" />
+    <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 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="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="rccl" />
+    <project groups="mathlibs" name="AMDMIGraphX" />
    <project groups="mathlibs" name="MIOpen" />
    <project groups="mathlibs" name="MIVisionX" />
    <project groups="mathlibs" name="ROCmValidationSuite" />
+    <project groups="mathlibs" name="Tensile" />
    <project groups="mathlibs" name="composable_kernel" />
+    <project groups="mathlibs" name="hipBLAS" />
+    <project groups="mathlibs" name="hipBLASLt" />
+    <project groups="mathlibs" name="hipCUB" />
+    <project groups="mathlibs" name="hipFFT" />
+    <project groups="mathlibs" name="hipRAND" />
+    <project groups="mathlibs" name="hipSOLVER" />
+    <project groups="mathlibs" name="hipSPARSE" />
+    <project groups="mathlibs" name="hipSPARSELt" />
+    <project groups="mathlibs" name="hipTensor" />
    <project groups="mathlibs" name="hipfort" />
+    <project groups="mathlibs" name="rccl" />
+    <project groups="mathlibs" name="rocAL" />
+    <project groups="mathlibs" name="rocALUTION" />
+    <project groups="mathlibs" name="rocBLAS" />
    <project groups="mathlibs" name="rocDecode" />
-    <project groups="mathlibs" name="AMDMIGraphX" />
+    <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" />
+    <project groups="mathlibs" name="rocm-cmake" />
    <project groups="mathlibs" name="rpp" />
 <!-- Projects for OpenMP-Extras -->
    <project name="aomp" path="openmp-extras/aomp" />
    <project name="aomp-extras" path="openmp-extras/aomp-extras" />
    <project name="flang" path="openmp-extras/flang" />
-</manifest>
+</manifest>
Author	SHA1	Message	Date
Sam Wu	f93799f9c9	Merge pull request #3828 from samjwu/tag Update tags to 6.2.2 (#3827)	2024-09-27 13:12:19 -08:00
Sam Wu	a51979a2a5	Update tags to 6.2.2 (#3827 )	2024-09-27 15:00:53 -06:00
Sam Wu	912fab238c	Merge pull request #3823 from samjwu/rel62 Update 6.2 release branch	2024-09-27 12:03:39 -08:00
Peter Park	a34e7a381a	Merge branch 'roc-6.2.x' into rel62	2024-09-27 15:21:11 -04:00
Sam Wu	e691307d60	Sync develop branch	2024-09-27 12:57:18 -06:00
Daniel Su	681a98a59d	External CI: omnitrace tests (#3822 )	2024-09-27 13:13:53 -04:00
Yanyao Wang	15d5040517	Merge pull request #3821 from ROCm/JeniferC99-patch-2 Update default.xml - Change 6.2.1 to 6.2.2	2024-09-27 11:15:08 -05:00
JeniferC99	41db131ada	Update default.xml - Change 6.2.1 to 6.2.2	2024-09-27 08:44:36 -07:00
Sam Wu	17ad66f3d4	Update version list (#182 ) * Update version list * Update GA date in release notes --------- Co-authored-by: Peter Park <peter.park@amd.com>	2024-09-27 10:39:53 -04:00
Daniel Su	5d1204ecdc	External CI: Fix/add missing pipeline IDs (#3818 )	2024-09-27 09:25:00 -04:00
Joseph Macaranas	c542ee1363	External CI: Build pipeline for rocprofiler-sdk (#3819 ) * External CI: Pipeline for rocprofiler-sdk * Add rocprofiler dependency * External CI: rocprofiler-sdk build pipeline --------- Co-authored-by: Daniel Su <danielsu@amd.com>	2024-09-26 16:42:53 -04:00
Daniel Su	ed4ffafec5	External CI: rpp tests (#3816 )	2024-09-26 10:43:09 -04:00
Daniel Su	3fe8e17e56	External CI: test fixes w/ roctracer, list omniperf as partially succeeding (#3815 )	2024-09-26 10:38:45 -04:00
Joseph Macaranas	fa31ee35e3	External CI: AMDMIGraphX Build Fix (#3814 ) - Swap to default gcc on OS to resolve build errors from recent commits. - Added libdnnl-dev dependency from iterative attempts with compiler change. - Referred to the passing GitHub checks to observe the compilers that was used. - Build CK jit lib and include in AMDMIGraphX build.	2024-09-26 10:20:10 -04:00
Joseph Macaranas	4b737a1cda	External CI: omnitrace build pipeline (#3812 ) * External CI: omnitrace build pipeline starter - Adding initial set of dependencies and build flags. * External CI: omnitrace build pipeline - Add bison, rccl, texinfo dependencies based on build failures. - Add AMDGPU_TARGETS flag - Add ROCm binaries to PATH for clang-format and other tools used. * Fix indentation --------- Co-authored-by: Daniel Su <danielsu@amd.com>	2024-09-26 10:19:28 -04:00
Joseph Macaranas	ff0d863a0d	External CI: torch and torchvision smoke tests (#3810 ) * External CI: torch and torchvision smoke tests - Fixed issues with package name and version for the vision wheel that prevented it from installing. A patch is used until my pull request in vision repo is merged. - Referred to rocAutomation scripts to pick which test scripts to run out of the many in the torch and vision repo, and iteratively tested suggested scripts to see which ones completed in a timely manner. - Leveraging pytest-azurepipelines module to automatically parse and graph results from these tests.	2024-09-25 15:25:36 -04:00
Daniel Su	b203a7cb74	External CI: default branches for hip-tests, omniperf (#3811 )	2024-09-25 14:43:15 -04:00
Daniel Su	7d0e1aa06c	External CI: enable ROCR-Runtime tests (#3809 )	2024-09-25 14:19:45 -04:00
Peter Park	920efcd0b1	change release notes date to 9/25 (#181 )	2024-09-25 10:05:41 -04:00
randyh62	ff26ae7c18	remove llvm-alt license (#3727 ) * remove llvm-alt license * fix linting error	2024-09-24 16:05:28 -07:00
Daniel Su	f9f92037cb	External CI: fixes for rocMLIR and nightly build (#3800 ) * External CI: fix symlinks for rocMLIR and nightly build * add pipeline IDs for hip-tests * fix hip-test ID typo	2024-09-24 16:39:48 -04:00
Yanyao Wang	4f9aadd6b6	Merge pull request #3802 from WBobby/roc-6.2.1 Adding ROCm6.2.1 manifest file and update the build script of rocAL	2024-09-24 13:35:41 -05:00
Peter Park	3ab3782a7f	Update compat matrix for ROCm 6.2.2 (#179 ) * update current matrix for 6.2.2 * update history compat * fix typo * fixed missed 60201s * fix missed rocm-6.2.1 * Add additional column to compatibility-matrix-historical-6.0, so it includes it correctly Also, fixing a few 6.2.2 footnote references * add oracle linux 8.9 under 6.2.2 in historical * rm widths in historical table * lowercase a letter * Fix version numbers for 6.2.2 * Minor updates to historical matrix * add ubuntu 24.04.1 * Docs: Add Ubuntu 24.04.1 (#3801) * add ubuntu 24.04.1 * add 24.04.1 to bottom os section * fix heading and template * Update compatibility-matrix.rst for OpenMP version * Update compatibility-matrix-historical-6.0.csv for OpenMP version * rm ubuntu 24.04.1 from 6.2.0 * Update docs/compatibility/compatibility-matrix.rst Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com> * rm duplicate ubuntu in historical --------- Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com> * add overwritten ubuntu 24.04.1 * fix wrong versions and extra comma --------- Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com>	2024-09-24 14:22:00 -04:00
Peter Park	516b6c8ebc	Add ROCm 6.2.2 release notes (#178 ) * rm extra file * sync release.md w/ public version * update versions to 6.2.2 * update version, release, and ga date * Revert "update versions to 6.2.2" This reverts commit c08e51d1acc8e773deefef96946c31fd368a09dd. * stack 6.2.2 and 6.2.1 * fix word * bump 6.2.1 headings * add explanatory note remove 'please' rm caps * add fixed issue highlight * update mode-2 fix * add clarification * add ubuntu 24.04.1 note * update autotag templates for 6.2.x * rm Ubuntu 24.04.1 from 6.2.2 (have it in 6.2.1 only) * add horizontal rule for visual separation between 6.2.2 and 6.2.1 release notes * remove extra templ * spellcheck * Docs: Add Ubuntu 24.04.1 (#3801) * add ubuntu 24.04.1 * add 24.04.1 to bottom os section * fix heading and template * Update compatibility-matrix.rst for OpenMP version * Update compatibility-matrix-historical-6.0.csv for OpenMP version * rm ubuntu 24.04.1 from 6.2.0 * Update docs/compatibility/compatibility-matrix.rst Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com> * rm duplicate ubuntu in historical --------- Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com> --------- Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com>	2024-09-24 14:07:40 -04:00
Sam Wu	508f3e1afb	Merge pull request #3803 from peterjunpark/roc-6.2.x roc-6.2.x: Add Ubuntu 24.04.1 (#3801)	2024-09-24 10:02:44 -08:00
Peter Park	8d6d82d65f	Docs: Add Ubuntu 24.04.1 (#3801 ) * add ubuntu 24.04.1 * add 24.04.1 to bottom os section * fix heading and template * Update compatibility-matrix.rst for OpenMP version * Update compatibility-matrix-historical-6.0.csv for OpenMP version * rm ubuntu 24.04.1 from 6.2.0 * Update docs/compatibility/compatibility-matrix.rst Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com> * rm duplicate ubuntu in historical --------- Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com>	2024-09-24 13:33:48 -04:00
Peter Park	c5d0fb8477	Docs: Add Ubuntu 24.04.1 (#3801 ) * add ubuntu 24.04.1 * add 24.04.1 to bottom os section * fix heading and template * Update compatibility-matrix.rst for OpenMP version * Update compatibility-matrix-historical-6.0.csv for OpenMP version * rm ubuntu 24.04.1 from 6.2.0 * Update docs/compatibility/compatibility-matrix.rst Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com> * rm duplicate ubuntu in historical --------- Co-authored-by: Young Hui - AMD <145490163+yhuiYH@users.noreply.github.com>	2024-09-24 13:32:08 -04:00
pbhandar-amd	3dc6d89297	Update versions.md (#180 )	2024-09-24 11:38:06 -04:00
Daniel Su	7c0c197c91	External CI: fix hip-tests symlink creation (#3799 )	2024-09-24 10:32:05 -04:00
Wang, Yanyao	055511ed33	Add ROCm6.2.1 manifest file	2024-09-23 21:17:44 -05:00
Wang, Yanyao	210be113e4	fix build rocal for ROCm6.2.1	2024-09-23 21:14:57 -05:00
Joseph Macaranas	7963d27853	External CI: Publish wheel as artifact for rocPyDecode (#3796 )	2024-09-23 17:52:24 -04:00
Sam Wu	a493148cbc	Merge pull request #3777 from samjwu/rcclki Cherry pick to 6.2 release branch: Update RCCL known issue wording (#3775)	2024-09-20 16:08:12 -08:00
Sam Wu	e76c7954dd	Merge pull request #3773 from samjwu/updaterel62 Update 6.2 release notes	2024-09-20 15:47:10 -08:00
Sam Wu	702602c8b9	Merge branch 'roc-6.2.x' into updaterel62	2024-09-20 15:45:06 -08:00
Sam Wu	f64ddeeca1	Merge pull request #3764 from samjwu/update62 Update 6.2 release branch	2024-09-20 13:11:38 -08:00
Sam Wu	07815f166e	Merge remote-tracking branch 'upstream/roc-6.2.x' into update62	2024-09-20 15:08:24 -06:00
spolifroni-amd	b96ecad5c2	Include rocal version change in the highlights (#177 ) * Include rocal version change in the highlights * Reworded rocal known issues and added link to rocal in highlights	2024-09-20 15:05:52 -06:00
Sam Wu	14fc301896	Merge pull request #3758 from amd-jnovotny/fix-radeon-link-roc62x Cherry-pick to roc-6-2.x: Fix Radeon link and point at R6.1.3 as absolute link (#3757)	2024-09-19 12:29:21 -08:00
Jeffrey Novotny	7fe62a5f98	Fix Radeon link and point at R6.1.3 as absolute link (#3757 )	2024-09-19 16:21:52 -04:00
Jeffrey Novotny	90470cd007	Update link to rocRAND data type support (#3736 )	2024-09-17 16:57:05 -06:00
Sam Wu	2f1d48a88a	Merge pull request #3724 from peterjunpark/roc-6.2.x Add docs fixes to roc-6.2.x	2024-09-16 13:40:33 -08:00
Peter Park	1f52787875	add missing make command to bitsandbytes install commands (#3722 )	2024-09-13 13:24:17 -04:00
Sam Wu	1a4b46781e	Merge pull request #3665 from peterjunpark/roc-6.2.x Add docs fixes to roc-6.2.x	2024-09-13 08:09:51 -08:00
Sandra Polifroni	bf018105d3	Fixed broken links for tensile, rocprofiler, roctracer, hipify, rocm-cmake	2024-09-13 11:22:30 -04:00
Sam Wu	43fd9e65c0	Merge pull request #3690 from amd-jnovotny/fbgemm-init-roc62x Cherry-pick to "roc-6.2.x": Add FBGEMM/FBGEMM_GPU to the Model acceleration libraries page (#3659)	2024-09-09 10:02:38 -06:00
Jeffrey Novotny	36c30b9dd7	Add FBGEMM/FBGEMM_GPU to the Model acceleration libraries page (#3659 ) * Add FBGEMM/FBGEMM_GPU to the Model acceleration libraries page * Add words to wordlist and fix a typo * Add new sections for Docker and testing * Incorporate comments from the external review * Some minor edits and clarifications * Incorporate further review coments and fix test section * Add comment to test section * Change git clone command for FBGEMM repo * Change Docker command * Changes from internal review * Fix linting issue	2024-09-09 11:29:49 -04:00
Sam Wu	5a4dc736cb	Merge pull request #3679 from amd-jnovotny/vllm-docker-guide-links-roc62x Cherry pick to roc-6.2.x: Add introduction and links to the new guide to the vLLM optimized Doc…	2024-09-09 09:06:52 -06:00
Sam Wu	0038c7e52d	Merge pull request #3649 from amd-jnovotny/amdttm-fix-roc62x Cherry pick to roc-6.2.x: Correct ttm to amdttm (#3648)	2024-09-09 09:06:20 -06:00
Sam Wu	da29e48193	Merge pull request #3657 from amd-jnovotny/mi300a-updates-roc62x Cherry-pick to roc-6.2.x: MI300A updates	2024-09-09 09:01:41 -06:00
Sandra Polifroni	1ea2657694	Fixed broken link to RISC-V documentation	2024-09-05 09:11:44 -04:00
Jeffrey Novotny	b81be39072	Add introduction and links to the new guide to the vLLM optimized Doc… (#3637 ) * Add introduction and links to the new guide to the vLLM optimized Docker image on AMD Infinity Hub * Update target link for the Docker vLLM guide * Change target URL * Change link target URL again	2024-09-04 17:14:18 -04:00
Peter Park	0eccec4d68	Fix intersphinx links (#3668 ) * fix links in install.rst * fix links in sys opt guides	2024-09-03 12:32:55 -04:00
Peter Park	7bbdb49875	remove unneeded file (#3663 )	2024-09-03 10:37:06 -04:00
ozziemoreno	14113a8f6d	Update model-quantization.rst to import `BitsAndBytesConfig` from transformers library (#3638 )	2024-09-03 10:36:49 -04:00
Jeffrey Novotny	9480b84fd1	Expand the section on changing thread affinity (#3653 ) * Expand the section on changing thread affinity * Clarify the methods for configuring allocatable memory settings * Small correction	2024-08-29 09:49:36 -04:00
Chris Kime	f78c83c3b3	Correct ttm to amdttm (#3648 )	2024-08-27 14:27:33 -04:00
Sam Wu	87bc26e672	Merge pull request #3623 from samjwu/update62x Update roc-6.2.x	2024-08-20 15:17:56 -06:00
Wang, Yanyao	1d79657057	fix README.md for Ubuntu24 docker	2024-08-20 10:00:23 -07:00
Wang, Yanyao	884b5a0ec2	Update build scripts for ROCm6.2 release	2024-08-20 10:00:23 -07:00
Sam Wu	5273089b51	Merge pull request #3602 from amd-jnovotny/mi300a-memory-alloc-roc62x Cherry-pick to roc-6.2.x: Add a section on increasing memory allocation to the MI300A system op…	2024-08-16 10:21:01 -06:00
Jeffrey Novotny	efe7917857	Add a section on increasing memory allocation to the MI300A system op… (#3587 ) * Add a section on increasing memory allocation to the MI300A system optimization guide * Addition to wordlist * Change GB to GiB for consistency * Standardize GiB/KiB spacing * Minor wording changes	2024-08-16 08:40:39 -04:00
Sam Wu	d3ce15347f	Merge pull request #3595 from samjwu/update62x Update roc-6.2.x with documentation fixes and requirement update	2024-08-15 12:39:55 -06:00
Sam Wu	e07aef730e	Merge branch 'roc-6.2.x' into update62x	2024-08-15 12:34:30 -06:00
David Galiffi	0a9966cb3e	Add rocm 6.2.0 manifest file for rocm-build scripts (#3538 ) * Add rocm 6.2.0 manifest file for rocm-build scripts Signed-off-by: David Galiffi <David.Galiffi@amd.com> * Add "rocm-examples" --------- Signed-off-by: David Galiffi <David.Galiffi@amd.com>	2024-08-15 10:27:12 -06:00
David Galiffi	77bc63e5e2	Add rocm-examples to default.xml (#3583 )	2024-08-14 12:43:15 -04:00
Sam Wu	73bc7d6167	Merge pull request #3564 from amd-jnovotny/peak-tflops-typo-roc62x Fix typo for TFLOPs metric in MI250 architecture page: cherry pick to roc-6.2.x	2024-08-12 11:27:40 -06:00
Jeffrey Novotny	5895f04f85	Fix typo for TFLOPs metric in MI250 architecture page	2024-08-12 09:58:30 -04:00
Sam Wu	df8dce7f77	Merge pull request #3528 from amd-jnovotny/update-llama-link-roc62x Fix link to meta-llama finetuning recipes - 6.2.x	2024-08-09 10:32:44 -06:00
Sam Wu	c6a73fb255	Merge pull request #3554 from peterjunpark/roc-6.2.x roc-6.2.x: Fix intersphinx links (#3546)	2024-08-08 15:05:28 -06:00
Sam Wu	2db956f3ed	Merge pull request #3552 from samjwu/update62x Update roc-6.2.x branch	2024-08-08 13:36:32 -06:00
Sam Wu	ad4e7f29ea	add rocPyDecode repo to ROCm6.2 manifest file (#3541 ) (#3553 ) Co-authored-by: Yanyao Wang <yanywang@amd.com> Co-authored-by: Wang, Yanyao <yanyao.wang@amd.com>	2024-08-08 13:26:36 -06:00
Peter Park	2a402e010c	Fix intersphinx links (#3546 ) * update fw install links * fix more intersphinx links * fix more links	2024-08-08 15:22:28 -04:00
Jeffrey Novotny	a1b9eac4af	Fix link to rocr debug agent (#3533 ) Co-authored-by: Sam Wu <22262939+samjwu@users.noreply.github.com>	2024-08-08 12:47:04 -06:00
Sam Wu	27d94c174a	Spellcheck fixes in release notes templates (#3526 ) (#3548 ) * fix spelling in 5.4.x templates * add to wordlist * update templates update wordlist * remove extra_components rm extra_components * fix spelling Co-authored-by: Peter Park <peter.park@amd.com>	2024-08-08 12:23:22 -06:00
Jeffrey Novotny	4e9e38fcd0	Fix link to meta-llama finetuning recipes	2024-08-06 15:31:20 -04:00
Sam Wu	38e86b97d4	Merge pull request #3510 from ROCm/develop Merge develop into roc-6.2.x	2024-08-02 16:58:43 -06:00
Sam Wu	f12354349a	Update version list with 6.2.0 (#3505 ) (#3506 )	2024-08-02 14:18:20 -06:00