update links to vllm perf validation doc

External CI: various fixes (#3963 )
External CI: Add aqlprofile to Tensile test dependencies (#3961 )
2026-01-10 15:18:11 -05:00 · 2024-10-30 15:52:12 -04:00 · 2024-10-30 15:52:12 -04:00 · 2024-10-30 15:52:12 -04:00 · 2024-10-30 14:08:35 -04:00 · 2024-10-30 12:51:40 -04:00
85 changed files with 898 additions and 2389 deletions
--- a/.azuredevops/components/MIOpen.yml
+++ b/.azuredevops/components/MIOpen.yml
@@ -210,3 +210,4 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
    parameters:
      componentName: MIOpen
+      reloadAMDGPU: true
--- a/.azuredevops/components/hip-tests.yml
+++ b/.azuredevops/components/hip-tests.yml
@@ -136,6 +136,7 @@ jobs:
    parameters:
      componentName: hip_tests
      testDir: $(Agent.BuildDirectory)/rocm/share/hip
+      reloadAMDGPU: true
  - task: Bash@3
    displayName: Clean up symlink
    inputs:
--- a/.azuredevops/components/rocprofiler-compute.yml
+++ b/.azuredevops/components/rocprofiler-compute.yml
@@ -9,7 +9,6 @@ parameters:
  type: object
  default:
    - cmake
-    - locales
    - python3-pip
 - name: pipModules
  type: object
@@ -47,7 +46,7 @@ parameters:
    - roctracer

 jobs:
- job: rocprofiler_compute
+- job: omniperf
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
@@ -89,8 +88,8 @@ jobs:
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)

- job: rocprofiler_compute_testing
-  dependsOn: rocprofiler_compute
+- job: omniperf_testing
+  dependsOn: omniperf
  condition: and(succeeded(), eq(variables.ENABLE_GFX942_TESTS, 'true'), not(containsValue(split(variables.DISABLED_GFX942_TESTS, ','), variables['Build.DefinitionName'])))
  variables:
  - group: common
@@ -111,14 +110,6 @@ jobs:
      aptPackages: ${{ parameters.aptPackages }}
      pipModules: ${{ parameters.pipModules }}
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
-  - task: Bash@3
-    displayName: Add en_US.UTF-8 locale
-    inputs:
-      targetType: inline
-      script: |
-        sudo locale-gen en_US.UTF-8
-        sudo update-locale
-        locale -a
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
@@ -160,9 +151,9 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/gpu-diagnostics.yml
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
    parameters:
-      componentName: rocprofiler-compute
-      testDir: $(Build.BinariesDirectory)/libexec/rocprofiler-compute
-      testExecutable: export ROCPROFCOMPUTE_ARCH_OVERRIDE="MI300X"; ctest
+      componentName: omniperf
+      testDir: $(Build.BinariesDirectory)/libexec/omniperf
+      testExecutable: export OMNIPERF_ARCH_OVERRIDE="MI300X"; ctest
  - task: Bash@3
    displayName: Remove ROCm binaries from PATH
    inputs:
--- a/.azuredevops/components/rocAL.yml
+++ b/.azuredevops/components/rocAL.yml
@@ -224,6 +224,7 @@ jobs:
    parameters:
      componentName: rocAL
      testDir: rocAL-tests
+      reloadAMDGPU: true
  - task: Bash@3
    displayName: Clean up libjpeg-turbo
    inputs:
--- a/.azuredevops/components/rocBLAS.yml
+++ b/.azuredevops/components/rocBLAS.yml
@@ -40,7 +40,6 @@ parameters:
    - aomp-extras
    - hipBLAS-common
    - hipBLASLt
-    - roctracer
 - name: rocmTestDependencies
  type: object
  default:
--- a/.azuredevops/components/rocDecode.yml
+++ b/.azuredevops/components/rocDecode.yml
@@ -93,9 +93,7 @@ jobs:
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool:
-    name: $(JOB_TEST_POOL)
-    demands: firstRenderDeviceAccess
+  pool: $(JOB_TEST_POOL)
  workspace:
    clean: all
  strategy:
@@ -104,18 +102,6 @@ jobs:
        JOB_GPU_TARGET: gfx942
        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
  steps:
-  # Since mesa-amdgpu-multimedia-devel is not directly available from apt, register it
-  - task: Bash@3
-    displayName: 'Register ROCm packages'
-    inputs:
-      targetType: inline
-      script: |
-        sudo mkdir --parents --mode=0755 /etc/apt/keyrings
-        wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null
-        echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${{ variables.KEYRING_VERSION }}/ubuntu jammy main" | sudo tee /etc/apt/sources.list.d/amdgpu.list
-        echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${{ variables.KEYRING_VERSION }} jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list
-        echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600
-        sudo apt update
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
--- a/.azuredevops/components/rocPyDecode.yml
+++ b/.azuredevops/components/rocPyDecode.yml
@@ -22,7 +22,6 @@ parameters:
 - name: pipModules
  type: object
  default:
-    - numpy
    - pybind11
 - name: rocmDependencies
  type: object
@@ -81,18 +80,15 @@ jobs:
        sudo rm -rf /opt/rocm
        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
  - task: Bash@3
-    displayName: 'Save Python Package Paths'
+    displayName: 'Set User Site Packages Path'
    inputs:
      targetType: inline
-      script: |
-        echo "##vso[task.setvariable variable=PYTHON_USER_SITE;]$(python3 -m site --user-site)"
-        echo "##vso[task.setvariable variable=PYTHON_DIST_PACKAGES;]$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')"
-        echo "##vso[task.setvariable variable=PYBIND11_PATH;]$(python3 -c 'import pybind11; print(pybind11.get_cmake_dir())')"
+      script: echo "##vso[task.setvariable variable=USER_SITE;]$(python -m site --user-site)"
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
-        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(PYTHON_USER_SITE)/pybind11;$(PYTHON_DIST_PACKAGES)/pybind11;$(PYBIND11_PATH)
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(USER_SITE)/pybind11
        -DCMAKE_BUILD_TYPE=Release
        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
        -DCMAKE_INSTALL_PREFIX_PYTHON=$(Build.BinariesDirectory)
@@ -128,9 +124,7 @@ jobs:
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool:
-    name: $(JOB_TEST_POOL)
-    demands: firstRenderDeviceAccess
+  pool: $(JOB_TEST_POOL)
  workspace:
    clean: all
  strategy:
@@ -139,17 +133,6 @@ jobs:
        JOB_GPU_TARGET: gfx942
        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
  steps:
-  - task: Bash@3
-    displayName: Ensure pybind11-dev is not installed
-    inputs:
-      targetType: inline
-      script: |
-        if dpkg -l | grep -q pybind11-dev; then
-          echo "Removing pybind11-dev..."
-          sudo apt remove -y pybind11-dev
-        else
-          echo "pybind11-dev is not installed."
-        fi
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
@@ -160,14 +143,9 @@ jobs:
      targetType: inline
      script: pip install -i https://test.pypi.org/simple hip-python
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
-  - task: DownloadPipelineArtifact@2
-    displayName: 'Download Pipeline Wheel Files'
-    inputs:
-      itemPattern: '**/*.whl'
-      targetPath: $(Agent.BuildDirectory)
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
    parameters:
-      checkoutRepo: ${{ parameters.checkoutRepo }}
+      gpuTarget: $(JOB_GPU_TARGET)
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
    parameters:
      ${{ if eq(parameters.checkoutRef, '') }}:
@@ -182,38 +160,25 @@ jobs:
        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: pip install
-    inputs:
-      targetType: inline
-      script: |
-        pip uninstall -y rocPyDecode
-        find -name *.whl -exec pip install {} \;
-      workingDirectory: $(Agent.BuildDirectory)
-  - task: Bash@3
-    displayName: Setup search paths
+    displayName: Setup test environment
    inputs:
      targetType: inline
      script: |
        sudo rm -rf /opt/rocm
        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
-        echo "##vso[task.setvariable variable=PYTHON_USER_SITE;]$(python3 -m site --user-site)"
-        echo "##vso[task.setvariable variable=PYTHON_DIST_PACKAGES;]$(python3 -c 'import sysconfig; print(sysconfig.get_paths()["purelib"])')"
-        echo "##vso[task.setvariable variable=PYBIND11_PATH;]$(python3 -c 'import pybind11; print(pybind11.get_cmake_dir())')"
-  - task: CMake@1
-    displayName: 'rocPyDecode Test CMake Flags'
-    inputs:
-      cmakeArgs: >-
-        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
-        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(PYTHON_USER_SITE)/pybind11;$(PYTHON_DIST_PACKAGES)/pybind11;$(PYBIND11_PATH)
-        -DCMAKE_BUILD_TYPE=Release
-        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
-        ..
+        echo "##vso[task.setvariable variable=USER_SITE;]$(python3 -m site --user-site)"
+        cd $(Build.SourcesDirectory)
+        sudo pip install .
+        cmake -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(USER_SITE)/pybind11 -DAMDGPU_TARGETS=$(JOB_GPU_TARGET) .
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/gpu-diagnostics.yml
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
    parameters:
      componentName: rocPyDecode
-      testDir: $(Build.SourcesDirectory)/build
+      testDir: $(Build.SourcesDirectory)
 # sudo required for pip install but screws up permissions for next pipeline run
  - task: Bash@3
    displayName: Clean up test environment
@@ -221,5 +186,5 @@ jobs:
    inputs:
      targetType: inline
      script: |
-        pip uninstall -y rocPyDecode
-        pip uninstall -y hip-python
+        sudo pip uninstall -y rocPyDecode
+        sudo rm -rf $(Build.SourcesDirectory)/*
--- a/.azuredevops/components/rocm-examples.yml
+++ b/.azuredevops/components/rocm-examples.yml
@@ -166,3 +166,4 @@ jobs:
    parameters:
      componentName: rocm-examples
      testDir: $(Build.SourcesDirectory)/build
+      reloadAMDGPU: true
--- a/.azuredevops/components/rocprofiler-systems.yml
+++ b/.azuredevops/components/rocprofiler-systems.yml
@@ -40,7 +40,6 @@ parameters:
 - name: rocmDependencies
  type: object
  default:
-    - aomp
    - clr
    - llvm-project
    - rccl
--- a/.azuredevops/nightly/rocm-nightly.yml
+++ b/.azuredevops/nightly/rocm-nightly.yml
@@ -26,6 +26,7 @@ parameters:
    - llvm-project
    - MIOpen
    - MIVisionX
+    - omniperf
    - rccl
    - rdc
    - rocAL
@@ -44,7 +45,6 @@ parameters:
    - rocm_bandwidth_test
    - rocm_smi_lib
    - rocPRIM
-    - rocprofiler-compute
    - rocprofiler-register
    - rocprofiler-sdk
    - rocprofiler-systems
--- a/.azuredevops/tag-builds/rocprofiler-compute.yml
+++ b/.azuredevops/tag-builds/rocprofiler-compute.yml
@@ -16,14 +16,14 @@ resources:
  - repository: release_repo
    type: github
    endpoint: ROCm
-    name: ROCm/rocprofiler-compute
+    name: ROCm/omniperf
    ref: ${{ parameters.checkoutRef }}

 trigger: none
 pr: none

 jobs:
-  - template: ${{ variables.CI_COMPONENT_PATH }}/rocprofiler-compute.yml
+  - template: ${{ variables.CI_COMPONENT_PATH }}/omniperf.yml
    parameters:
      checkoutRepo: release_repo
      checkoutRef: ${{ parameters.checkoutRef }}
--- a/.azuredevops/templates/steps/artifact-download.yml
+++ b/.azuredevops/templates/steps/artifact-download.yml
@@ -70,7 +70,6 @@ parameters:
    rocm_smi_lib: amd-staging
    rocPRIM: develop
    rocprofiler: amd-staging
-    rocprofiler-compute: amd-staging
    rocprofiler-register: amd-staging
    rocprofiler-sdk: amd-staging
    rocprofiler-systems: amd-staging
@@ -132,7 +131,6 @@ parameters:
    rocm_smi_lib: amd-mainline
    rocPRIM: mainline
    rocprofiler: amd-master
-    rocprofiler-compute: amd-mainline
    rocprofiler-register: amd-mainline
    rocprofiler-sdk: amd-mainline
    rocprofiler-systems: amd-mainline
@@ -146,22 +144,26 @@ parameters:
    roctracer: amd-master
    rocWMMA: mainline
    rpp: mainline
+- name: allowPartiallySucceededBuilds
+  type: object
+  default:
+    - amdsmi
+    - aomp
+    - HIPIFY
+    - MIVisionX
+    - omniperf
+    - rccl
+    - rdc
+    - rocm-cmake
+    - rocm_smi_lib
+    - rocFFT
+    - rpp
 # BELOW REQUIRED IF useDefaultBranch false
 - name: branchName
  type: string
  default: '$(Build.SourceBranchName)' # for tagged builds

 steps:
- task: Bash@3
-  displayName: Set allowPartiallySucceededBuilds
-  inputs:
-    targetType: inline
-    script: |
-      if [[ ",$ALLOWED_PARTIAL_SUCCEED_BUILDS," == *",${{ parameters.componentName }},"* ]]; then
-        echo "##vso[task.setvariable variable=allowPartiallySucceededBuilds;]true"
-      else
-        echo "##vso[task.setvariable variable=allowPartiallySucceededBuilds;]false"
-      fi
 - task: DownloadPipelineArtifact@2
  displayName: Download ${{ parameters.componentName }}
  inputs:
@@ -179,7 +181,8 @@ steps:
      branchName: refs/heads/${{ parameters.mainlineBranchList[parameters.componentName] }}
    ${{ else }}:
      branchName: ${{ parameters.branchName }}
-    allowPartiallySucceededBuilds: $(allowPartiallySucceededBuilds)
+    ${{ if containsValue(parameters.allowPartiallySucceededBuilds, parameters.componentName) }}:
+      allowPartiallySucceededBuilds: true
    targetPath: '$(Pipeline.Workspace)/d'
 - task: ExtractFiles@1
  displayName: Extract ${{ parameters.componentName }}
--- a/.azuredevops/templates/steps/dependencies-other.yml
+++ b/.azuredevops/templates/steps/dependencies-other.yml
@@ -8,12 +8,6 @@ parameters:
  default: []

 steps:
-# firefox takes time to upgrade and is not needed for CI workloads, hold version
- task: Bash@3
-  displayName: 'sudo apt-mark hold firefox'
-  inputs:
-    targetType: inline
-    script: sudo apt-mark hold firefox
 - task: Bash@3
  displayName: 'sudo apt-get update'
  inputs:
--- a/.azuredevops/templates/steps/dependencies-rocm.yml
+++ b/.azuredevops/templates/steps/dependencies-rocm.yml
@@ -74,7 +74,6 @@ parameters:
    rocm_bandwidth_test: $(ROCM_BANDWIDTH_TEST_PIPELINE_ID)
    rocm_smi_lib: $(ROCM_SMI_LIB_PIPELINE_ID)
    rocPRIM: $(ROCPRIM_PIPELINE_ID)
-    rocprofiler-compute: $(ROCPROFILER_COMPUTE_PIPELINE_ID)
    rocprofiler-register: $(ROCPROFILER_REGISTER_PIPELINE_ID)
    rocprofiler-sdk: $(ROCPROFILER_SDK_PIPELINE_ID)
    rocprofiler-systems: $(ROCPROFILER_SYSTEMS_PIPELINE_ID)
@@ -137,7 +136,6 @@ parameters:
    rocm_bandwidth_test: $(ROCM_BANDWIDTH_TEST_TAGGED_PIPELINE_ID)
    rocm_smi_lib: $(ROCM_SMI_LIB_TAGGED_PIPELINE_ID)
    rocPRIM: $(ROCPRIM_TAGGED_PIPELINE_ID)
-    rocprofiler-compute: $(ROCPROFILER_COMPUTE_TAGGED_PIPELINE_ID)
    rocprofiler-register: $(ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID)
    rocprofiler-sdk: $(ROCPROFILER_SDK_TAGGED_PIPELINE_ID)
    rocprofiler-systems: $(ROCPROFILER_SYSTEMS_PIPELINE_ID)
@@ -188,7 +186,6 @@ parameters:
    - rocFFT
    - rocm-examples
    - rocPRIM
-    - rocprofiler-compute
    - rocprofiler-sdk
    - rocprofiler-systems
    - rocprofiler
--- a/.azuredevops/templates/steps/gpu-diagnostics.yml
+++ b/.azuredevops/templates/steps/gpu-diagnostics.yml
@@ -11,44 +11,44 @@ steps:
    continueOnError: true
    inputs:
      targetType: inline
-      script: $(Agent.BuildDirectory)/rocm/bin/rocminfo || true
+      script: $(Agent.BuildDirectory)/rocm/bin/rocminfo
  - task: Bash@3
    displayName: 'rocm_agent_enumerator'
    continueOnError: true
    inputs:
      targetType: inline
-      script: $(Agent.BuildDirectory)/rocm/bin/rocm_agent_enumerator || true
+      script: $(Agent.BuildDirectory)/rocm/bin/rocm_agent_enumerator
 - task: Bash@3
  displayName: 'List DRI devices'
  continueOnError: true
  inputs:
    targetType: inline
-    script: ls -la /dev/dri/ || true
+    script: ls -la /dev/dri/by-path/
 - task: Bash@3
  displayName: 'List amdgpu/rocm/mesa packages'
  continueOnError: true
  inputs:
    targetType: inline
-    script: apt list --installed | grep -E 'amdgpu|rocm|mesa' || true
+    script: apt list --installed | grep -E 'amdgpu|rocm|mesa'
 - task: Bash@3
  displayName: 'List GPU processes'
  continueOnError: true
  inputs:
    targetType: inline
    script: |
-      ls /sys/class/kfd/kfd/proc/ || true
-      sudo lsof | grep amdgpu || true
+      ls /sys/class/kfd/kfd/proc/
+      sudo lsof | grep amdgpu
 - task: Bash@3
  displayName: 'System snapshot'
  continueOnError: true
  inputs:
    targetType: inline
-    script: top -bn1 || true
+    script: top -bn1
 - task: Bash@3
  displayName: 'List dmesg'
  continueOnError: true
  inputs:
    targetType: inline
    script: |
-      echo 'rocm-ci: $(Build.DefinitionName) $(System.DefinitionId)' | sudo tee /dev/kmsg || true
-      sudo dmesg || true
+      echo 'rocm-ci: $(Build.DefinitionName) $(System.DefinitionId)' | sudo tee /dev/kmsg
+      sudo dmesg
--- a/.azuredevops/variables-global.yml
+++ b/.azuredevops/variables-global.yml
@@ -259,10 +259,6 @@ variables:
  value: 20
 - name: ROCPROFILER_GFX942_TEST_PIPELINE_ID
  value: 190
- name: ROCPROFILER_COMPUTE_PIPELINE_ID
-  value: 257
- name: ROCPROFILER_COMPUTE_TAGGED_PIPELINE_ID
-  value: 258
 - name: ROCPROFILER_REGISTER_PIPELINE_ID
  value: 1
 - name: ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -276,7 +276,6 @@ OpenSSL
 OpenVX
 OpenXLA
 Oversubscription
-PagedAttention
 PCC
 PCI
 PCIe
--- 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.4 # Or 6.2.0, 6.2.1, 6.2.2
+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,69 +1,104 @@
-# ROCm 6.2.4 release notes
+# ROCm 6.2.2 release notes

-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)
+These release notes provide a summary of notable changes since the previous ROCm release.

 ```{note}
-If you’re using Radeon™ PRO or Radeon GPUs in a workstation setting with a
-display connected, continue to use ROCm 6.2.3. See the [Use ROCm on Radeon
-GPUs](https://rocm.docs.amd.com/projects/radeon/en/latest/index.html)
-documentation to verify compatibility and system requirements.
+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 are notable new features and improvements in ROCm 6.2.4. For changes to individual components, see
-[Detailed component changes](#detailed-component-changes).
+The following is a significant fix introduced in ROCm 6.2.2.

-#### ROCm documentation updates
+### Fixed Instinct MI300X error recovery failure

-ROCm documentation continues to be updated to provide clearer and more comprehensive guidance for
-a wider variety of user needs and use cases.
+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.

-* Added a new GPU cluster networking guide. See
-  [Cluster network performance validation for AMD Instinct accelerators](https://rocm.docs.amd.com/projects/gpu-cluster-networking/en/docs-6.2.4/index.html).
-  This documentation provides guidelines on validating network configurations
-  in single-node and multi-node environments to attain optimal speed and bandwidth
-  in AMD Instinct-powered clusters.
+See the [original issue](#instinct-mi300x-gpu-recovery-failure-on-uncorrectable-errors)
+noted in the ROCm 6.2.1 release notes.

-* Updated the HIP runtime documentation.
+---

-  * Added a new section on how to use [HIP graphs](https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.4/how-to/hipgraph.html).
+## ROCm 6.2.1 release notes

-  * Added a new section about the [Stream ordered memory allocator (SOMA)](https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.4/how-to/stream_ordered_allocator.html).
+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.

-  * Updated the [Porting CUDA driver API](https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.4/how-to/hip_porting_driver_api.html) section.
+- [Release highlights](release-highlights)

-* Updated the [Post-installation instructions](https://rocm.docs.amd.com/projects/install-on-linux/en/docs-6.2.4/install/post-install.html)
-  with guidance on using the `update-alternatives` utility and environment modules to help you manage multiple ROCm
-  versions and streamline PATH configuration.
+- [Operating system and hardware support changes](operating-system-and-hardware-support-changes)

-* Updated the [LLM inference performance validation on AMD Instinct
-  MI300X](https://rocm.docs.amd.com/en/docs-6.2.4/how-to/performance-validation/mi300x/vllm-benchmark.html)
-  documentation with more detailed guidance, new models, and the `float8` data type.
+- [ROCm components versioning](rocm-components)

-## Operating system and hardware support changes
+- [Detailed component changes](detailed-component-changes)

-ROCm 6.2.4 adds support for the [AMD Radeon PRO V710](https://www.amd.com/en/products/accelerators/radeon-pro/amd-radeon-pro-v710.html) GPU for compute workloads. See 
-[Supported GPUs](https://rocm.docs.amd.com/projects/install-on-linux/en/docs-6.2.4/reference/system-requirements.html#supported-gpus)
-for more information.
+- [ROCm known issues](rocm-known-issues)

-This release maintains the same operating system support as 6.2.2.
+- [ROCm upcoming changes](rocm-upcoming-changes)

-## ROCm components
+### Release highlights

-The following table lists the versions of ROCm components for ROCm 6.2.4, including any version changes from 6.2.2 to 6.2.4.
+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.
+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)
+
+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
+
+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
+* Updated prerequisite repositories
+* Fixed CTest issues
+
+#### ROCm documentation changes 
+
+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/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).
+```
+
+### 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.
+
+### 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. 

 Click the component's updated version to go to a detailed list of its changes. Click <i class="fab fa-github fa-lg"></i> to go to the component's source code on GitHub.

@@ -86,51 +121,51 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="8">Libraries</th>
                <th rowspan="8">Machine learning and computer vision</th>
-                <td><a href="https://rocm.docs.amd.com/projects/composable_kernel/en/docs-6.2.4">Composable Kernel</a>
+                <td><a href="https://rocm.docs.amd.com/projects/composable_kernel/en/docs-6.2.1">Composable Kernel</a>
                </td>
                <td>1.1.0</td>
-                <td><a href="https://github.com/ROCm/composable_kernel/releases/"><i
+                <td><a href="https://github.com/ROCm/composable_kernel/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/AMDMIGraphX/en/docs-6.2.4">MIGraphX</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/AMDMIGraphX/en/docs-6.2.1">MIGraphX</a></td>
                <td>2.10</td>
-                <td><a href="https://github.com/ROCm/AMDMIGraphX/releases/"><i class="fab fa-github fa-lg"></i></a></td>
+                <td><a href="https://github.com/ROCm/AMDMIGraphX/releases/tag/rocm-6.2.1"><i class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/MIOpen/en/docs-6.2.4">MIOpen</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/MIOpen/en/docs-6.2.1">MIOpen</a></td>
                <td>3.2.0</td>
-                <td><a href="https://github.com/ROCm/MIOpen/releases/"><i
+                <td><a href="https://github.com/ROCm/MIOpen/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/MIVisionX/en/docs-6.2.4">MIVisionX</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/MIVisionX/en/docs-6.2.1">MIVisionX</a></td>
                <td>3.0.0</td>
-                <td><a href="https://github.com/ROCm/MIVisionX/releases/"><i
+                <td><a href="https://github.com/ROCm/MIVisionX/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocAL/en/docs-6.2.4">rocAL</a></td>
-                <td>2.0.0</td>
-                <td><a href="https://github.com/ROCm/rocAL/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocAL/en/docs-6.2.1">rocAL</a></td>
+                <td>1.0.0&nbsp;&Rightarrow;&nbsp;<a href="#rocal-2-0-0">2.0.0</a></td>
+                <td><a href="https://github.com/ROCm/rocAL/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocDecode/en/docs-6.2.4">rocDecode</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rocDecode/en/docs-6.2.1">rocDecode</a></td>
                <td>0.6.0</td>
-                <td><a href="https://github.com/ROCm/rocDecode/releases/"><i
+                <td><a href="https://github.com/ROCm/rocDecode/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocPyDecode/en/docs-6.2.4">rocPyDecode</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rocPyDecode/en/docs-6.2.1">rocPyDecode</a></td>
                <td>0.1.0</td>
-                <td><a href="https://github.com/ROCm/rocPyDecode/releases/"><i
+                <td><a href="https://github.com/ROCm/rocPyDecode/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rpp/en/docs-6.2.4">RPP</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rpp/en/docs-6.2.1">RPP</a></td>
                <td>1.8.0</td>
-                <td><a href="https://github.com/ROCm/rpp/releases/"><i
+                <td><a href="https://github.com/ROCm/rpp/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
@@ -138,9 +173,9 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="1"></th>
                <th rowspan="1">Communication</th>
-                <td><a href="https://rocm.docs.amd.com/projects/rccl/en/docs-6.2.4">RCCL</a></td>
-                <td>2.20.5</td>
-                <td><a href="https://github.com/ROCm/rccl/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rccl/en/docs-6.2.1">RCCL</a></td>
+                <td>2.20.5&nbsp;&Rightarrow;&nbsp;<a href="#rccl-2-20-5">2.20.5</a></td>
+                <td><a href="https://github.com/ROCm/rccl/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
@@ -148,99 +183,99 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="16"></th>
                <th rowspan="16">Math</th>
-                <td><a href="https://rocm.docs.amd.com/projects/hipBLAS/en/docs-6.2.4">hipBLAS</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipBLAS/en/docs-6.2.1">hipBLAS</a></td>
                <td>2.2.0</td>
-                <td><a href="https://github.com/ROCm/hipBLAS/releases/"><i
+                <td><a href="https://github.com/ROCm/hipBLAS/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipBLASLt/en/docs-6.2.4">hipBLASLt</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipBLASLt/en/docs-6.2.1">hipBLASLt</a></td>
                <td>0.8.0</td>
-                <td><a href="https://github.com/ROCm/hipBLASLt/releases/"><i
+                <td><a href="https://github.com/ROCm/hipBLASLt/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipFFT/en/docs-6.2.4">hipFFT</a></td>
-                <td>1.0.15&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/hipFFT/blob/docs/6.2.4/CHANGELOG.md">1.0.16</a></td>
-                <td><a href="https://github.com/ROCm/hipFFT/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/hipFFT/en/docs-6.2.1">hipFFT</a></td>
+                <td>1.0.15</td>
+                <td><a href="https://github.com/ROCm/hipFFT/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipfort/en/docs-6.2.4">hipfort</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipfort/en/docs-6.2.1">hipfort</a></td>
                <td>0.4.0</td>
-                <td><a href="https://github.com/ROCm/hipfort/releases/"><i
+                <td><a href="https://github.com/ROCm/hipfort/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipRAND/en/docs-6.2.4">hipRAND</a></td>
-                <td>2.11.0&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/hipRAND/blob/docs/6.2.4/CHANGELOG.md">2.11.1</a></td>
-                <td><a href="https://github.com/ROCm/hipRAND/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/hipRAND/en/docs-6.2.1">hipRAND</a></td>
+                <td>2.11.0</td>
+                <td><a href="https://github.com/ROCm/hipRAND/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipSOLVER/en/docs-6.2.4">hipSOLVER</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipSOLVER/en/docs-6.2.1">hipSOLVER</a></td>
                <td>2.2.0</td>
-                <td><a href="https://github.com/ROCm/hipSOLVER/releases/"><i
+                <td><a href="https://github.com/ROCm/hipSOLVER/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipSPARSE/en/docs-6.2.4">hipSPARSE</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipSPARSE/en/docs-6.2.1">hipSPARSE</a></td>
                <td>3.1.1</td>
-                <td><a href="https://github.com/ROCm/hipSPARSE/releases/"><i
+                <td><a href="https://github.com/ROCm/hipSPARSE/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipSPARSELt/en/docs-6.2.4">hipSPARSELt</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipSPARSELt/en/docs-6.2.1">hipSPARSELt</a></td>
                <td>0.2.1</td>
-                <td><a href="https://github.com/ROCm/hipSPARSELt/releases/"><i
+                <td><a href="https://github.com/ROCm/hipSPARSELt/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocALUTION/en/docs-6.2.4">rocALUTION</a></td>
-                <td>3.2.0&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/rocALUTION/blob/docs/6.2.4/CHANGELOG.md">3.2.1</a></td>
-                <td><a href="https://github.com/ROCm/rocALUTION/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocALUTION/en/docs-6.2.1">rocALUTION</a></td>
+                <td>3.2.0</td>
+                <td><a href="https://github.com/ROCm/rocALUTION/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocBLAS/en/docs-6.2.4">rocBLAS</a></td>
-                <td>4.2.1&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/rocBLAS/blob/docs/6.2.4/CHANGELOG.md">4.2.4</a></td>
-                <td><a href="https://github.com/ROCm/rocBLAS/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocBLAS/en/docs-6.2.1">rocBLAS</a></td>
+                <td>4.1.2&nbsp;&Rightarrow;&nbsp;<a href="#rocblas-4-2-1">4.2.1</a></td>
+                <td><a href="https://github.com/ROCm/rocBLAS/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocFFT/en/docs-6.2.4">rocFFT</a></td>
-                <td>1.0.29&nbsp;&Rightarrow;&nbsp;<a href="#rocfft-1-0-30">1.0.30</a></td>
-                <td><a href="https://github.com/ROCm/rocFFT/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocFFT/en/docs-6.2.1">rocFFT</a></td>
+                <td>1.0.28&nbsp;&Rightarrow;&nbsp;<a href="#rocfft-1-0-29">1.0.29</a></td>
+                <td><a href="https://github.com/ROCm/rocFFT/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocRAND/en/docs-6.2.4">rocRAND</a></td>
-                <td>3.1.0&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/rocRAND/blob/docs/6.2.4/CHANGELOG.md">3.1.1</a></td>
-                <td><a href="https://github.com/ROCm/rocRAND/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocRAND/en/docs-6.2.1">rocRAND</a></td>
+                <td>3.1.0</td>
+                <td><a href="https://github.com/ROCm/rocRAND/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocSOLVER/en/docs-6.2.4">rocSOLVER</a></td>
-                <td>3.26.0&nbsp;&Rightarrow;&nbsp;<a href="#rocsolver-3-26-2">3.26.2</a></td>
-                <td><a href="https://github.com/ROCm/rocSOLVER/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocSOLVER/en/docs-6.2.1">rocSOLVER</a></td>
+                <td>3.26.0</td>
+                <td><a href="https://github.com/ROCm/rocSOLVER/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocSPARSE/en/docs-6.2.4">rocSPARSE</a></td>
-                <td>3.2.0&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/rocSPARSE/blob/docs/6.2.4/CHANGELOG.md">3.2.1</a></td>
-                <td><a href="https://github.com/ROCm/rocSPARSE/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocSPARSE/en/docs-6.2.1">rocSPARSE</a></td>
+                <td>3.2.0</td>
+                <td><a href="https://github.com/ROCm/rocSPARSE/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocWMMA/en/docs-6.2.4">rocWMMA</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rocWMMA/en/docs-6.2.1">rocWMMA</a></td>
                <td>1.5.0</td>
-                <td><a href="https://github.com/ROCm/rocWMMA/releases/"><i
+                <td><a href="https://github.com/ROCm/rocWMMA/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
                <td><a href="https://github.com/ROCm/Tensile">Tensile</a></td>
                <td>4.41.0</td>
-                <td><a href="https://github.com/ROCm/tensile/releases/"><i
+                <td><a href="https://github.com/ROCm/tensile/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
@@ -248,27 +283,27 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="4"></th>
                <th rowspan="4">Primitives</th>
-                <td><a href="https://rocm.docs.amd.com/projects/hipCUB/en/docs-6.2.4">hipCUB</a></td>
-                <td>3.2.0&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/hipCUB/blob/docs/6.2.4/CHANGELOG.md">3.2.1</a></td>
-                <td><a href="https://github.com/ROCm/hipCUB/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/hipCUB/en/docs-6.2.1">hipCUB</a></td>
+                <td>3.2.0</td>
+                <td><a href="https://github.com/ROCm/hipCUB/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/hipTensor/en/docs-6.2.4">hipTensor</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/hipTensor/en/docs-6.2.1">hipTensor</a></td>
                <td>1.3.0</td>
-                <td><a href="https://github.com/ROCm/hipTensor/releases/"><i
+                <td><a href="https://github.com/ROCm/hipTensor/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocPRIM/en/docs-6.2.4">rocPRIM</a></td>
-                <td>3.2.1&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/rocPRIM/blob/docs/6.2.4/CHANGELOG.md">3.2.2</a></td>
-                <td><a href="https://github.com/ROCm/rocPRIM/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocPRIM/en/docs-6.2.1">rocPRIM</a></td>
+                <td>3.2.0&nbsp;&Rightarrow;&nbsp;<a href="#rocprim-3-2-1">3.2.1</a></td>
+                <td><a href="https://github.com/ROCm/rocPRIM/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocThrust/en/docs-6.2.4">rocThrust</a></td>
-                <td>3.1.0&nbsp;&Rightarrow;&nbsp;<a href="https://github.com/ROCm/rocThrust/blob/docs/6.2.4/CHANGELOG.md">3.1.1</a></td>
-                <td><a href="https://github.com/ROCm/rocThrust/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/rocThrust/en/docs-6.2.1">rocThrust</a></td>
+                <td>3.1.0</td>
+                <td><a href="https://github.com/ROCm/rocThrust/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
@@ -276,33 +311,33 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="6">Tools</th>
                <th rowspan="6">System management</th>
-                <td><a href="https://rocm.docs.amd.com/projects/amdsmi/en/docs-6.2.4">AMD SMI</a></td>
-                <td>24.6.3&nbsp;&Rightarrow;&nbsp;<a href="#amd-smi-24-6-3">24.6.3</a></td>
-                <td><a href="https://github.com/ROCm/amdsmi/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/amdsmi/en/docs-6.2.1">AMD SMI</a></td>
+                <td>24.6.2&nbsp;&Rightarrow;&nbsp;<a href="#amd-smi-24-6-3">24.6.3</a></td>
+                <td><a href="https://github.com/ROCm/amdsmi/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocminfo/en/docs-6.2.4">rocminfo</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rocminfo/en/docs-6.2.1">rocminfo</a></td>
                <td>1.0.0</td>
-                <td><a href="https://github.com/ROCm/rocminfo/releases/"><i
+                <td><a href="https://github.com/ROCm/rocminfo/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rdc/en/docs-6.2.4">ROCm Data Center Tool</a></td>
-                <td>0.3.0</td>
-                <td><a href="https://github.com/ROCm/rdc/releases/"><i
-                            class="fab fa-github fa-lg"></i></a></td>
-            </tr>
-            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocm_smi_lib/en/docs-6.2.4">ROCm SMI</a></td>
-                <td>7.3.0</td>
-                <td><a href="https://github.com/ROCm/rocm_smi_lib/releases/"><i
-                            class="fab fa-github fa-lg"></i></a></td>
-            </tr>
-            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/ROCmValidationSuite/en/docs-6.2.4">ROCm Validation Suite</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rdc/en/docs-6.2.1">ROCm Data Center Tool</a></td>
                <td>1.0.0</td>
-                <td><a href="https://github.com/ROCm/ROCmValidationSuite/releases/"><i
+                <td><a href="https://github.com/ROCm/rdc/releases/tag/rocm-6.2.1"><i
+                            class="fab fa-github fa-lg"></i></a></td>
+            </tr>
+            <tr>
+                <td><a href="https://rocm.docs.amd.com/projects/rocm_smi_lib/en/docs-6.2.1">ROCm SMI</a></td>
+                <td>7.3.0&nbsp;&Rightarrow;&nbsp;<a href="#rocm-smi-7-3-0">7.3.0</a></td>
+                <td><a href="https://github.com/ROCm/rocm_smi_lib/releases/tag/rocm-6.2.1"><i
+                            class="fab fa-github fa-lg"></i></a></td>
+            </tr>
+            <tr>
+                <td><a href="https://rocm.docs.amd.com/projects/ROCmValidationSuite/en/docs-6.2.1">ROCm Validation Suite</a></td>
+                <td>1.0.0</td>
+                <td><a href="https://github.com/ROCm/ROCmValidationSuite/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
@@ -310,40 +345,40 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="6"></th>
                <th rowspan="6">Performance</th>
-                <td><a href="https://rocm.docs.amd.com/projects/omniperf/en/docs-6.2.4">Omniperf</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/omniperf/en/docs-6.2.1">Omniperf</a></td>
                <td>2.0.1</td>
-                <td><a href="https://github.com/ROCm/omniperf/releases/"><i
+                <td><a href="https://github.com/ROCm/omniperf/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/omnitrace/en/docs-6.2.4">Omnitrace</a></td>
-                <td>1.11.2</td>
-                <td><a href="https://github.com/ROCm/omnitrace/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/omnitrace/en/docs-6.2.1">Omnitrace</a></td>
+                <td>1.11.2&nbsp;&Rightarrow;&nbsp;<a href="#omnitrace-1-11-2">1.11.2</a></td>
+                <td><a href="https://github.com/ROCm/omnitrace/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocm_bandwidth_test/en/docs-6.2.4">ROCm Bandwidth
+                <td><a href="https://rocm.docs.amd.com/projects/rocm_bandwidth_test/en/docs-6.2.1">ROCm Bandwidth
                        Test</a></td>
                <td>1.4.0</td>
-                <td><a href="https://github.com/ROCm/rocm_bandwidth_test/releases/"><i
+                <td><a href="https://github.com/ROCm/rocm_bandwidth_test/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocprofiler/en/docs-6.2.4/">ROCProfiler</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rocprofiler/en/docs-6.2.1/">ROCProfiler</a></td>
                <td>2.0.0</td>
-                <td><a href="https://github.com/ROCm/ROCProfiler/releases/"><i
+                <td><a href="https://github.com/ROCm/ROCProfiler/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocprofiler-sdk/en/docs-6.2.4">ROCprofiler-SDK</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/rocprofiler-sdk/en/docs-6.2.1">ROCprofiler-SDK</a></td>
                <td>0.4.0</td>
-                <td><a href="https://github.com/ROCm/rocprofiler-sdk/releases/"><i
+                <td><a href="https://github.com/ROCm/rocprofiler-sdk/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr >
-                <td><a href="https://rocm.docs.amd.com/projects/roctracer/en/docs-6.2.4/">ROCTracer</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/roctracer/en/docs-6.2.1/">ROCTracer</a></td>
                <td>4.1.0</td>
-                <td><a href="https://github.com/ROCm/ROCTracer/releases/"><i
+                <td><a href="https://github.com/ROCm/ROCTracer/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
@@ -351,114 +386,219 @@ Click the component's updated version to go to a detailed list of its changes. C
            <tr>
                <th rowspan="5"></th>
                <th rowspan="5">Development</th>
-                <td><a href="https://rocm.docs.amd.com/projects/HIPIFY/en/docs-6.2.4/">HIPIFY</a></td>
-                <td>18.0.0</td>
-                <td><a href="https://github.com/ROCm/HIPIFY/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/HIPIFY/en/docs-6.2.1/">HIPIFY</a></td>
+                <td>18.0.0&nbsp;&Rightarrow;&nbsp;<a href="#hipify-18-0-0">18.0.0</a></td>
+                <td><a href="https://github.com/ROCm/HIPIFY/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/ROCdbgapi/en/docs-6.2.4">ROCdbgapi</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/ROCdbgapi/en/docs-6.2.1">ROCdbgapi</a></td>
                <td>0.76.0</td>
-                <td><a href="https://github.com/ROCm/ROCdbgapi/releases/"><i
+                <td><a href="https://github.com/ROCm/ROCdbgapi/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/ROCmCMakeBuildTools/en/docs-6.2.4/">ROCm CMake</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/ROCmCMakeBuildTools/en/docs-6.2.1/">ROCm CMake</a></td>
                <td>0.13.0</td>
-                <td><a href="https://github.com/ROCm/rocm-cmake/releases/"><i
+                <td><a href="https://github.com/ROCm/rocm-cmake/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/ROCgdb/en/docs-6.2.4">ROCm Debugger (ROCgdb)</a>
+                <td><a href="https://rocm.docs.amd.com/projects/ROCgdb/en/docs-6.2.1">ROCm Debugger (ROCgdb)</a>
                </td>
                <td>14.2</td>
-                <td><a href="https://github.com/ROCm/ROCgdb/releases/"><i
+                <td><a href="https://github.com/ROCm/ROCgdb/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/rocr_debug_agent/en/docs-6.2.4">ROCr Debug Agent</a>
+                <td><a href="https://rocm.docs.amd.com/projects/rocr_debug_agent/en/docs-6.2.1">ROCr Debug Agent</a>
                </td>
                <td>2.0.3</td>
-                <td><a href="https://github.com/ROCm/rocr_debug_agent/releases/"><i
+                <td><a href="https://github.com/ROCm/rocr_debug_agent/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
        <tbody class="rocm-components-compilers tbody-reverse-zebra">
            <tr>
                <th rowspan="2" colspan="2">Compilers</th>
-                <td><a href="https://rocm.docs.amd.com/projects/HIPCC/en/docs-6.2.4">HIPCC</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/HIPCC/en/docs-6.2.1">HIPCC</a></td>
                <td>1.1.1</td>
-                <td><a href="https://github.com/ROCm/llvm-project/releases/"><i
+                <td><a href="https://github.com/ROCm/llvm-project/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/llvm-project/en/docs-6.2.4">llvm-project</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/llvm-project/en/docs-6.2.1">llvm-project</a></td>
                <td>18.0.0</td>
-                <td><a href="https://github.com/ROCm/llvm-project/releases/"><i
+                <td><a href="https://github.com/ROCm/llvm-project/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
        <tbody class="rocm-components-runtimes tbody-reverse-zebra">
            <tr>
                <th rowspan="2" colspan="2">Runtimes</th>
-                <td><a href="https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.4">HIP</a></td>
-                <td>6.2.4</a></td>
-                <td><a href="https://github.com/ROCm/HIP/releases/"><i
+                <td><a href="https://rocm.docs.amd.com/projects/HIP/en/docs-6.2.1">HIP</a></td>
+                <td>6.2&nbsp;&Rightarrow;&nbsp;<a href="#hip-6-2-1">6.2.1</a></td>
+                <td><a href="https://github.com/ROCm/HIP/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
            <tr>
-                <td><a href="https://rocm.docs.amd.com/projects/ROCR-Runtime/en/docs-6.2.4">ROCr Runtime</a></td>
+                <td><a href="https://rocm.docs.amd.com/projects/ROCR-Runtime/en/docs-6.2.1">ROCr Runtime</a></td>
                <td>1.14.0</td>
-                <td><a href="https://github.com/ROCm/ROCR-Runtime/releases/"><i
+                <td><a href="https://github.com/ROCm/ROCR-Runtime/releases/tag/rocm-6.2.1"><i
                            class="fab fa-github fa-lg"></i></a></td>
            </tr>
        </tbody>
    </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)

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

-* Fixed support for the API calls `amdsmi_get_gpu_process_isolation` and
-  `amdsmi_clean_gpu_local_data`, along with the `amd-smi set
-  --process-isolation <0 or 1>` command. See issue
-  [#3500](https://github.com/ROCm/ROCm/issues/3500) on GitHub.
+* Added `amd-smi static --ras` on Guest VMs. Guest VMs can view enabled/disabled RAS features on Host cards.

-### **rocFFT** (1.0.30)
+##### Removals

-#### Optimized
+* 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.

-* Implemented 1D kernels for factorizable sizes greater than 1024 and less than 2048.
+##### 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.

-* Fixed plan creation failure on some even-length real-complex transforms that use Bluestein's algorithm.
+#### **HIP** (6.2.1)

-### **rocSOLVER** (3.26.2)
+##### Resolved issues

-#### Resolved issues
+* Soft hang when using `AMD_SERIALIZE_KERNEL`
+* Memory leak in `hipIpcCloseMemHandle`

-* Fixed synchronization issue in STEIN.
+#### **HIPIFY** (18.0.0)

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

-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.
+* Added CUDA 12.5.1 support
+* Added cuDNN 9.2.1 support
+* Added LLVM 18.1.8 support
+* Added `hipBLAS` 64-bit APIs support
+* Added Support for math constants `math_constants.h`

-## ROCm upcoming changes
+#### **Omnitrace** (1.11.2)
+
+##### 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)
+
+##### 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.
+Older RCCL versions are also impacted.
+
+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)
+
+##### 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.
+* Added development and test packages.
+* Added C++ rocAL audio unit test and Python script to run and compare the outputs.
+* Added Python support for audio decoders.
+* Added Pytorch iterator for audio.
+* Added Python audio unit test and support to verify outputs.
+* Added rocDecode for HW decode.
+* Added support for: 
+    * Audio loader and decoder, which uses libsndfile library to decode wav files
+    * Audio augmentation - PreEmphasis filter, Spectrogram, ToDecibels, Resample, NonSilentRegionDetection, MelFilterBank 
+    * Generic augmentation - Slice, Normalize
+    * Reading from file lists in file reader
+    * Downmixing audio channels during decoding
+    * TensorTensorAdd and TensorScalarMultiply operations
+    * Uniform and Normal distribution nodes
+* Image to tensor updates
+* ROCm install - use case graphics removed
+
+##### 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)
+
+##### Removals
+
+* Removed Device_Memory_Allocation.pdf link in documentation.
+
+##### Resolved issues
+
+* Fixed error/warning message during `rocblas_set_stream()` call.
+
+#### **rocFFT** (1.0.29)
+
+##### Optimizations
+
+* Implemented 1D kernels for factorizable sizes less than 1024.
+
+#### **ROCm SMI** (7.3.0)
+
+##### Optimizations
+
+* Improved handling of UnicodeEncodeErrors with non UTF-8 locales. Non UTF-8 locales were causing crashes on UTF-8 special characters.
+
+##### Resolved issues
+
+* Fixed an issue where the Compute Partition tests segfaulted when AMDGPU was loaded with optional parameters.
+
+##### 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:
+        
+    1. Unload AMDGPU: `sudo rmmod amdgpu`.
+    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)
+
+##### Optimizations
+
+* Improved performance of `block_reduce_warp_reduce` when warp size equals block size.
+
+### 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
+successfully, which can result in the system being left in an undefined state. A system reboot is needed to recover from
+this state. Additionally, error logging might fail in these situations, hindering diagnostics.
+
+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

 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.4"
+    <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
@@ -60,7 +60,7 @@ additional licenses. Please review individual repositories for more information.
 | [ROCdbgapi](https://github.com/ROCm/ROCdbgapi/) | [MIT](https://github.com/ROCm/ROCdbgapi/blob/amd-staging/LICENSE.txt) |
 | [rocDecode](https://github.com/ROCm/rocDecode) | [MIT](https://github.com/ROCm/rocDecode/blob/develop/LICENSE) |
 | [rocFFT](https://github.com/ROCm/rocFFT/) | [MIT](https://github.com/ROCm/rocFFT/blob/develop/LICENSE.md) |
-| [ROCgdb](https://github.com/ROCm/ROCgdb/) | [GNU General Public License v3.0](https://github.com/ROCm/ROCgdb/blob/amd-master/COPYING3) |
+| [ROCgdb](https://github.com/ROCm/ROCgdb/) | [GNU General Public License v2.0](https://github.com/ROCm/ROCgdb/blob/amd-master/COPYING) |
 | [ROCK-Kernel-Driver](https://github.com/ROCm/ROCK-Kernel-Driver/) | [GPL 2.0 WITH Linux-syscall-note](https://github.com/ROCm/ROCK-Kernel-Driver/blob/master/COPYING) |
 | [rocminfo](https://github.com/ROCm/rocminfo/) | [The University of Illinois/NCSA](https://github.com/ROCm/rocminfo/blob/amd-staging/License.txt) |
 | [ROCm Bandwidth Test](https://github.com/ROCm/rocm_bandwidth_test/) | [The University of Illinois/NCSA](https://github.com/ROCm/rocm_bandwidth_test/blob/master/LICENSE.txt) |
--- 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.4,6.2.2,6.2.1,6.2.0, 6.1.5, 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.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.5, 22.04.4","Ubuntu 22.04.5, 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","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","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, 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.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.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","RHEL 8.9, 8.8"
-      ,"SLES 15 SP6, SP5","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","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]_,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,CDNA3,CDNA3
-      ,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2
-      ,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA
-      ,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3
-      ,RDNA2,RDNA2,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,gfx1100,gfx1100
-      ,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030
-      ,gfx942 [#mi300_624-past-60]_,gfx942 [#mi300_622-past-60]_,gfx942 [#mi300_621-past-60]_,gfx942 [#mi300_620-past-60]_, gfx942 [#mi300_612-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,gfx90a,gfx90a
-      ,gfx908,gfx908,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.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","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.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.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,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.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.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.15.0,>=1.14.1,>=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.2.0,2.1.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.2.0,2.1.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.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","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,1.1.0,1.1.0
-      :doc:`MIGraphX <amdmigraphx:index>`,2.10.0,2.10.0,2.10.0,2.10.0,2.9.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.2.0,3.1.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,3.0.0,2.5.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,2.0.0,1.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.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,0.1.0,N/A,N/A,N/A,N/A,N/A,N/A
-      :doc:`RPP <rpp:index>`,1.8.0,1.8.0,1.8.0,1.8.0,1.5.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.20.5,2.18.6,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,1.12.0,1.12.0
-      :doc:`hipBLAS <hipblas:index>`,2.2.0,2.2.0,2.2.0,2.2.0,2.1.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.8.0,0.7.0,0.7.0,0.7.0,0.7.0,0.6.0,0.6.0
-      :doc:`hipFFT <hipfft:index>`,1.0.16,1.0.15,1.0.15,1.0.14,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,0.4.0,0.4.0
-      :doc:`hipRAND <hiprand:index>`,2.11.1,2.11.0,2.11.0,2.11.0,2.10.16,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.2.0,2.1.1,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.1.1,3.0.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.1,0.2.0,0.2.0,0.1.0,0.1.0,0.1.0,0.1.0
-      :doc:`rocALUTION <rocalution:index>`,3.2.1,3.2.0,3.2.0,3.2.0,3.1.1,3.1.1,3.1.1,3.1.1,3.0.3,3.0.3
-      :doc:`rocBLAS <rocblas:index>`,4.2.4,4.2.1,4.2.1,4.2.0,4.1.2,4.1.2,4.1.0,4.1.0,4.0.0,4.0.0
-      :doc:`rocFFT <rocfft:index>`,1.0.30,1.0.29,1.0.29,1.0.28,1.0.27,1.0.27,1.0.27,1.0.26,1.0.25,1.0.23
-      :doc:`rocRAND <rocrand:index>`,3.1.1,3.1.0,3.1.0,3.1.0,3.0.1,3.0.1,3.0.1,3.0.1,3.0.0,2.10.17
-      :doc:`rocSOLVER <rocsolver:index>`,3.26.2,3.26.0,3.26.0,3.26.0,3.25.0,3.25.0,3.25.0,3.25.0,3.24.0,3.24.0
-      :doc:`rocSPARSE <rocsparse:index>`,3.2.1,3.2.0,3.2.0,3.2.0,3.1.2,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.5.0,1.4.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.40.0,4.40.0,4.39.0,4.39.0
-      ,,,,,,,,,,
-      PRIMITIVES,.. _primitivelibs-support-compatibility-matrix-past-60:,,,,,,,,,
-      :doc:`hipCUB <hipcub:index>`,3.2.1,3.2.0,3.2.0,3.2.0,3.1.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.3.0,1.2.0,1.2.0,1.2.0,1.2.0,1.1.0,1.1.0
-      :doc:`rocPRIM <rocprim:index>`,3.2.2,3.2.0,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
-      :doc:`rocThrust <rocthrust:index>`,3.1.1,3.1.0,3.1.0,3.0.1,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.41134,6.2.41133,6.1.40093,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.4,6.2.2,6.2.1,6.2.0,6.1.5,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.5.7,20240607.5.7,20240607.4.05,20240607.1.4246,20240125.5.08,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.3,24.6.2,24.5.1,24.5.1,24.5.1,24.4.1,23.4.2,23.4.2
-      :doc:`ROCm Data Center Tool <rdc:index>`,0.3.0,0.3.0,0.3.0,0.3.0,0.3.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,1.0.0,1.0.0
-      :doc:`ROCm SMI <rocm_smi_lib:index>`,7.3.0,7.3.0,7.3.0,7.3.0,7.2.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.4,rocm-6.2.2,rocm-6.2.1,rocm-6.2.0,rocm-6.1.5,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,2.0.1,N/A,N/A,N/A,N/A,N/A,N/A
-      :doc:`Omnitrace <omnitrace:index>`,1.11.2,1.11.2,1.11.2,1.11.2,N/A,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,1.4.0,1.4.0
-      :doc:`ROCProfiler <rocprofiler:index>`,2.0.60204,2.0.60202,2.0.60201,2.0.60200,2.0.60105,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,0.4.0,N/A,N/A,N/A,N/A,N/A,N/A
-      :doc:`ROCTracer <roctracer:index>`,4.1.60204,4.1.60202,4.1.60201,4.1.60200,4.1.60105,4.1.60102,4.1.60101,4.1.60100,4.1.60002,4.1.60000
-      ,,,,,,,,,,
-      DEVELOPMENT TOOLS,,,,,,,,,,
-      :doc:`HIPIFY <hipify:index>`,18.0.0.24392,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,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.13.0,0.12.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.76.0,0.71.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.2.0,14.1.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.4.0,0.3.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,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,N/A,0.5.0,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.1.1,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
-      `Flang <https://github.com/ROCm/flang>`_,18.0.0.24392,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,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.24392,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,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.24392,18.0.0.24355,18.0.0.24355,18.0.0.24232,17.0.0.24193,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.41134,6.2.41133,6.1.40093,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.41134,6.2.41133,6.1.40093,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,2.0.0,2.0.0
-      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.14.0,1.14.0,1.13.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
@@ -18,11 +18,11 @@ Accelerators and GPUs listed in the following table support compute workloads (n

 .. container:: format-big-table

-  .. csv-table::
-      :header: "ROCm Version", "6.2.4", "6.2.2", "6.1.0"
+  .. csv-table:: 
+      :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.1, 24.04","Ubuntu 24.04.1, 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"
@@ -39,13 +39,13 @@ Accelerators and GPUs listed in the following table support compute workloads (n
      ,.. _gpu-support-compatibility-matrix:,,
      :doc:`GPU / LLVM target <rocm-install-on-linux:reference/system-requirements>`,gfx1100,gfx1100,gfx1100
      ,gfx1030,gfx1030,gfx1030
-      ,gfx942 [#mi300_624]_,gfx942 [#mi300_622]_, gfx942 [#mi300_610]_
+      ,gfx942 [#mi300_622]_,gfx942 [#mi300_621]_, gfx942 [#mi300_610]_
      ,gfx90a,gfx90a,gfx90a
      ,gfx908,gfx908,gfx908
      ,,,
      FRAMEWORK SUPPORT,.. _framework-support-compatibility-matrix:,,
      :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"
-      :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"
+      :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, 2.14, 2.13"
      :doc:`JAX <rocm-install-on-linux:install/3rd-party/jax-install>`,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
      ,,,
@@ -77,49 +77,49 @@ Accelerators and GPUs listed in the following table support compute workloads (n
      `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.16,1.0.15,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.1,2.11.0,2.10.16
+      :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.1,3.2.0,3.1.1
-      :doc:`rocBLAS <rocblas:index>`,4.2.4,4.2.1,4.1.0
-      :doc:`rocFFT <rocfft:index>`,1.0.30,1.0.29,1.0.26
-      :doc:`rocRAND <rocrand:index>`,3.1.1,3.1.0,3.0.1
-      :doc:`rocSOLVER <rocsolver:index>`,3.26.2,3.26.0,3.25.0
-      :doc:`rocSPARSE <rocsparse:index>`,3.2.1,3.2.0,3.1.2
+      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.2.0,3.1.1
+      :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
      :doc:`rocWMMA <rocwmma:index>`,1.5.0,1.5.0,1.4.0
      `Tensile <https://github.com/ROCm/Tensile>`_,4.40.0,4.40.0,4.40.0
      ,,,
      PRIMITIVES,.. _primitivelibs-support-compatibility-matrix:,,
-      :doc:`hipCUB <hipcub:index>`,3.2.1,3.2.0,3.1.0
+      :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.2,3.2.0,3.1.0
-      :doc:`rocThrust <rocthrust:index>`,3.1.1,3.1.0,3.0.1
+      :doc:`rocPRIM <rocprim:index>`,3.2.0,3.2.0,3.1.0
+      :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.41134,6.1.40091
-      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.4,6.2.2,6.1.0
-      `ROCT-Thunk-Interface <https://github.com/ROCm/ROCT-Thunk-Interface>`_,20240607.5.7,20240607.5.7,20240125.3.30
+      `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.3,24.4.1
-      :doc:`ROCm Data Center Tool <rdc:index>`,0.3.0,0.3.0,0.3.0
+      :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.4,rocm-6.2.2,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.60204,2.0.60202,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.60204,4.1.60202,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.24392,18.0.0.24355,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
@@ -129,9 +129,9 @@ Accelerators and GPUs listed in the following table support compute workloads (n
      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.24392,18.0.0.24355,17.0.0.24103
-      :doc:`llvm-project <llvm-project:index>`,18.0.0.24392,18.0.0.24355,17.0.0.24103
-      `OpenMP <https://github.com/ROCm/llvm-project/tree/amd-staging/openmp>`_,18.0.0.24392,18.0.0.24355,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.41134,6.1.40091
@@ -144,10 +144,10 @@ Accelerators and GPUs listed in the following table support compute workloads (n

 .. [#red-hat94] RHEL 9.4 is supported only on AMD Instinct MI300A.
 .. [#oracle89] Oracle Linux is supported only on AMD Instinct MI300X.
-.. [#mi300_624] **For ROCm 6.2.4** - 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_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_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. The tested user space versions on this page were accurate as of the time of initial ROCm release. For the most up-to-date information, see the latest version of this information at `User and kernel-space support matrix <https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/user-kernel-space-compat-matrix.html>`_.
+.. [#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.


 .. _OS-kernel-versions:
@@ -216,7 +216,6 @@ 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_624-past-60] **For ROCm 6.2.4** - 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_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].
@@ -225,4 +224,4 @@ Expand for full historical view of:
   .. [#mi300_610-past-60] **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.
   .. [#mi300_602-past-60] **For ROCm 6.0.2** - MI300A (gfx942) is supported on Ubuntu 22.04.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.3.
   .. [#mi300_600-past-60] **For ROCm 6.0.0** - MI300A (gfx942) is supported on Ubuntu 22.04.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.3.
-   .. [#kfd_support-past-60] ROCm provides forward and backward compatibility between the Kernel Fusion Driver (KFD) and its user space software for +/- 2 releases. The tested user space versions on this page were accurate as of the time of initial ROCm release. For the most up-to-date information, see the latest version of this information at `User and kernel-space support matrix <https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/user-kernel-space-compat-matrix.html>`_.
+   .. [#kfd_support-past-60] 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.
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -30,15 +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.4"
-release = "6.2.4"
+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-11-06"},
+    {"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/how-to/rocm-for-hpc/index.rst
+++ b/docs/how-to/rocm-for-hpc/index.rst
@@ -115,12 +115,6 @@ Ubuntu versions.
          for non-destructive testing or for ocean acoustics.

      * - Molecular dynamics
-        - `Amber <https://github.com/amd/InfinityHub-CI/tree/main/amber>`_
-        - Amber is a suite of biomolecular simulation programs. It is a set of molecular mechanical force fields for 
-          simulating biomolecules. Amber is also a package of molecular simulation 
-          programs which includes source code and demos.
-
-      * - 
        - `GROMACS with HIP (AMD implementation) <https://github.com/amd/InfinityHub-CI/tree/main/gromacs>`_
        - GROMACS is a versatile package to perform molecular dynamics, i.e.
          simulate the Newtonian equations of motion for systems with hundreds
@@ -135,13 +129,6 @@ Ubuntu versions.
          Parallel Simulator.

      * - Computational fluid dynamics
-        - `Ansys Fluent <https://github.com/amd/InfinityHub-CI/tree/main/ansys-fluent>`_
-        - Ansys Fluent is an advanced computational fluid dynamics (CFD) tool for 
-          simulating and analyzing fluid flow, heat transfer, and related phenomena in complex systems. 
-          It offers a range of powerful features for detailed and accurate modeling of various physical 
-          processes, including turbulence, chemical reactions, and multiphase flows.
-
-      * -
        - `NEKO <https://github.com/amd/InfinityHub-CI/tree/main/neko>`_
        - Neko is a portable framework for high-order spectral element flow simulations.
          Written in modern Fortran, Neko adopts an object-oriented approach, allowing
@@ -154,26 +141,6 @@ Ubuntu versions.
        - nekRS is an open-source Navier Stokes solver based on the spectral element
          method targeting classical processors and accelerators like GPUs. 

-      * -
-        - `OpenFOAM <https://github.com/amd/InfinityHub-CI/tree/main/openfoam>`_
-        - OpenFOAM is a free, open-source computational fluid dynamics (CFD) 
-          tool developed primarily by OpenCFD Ltd. It has a large user 
-          base across most areas of engineering and science, from both commercial and 
-          academic organizations. OpenFOAM has extensive features to solve 
-          anything from complex fluid flows involving chemical reactions, turbulence, and 
-          heat transfer, to acoustics, solid mechanics, and electromagnetics.
-
-      * -
-        - `PeleC <https://github.com/amd/InfinityHub-CI/tree/main/pelec>`_
-        - PeleC is an adaptive mesh refinement(AMR) solver for compressible reacting flows.
-
-      * -
-        - `Simcenter Star-CCM+ <https://github.com/amd/InfinityHub-CI/tree/main/siemens-star-ccm>`_
-        - Simcenter Star-CCM+ is a comprehensive computational fluid dynamics (CFD) and multiphysics 
-          simulation tool developed by Siemens Digital Industries Software. It is designed to 
-          help engineers and researchers analyze and optimize the performance of products and 
-          systems across various industries.
-
      * - Computational chemistry
        - `QUDA <https://github.com/amd/InfinityHub-CI/tree/main/quda>`_
        - Library designed for efficient lattice QCD computations on
@@ -203,30 +170,12 @@ Ubuntu versions.
          developing atmosphere, ocean, and other earth-system simulation components
          for use in climate, regional climate, and weather studies.

-      * - Energy, Oil, and Gas
-        - `DevitoPRO <https://github.com/amd/InfinityHub-CI/tree/main/devitopro>`_
-        - DevitoPRO is an advanced extension of the open-source Devito platform with added 
-          features tailored for high-demand production workflows. It supports
-          high-performance computing (HPC) needs, especially in seismic imaging and inversion. 
-          It is used to perform optimized finite difference (FD) computations 
-          from high-level symbolic problem definitions. DevitoPro performs automated 
-          code generation and Just-In-time (JIT) compilation based on symbolic equations 
-          defined in SymPy to create and execute highly optimized Finite Difference stencil 
-          kernels on multiple computer platforms.
-
-      * - 
-        - `ECHELON <https://github.com/amd/InfinityHub-CI/tree/main/srt-echelon>`_
-        - ECHELON by Stone Ridge Technology is a reservoir simulation tool. With 
-          fast processing, it retains precise accuracy and preserves legacy simulator results. 
-          Faster reservoir simulation enables reservoir engineers to produce many realizations, 
-          address larger models, and use advanced physics. It opens new workflows based on 
-          ensemble methodologies for history matching and forecasting that yield 
-          increased accuracy and more predictive results.
-
      * - Benchmark
        - `rocHPL <https://github.com/amd/InfinityHub-CI/tree/main/rochpl>`_
-        - HPL, or High-Performance Linpack, is a benchmark which solves a uniformly 
-          random system of linear equations and reports floating-point execution rate.
+        - HPL, or High-Performance Linpack, is a benchmark which solves a uniformly 
+          random system of linear equations and reports floating-point execution rate. 
+          This documentation supports the implementation of the HPL benchmark on 
+          top of AMD's ROCm platform.

      * -
        - `rocHPL-MxP <https://github.com/amd/InfinityHub-CI/tree/main/hpl-mxp>`_
@@ -267,14 +216,6 @@ Ubuntu versions.
          range of hardware platforms via use of an in-built domain specific language derived
          from the Mako templating engine.

-      * -
-        - `PETSc <https://github.com/amd/InfinityHub-CI/tree/main/petsc>`_
-        - Portable, Extensible Toolkit for Scientific Computation (PETSc) is a suite of data structures 
-          and routines for the scalable (parallel) solution of scientific applications modeled by partial 
-          differential equations. It supports MPI, GPUs through CUDA, HIP, and OpenCL, 
-          as well as hybrid MPI-GPU parallelism. It also supports the NEC-SX Tsubasa Vector Engine. 
-          PETSc also includes the Toolkit for Advanced Optimization (TAO) library.
-
      * -
        - `RAJA <https://github.com/amd/InfinityHub-CI/tree/main/raja>`_
        - RAJA is a library of C++ software abstractions, primarily developed at Lawrence
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,7 +11,7 @@ ROCm is an open-source software platform optimized to extract HPC and AI workloa
 performance from AMD Instinct accelerators and AMD Radeon GPUs while maintaining
 compatibility with industry software frameworks. For more information, see [What is ROCm?](./what-is-rocm.rst)

-If you're using AMD Radeon™ PRO or Radeon GPUs in a workstation setting with a display connected, review {doc}`Radeon-specific ROCm documentation<radeon:index>`.
+If you're using Radeon GPUs, consider reviewing {doc}`Radeon-specific ROCm documentation<radeon:index>`.

 Installation instructions are available from:

@@ -41,16 +41,16 @@ ROCm documentation is organized into the following categories:
 :::{grid-item-card} How to
 :class-body: rocm-card-banner rocm-hue-12

-* [Use ROCm for AI](./how-to/rocm-for-ai/index.rst)
-* [Use ROCm for HPC](./how-to/rocm-for-hpc/index.rst)
-* [Fine-tune LLMs and inference optimization](./how-to/llm-fine-tuning-optimization/index.rst)
+* [Using ROCm for AI](./how-to/rocm-for-ai/index.rst)
+* [Using ROCm for HPC](./how-to/rocm-for-hpc/index.rst)
+* [Fine-tuning LLMs and inference optimization](./how-to/llm-fine-tuning-optimization/index.rst)
 * [System optimization](./how-to/system-optimization/index.rst)
 * [AMD Instinct MI300X performance validation and tuning](./how-to/tuning-guides/mi300x/index.rst)
-* [GPU cluster networking](https://dcgpu.docs.amd.com/projects/gpu-cluster-networking/en/latest/index.html)
+* [GPU cluster networking](https://rocm.docs.amd.com/projects/gpu-cluster-networking/en/latest/index.html)
 * [System debugging](./how-to/system-debugging.md)
-* [Use MPI](./how-to/gpu-enabled-mpi.rst)
-* [Use advanced compiler features](./conceptual/compiler-topics.md)
-* [Set the number of CUs](./how-to/setting-cus)  
+* [Using MPI](./how-to/gpu-enabled-mpi.rst)
+* [Using advanced compiler features](./conceptual/compiler-topics.md)
+* [Setting the number of CUs](./how-to/setting-cus)  
 * [ROCm examples](https://github.com/amd/rocm-examples)
 :::

--- a/docs/reference/gpu-arch-specs.rst
+++ b/docs/reference/gpu-arch-specs.rst
@@ -235,22 +235,6 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - L0 Instruction Cache (KiB)
          - VGPR File (KiB)
          - SGPR File (KiB)
-        *
-          - Radeon PRO V710
-          - RDNA3
-          - gfx1101
-          - 28
-          - 54
-          - 32
-          - 128
-          - 56
-          - 4
-          - 256
-          - 32
-          - 16
-          - 32
-          - 768
-          - 16
        *
          - Radeon PRO W7900 Dual Slot
          - RDNA3
@@ -265,8 +249,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon PRO W7900
          - RDNA3
@@ -281,8 +265,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon PRO W7800
          - RDNA3
@@ -297,8 +281,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon PRO W7700
          - RDNA3
@@ -313,8 +297,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon PRO W6800
          - RDNA2
@@ -329,8 +313,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon PRO W6600
          - RDNA2
@@ -345,8 +329,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon PRO V620
          - RDNA2
@@ -361,8 +345,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon Pro W5500
          - RDNA
@@ -377,7 +361,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
+          - 256
          - 20
        *
          - Radeon Pro VII
@@ -432,8 +416,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon RX 7900 XT
          - RDNA3
@@ -448,8 +432,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon RX 7900 GRE
          - RDNA3
@@ -464,8 +448,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon RX 7800 XT
          - RDNA3
@@ -480,8 +464,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon RX 7700 XT
          - RDNA3
@@ -496,8 +480,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 768
-          - 16
+          - 384
+          - 20
        *
          - Radeon RX 7600
          - RDNA3
@@ -512,8 +496,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 32
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6950 XT
          - RDNA2
@@ -528,8 +512,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6900 XT
          - RDNA2
@@ -544,8 +528,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6800 XT
          - RDNA2
@@ -560,8 +544,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6800
          - RDNA2
@@ -576,8 +560,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6750 XT
          - RDNA2
@@ -592,8 +576,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6700 XT
          - RDNA2
@@ -608,8 +592,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6700
          - RDNA2
@@ -624,8 +608,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6650 XT
          - RDNA2
@@ -640,8 +624,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6600 XT
          - RDNA2
@@ -656,8 +640,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon RX 6600
          - RDNA2
@@ -672,8 +656,8 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
          - 16
          - 16
          - 32
-          - 512
-          - 16
+          - 256
+          - 20
        *
          - Radeon VII
          - GCN5.1
@@ -700,7 +684,7 @@ For more information about the terms used, see the

 **LLVM target name**

-Argument to pass to clang in ``--offload-arch`` to compile code for the given
+Argument to pass to clang in `--offload-arch` to compile code for the given
 architecture.

 **VRAM**
@@ -735,13 +719,13 @@ data and instructions. Similar to the L3 Cache on CDNA/GCN architectures.

 **L2 Cache**

-Size of the level 2 cache. Shared by all compute units on the same GCD. Caches
+Size of the level 3 cache. Shared by all compute units on the same GCD. Caches
 data and instructions.

 **Graphics L1 Cache (RDNA only)**

 An additional cache level that only exists in RDNA architectures. Local to a
-shader array.
+work group processor.

 **L1 Vector Cache (CDNA/GCN only)**

--- a/docs/release/versions.md
+++ b/docs/release/versions.md
@@ -8,7 +8,6 @@

 | Version | Release date |
 | ------- | ------------ |
-| [6.2.4](https://rocm.docs.amd.com/en/docs-6.2.4/) | November 6, 2024 |
 | [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 |
--- a/docs/sphinx/_toc.yml.in
+++ b/docs/sphinx/_toc.yml.in
@@ -24,21 +24,18 @@ subtrees:
 - caption: How to
  entries:
  - file: how-to/rocm-for-ai/index.rst
-    title: Use ROCm for AI
+    title: Using ROCm for AI
    subtrees:
    - entries:
      - file: how-to/rocm-for-ai/install.rst
        title: Installation
      - file: how-to/rocm-for-ai/train-a-model.rst
-        title: Train a model
      - file: how-to/rocm-for-ai/hugging-face-models.rst
-        title: Run models from Hugging Face
      - file: how-to/rocm-for-ai/deploy-your-model.rst
-        title: Deploy your model
  - file: how-to/rocm-for-hpc/index.rst
-    title: Use ROCm for HPC
+    title: Using ROCm for HPC
  - file: how-to/llm-fine-tuning-optimization/index.rst
-    title: Fine-tune LLMs and inference optimization
+    title: Fine-tuning LLMs and inference optimization
    subtrees:
    - entries:
      - file: how-to/llm-fine-tuning-optimization/overview.rst
@@ -54,11 +51,10 @@ subtrees:
      - file: how-to/llm-fine-tuning-optimization/model-acceleration-libraries.rst
      - file: how-to/llm-fine-tuning-optimization/llm-inference-frameworks.rst
      - file: how-to/llm-fine-tuning-optimization/optimizing-with-composable-kernel.md
-        title: Optimize with Composable Kernel
+        title: Optimizing with Composable Kernel
      - file: how-to/llm-fine-tuning-optimization/optimizing-triton-kernel.rst
-        title: Optimize Triton kernels
+        title: Optimizing Triton kernels
      - file: how-to/llm-fine-tuning-optimization/profiling-and-debugging.rst
-        title: Profile and Debug
  - file: how-to/system-optimization/index.rst
    title: System optimization
    subtrees:
@@ -83,23 +79,23 @@ subtrees:
        title: System tuning
      - file: how-to/tuning-guides/mi300x/workload.rst
        title: Workload tuning
-  - url: https://dcgpu.docs.amd.com/projects/gpu-cluster-networking/en/latest/index.html
+  - url: https://rocm.docs.amd.com/projects/gpu-cluster-networking/en/${branch}/index.html
    title: GPU cluster networking
  - file: how-to/gpu-enabled-mpi.rst
-    title: Use MPI
+    title: Using MPI
  - file: how-to/system-debugging.md
  - file: conceptual/compiler-topics.md
-    title: Use advanced compiler features
+    title: Using advanced compiler features
    subtrees:
    - entries:
      - url: https://rocm.docs.amd.com/projects/llvm-project/en/latest/index.html
        title: ROCm compiler infrastructure
      - url: https://rocm.docs.amd.com/projects/llvm-project/en/latest/conceptual/using-gpu-sanitizer.html
-        title: Use AddressSanitizer
+        title: Using AddressSanitizer
      - url: https://rocm.docs.amd.com/projects/llvm-project/en/latest/conceptual/openmp.html
        title: OpenMP support
  - file: how-to/setting-cus
-    title: Set the number of CUs  
+    title: Setting the number of CUs  
  - url: https://github.com/amd/rocm-examples
    title: ROCm examples

--- a/docs/sphinx/requirements.in
+++ b/docs/sphinx/requirements.in
@@ -1,2 +1,2 @@
-rocm-docs-core==1.8.5
+rocm-docs-core==1.8.3
 sphinx-reredirects
--- a/docs/sphinx/requirements.txt
+++ b/docs/sphinx/requirements.txt
@@ -6,9 +6,9 @@
 #
 accessible-pygments==0.0.5
    # via pydata-sphinx-theme
-alabaster==1.0.0
+alabaster==0.7.16
    # via sphinx
-babel==2.16.0
+babel==2.15.0
    # via
    #   pydata-sphinx-theme
    #   sphinx
@@ -16,19 +16,19 @@ beautifulsoup4==4.12.3
    # via pydata-sphinx-theme
 breathe==4.35.0
    # via rocm-docs-core
-certifi==2024.8.30
+certifi==2024.7.4
    # via requests
-cffi==1.17.1
+cffi==1.16.0
    # via
    #   cryptography
    #   pynacl
-charset-normalizer==3.4.0
+charset-normalizer==3.3.2
    # via requests
 click==8.1.7
    # via sphinx-external-toc
-cryptography==43.0.3
+cryptography==43.0.1
    # via pyjwt
-deprecated==1.2.15
+deprecated==1.2.14
    # via pygithub
 docutils==0.21.2
    # via
@@ -42,7 +42,7 @@ gitdb==4.0.11
    # via gitpython
 gitpython==3.1.43
    # via rocm-docs-core
-idna==3.10
+idna==3.7
    # via requests
 imagesize==1.4.1
    # via sphinx
@@ -54,34 +54,36 @@ markdown-it-py==3.0.0
    # via
    #   mdit-py-plugins
    #   myst-parser
-markupsafe==3.0.2
+markupsafe==2.1.5
    # via jinja2
-mdit-py-plugins==0.4.2
+mdit-py-plugins==0.4.1
    # via myst-parser
 mdurl==0.1.2
    # via markdown-it-py
-myst-parser==4.0.0
+myst-parser==3.0.1
    # via rocm-docs-core
-packaging==24.2
-    # via sphinx
+packaging==24.1
+    # via
+    #   pydata-sphinx-theme
+    #   sphinx
 pycparser==2.22
    # via cffi
-pydata-sphinx-theme==0.16.0
+pydata-sphinx-theme==0.15.4
    # via
    #   rocm-docs-core
    #   sphinx-book-theme
-pygithub==2.5.0
+pygithub==2.3.0
    # via rocm-docs-core
 pygments==2.18.0
    # via
    #   accessible-pygments
    #   pydata-sphinx-theme
    #   sphinx
-pyjwt[crypto]==2.10.0
+pyjwt[crypto]==2.8.0
    # via pygithub
 pynacl==1.5.0
    # via pygithub
-pyyaml==6.0.2
+pyyaml==6.0.1
    # via
    #   myst-parser
    #   rocm-docs-core
@@ -90,15 +92,15 @@ requests==2.32.3
    # via
    #   pygithub
    #   sphinx
-rocm-docs-core==1.8.5
+rocm-docs-core==1.8.3
    # via -r requirements.in
 smmap==5.0.1
    # via gitdb
 snowballstemmer==2.2.0
    # via sphinx
-soupsieve==2.6
+soupsieve==2.5
    # via beautifulsoup4
-sphinx==8.1.3
+sphinx==7.3.7
    # via
    #   breathe
    #   myst-parser
@@ -114,33 +116,33 @@ sphinx-book-theme==1.1.3
    # via rocm-docs-core
 sphinx-copybutton==0.5.2
    # via rocm-docs-core
-sphinx-design==0.6.1
+sphinx-design==0.6.0
    # via rocm-docs-core
 sphinx-external-toc==1.0.1
    # via rocm-docs-core
-sphinx-notfound-page==1.0.4
+sphinx-notfound-page==1.0.2
    # via rocm-docs-core
 sphinx-reredirects==0.1.5
    # via -r requirements.in
-sphinxcontrib-applehelp==2.0.0
+sphinxcontrib-applehelp==1.0.8
    # via sphinx
-sphinxcontrib-devhelp==2.0.0
+sphinxcontrib-devhelp==1.0.6
    # via sphinx
-sphinxcontrib-htmlhelp==2.1.0
+sphinxcontrib-htmlhelp==2.0.5
    # via sphinx
 sphinxcontrib-jsmath==1.0.1
    # via sphinx
-sphinxcontrib-qthelp==2.0.0
+sphinxcontrib-qthelp==1.0.7
    # via sphinx
-sphinxcontrib-serializinghtml==2.0.0
+sphinxcontrib-serializinghtml==1.1.10
    # via sphinx
-tomli==2.1.0
+tomli==2.0.1
    # via sphinx
 typing-extensions==4.12.2
    # via
    #   pydata-sphinx-theme
    #   pygithub
-urllib3==2.2.3
+urllib3==2.2.2
    # via
    #   pygithub
    #   requests
--- 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.2.4"
+    <default revision="refs/tags/rocm-6.2.2"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
--- a/tools/autotag/templates/extra_components/6.2.4.md
+++ b/tools/autotag/templates/extra_components/6.2.4.md
@@ -1,35 +0,0 @@
-### Hardware architecture support updates
-
-Updated the following math and primitives libraries to pre-enable support for
-an upcoming hardware architecture.
-
-* hipCUB (3.2.1)
-
-* hipFFT (1.0.16)
-
-* hipRAND (2.11.1)
-
-* rocALUTION (3.2.1)
-
-* rocBLAS (4.2.4)
-
-* rocFFT (1.0.30)
-
-* rocPRIM (3.2.2)
-
-* rocRAND (3.1.1)
-
-* rocSOLVER (3.26.2)
-
-* rocSPARSE (3.2.1)
-
-* rocThrust (3.1.1)
-
-### **AMD SMI** (24.6.3)
-
-#### Resolved issues
-
-* Fixed support for the API calls `amdsmi_get_gpu_process_isolation` and
-  `amdsmi_clean_gpu_local_data`, along with the
-  `amd-smi set --process-isolation <0 or 1>` command. See issue
-  [#3500](https://github.com/ROCm/ROCm/issues/3500) on GitHub.
--- a/tools/autotag/templates/highlights/6.2.4.md
+++ b/tools/autotag/templates/highlights/6.2.4.md
@@ -1,55 +0,0 @@
-# ROCm 6.2.4 release notes
-
-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)
-
-```{note}
-If you’re using Radeon™ PRO or Radeon GPUs in a workstation setting with a
-display connected, continue to use ROCm 6.2.3. See the [Use ROCm on Radeon
-GPUs](https://rocm.docs.amd.com/projects/radeon/en/latest/index.html)
-documentation to verify compatibility and system requirements.
-```
-
-## Release highlights
-
-The following are notable new features and improvements in ROCm 6.2.4. For changes to individual components, see
-[Detailed component changes](#detailed-component-changes).
-
-#### ROCm documentation updates
-
-ROCm documentation continues to be updated to provide clearer and more comprehensive guidance for
-a wider variety of user needs and use cases.
-
-* Added a new GPU cluster networking guide. See
-  [Cluster network performance validation for AMD Instinct accelerators](https://rocm.docs.amd.com/projects/gpu-cluster-networking/en/latest/index.html).
-
-  This documentation provides guidelines on validating network configurations
-  in single-node and multi-node environments to attain optimal speed and bandwidth
-  in AMD Instinct-powered clusters.
-
-* Updated the HIP runtime documentation.
-
-  * Added a new section on how to use [HIP graphs](https://rocm.docs.amd.com/projects/HIP/en/latest/how-to/hipgraph.html).
-
-  * Added a new section about the [Stream ordered memory allocator (SOMA)](https://rocm.docs.amd.com/projects/HIP/en/latest/how-to/stream_ordered_allocator.html).
-
-  * Updated the [Porting CUDA driver API](https://rocm.docs.amd.com/projects/HIP/en/latest/how-to/hip_porting_driver_api.html) section.
-
-* Updated the [Post-installation instructions](https://rocm.docs.amd.com/projects/install-on-linux/en/docs-6.2.4/install/post-install.html)
-  with guidance on using the `update-alternatives` utility and environment modules to help you manage multiple ROCm
-  versions and streamline PATH configuration.
-
-* Updated [LLM inference performance validation on AMD Instinct
-  MI300X](https://rocm.docs.amd.com/en/docs-6.2.4/how-to/performance-validation/mi300x/vllm-benchmark.html)
-  documentation with more detailed guidance, new models, and the `float8` data type.
--- a/tools/autotag/templates/support/6.2.4.md
+++ b/tools/autotag/templates/support/6.2.4.md
@@ -1,5 +0,0 @@
-## Operating system and hardware support changes
-
-ROCm 6.2.4 adds support for the AMD Radeon PRO V710 GPU. See 
-[Supported GPUs](https://rocm.docs.amd.com/projects/install-on-linux-internal/en/docs-6.2.4/reference/system-requirements.html#supported-gpus)
-for more information.
--- a/tools/autotag/templates/upcoming_changes/6.2.4.md
+++ b/tools/autotag/templates/upcoming_changes/6.2.4.md
@@ -1,9 +0,0 @@
-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*".
-
-### rccl-rdma-sharp-plugins
-
-The RCCL plugin package, `rccl-rdma-sharp-plugins`, will be removed in an upcoming ROCm release. 
--- a/tools/rocm-build/ROCm.mk
+++ b/tools/rocm-build/ROCm.mk
@@ -67,18 +67,16 @@ 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} hsa comgr hipcc rocprofiler-register)
+$(call adddep,hip_on_rocclr,${ASAN_DEP} rocclr 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,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,opencl_on_rocclr,${ASAN_DEP} rocclr)
 $(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)
@@ -89,15 +87,14 @@ $(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-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,rocprofiler,${ASAN_DEP} hsa roctracer aqlprofile opencl_on_rocclr hip_on_rocclr comgr dbgapi rocm_smi_lib)
 $(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 \
-	omniperf omnitrace rocm-core amd_smi_lib hipcc \
+	rocm-core amd_smi_lib hipcc clang-ocl \
 	rocm_bandwidth_test rocr_debug_agent rocm-gdb
 $(call adddep,rocm-dev,$(filter-out ${NOBUILD},${rocm-dev-components}))

@@ -120,7 +117,6 @@ $(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)
@@ -225,7 +221,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)" "/opt"
+	sudo chown -R "$(shell id -u):$(shell id -g)" "${ROCM_INSTALL_PATH}"
 	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,13 +22,12 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,7 +17,9 @@ build_miopen_ck() {
    mkdir "$BUILD_DIR" && cd "$BUILD_DIR"

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

    if [ "${ASAN_CMAKE_PARAMS}" == "true" ] ; then
@@ -41,7 +43,7 @@ build_miopen_ck() {
            ${LAUNCHER_FLAGS} \
            -DINSTANCES_ONLY=ON \
            -DENABLE_ASAN_PACKAGING=true \
-            "${GPU_TARGETS}" \
+            -DAMDGPU_TARGETS=${GPU_TARGETS} \
            "$COMPONENT_SRC"
    else
        cmake -DBUILD_DEV=OFF \
@@ -61,11 +63,9 @@ 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 \
-            "${GPU_TARGETS}" \
+            -DAMDGPU_TARGETS=${GPU_TARGETS} \
            "$COMPONENT_SRC"
    fi

@@ -106,6 +106,8 @@ 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,10 +28,9 @@ build_hipblas() {
       rebuild_lapack
    fi

-    init_rocm_common_cmake_params
    cmake \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+	$(rocm_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,12 +27,11 @@ build_hipblaslt() {
        GPU_TARGETS=all
    fi

-    init_rocm_common_cmake_params
    CXX=$(set_build_variables CXX)\
    cmake \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+         $(rocm_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,7 +17,6 @@ build_hipcub() {
    fi

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

    if [ -n "$GPU_ARCHS" ]; then
        GPU_TARGETS="$GPU_ARCHS"
@@ -28,7 +27,7 @@ build_hipcub() {
    CXX=$(set_build_variables CXX)\
    cmake \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,7 +16,6 @@ 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"
@@ -27,7 +26,7 @@ build_hipfft() {
    cmake \
        -DCMAKE_CXX_COMPILER=$(set_build_variables CXX) \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,6 +61,7 @@ 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,11 +27,10 @@ build_hipsolver() {
       rebuild_lapack
    fi

-    init_rocm_common_cmake_params
    cmake \
        -DUSE_CUDA=OFF \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,12 +22,11 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,7 +28,6 @@ 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"
@@ -42,7 +41,7 @@ build_hipsparselt() {
    cmake \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+         $(rocm_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,8 +16,6 @@ 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"
@@ -27,7 +25,7 @@ build_hiptensor() {

    cmake \
        -B "${BUILD_DIR}" \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,8 +17,7 @@ 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                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 "  -s,  --static                Supports static CI by accepting this param & not bailing out. No effect of the param though"
    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"
@@ -43,7 +42,6 @@ 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"
@@ -71,29 +69,14 @@ 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: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: -- "$@"`
+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: -- "$@"`
 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
@@ -112,7 +95,6 @@ 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 ;;
@@ -121,12 +103,9 @@ do
                unset HSA_INC_PATH ;
                unset COMGR_INC_PATH ; shift ;;
        (-s | --static)
-                SHARED_LIBS="OFF" ;
-                STATIC_FLAG="-DBUILD_SHARED_LIBS=$SHARED_LIBS" ; shift ;;
+                SHARED_LIBS="OFF" ; 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)
@@ -172,7 +151,6 @@ else
 fi

 clean_lightning() {
-    rm -rf "$ROCM_WHEEL_DIR"
    rm -rf "$BUILD_PATH"
    rm -rf "$DEB_PATH"
    rm -rf "$RPM_PATH"
@@ -218,10 +196,7 @@ 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}/../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
+    local LLVM_VERSIONS=($(awk '/set\(LLVM_VERSION/ {print substr($2,1,length($2)-1)}' ${LLVM_ROOT_LCL}/CMakeLists.txt))
    LLVM_VERSION_MAJOR=${LLVM_VERSIONS[0]}
    LLVM_VERSION_MINOR=${LLVM_VERSIONS[1]}
    LLVM_VERSION_PATCH=${LLVM_VERSIONS[2]}
@@ -285,22 +260,15 @@ build_lightning() {

    if [ ! -e Makefile ]; then
        echo "Building LLVM CMake environment"
-        if [ -e "$LLVM_ROOT_LCL/../flang/AFARrelease" ]; then
-            FLANG_NEW=1
-            LLVM_PROJECTS="$LLVM_PROJECTS;flang;mlir"
-            ENABLE_RUNTIMES="$ENABLE_RUNTIMES;openmp";
-        else
+	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 [[ "${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" \
@@ -339,9 +307,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"
@@ -358,23 +326,8 @@ 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 [ $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 [ "$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
@@ -780,7 +733,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" "clang-linker-wrapper" "clang-nvlink-wrapper" "flang" "flang-new"
+                    "clang-cpp" "clang-build-select-link" "clang-offload-bundler" "clang-offload-packager" "clang-offload-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"
@@ -981,7 +934,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
@@ -995,6 +948,7 @@ 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
@@ -1016,12 +970,14 @@ 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
@@ -1108,6 +1064,7 @@ 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
@@ -1115,15 +1072,18 @@ 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
@@ -1165,34 +1125,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/LLVM"
+    local distDoc="$INSTALL_PATH/share/doc"

    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/$licenseDir"
+        mkdir -p "$packageDeb/$installPath"
        mkdir "${controlFile%/*}"
+        mkdir -p "$packageDeb/$licenseDir"

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

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

        {
            echo "Package: $packageName"
@@ -1202,7 +1162,6 @@ 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"
@@ -1223,7 +1182,6 @@ 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
@@ -1232,13 +1190,16 @@ 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/$licenseDir" >> $specFile
+        echo "cp -R \"$distDoc\" \$RPM_BUILD_ROOT/$installPath" >> $specFile

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

@@ -1271,18 +1232,6 @@ 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)
@@ -1301,9 +1250,4 @@ 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 '/ROCm\/rocMLIR@\|ROCm\/composable_kernel@/s/^/#/' requirements.txt
+    sed -i '/ROCmSoftwarePlatform\/rocMLIR@\|ROCmSoftwarePlatform\/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,9 +22,8 @@ build_miopen_hip() {
   fi

    mkdir "$BUILD_DIR" && cd "$BUILD_DIR"
-    init_rocm_common_cmake_params
    cmake \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,8 +16,6 @@ build_mivisionx() {
       BUILD_DEV=OFF
    fi

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

    cmake \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_common_cmake_params) \
        -DROCM_PATH="$ROCM_PATH" \
        -DBUILD_DEV=$BUILD_DEV \
        -DCMAKE_INSTALL_LIBDIR=$(getInstallLibDir) \
@@ -36,7 +34,6 @@ 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
@@ -1,171 +0,0 @@
-#!/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
@@ -1,191 +0,0 @@
-#!/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
@@ -1,141 +0,0 @@
-#!/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,16 +26,14 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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
@@ -1,71 +0,0 @@
-#!/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,7 +22,6 @@ 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"
@@ -33,7 +32,7 @@ build_rocalution() {
    cmake \
        -DSUPPORT_HIP=ON \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,12 +28,11 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,16 +4,15 @@ source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 set_component_src rocDecode
 BUILD_DEV=ON
 build_rocdecode() {
-    if [ "$DISTRO_ID" = "centos-7" ] || [ "$DISTRO_ID" = "sles-15.4" ] ; then
+    if [ "$DISTRO_ID" = "centos-7" ] ; 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 -DROCM_DEP_ROCMCORE=ON ${COMPONENT_SRC}
+    cmake ${COMPONENT_SRC}
    make -j8
    make install
    make package
--- a/tools/rocm-build/build_rocfft.sh
+++ b/tools/rocm-build/build_rocfft.sh
@@ -16,7 +16,6 @@ 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"
@@ -27,7 +26,7 @@ build_rocfft() {
    CXX="${ROCM_PATH}/bin/hipcc" \
    cmake \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,13 +10,11 @@ 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             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 "  -s,  --static             Supports static CI by accepting this param & not bailing out. No effect of the param though"
    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

@@ -32,7 +30,6 @@ 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"
@@ -40,7 +37,7 @@ CLEAN_OR_OUT=0;
 PKGTYPE="deb"
 MAKETARGET="deb"

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

 while true ;
@@ -56,8 +53,6 @@ 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)
@@ -78,7 +73,6 @@ 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
@@ -93,7 +87,6 @@ build_rocm_cmake() {

        cmake \
            $(rocm_cmake_params) \
-            -DBUILD_SHARED_LIBS=$SHARED_LIBS \
            -DCPACK_SET_DESTDIR="OFF" \
            -DROCM_DISABLE_LDCONFIG=ON \
            $ROCM_CMAKE_ROOT
@@ -106,19 +99,6 @@ 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")
@@ -138,9 +118,4 @@ 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,14 +24,13 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_common_cmake_params) \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DBUILD_BENCHMARK=OFF \
-	-DBUILD_SHARED_LIBS=ON \
+        -DBUILD_BENCHMARK=OFF \
        -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
@@ -1,222 +0,0 @@
-#!/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,12 +25,10 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,13 +28,11 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,14 +27,12 @@ build_rocsparse() {
    fi

    ROCSPARSE_TEST_MIRROR=$MIRROR \
-    export CXX=$(set_build_variables CXX)\
-    export CC=$(set_build_variables CC)\
-
-    init_rocm_common_cmake_params
+    CXX=$(set_build_variables CXX)\
+    CC=$(set_build_variables CC)\
    cmake \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        ${LAUNCHER_FLAGS} \
-        "${rocm_math_common_cmake_params[@]}"\
+        $(rocm_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,12 +27,10 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,11 +27,9 @@ 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_math_common_cmake_params[@]}" \
+        $(rocm_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,--build-id=sha1,--rpath,$ROCM_ASAN_EXE_RPATH:$LLVM_LIBDIR"
+        rpp_cmake_params="-DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--rpath,$ROCM_ASAN_EXE_RPATH:$LLVM_LIBDIR"
    else
        rpp_cmake_params=""
    fi
@@ -41,16 +41,14 @@ build_rpp() {
        GPU_TARGETS="gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1100"
    fi

-    init_rocm_common_cmake_params
-
    cmake \
-        "${rocm_math_common_cmake_params[@]}" \
+        $(rocm_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,--build-id=sha1,--rpath,${ROCM_LIB_RPATH}:${DEPS_DIR}/lib:${ROCM_LLVM_LIB_RPATH}" \
+        -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_PREFIX_PATH="${DEPS_DIR};${ROCM_PATH}" \
        "$COMPONENT_SRC"

--- a/tools/rocm-build/compute_helper.sh
+++ b/tools/rocm-build/compute_helper.sh
@@ -189,65 +189,6 @@ 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,6 +2,7 @@

 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 
@@ -104,7 +105,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  -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' ../.. 
+cmake -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF  -DCMAKE_INSTALL_PREFIX=/usr/grpc   -DCMAKE_CXX_STANDARD=14  ../.. 
 make -j$(nproc)
 make install 
 cd  / 
@@ -119,11 +120,11 @@ mv amd-blis-mt /usr/blis
 cd / 
 rm -rf /tmp/blis

-## Download aocl-linux-gcc-4.2.0_1_amd64.deb
+## Download aocl-linux-aocc-4.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
+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
 rm -rf /tmp/aocl

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

-# Install FFmpeg from source
+# 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

 command -v lbzip2 
--- a/tools/rocm-build/docker/ubuntu20/packages
+++ b/tools/rocm-build/docker/ubuntu20/packages
@@ -8,7 +8,6 @@ bison
 bridge-utils
 build-essential
 bzip2
-ccache
 check
 chrpath
 cifs-utils
@@ -98,7 +97,6 @@ libva-dev
 libvirt-clients
 libvirt-daemon-system
 libyaml-cpp-dev
-libzstd-dev
 llvm
 llvm-6.0-dev
 llvm-dev
@@ -121,11 +119,9 @@ 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 -x
+set -ex

 apt-get -y update 
 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y $(sed 's/#.*//' /tmp/packages)
@@ -60,6 +60,7 @@ 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
@@ -117,12 +118,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 -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' .. 
+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 .. 
 make -j $(nproc) install 
 rm -rf /tmp/grpc

 ## rocBLAS Pre-requisites
-## Download prebuilt AMD multithreaded blis (2.0)
+## Download prebuilt AMD multithreaded   (2.0)
 ## Reference : https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/install.sh#L403
 mkdir -p /tmp/blis 
 cd /tmp/blis
@@ -130,13 +131,12 @@ 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-gcc-4.2.0_1_amd64.deb
+## Download aocl-linux-aocc-4.0_1_amd64
 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 
+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 
 rm -rf /tmp/aocl

 ## hipBLAS Pre-requisites
@@ -194,62 +194,9 @@ cd ninja-1.11.1.g95dee.kitware.jobserver-1
 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
-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
+# 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

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

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

-# Build boost-1.85.0 from source for RPP
+# Build boost-1.82.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.85.0
+# For example, if this was installed in the standard location it would declare a dependency on libboost-dev(el)1.82.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.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 
+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 
 ./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.85.0
+rm -rf /tmp/boost-1.82.0
--- a/tools/rocm-build/docker/ubuntu22/packages
+++ b/tools/rocm-build/docker/ubuntu22/packages
@@ -8,7 +8,6 @@ bison
 bridge-utils
 build-essential
 bzip2
-ccache
 check
 chrpath
 cifs-utils
@@ -100,7 +99,6 @@ libva-dev
 libvirt-clients
 libvirt-daemon-system
 libyaml-cpp-dev
-libzstd-dev
 llvm
 llvm-dev
 llvm-runtime
@@ -139,4 +137,3 @@ unzip
 vim
 wget
 xsltproc
-zlib1g-dev
--- a/tools/rocm-build/docker/ubuntu24/Dockerfile
+++ b/tools/rocm-build/docker/ubuntu24/Dockerfile
@@ -1,11 +0,0 @@
-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
@@ -1,27 +0,0 @@
-## 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
@@ -1,237 +0,0 @@
-
-#! /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
@@ -1,3 +0,0 @@
-Package: *
-Pin: origin ""
-Pin-Priority: 600
--- a/tools/rocm-build/docker/ubuntu24/packages
+++ b/tools/rocm-build/docker/ubuntu24/packages
@@ -1,140 +0,0 @@
-# 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,12 +123,9 @@ 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
@@ -150,6 +147,7 @@ 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
@@ -181,7 +179,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}/bin:${ROCM_PATH}/lib/llvm/bin:${PATH}"
+export PATH="${ROCM_PATH}/lib/llvm/bin:${PATH}"

 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
--- a/tools/rocm-build/rocm-6.1.0.xml
+++ b/tools/rocm-build/rocm-6.1.0.xml
@@ -1,71 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest>
    <remote name="rocm-org" fetch="https://github.com/ROCm/" />
-    <default revision="refs/tags/rocm-6.2.2"
+    <default revision="refs/tags/rocm-6.1.0"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
 <!--list of projects for ROCm-->
-    <project name="ROCm" revision="roc-6.2.x" />
+    <project name="ROCm" revision="roc-6.1.x" />
    <project name="ROCK-Kernel-Driver" />
-    <project name="ROCR-Runtime" />
    <project name="ROCT-Thunk-Interface" />
+    <project name="ROCR-Runtime" />
    <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="half" />
    <project name="llvm-project" />
+    <project name="half" />
 <!-- gdb projects -->
-    <project name="ROCdbgapi" />
    <project name="ROCgdb" />
+    <project name="ROCdbgapi" />
    <project name="rocr_debug_agent" />
 <!-- ROCm Libraries -->
-    <project groups="mathlibs" name="AMDMIGraphX" />
+    <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="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="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="AMDMIGraphX" />
    <project groups="mathlibs" name="rpp" />
 <!-- Projects for OpenMP-Extras -->
    <project name="aomp" path="openmp-extras/aomp" />
--- a/tools/rocm-build/rocm-6.1.1.xml
+++ b/tools/rocm-build/rocm-6.1.1.xml
@@ -1,74 +1,71 @@
 <?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.1.1"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
 <!--list of projects for ROCm-->
-    <project name="ROCm" revision="roc-6.2.x" />
+    <project name="ROCm" revision="roc-6.1.x" />
    <project name="ROCK-Kernel-Driver" />
-    <project name="ROCR-Runtime" />
    <project name="ROCT-Thunk-Interface" />
+    <project name="ROCR-Runtime" />
    <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="half" />
    <project name="llvm-project" />
+    <project name="half" />
 <!-- gdb projects -->
-    <project name="ROCdbgapi" />
    <project name="ROCgdb" />
+    <project name="ROCdbgapi" />
    <project name="rocr_debug_agent" />
 <!-- ROCm Libraries -->
-    <project groups="mathlibs" name="AMDMIGraphX" />
+    <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="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="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="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>
+</manifest>
--- a/tools/rocm-build/rocm-6.1.2.xml
+++ b/tools/rocm-build/rocm-6.1.2.xml
@@ -0,0 +1,71 @@
+<?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,29 +6,30 @@
     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="rocprofiler" />
-    <project name="rocprofiler-register" />
-    <project name="rocprofiler-sdk" />
-    <project name="roctracer" />
+    <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" />
 <!--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" />
@@ -71,4 +72,5 @@
    <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
Peter Park	17d04124c1	update links to vllm perf validation doc	2024-10-30 15:52:12 -04:00
Daniel Su	4b8fdf1ae3	External CI: various fixes (#3963 )	2024-10-30 15:52:12 -04:00
Joseph Macaranas	c88f3996dc	External CI: Add aqlprofile to Tensile test dependencies (#3961 )	2024-10-30 15:52:12 -04:00
Peter Park	5b53802c54	add suggestions to vllm perf validation doc	2024-10-30 14:08:35 -04:00
Peter Park	bdeef73263	add vllm performance validation doc	2024-10-30 12:51:40 -04:00