Footnote update (#4966 )

6.1.5 column added to docs/6.2.1 (#4633 )
* 6.1.5 column added
2026-01-10 15:18:11 -05:00 · 2025-06-26 15:33:29 -04:00 · 2025-04-17 11:47:47 -04:00 · 2024-12-23 18:10:31 -05:00 · 2024-11-05 17:13:54 -05:00 · 2024-11-05 17:13:54 -05:00
117 changed files with 3601 additions and 2712 deletions
--- a/.azuredevops/ci-builds/aomp.yml
+++ b/.azuredevops/ci-builds/aomp.yml
@@ -8,17 +8,17 @@ resources:
    type: github
    endpoint: ROCm
    name: ROCm/aomp
-    ref: aomp-dev
+    ref: amd-staging
  - repository: aomp-extras_repo
    type: github
    endpoint: ROCm
    name: ROCm/aomp-extras
-    ref: aomp-dev
+    ref: amd-staging
  - repository: flang_repo
    type: github
    endpoint: ROCm
    name: ROCm/flang
-    ref: aomp-dev
+    ref: amd-staging
  - repository: llvm-project_repo
    type: github
    endpoint: ROCm
--- a/.azuredevops/components/ROCgdb.yml
+++ b/.azuredevops/components/ROCgdb.yml
@@ -5,24 +5,46 @@ parameters:
 - name: checkoutRef
  type: string
  default: ''
+# reference: https://github.com/ROCm/ROCgdb/blob/amd-staging/README-ROCM.md
 - name: aptPackages
  type: object
  default:
-    - libgmp-dev
-    - libmpfr-dev
-    - texinfo
    - bison
+    - dejagnu
    - flex
+    - libbabeltrace-dev
+    - libexpat-dev
+    - libgmp-dev
+    - liblzma-dev
+    - libmpfr-dev
+    - ncurses-dev
+    - texinfo
+    - zlib1g-dev
+- name: rocmDependencies
+  type: object
+  default:
+    - clr
+    - llvm-project
+    - ROCdbgapi
+    - rocminfo
+    - rocprofiler-register
+    - ROCR-Runtime

 jobs:
- job: rocgdb
+- job: ROCgdb
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool:
-    vmImage: ${{ variables.BASE_BUILD_POOL }}
+  - name: PKG_CONFIG_PATH
+    value: $(Agent.BuildDirectory)/rocm/share/pkgconfig
+  pool: $(JOB_TEST_POOL)
  workspace:
    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
  steps:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
@@ -31,5 +53,63 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-autotools.yml
+    parameters:
+      configureFlags: >-
+        --program-prefix=roc
+        --enable-64-bit-bfd
+        --enable-targets="x86_64-linux-gnu,amdgcn-amd-amdhsa"
+        --disable-ld
+        --disable-gas
+        --disable-gdbserver
+        --disable-sim
+        --enable-tui
+        --disable-gdbtk
+        --disable-shared
+        --disable-gprofng
+        --with-expat
+        --with-system-zlib
+        --without-guile
+        --with-babeltrace
+        --with-lzma
+        --with-python=python3
+        --with-rocm-dbgapi=$(Agent.BuildDirectory)/rocm
+        LDFLAGS="-Wl,--enable-new-dtags,-rpath=$(Agent.BuildDirectory)/rocm/lib"
+      makeCallPrefix: LD_RUN_PATH='${ORIGIN}/../lib'
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+  - task: Bash@3
+    displayName: Setup test environment
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+        echo "##vso[task.prependpath]/opt/rocm/bin"
+  - task: Bash@3
+    displayName: check-gdb
+    continueOnError: true
+    inputs:
+      targetType: inline
+      script: make check-gdb TESTS=gdb.rocm/simple.exp
+      workingDirectory: $(Build.SourcesDirectory)
+  - task: Bash@3
+    displayName: print gdb log
+    inputs:
+      targetType: inline
+      script: find -name gdb.log -exec cat {} \;
+      workingDirectory: $(Build.SourcesDirectory)
--- a/.azuredevops/components/aomp.yml
+++ b/.azuredevops/components/aomp.yml
@@ -42,6 +42,7 @@ parameters:
    - python3-setuptools
    - python3-dev
    - libudev-dev
+    - parallel
  # Referencing comment snippet below but excluding rocprofiler and roctracer.
  # This is to remove need for separate build per gpu target.
  # With our selected build flags, compilation and installation work fine without these two.
@@ -55,16 +56,18 @@ parameters:
 - name: rocmDependencies
  type: object
  default:
-    - rocm-cmake
-    - llvm-project
-    - ROCR-Runtime
+    - amdsmi
    - clr
-    - rocminfo
-    - rocprofiler-register
+    - llvm-project
    - ROCdbgapi
    - ROCgdb
+    - rocm-cmake
+    - rocm-core
+    - rocminfo
    - rocm_smi_lib
-    - amdsmi
+    - rocprofiler-register
+    - ROCR-Runtime
+    - roctracer

 jobs:
 - job: aomp
@@ -407,3 +410,79 @@ jobs:
      Contents: '/**/*'
      RemoveDotFiles: true
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+
+- job: aomp_testing
+  dependsOn: aomp
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: ROCm symbolic link
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: aomp-extras_repo
+# these copy steps are from the aomp prototype script for test prep
+  - task: CopyFiles@2
+    displayName: 'Copy AOMP contents'
+    inputs:
+      CleanTargetFolder: false
+      SourceFolder: $(Build.SourcesDirectory)/aomp
+      Contents: |
+        **
+        !**/.git/**
+        !**/.github/**
+        !**/.gitignore
+      TargetFolder: $(Agent.BuildDirectory)/rocm/share/openmp-extras/tests
+      retryCount: 3
+  - task: CopyFiles@2
+    displayName: 'Copy FileCheck'
+    inputs:
+      CleanTargetFolder: false
+      SourceFolder: $(Agent.BuildDirectory)/rocm/llvm/bin
+      Contents: FileCheck
+      TargetFolder: $(Agent.BuildDirectory)/rocm/share/openmp-extras/tests/bin
+      retryCount: 3
+  - task: Bash@3
+    displayName: Test AOMP
+    continueOnError: true
+    inputs:
+      targetType: inline
+      script: ./run_rocm_test.sh
+      workingDirectory: $(Build.SourcesDirectory)/aomp/bin
+    env:
+      AOMP: $(Agent.BuildDirectory)/rocm/llvm
+      AOMP_REPOS_TEST: $(Build.SourcesDirectory)/aomp-test
+      AOMP_TEST_DIR: $(Build.SourcesDirectory)/aomp-test
+      SKIP_TEST_PACKAGE: 1
+      MAINLINE_BUILD: 1
+      SUITE_LIST: smoke
--- a/.azuredevops/components/hip-tests.yml
+++ b/.azuredevops/components/hip-tests.yml
@@ -28,6 +28,14 @@ parameters:
    - clr
    - rocminfo
    - rocprofiler-register
+- name: rocmTestDependencies
+  type: object
+  default:
+    - clr
+    - llvm-project
+    - rocminfo
+    - rocprofiler-register
+    - ROCR-Runtime

 # HIP with AMD backend
 jobs:
@@ -79,3 +87,58 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: hip_tests_testing
+  timeoutInMinutes: 180
+  dependsOn: hip_tests
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: Symlink rocm_agent_enumerator
+    inputs:
+      targetType: inline
+      script: |
+        sudo mkdir -p /opt/rocm/bin
+        sudo ln -s $(Agent.BuildDirectory)/rocm/bin/rocm_agent_enumerator /opt/rocm/bin/rocm_agent_enumerator
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: hip_tests
+      testDir: $(Agent.BuildDirectory)/rocm/share/hip
+      reloadAMDGPU: true
+  - task: Bash@3
+    displayName: Clean up symlink
+    inputs:
+      targetType: inline
+      script: sudo rm -rf /opt/rocm
--- a/.azuredevops/components/hipBLAS.yml
+++ b/.azuredevops/components/hipBLAS.yml
@@ -16,7 +16,6 @@ parameters:
    - libgtest-dev
    - wget
    - python3-pip
-    - libomp-dev
 - name: rocmDependencies
  type: object
  default:
@@ -46,6 +45,7 @@ parameters:
    - rocBLAS
    - rocSPARSE
    - rocSOLVER
+    - roctracer

 jobs:
 - job: hipBLAS
--- a/.azuredevops/components/hipBLASLt.yml
+++ b/.azuredevops/components/hipBLASLt.yml
@@ -16,8 +16,8 @@ parameters:
    - python3-pip
    - python3-venv
    - gfortran
-    - libomp-dev
    - libblas-dev
+    - ccache
 - name: pipModules
  type: object
  default:
@@ -33,6 +33,7 @@ parameters:
    - rocm_smi_lib
    - rocprofiler-register
    - ROCR-Runtime
+    - roctracer
 - name: rocmTestDependencies
  type: object
  default:
@@ -44,6 +45,7 @@ parameters:
    - rocm_smi_lib
    - rocprofiler-register
    - ROCR-Runtime
+    - roctracer

 jobs:
 - job: hipBLASLt
@@ -63,7 +65,9 @@ jobs:
    value: $(Agent.BuildDirectory)/rocm/bin/hipcc
  - name: PATH
    value: $(Agent.BuildDirectory)/rocm/llvm/bin:$(Agent.BuildDirectory)/rocm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/snap/bin
-  pool: ${{ variables.MEDIUM_BUILD_POOL }}
+  - name: DAY_STRING
+    value: $[format('{0:ddMMyyyy}', pipeline.startTime)]
+  pool: ${{ variables.ULTRA_BUILD_POOL }}
  workspace:
    clean: all
  strategy:
@@ -110,12 +114,27 @@ jobs:
  - script: sudo make install
    displayName: Install hipBLASLt external dependencies
    workingDirectory: $(Pipeline.Workspace)/deps
+  - script: |
+      mkdir -p $(CCACHE_DIR)
+      echo "##vso[task.prependpath]/usr/lib/ccache"
+    displayName: Update path for ccache
+  - task: Cache@2
+    displayName: Ccache caching
+    inputs:
+      key: hipBLASLt | $(Agent.OS) | $(JOB_GPU_TARGET) | $(DAY_STRING) | $(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++
+      path: $(CCACHE_DIR)
+      restoreKeys: |
+        hipBLASLt | $(Agent.OS) | $(JOB_GPU_TARGET) | $(DAY_STRING)
+        hipBLASLt | $(Agent.OS) | $(JOB_GPU_TARGET)
+        hipBLASLt | $(Agent.OS)
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
        -DCMAKE_BUILD_TYPE=Release
        -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++
        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang
+        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        -DCMAKE_C_COMPILER_LAUNCHER=ccache
        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
        -DTensile_LOGIC=
        -DTensile_CPU_THREADS=
--- a/.azuredevops/components/hipFFT.yml
+++ b/.azuredevops/components/hipFFT.yml
@@ -14,11 +14,11 @@ parameters:
    - libgtest-dev
    - libfftw3-dev
    - python3-pip
-    - libomp-14-dev
 # rocm dependencies should match dependencies-rocm.yml
 - name: rocmDependencies
  type: object
  default:
+    - aomp
    - rocRAND
    - hipRAND
    - llvm-project
--- a/.azuredevops/components/hipSPARSELt.yml
+++ b/.azuredevops/components/hipSPARSELt.yml
@@ -15,7 +15,6 @@ parameters:
    - python3-pip
    - gfortran
    - libgfortran5
-    - libomp-dev
    - libopenblas-dev
 - name: pipModules
  type: object
--- a/.azuredevops/components/hipfort.yml
+++ b/.azuredevops/components/hipfort.yml
@@ -11,26 +11,137 @@ parameters:
    - gfortran
    - git
    - cmake
+    - python3-pip
+    - python3-dev
+    - ninja-build
+- name: rocmDependencies
+  type: object
+  default:
+    - aomp
+    - llvm-project
+    - clr
+    - hipBLAS
+    - hipBLAS-common
+    - hipBLASLt
+    - hipFFT
+    - hipRAND
+    - hipSOLVER
+    - hipSPARSE
+    - rocBLAS
+    - rocFFT
+    - rocm-cmake
+    - rocminfo
+    - rocprofiler
+    - rocprofiler-register
+    - rocRAND
+    - ROCR-Runtime
+    - rocSOLVER
+    - rocSPARSE
+    - roctracer

 jobs:
 - job: hipfort
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool:
-    vmImage: ${{ variables.BASE_BUILD_POOL }}
+  pool: ${{ variables.MEDIUM_BUILD_POOL }}
  workspace:
    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+      gfx90a:
+        JOB_GPU_TARGET: gfx90a
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-cmake-latest.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+    parameters:
+      extraBuildFlags: >-
+        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(Agent.BuildDirectory)/rocm/llvm
+        -DHIPFORT_INSTALL_DIR=$(Build.BinariesDirectory)
+        -DHIPFORT_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/flang
+        -DCMAKE_Fortran_FLAGS="-Mfree -fPIC"
+        -DCMAKE_Fortran_FLAGS_DEBUG=""
+        -DHIPFORT_COMPILER_FLAGS="-cpp"
+        -DHIPFORT_AR=$(Agent.BuildDirectory)/rocm/llvm/bin/llvm-ar
+        -DHIPFORT_RANLIB=$(Agent.BuildDirectory)/rocm/llvm/bin/llvm-ranlib
+        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
+        -DBUILD_TESTING=ON
+        -GNinja
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: hipfort_testing
+  dependsOn: hipfort
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
  steps:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
-    parameters:
-      extraBuildFlags: >-
-        -DHIPFORT_INSTALL_DIR=/tmp/hipfort
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+  - task: Bash@3
+    displayName: 'ROCm symbolic link'
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+      workingDirectory: $(Build.SourcesDirectory)
+  - task: Bash@3
+    displayName: 'Test hipfort'
+    inputs:
+      targetType: inline
+      script: PATH=$(Agent.BuildDirectory)/rocm/bin:$PATH make run_all
+      workingDirectory: $(Build.SourcesDirectory)/test
--- a/.azuredevops/components/llvm-project.yml
+++ b/.azuredevops/components/llvm-project.yml
@@ -104,6 +104,14 @@ jobs:
      testExecutable: './bin/llvm-lit'
      testParameters: '-q --xunit-xml-output=lld_test_output.xml ./tools/lld/test'
      testOutputFile: lld_test_output.xml
+  - task: CopyFiles@2
+    displayName: Copy FileCheck for Publishing
+    inputs:
+      CleanTargetFolder: false
+      SourceFolder: llvm/build/bin
+      Contents: FileCheck
+      TargetFolder: $(Build.BinariesDirectory)/llvm/bin
+      retryCount: 3
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      componentName: device-libs
--- a/.azuredevops/components/omniperf.yml
+++ b/.azuredevops/components/omniperf.yml
@@ -0,0 +1,167 @@
+parameters:
+- name: checkoutRepo
+  type: string
+  default: 'self'
+- name: checkoutRef
+  type: string
+  default: ''
+- name: aptPackages
+  type: object
+  default:
+    - cmake
+    - python3-pip
+- name: pipModules
+  type: object
+  default:
+    - astunparse==1.6.2
+    - colorlover
+    - dash>=1.12.0
+    - matplotlib
+    - numpy>=1.17.5
+    - pandas>=1.4.3
+    - pymongo
+    - pyyaml
+    - tabulate
+    - tqdm
+    - dash-svg
+    - dash-bootstrap-components
+    - kaleido
+    - setuptools
+    - plotille
+    - mock
+    - pytest
+    - pytest-cov
+    - pytest-xdist
+- name: rocmDependencies
+  type: object
+  default:
+    - clr
+    - llvm-project
+    - rocm-cmake
+    - rocm-core
+    - rocminfo
+    - ROCR-Runtime
+    - rocprofiler
+    - rocprofiler-register
+    - roctracer
+
+jobs:
+- job: omniperf
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool:
+    vmImage: ${{ variables.BASE_BUILD_POOL }}
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+      gfx90a:
+        JOB_GPU_TARGET: gfx90a
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: omniperf_testing
+  dependsOn: omniperf
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  - name: PYTHON_VERSION
+    value: 3.10
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+      pipModules: ${{ parameters.pipModules }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: Add ROCm binaries to PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/bin"
+  - task: Bash@3
+    displayName: Add ROCm compilers to PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/llvm/bin"
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+    parameters:
+      extraBuildFlags: >-
+        -DCMAKE_HIP_ARCHITECTURES=$(JOB_GPU_TARGET)
+        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang
+        -DCMAKE_MODULE_PATH=$(Agent.BuildDirectory)/rocm/lib/cmake/hip
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
+        -DCMAKE_BUILD_TYPE=Release
+        -DENABLE_TESTS=ON
+        -DINSTALL_TESTS=ON
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: omniperf
+      testDir: $(Build.BinariesDirectory)/libexec/omniperf
+      testExecutable: export OMNIPERF_ARCH_OVERRIDE="MI300X"; ctest
+  - task: Bash@3
+    displayName: Remove ROCm binaries from PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/bin;;' -e 's;^/;;' -e 's;/$;;')"
+  - task: Bash@3
+    displayName: Remove ROCm compilers from PATH
+    inputs:
+      targetType: inline
+      script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/llvm/bin;;' -e 's;^/;;' -e 's;/$;;')"
--- a/.azuredevops/components/rccl.yml
+++ b/.azuredevops/components/rccl.yml
@@ -31,6 +31,20 @@ parameters:
    - HIPIFY
    - aomp
    - aomp-extras
+- name: rocmTestDependencies
+  type: object
+  default:
+    - aomp
+    - aomp-extras
+    - clr
+    - HIPIFY
+    - llvm-project
+    - rocm-cmake
+    - rocm-core
+    - rocm_smi_lib
+    - rocminfo
+    - rocprofiler-register
+    - ROCR-Runtime

 jobs:
 - job: rccl
@@ -84,3 +98,47 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: rccl_testing
+  timeoutInMinutes: 120
+  dependsOn: rccl
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rccl
+      testDir: '$(Agent.BuildDirectory)/rocm/bin'
+      testExecutable: './rccl-UnitTests'
+      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/rdc.yml
+++ b/.azuredevops/components/rdc.yml
@@ -18,16 +18,35 @@ parameters:
    - autoconf
    - libtool
    - pkg-config
+    - libdrm-dev
+    - libyaml-cpp-dev
 - name: rocmDependencies
  type: object
  default:
-    - rocm-cmake
-    - llvm-project
-    - ROCR-Runtime
+    - amdsmi
    - clr
+    - llvm-project
+    - rocBLAS
+    - rocm-cmake
    - rocminfo
    - rocm_smi_lib
+    - ROCmValidationSuite
+    - rocprofiler
+    - rocprofiler-register
+    - ROCR-Runtime
+- name: rocmTestDependencies
+  type: object
+  default:
    - amdsmi
+    - clr
+    - llvm-project
+    - rocm-cmake
+    - rocminfo
+    - rocm_smi_lib
+    - ROCmValidationSuite
+    - rocprofiler
+    - rocprofiler-register
+    - ROCR-Runtime

 jobs:
 - job: rdc
@@ -37,6 +56,12 @@ jobs:
  pool: ${{ variables.MEDIUM_BUILD_POOL }}
  workspace:
    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+      gfx90a:
+        JOB_GPU_TARGET: gfx90a
  steps:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
@@ -48,6 +73,7 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
      # CI case: download latest default branch build
      ${{ if eq(parameters.checkoutRef, '') }}:
        dependencySource: staging
@@ -71,11 +97,71 @@ jobs:
        -DBUILD_SHARED_LIBS=ON
        -DCMAKE_INSTALL_LIBDIR=lib
        -DCMAKE_BUILD_TYPE=Release
+        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
        -DGRPC_ROOT="$(Build.SourcesDirectory)/bin"
+        -DBUILD_RVS=ON
+        -DBUILD_PROFILER=ON
        -DBUILD_TESTS=ON
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: rdc_testing
+  dependsOn: rdc
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmTestDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: Setup test environment
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo rm -rf /usr/sbin/rdcd
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm/bin/rdcd /usr/sbin/rdcd
+        echo $(Agent.BuildDirectory)/rocm/lib/rdc/grpc/lib | sudo tee /etc/ld.so.conf.d/grpc.conf
+        sudo ldconfig -v
+  - task: Bash@3
+    displayName: Test rdc
+    inputs:
+      targetType: inline
+      script: >-
+        $(Agent.BuildDirectory)/rocm/share/rdc/rdctst_tests/rdctst
+        --batch_mode
+        --start_rdcd
+        --unauth_comm
--- a/.azuredevops/components/rocPyDecode.yml
+++ b/.azuredevops/components/rocPyDecode.yml
@@ -85,3 +85,62 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: rocPyDecode_testing
+  dependsOn: rocPyDecode
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
+    parameters:
+      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - task: Bash@3
+    displayName: Setup test environment
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+        cd $(Build.SourcesDirectory)
+        sudo pip install .
+        cmake -DAMDGPU_TARGETS=$(JOB_GPU_TARGET) .
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rocPyDecode
+      testDir: $(Build.SourcesDirectory)
+# sudo required for pip install but screws up permissions for next pipeline run
+  - task: Bash@3
+    displayName: Clean up test environment
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf $(Build.SourcesDirectory)/*
--- a/.azuredevops/components/rocWMMA.yml
+++ b/.azuredevops/components/rocWMMA.yml
@@ -16,10 +16,10 @@ parameters:
    - googletest
    - libfftw3-dev
    - git
-    - libomp-dev
 - name: rocmDependencies
  type: object
  default:
+    - aomp
    - rocm-cmake
    - llvm-project
    - ROCR-Runtime
@@ -42,6 +42,7 @@ parameters:
    - rocminfo
    - rocprofiler-register
    - ROCR-Runtime
+    - roctracer

 jobs:
 - job: rocWMMA
--- a/.azuredevops/components/rocprofiler.yml
+++ b/.azuredevops/components/rocprofiler.yml
@@ -92,6 +92,65 @@ jobs:
        -DENABLE_LDCONFIG=OFF
        -DUSE_PROF_API=1
        -DGPU_TARGETS=$(JOB_GPU_TARGET)
+        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
+      multithreadFlag: -- -j32
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
+
+- job: rocprofiler_testing
+  dependsOn: rocprofiler
+  condition: succeeded()
+  variables:
+  - group: common
+  - template: /.azuredevops/variables-global.yml
+  pool: $(JOB_TEST_POOL)
+  workspace:
+    clean: all
+  strategy:
+    matrix:
+      gfx942:
+        JOB_GPU_TARGET: gfx942
+        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
+  steps:
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
+    parameters:
+      gpuTarget: $(JOB_GPU_TARGET)
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
+    parameters:
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
+    parameters:
+      dependencyList: ${{ parameters.rocmDependencies }}
+      gpuTarget: $(JOB_GPU_TARGET)
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        dependencySource: staging
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        dependencySource: tag-builds
+  - task: Bash@3
+    displayName: Setup test environment
+    inputs:
+      targetType: inline
+      script: |
+        sudo rm -rf /opt/rocm
+        sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rocprofilerV1
+      testExecutable: LD_LIBRARY_PATH="$(Agent.BuildDirectory)/rocm/lib/rocprofiler:$(Agent.BuildDirectory)/rocm/share/rocprofiler/tests-v1/test" ./run.sh
+      testDir: $(Agent.BuildDirectory)/rocm/share/rocprofiler/tests-v1
+      testParameters: ''
+      testPublishResults: false
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
+    parameters:
+      componentName: rocprofilerV2
+      testExecutable: LD_LIBRARY_PATH="$(Agent.BuildDirectory)/rocm/lib/rocprofiler:$(Agent.BuildDirectory)/rocm/share/rocprofiler/tests" share/rocprofiler/tests/runUnitTests
+      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
+      testDir: $(Agent.BuildDirectory)/rocm
--- a/.azuredevops/components/rpp.yml
+++ b/.azuredevops/components/rpp.yml
@@ -9,13 +9,12 @@ parameters:
  type: object
  default:
    - cmake
-    - libomp-dev # needed to pass flag step
    - ninja-build
    - clang
 - name: rocmDependencies
  type: object
  default:
-    - aomp # needed to pass build step
+    - aomp
    - clr
    - half
    - llvm-project
--- a/.azuredevops/nightly/rocm-nightly.yml
+++ b/.azuredevops/nightly/rocm-nightly.yml
@@ -1,5 +1,5 @@
 parameters:
-# currently excludes clr and rocm-examples
+# currently excludes clr
 - name: rocmDependencies
  type: object
  default:
@@ -10,6 +10,7 @@ parameters:
    - composable_kernel
    - half
    - HIP
+    - hip-tests
    - hipBLAS
    - hipBLAS-common
    - hipBLASLt
@@ -25,6 +26,7 @@ parameters:
    - llvm-project
    - MIOpen
    - MIVisionX
+    - omniperf
    - rccl
    - rdc
    - rocAL
@@ -36,6 +38,7 @@ parameters:
    - ROCgdb
    - rocm-cmake
    - rocm-core
+    - rocm-examples
    - rocminfo
    - rocMLIR
    - ROCmValidationSuite
@@ -44,6 +47,7 @@ parameters:
    - rocPRIM
    - rocprofiler-register
    - rocprofiler
+    - rocPyDecode
    - ROCR-Runtime
    - rocRAND
    - rocr_debug_agent
--- a/.azuredevops/tag-builds/omniperf.yml
+++ b/.azuredevops/tag-builds/omniperf.yml
@@ -0,0 +1,29 @@
+variables:
+- group: common
+- template: /.azuredevops/variables-global.yml
+
+parameters:
+- name: checkoutRef
+  type: string
+  default: refs/tags/$(LATEST_RELEASE_TAG)
+
+resources:
+  repositories:
+  - repository: pipelines_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/ROCm
+  - repository: release_repo
+    type: github
+    endpoint: ROCm
+    name: ROCm/omniperf
+    ref: ${{ parameters.checkoutRef }}
+
+trigger: none
+pr: none
+
+jobs:
+  - 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
@@ -76,9 +76,12 @@ parameters:
 - name: allowPartiallySucceededBuilds
  type: object
  default:
-    - rocm-cmake
    - amdsmi
+    - aomp
    - HIPIFY
+    - rccl
+    - rdc
+    - rocm-cmake
    - rocm_smi_lib
    - rocFFT
    - MIVisionX
--- a/.azuredevops/templates/steps/build-autotools.yml
+++ b/.azuredevops/templates/steps/build-autotools.yml
@@ -11,6 +11,9 @@ parameters:
 - name: installDir
  type: string
  default: '$(Build.BinariesDirectory)'
+- name: makeCallPrefix
+  type: string
+  default: ''

 steps:
 - task: Bash@3
@@ -23,7 +26,7 @@ steps:
  displayName: '${{ parameters.componentName }} make'
  inputs:
    targetType: inline
-    script: make -j$(nproc)
+    script: ${{ parameters.makeCallPrefix }} make -j$(nproc)
    workingDirectory: ${{ parameters.buildDir }}
 - task: Bash@3
  displayName: '${{ parameters.componentName }} make install'
--- a/.azuredevops/templates/steps/dependencies-aqlprofile.yml
+++ b/.azuredevops/templates/steps/dependencies-aqlprofile.yml
@@ -8,13 +8,13 @@ parameters:
 - name: repositoryUrl
  type: object
  default: 
-    staging: https://repo.radeon.com/rocm/misc/aqlprofile/ubuntu-22.04
-    tag-builds: https://repo.radeon.com/rocm/apt/6.1/pool/main/h/hsa-amd-aqlprofile
+    staging: https://repo.radeon.com/rocm/apt/6.2/pool/main/h/hsa-amd-aqlprofile
+    tag-builds: https://repo.radeon.com/rocm/apt/6.2/pool/main/h/hsa-amd-aqlprofile
 - name: packageName
  type: object
  default:
-    staging: hsa-amd-aqlprofile_1.0.0.60200.60200-crdnnh.14213~22.04_amd64.deb
-    tag-builds: hsa-amd-aqlprofile_1.0.0.60100.60100-82~22.04_amd64.deb
+    staging: hsa-amd-aqlprofile_1.0.0.60200.60200-66~22.04_amd64.deb
+    tag-builds: hsa-amd-aqlprofile_1.0.0.60200.60200-66~22.04_amd64.deb

 steps:
 - task: Bash@3
--- a/.azuredevops/templates/steps/dependencies-other.yml
+++ b/.azuredevops/templates/steps/dependencies-other.yml
@@ -34,4 +34,4 @@ steps:
    displayName: 'pip install  ...'
    inputs:
      targetType: inline
-      script: pip install ${{ join(' ', parameters.pipModules) }}
+      script: pip install -v ${{ join(' ', parameters.pipModules) }}
--- a/.azuredevops/templates/steps/dependencies-rocm.yml
+++ b/.azuredevops/templates/steps/dependencies-rocm.yml
@@ -52,6 +52,7 @@ parameters:
    llvm-project: $(LLVM_PROJECT_PIPELINE_ID)
    MIOpen: $(MIOpen_PIPELINE_ID)
    MIVisionX: $(MIVISIONX_PIPELINE_ID)
+    omniperf: $(OMNIPERF_PIPELINE_ID)
    rccl: $(RCCL_PIPELINE_ID)
    rdc: $(RDC_PIPELINE_ID)
    rocAL: $(ROCAL_PIPELINE_ID)
@@ -108,6 +109,7 @@ parameters:
    llvm-project: $(LLVM_PROJECT_TAGGED_PIPELINE_ID)
    MIOpen: $(MIOpen_TAGGED_PIPELINE_ID)
    MIVisionX: $(MIVISIONX_TAGGED_PIPELINE_ID)
+    omniperf: $(OMNIPERF_TAGGED_PIPELINE_ID)
    rccl: $(RCCL_TAGGED_PIPELINE_ID)
    rdc: $(RDC_TAGGED_PIPELINE_ID)
    rocAL: $(ROCAL_TAGGED_PIPELINE_ID)
@@ -186,6 +188,7 @@ parameters:
    - hipSPARSE
    - MIOpen
    - MIVision
+    - omniperf
    - rocAL
    - ROCmValidationSuite

--- a/.azuredevops/variables-global.yml
+++ b/.azuredevops/variables-global.yml
@@ -159,6 +159,10 @@ variables:
  value: 80
 - name: MIVISIONX_TAGGED_PIPELINE_ID
  value: 18
+- name: OMNIPERF_PIPELINE_ID
+  value: 241
+- name: OMNIPERF_TAGGED_PIPELINE_ID
+  value: 242
 - name: RCCL_GFX942_TEST_PIPELINE_ID
  value: 184
 - name: RCCL_PIPELINE_ID
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -36,6 +36,7 @@ Bluefield
 Bootloader
 CCD
 CDNA
+CHTML
 CIFAR
 CLI
 CLion
@@ -53,6 +54,7 @@ CSC
 CSE
 CSV
 CSn
+CTest
 CTests
 CU
 CUDA
@@ -69,6 +71,7 @@ Concretized
 Conda
 ConnectX
 CuPy
+Dashboarding
 DDR
 DF
 DGEMM
@@ -226,6 +229,7 @@ Mellanox's
 Meta's
 Miniconda
 MirroredStrategy
+Mixtral
 Multicore
 Multithreaded
 MyEnvironment
@@ -271,6 +275,8 @@ OpenMPI
 OpenSSL
 OpenVX
 OpenXLA
+Oversubscription
+PagedAttention
 PCC
 PCI
 PCIe
@@ -292,6 +298,7 @@ PowerShell
 PyPi
 PyTorch
 Qcycles
+Qwen
 RAII
 RAS
 RCCL
@@ -387,6 +394,7 @@ UAC
 UC
 UCC
 UCX
+UE
 UIF
 UMC
 USM
@@ -455,6 +463,7 @@ blit
 bootloader
 boson
 bosons
+br
 buildable
 bursty
 bzip
@@ -558,6 +567,7 @@ hipfort
 hipify
 hipsolver
 hipsparse
+hlist
 hotspotting
 hpc
 hpp
@@ -581,7 +591,9 @@ intra
 invariants
 invocating
 ipo
+jax
 kdb
+kfd
 latencies
 libfabric
 libjpeg
@@ -600,6 +612,7 @@ migraphx
 miopen
 miopengemm
 mivisionx
+mjx
 mkdir
 mlirmiopen
 mtypes
@@ -651,6 +664,7 @@ quasirandom
 queueing
 rccl
 rdc
+rdma
 reStructuredText
 redirections
 refactorization
--- a/CHANGELOG-tmp.md
+++ b/CHANGELOG-tmp.md
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ The following example shows how to use the repo tool to download the ROCm source
 ```bash
 mkdir -p ~/ROCm/
 cd ~/ROCm/
-~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.0.x
+~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.2.x
 ~/bin/repo sync
 ```

@@ -76,7 +76,7 @@ The Build time will reduce significantly if we limit the GPU Architecture/s agai

 mkdir -p ~/WORKSPACE/      # Or any folder name other than WORKSPACE
 cd ~/WORKSPACE/
-export ROCM_VERSION=6.2.0
+export ROCM_VERSION=6.2.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
--- 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.0"
+    <default revision="refs/tags/rocm-6.2.1"
     remote="rocm-org"
     sync-c="true"
     sync-j="4" />
--- a/docs/compatibility/compatibility-matrix-historical-6.0.csv
+++ b/docs/compatibility/compatibility-matrix-historical-6.0.csv
@@ -0,0 +1,117 @@
+ROCm Version,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,,,,,,
+      ,"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.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, 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 [#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.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 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]_,,,
+      ,.. _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_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
+      ,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.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13","2.1, 2.0, 1.13"
+      :doc:`TensorFlow <rocm-install-on-linux:install/3rd-party/tensorflow-install>`,"2.16.1, 2.15.1, 2.14.1","2.16.1, 2.15.1, 2.14.1","2.15.0, 2.14.0, 2.13.1","2.15.0, 2.14.0, 2.13.1","2.15.0, 2.14.0, 2.13.1","2.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.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.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.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.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
+      :doc:`MIGraphX <amdmigraphx:index>`,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.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,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,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.5.0,0.5.0,N/A,N/A
+      :doc:`rocPyDecode <rocpydecode:index>`,0.1.0,0.1.0,N/A,N/A,N/A,N/A,N/A,N/A
+      :doc:`RPP <rpp:index>`,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.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
+      :doc:`hipBLAS <hipblas:index>`,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.7.0,0.7.0,0.7.0,0.7.0,0.6.0,0.6.0
+      :doc:`hipFFT <hipfft:index>`,1.0.15,1.0.14,1.0.14,1.0.14,1.0.14,1.0.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.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.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.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.0,0.2.0,0.1.0,0.1.0,0.1.0,0.1.0
+      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.2.0,3.1.1,3.1.1,3.1.1,3.1.1,3.0.3,3.0.3
+      :doc:`rocBLAS <rocblas:index>`,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.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.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.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.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.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.39.0,4.39.0
+      ,,,,,,,,
+      PRIMITIVES,.. _primitivelibs-support-compatibility-matrix-past-60:,,,,,,,
+      :doc:`hipCUB <hipcub:index>`,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
+      :doc:`hipTensor <hiptensor:index>`,1.3.0,1.3.0,1.2.0,1.2.0,1.2.0,1.2.0,1.1.0,1.1.0
+      :doc:`rocPRIM <rocprim:index>`,3.2.0,3.2.0,3.1.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
+      :doc:`rocThrust <rocthrust:index>`,3.1.0,3.0.1,3.0.1,3.0.1,3.0.1,3.0.1,3.0.0,3.0.0
+      ,,,,,,,,
+      SUPPORT LIBS,,,,,,,,
+      `hipother <https://github.com/ROCm/hipother>`_,6.2.41134,6.2.41133,6.1.40093,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
+      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.1,6.2.0,6.1.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.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.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
+      :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.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.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,N/A,N/A,N/A,N/A,N/A,N/A
+      :doc:`Omnitrace <omnitrace:index>`,1.11.2,1.11.2,N/A,N/A,N/A,N/A,N/A,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.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,N/A,N/A,N/A,N/A,N/A,N/A
+      :doc:`ROCTracer <roctracer:index>`,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.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.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.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.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.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
+      ,,,,,,,,
+      COMPILERS,.. _compilers-support-compatibility-matrix-past-60:,,,,,,,
+      `clang-ocl <https://github.com/ROCm/clang-ocl>`_,N/A,N/A,0.5.0,0.5.0,0.5.0,0.5.0,0.5.0,0.5.0
+      :doc:`hipCC <hipcc:index>`,1.1.1,1.1.1,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0,1.0.0
+      `Flang <https://github.com/ROCm/flang>`_,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.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.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.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.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
+      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.13.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
@@ -1,144 +1,190 @@
 .. meta::
    :description: ROCm compatibility matrix
-    :keywords: AMD, GPU, architecture, hardware, compatibility, requirements
+    :keywords: GPU, architecture, hardware, compatibility, system, requirements, components, libraries

 **************************************************************************************
 Compatibility matrix
 **************************************************************************************

-Use this matrix to view the ROCm compatibility across successive major and minor releases.
+Use this matrix to view the ROCm compatibility and system requirements across successive major and minor releases.

 You can also refer to the :ref:`past versions of ROCm compatibility matrix<past-rocm-compatibility-matrix>`.

+.. |br| raw:: html
+
+   <br/>
+
 .. container:: format-big-table

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

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


 .. rubric:: Footnotes

-.. [#Ubuntu220405] Preview support of Ubuntu 22.04.5 only
-.. [#red-hat94] RHEL 9.4 is supported only on AMD Instinct MI300A.
+.. [#red-hat94] **For ROCm 6.1** - RHEL 9.4 is supported only on AMD Instinct MI300A.
 .. [#oracle89] Oracle Linux is supported only on AMD Instinct MI300X.
+.. [#mi300_621] **For ROCm 6.2.1** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
 .. [#mi300_620] **For ROCm 6.2.0** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
-.. [#mi300_612] **For ROCm 6.1.2** - MI300A (gfx942) is supported on Ubuntu 22.04.4, RHEL 9.4, RHEL 9.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.4 and Oracle Linux.
-.. [#mi300_600] **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.
+.. [#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>`_.
+
+
+.. _OS-kernel-versions:
+
+Operating systems and kernel versions
+*************************************
+
+Use this look up table to confirm which operating system and kernel versions are supported with ROCm.
+
+.. csv-table:: 
+   :header: "OS", "Version", "Kernel"
+   :widths: 40, 20, 40
+   :stub-columns: 1
+
+   `Ubuntu <https://ubuntu.com/about/release-cycle#ubuntu-kernel-release-cycle>`_, 24.04.1, "6.8 GA"
+   , 24.04, "6.8 GA"
+   `Ubuntu <https://ubuntu.com/about/release-cycle#ubuntu-kernel-release-cycle>`_, 22.04.05, "5.15 GA, 6.8 HWE"
+   , 22.04.04, "5.15 GA, 6.5 HWE"
+   , 22.04.03, "5.15 GA, 6.2 HWE"
+   , 22.04.02, "5.15 GA, 5.19 HWE"
+   `Ubuntu <https://ubuntu.com/about/release-cycle#ubuntu-kernel-release-cycle>`_, 20.04.06, "5.15 HWE"
+   , 20.04.05, "5.15 HWE"
+   ,,
+   `Red Hat Enterprise Linux (RHEL) <https://access.redhat.com/articles/3078#RHEL9>`_, 9.4, 5.14.0
+   ,9.3, 5.14.0
+   ,9.2, 5.14.0
+   ,,
+   `Red Hat Enterprise Linux (RHEL) <https://access.redhat.com/articles/3078#RHEL8>`_, 8.10, 4.18.0
+   ,8.9, 4.18.0
+   ,8.8, 4.18.0
+   ,,
+   `CentOS <https://access.redhat.com/articles/3078#RHEL7>`_, 7.9, 3.10
+   ,,
+   `SUSE Linux Enterprise Server (SLES) <https://www.suse.com/support/kb/doc/?id=000019587#SLE15SP4>`_, 15 SP6, 6.4.0
+   ,15 SP5, 5.14.21
+   ,15 SP4, 5.14.21
+   ,,
+   `Oracle Linux <https://blogs.oracle.com/scoter/post/oracle-linux-and-unbreakable-enterprise-kernel-uek-releases>`_, 8.9, 5.15.0
+ 

 ..
   Footnotes and ref anchors in below historical tables should be appended with "-past-60", to differentiate from the 
@@ -160,20 +206,20 @@ Expand for full historical view of:
   You can `download the entire .csv <../downloads/compatibility-matrix-historical-6.0.csv>`_ for offline reference.

   .. csv-table::
-      :file: ../data/reference/compatibility-matrix-historical-6.0.csv
-      :widths: 20,10,10,10,10,10,10
+      :file: compatibility-matrix-historical-6.0.csv
+      :widths: 20,10,10,10,10,10,10,10,10
      :header-rows: 1
      :stub-columns: 1
   
   .. rubric:: Footnotes

-   .. [#Ubuntu220405-past-60] Preview support of Ubuntu 22.04.5 only
   .. [#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_621-past-60] **For ROCm 6.2.1** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
   .. [#mi300_620-past-60] **For ROCm 6.2.0** - MI300X (gfx942) is supported on listed operating systems *except* Ubuntu 22.04.5 [6.8 HWE] and Ubuntu 22.04.4 [6.5 HWE].
   .. [#mi300_612-past-60] **For ROCm 6.1.2** - MI300A (gfx942) is supported on Ubuntu 22.04.4, RHEL 9.4, RHEL 9.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.4 and Oracle Linux.
   .. [#mi300_611-past-60] **For ROCm 6.1.1** - MI300A (gfx942) is supported on Ubuntu 22.04.4, RHEL 9.4, RHEL 9.3, RHEL 8.9, and SLES 15 SP5. MI300X (gfx942) is only supported on Ubuntu 22.04.4 and Oracle Linux.
   .. [#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>`_.
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,7 +10,7 @@ import shutil
 shutil.copy2("../RELEASE.md", "./about/release-notes.md")

 os.system("mkdir -p ../_readthedocs/html/downloads")
-os.system("cp data/reference/compatibility-matrix-historical-6.0.csv ../_readthedocs/html/downloads/compatibility-matrix-historical-6.0.csv")
+os.system("cp compatibility/compatibility-matrix-historical-6.0.csv ../_readthedocs/html/downloads/compatibility-matrix-historical-6.0.csv")

 latex_engine = "xelatex"
 latex_elements = {
@@ -30,16 +30,16 @@ 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.0"
-release = "6.2.0"
+version = "6.2.1"
+release = "6.2.1"
 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-08-02"},
-    {"file": "about/changelog", "os": ["linux", "windows"], "date": "2024-08-02"},
+    {"file": "about/release-notes", "os": ["linux", "windows"], "date": "2024-09-20"},
+    {"file": "about/changelog", "os": ["linux", "windows"], "date": "2024-09-20"},
    {"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"]},
@@ -82,6 +82,7 @@ article_pages = [
        "file": "how-to/llm-fine-tuning-optimization/profiling-and-debugging",
        "os": ["linux"],
    },
+    {"file": "how-to/performance-validation/mi300x/vllm-benchmark", "os": ["linux"]},
    {"file": "how-to/system-optimization/index", "os": ["linux"]},
    {"file": "how-to/system-optimization/mi300x", "os": ["linux"]},
    {"file": "how-to/system-optimization/mi200", "os": ["linux"]},
--- a/docs/data/reference/compatibility-matrix-historical-6.0.csv
+++ b/docs/data/reference/compatibility-matrix-historical-6.0.csv
@@ -1,114 +0,0 @@
-ROCm Version,6.2.0, 6.1.2, 6.1.1, 6.1.0, 6.0.2, 6.0.0
-      :doc:`Operating Systems <rocm-install-on-linux:reference/system-requirements>`,Ubuntu 24.04,,,,,
-      ,"Ubuntu 22.04.5 [#Ubuntu220405-past-60]_, 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","Ubuntu 22.04.4, 22.04.3"
-      ,,"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 [#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.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 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]_,,,
-      ,".. _architecture-support-compatibility-matrix-past-60:",,,,,
-      :doc:`Architecture <rocm-install-on-linux:reference/system-requirements>`,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3
-      ,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2
-      ,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA
-      ,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3
-      ,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
-      ,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030
-      ,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
-      ,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.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.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
-      `ONNX Runtime <https://onnxruntime.ai/docs/build/eps.html#amd-migraphx>`_,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.2.0,>=1.2.0
-      `UCX <https://github.com/ROCm/ucx>`_,>=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.1.0,2.1.0,2.1.0,2.0.1,2.0.1
-      CUB,2.2.0,2.1.0,2.1.0,2.1.0,2.0.1,2.0.1
-      ,,,,,,
-      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
-      :doc:`MIGraphX <amdmigraphx:index>`,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.1.0,3.1.0,3.1.0,3.0.0,3.0.0
-      :doc:`MIVisionX <mivisionx:index>`,3.0.0,2.5.0,2.5.0,2.5.0,2.5.0,2.5.0
-      :doc:`RPP <rpp:index>`,1.8.0,1.5.0,1.5.0,1.5.0,1.4.0,1.4.0
-      :doc:`rocAL <rocal:index>`,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.5.0,0.5.0,N/A,N/A
-      :doc:`rocPyDecode <rocpydecode:index>`,0.1.0,N/A,N/A,N/A,N/A,N/A
-      ,,,,,,
-      COMMUNICATION,".. _commlibs-support-compatibility-matrix-past-60:",,,,,
-      :doc:`RCCL <rccl:index>`,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
-      :doc:`hipBLAS <hipblas:index>`,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.7.0,0.7.0,0.7.0,0.6.0,0.6.0
-      :doc:`hipFFT <hipfft:index>`,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
-      :doc:`hipRAND <hiprand:index>`,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.1.1,2.1.1,2.1.0,2.0.0,2.0.0
-      :doc:`hipSPARSE <hipsparse:index>`,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.0,0.1.0,0.1.0,0.1.0,0.1.0
-      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.1.1,3.1.1,3.1.1,3.0.3,3.0.3
-      :doc:`rocBLAS <rocblas:index>`,4.2.0,4.1.2,4.1.0,4.1.0,4.0.0,4.0.0
-      :doc:`rocFFT <rocfft:index>`,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.0.1,3.0.1,3.0.1,3.0.0,2.10.17
-      :doc:`rocSOLVER <rocsolver:index>`,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.1.2,3.1.2,3.1.2,3.0.2,3.0.2
-      :doc:`rocWMMA <rocwmma:index>`,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.39.0,4.39.0
-      ,,,,,,
-      PRIMITIVES,".. _primitivelibs-support-compatibility-matrix-past-60:",,,,,
-      :doc:`hipCUB <hipcub:index>`,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.2.0,1.2.0,1.2.0,1.1.0,1.1.0
-      :doc:`rocPRIM <rocprim:index>`,3.2.0,3.1.0,3.1.0,3.1.0,3.0.0,3.0.0
-      :doc:`rocThrust <rocthrust:index>`,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.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.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.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.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,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
-      :doc:`ROCm SMI <rocm_smi_lib:index>`,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.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,N/A,N/A,N/A,N/A,N/A
-      :doc:`Omnitrace <omnitrace:index>`,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
-      :doc:`ROCProfiler <rocprofiler:index>`,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,N/A,N/A,N/A,N/A,N/A
-      :doc:`ROCTracer <roctracer:index>`,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.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.12.0,0.12.0,0.12.0,0.11.0,0.11.0
-      :doc:`ROCdbgapi <rocdbgapi:index>`,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.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.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
-      ,,,,,,
-      COMPILERS,".. _compilers-support-compatibility-matrix-past-60:",,,,,
-      `clang-ocl <https://github.com/ROCm/clang-ocl>`_,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.0.0,1.0.0,1.0.0,1.0.0,1.0.0
-      `Flang <https://github.com/ROCm/flang>`_,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.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.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.41133,6.1.40093,6.1.40092,6.1.40091,6.1.32831,6.1.32830
-      :doc:`HIP <hip:index>`,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
-      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.13.0,1.13.0,1.13.0,1.13.0,1.12.0,1.12.0
--- a/docs/how-to/llm-fine-tuning-optimization/llm-inference-frameworks.rst
+++ b/docs/how-to/llm-fine-tuning-optimization/llm-inference-frameworks.rst
@@ -16,7 +16,7 @@ This section discusses how to implement `vLLM <https://docs.vllm.ai/en/latest>`_
 vLLM inference
 ==============

-vLLM is renowned for its paged attention algorithm that can reduce memory consumption and increase throughput thanks to
+vLLM is renowned for its PagedAttention algorithm that can reduce memory consumption and increase throughput thanks to
 its paging scheme. Instead of allocating GPU high-bandwidth memory (HBM) for the maximum output token lengths of the
 models, the paged attention of vLLM allocates GPU HBM dynamically for its actual decoding lengths. This paged attention
 is also effective when multiple requests share the same key and value contents for a large value of beam search or
@@ -139,9 +139,7 @@ Refer to :ref:`mi300x-vllm-optimization` for performance optimization tips.

 ROCm provides a prebuilt optimized Docker image for validating the performance of LLM inference with vLLM 
 on the MI300X accelerator. The Docker image includes ROCm, vLLM, PyTorch, and tuning files in the CSV 
-format. For more information, see the guide to 
-`LLM inference performance validation with vLLM on the AMD Instinct™ MI300X accelerator <https://github.com/ROCm/MAD/blob/develop/benchmark/vllm/README.md>`_ 
-on the ROCm GitHub repository.
+format. For more information, see :doc:`/how-to/performance-validation/mi300x/vllm-benchmark`.

 .. _fine-tuning-llms-tgi:

--- a/docs/how-to/performance-validation/mi300x/vllm-benchmark.rst
+++ b/docs/how-to/performance-validation/mi300x/vllm-benchmark.rst
@@ -0,0 +1,407 @@
+.. meta::
+   :description: Learn how to validate LLM inference performance on MI300X accelerators using AMD MAD and the unified
+                 ROCm Docker image.
+   :keywords: model, MAD, automation, dashboarding, validate
+
+***********************************************************
+LLM inference performance validation on AMD Instinct MI300X
+***********************************************************
+
+.. _vllm-benchmark-unified-docker:
+
+The `ROCm vLLM Docker <https://hub.docker.com/r/rocm/vllm/tags>`_ image offers
+a prebuilt, optimized environment designed for validating large language model
+(LLM) inference performance on the AMD Instinct™ MI300X accelerator. This
+ROCm vLLM Docker image integrates vLLM and PyTorch tailored specifically for the
+MI300X accelerator and includes the following components:
+
+* `ROCm 6.2.1 <https://github.com/ROCm/ROCm>`_
+
+* `vLLM 0.6.4 <https://docs.vllm.ai/en/latest>`_
+
+* `PyTorch 2.5.0 <https://github.com/pytorch/pytorch>`_
+
+* Tuning files (in CSV format)
+
+With this Docker image, you can quickly validate the expected inference
+performance numbers on the MI300X accelerator. This topic also provides tips on
+optimizing performance with popular AI models.
+
+.. hlist::
+   :columns: 6
+
+   * Llama 3.1 8B
+
+   * Llama 3.1 70B
+
+   * Llama 3.1 405B
+
+   * Llama 2 7B
+
+   * Llama 2 70B
+
+   * Mixtral 8x7B
+
+   * Mixtral 8x22B
+
+   * Mixtral 7B
+
+   * Qwen2 7B
+
+   * Qwen2 72B
+
+   * JAIS 13B
+
+   * JAIS 30B
+
+.. _vllm-benchmark-vllm:
+
+.. note::
+
+   vLLM is a toolkit and library for LLM inference and serving. AMD implements
+   high-performance custom kernels and modules in vLLM to enhance performance.
+   See :ref:`fine-tuning-llms-vllm` and :ref:`mi300x-vllm-optimization` for
+   more information.
+
+Getting started
+===============
+
+Use the following procedures to reproduce the benchmark results on an
+MI300X accelerator with the prebuilt vLLM Docker image.
+
+.. _vllm-benchmark-get-started:
+
+1. Disable NUMA auto-balancing.
+
+   To optimize performance, disable automatic NUMA balancing. Otherwise, the GPU
+   might hang until the periodic balancing is finalized. For more information,
+   see :ref:`AMD Instinct MI300X system optimization <mi300x-disable-numa>`.
+
+   .. code-block:: shell
+
+      # disable automatic NUMA balancing
+      sh -c 'echo 0 > /proc/sys/kernel/numa_balancing'
+      # check if NUMA balancing is disabled (returns 0 if disabled)
+      cat /proc/sys/kernel/numa_balancing
+      0
+
+2. Download the :ref:`ROCm vLLM Docker image <vllm-benchmark-unified-docker>`.
+
+   Use the following command to pull the Docker image from Docker Hub.
+
+   .. code-block:: shell
+
+      docker pull rocm/vllm:rocm6.2_mi300_ubuntu20.04_py3.9_vllm_0.6.4
+
+Once setup is complete, you can choose between two options to reproduce the
+benchmark results:
+
+-  :ref:`MAD-integrated benchmarking <vllm-benchmark-mad>`
+
+-  :ref:`Standalone benchmarking <vllm-benchmark-standalone>`
+
+.. _vllm-benchmark-mad:
+
+MAD-integrated benchmarking
+===========================
+
+Clone the ROCm Model Automation and Dashboarding (`<https://github.com/ROCm/MAD>`__) repository to a local
+directory and install the required packages on the host machine.
+
+.. code-block:: shell
+
+   git clone https://github.com/ROCm/MAD
+   cd MAD
+   pip install -r requirements.txt
+
+Use this command to run a performance benchmark test of the Llama 3.1 8B model
+on one GPU with ``float16`` data type in the host machine.
+
+.. code-block:: shell
+
+   export MAD_SECRETS_HFTOKEN="your personal Hugging Face token to access gated models"
+   python3 tools/run_models.py --tags pyt_vllm_llama-3.1-8b --keep-model-dir --live-output --timeout 28800
+
+ROCm MAD launches a Docker container with the name
+``container_ci-pyt_vllm_llama-3.1-8b``. The latency and throughput reports of the
+model are collected in the following path: ``~/MAD/reports_float16/``.
+
+Although the following models are preconfigured to collect latency and
+throughput performance data, you can also change the benchmarking parameters.
+Refer to the :ref:`Standalone benchmarking <vllm-benchmark-standalone>` section.
+
+Available models
+----------------
+
+.. hlist::
+   :columns: 3
+
+   * ``pyt_vllm_llama-3.1-8b``
+
+   * ``pyt_vllm_llama-3.1-70b``
+
+   * ``pyt_vllm_llama-3.1-405b``
+
+   * ``pyt_vllm_llama-2-7b``
+
+   * ``pyt_vllm_llama-2-70b``
+
+   * ``pyt_vllm_mixtral-8x7b``
+
+   * ``pyt_vllm_mixtral-8x22b``
+
+   * ``pyt_vllm_mistral-7b``
+
+   * ``pyt_vllm_qwen2-7b``
+
+   * ``pyt_vllm_qwen2-72b``
+
+   * ``pyt_vllm_jais-13b``
+
+   * ``pyt_vllm_jais-30b``
+
+   * ``pyt_vllm_llama-3.1-8b_fp8``
+
+   * ``pyt_vllm_llama-3.1-70b_fp8``
+
+   * ``pyt_vllm_llama-3.1-405b_fp8``
+
+   * ``pyt_vllm_mixtral-8x7b_fp8``
+
+   * ``pyt_vllm_mixtral-8x22b_fp8``
+
+.. _vllm-benchmark-standalone:
+
+Standalone benchmarking
+=======================
+
+You can run the vLLM benchmark tool independently by starting the
+:ref:`Docker container <vllm-benchmark-get-started>` as shown in the following
+snippet.
+
+.. code-block::
+
+   docker pull rocm/vllm:rocm6.2_mi300_ubuntu20.04_py3.9_vllm_0.6.4
+   docker run -it --device=/dev/kfd --device=/dev/dri --group-add video --shm-size 128G --security-opt seccomp=unconfined --security-opt apparmor=unconfined --cap-add=SYS_PTRACE -v $(pwd):/workspace --env HUGGINGFACE_HUB_CACHE=/workspace --name vllm_v0.6.4 rocm/vllm:rocm6.2_mi300_ubuntu20.04_py3.9_vllm_0.6.4
+
+In the Docker container, clone the ROCm MAD repository and navigate to the
+benchmark scripts directory at ``~/MAD/scripts/vllm``.
+
+.. code-block::
+
+   git clone https://github.com/ROCm/MAD
+   cd MAD/scripts/vllm
+
+Command
+-------
+
+To start the benchmark, use the following command with the appropriate options.
+See :ref:`Options <vllm-benchmark-standalone-options>` for the list of
+options and their descriptions.
+
+.. code-block:: shell
+
+   ./vllm_benchmark_report.sh -s $test_option -m $model_repo -g $num_gpu -d $datatype
+
+See the :ref:`examples <vllm-benchmark-run-benchmark>` for more information.
+
+.. note::
+
+   The input sequence length, output sequence length, and tensor parallel (TP) are
+   already configured. You don't need to specify them with this script.
+
+.. note::
+
+   If you encounter the following error, pass your access-authorized Hugging
+   Face token to the gated models.
+
+   .. code-block:: shell
+
+      OSError: You are trying to access a gated repo.
+
+      # pass your HF_TOKEN
+      export HF_TOKEN=$your_personal_hf_token
+
+.. _vllm-benchmark-standalone-options:
+
+Options
+-------
+
+.. list-table::
+   :header-rows: 1
+   :align: center
+
+   * - Name
+     - Options
+     - Description
+
+   * - ``$test_option``
+     - latency
+     - Measure decoding token latency
+
+   * -
+     - throughput
+     - Measure token generation throughput
+
+   * -
+     - all
+     - Measure both throughput and latency
+
+   * - ``$model_repo``
+     - ``meta-llama/Meta-Llama-3.1-8B-Instruct``
+     - Llama 3.1 8B
+
+   * - (``float16``)
+     - ``meta-llama/Meta-Llama-3.1-70B-Instruct``
+     - Llama 3.1 70B
+
+   * -
+     - ``meta-llama/Meta-Llama-3.1-405B-Instruct``
+     - Llama 3.1 405B
+
+   * -
+     - ``meta-llama/Llama-2-7b-chat-hf``
+     - Llama 2 7B
+
+   * -
+     - ``meta-llama/Llama-2-70b-chat-hf``
+     - Llama 2 70B
+
+   * -
+     - ``mistralai/Mixtral-8x7B-Instruct-v0.1``
+     - Mixtral 8x7B
+
+   * -
+     - ``mistralai/Mixtral-8x22B-Instruct-v0.1``
+     - Mixtral 8x22B
+
+   * -
+     - ``mistralai/Mistral-7B-Instruct-v0.3``
+     - Mixtral 7B
+
+   * -
+     - ``Qwen/Qwen2-7B-Instruct``
+     - Qwen2 7B
+
+   * -
+     - ``Qwen/Qwen2-72B-Instruct``
+     - Qwen2 72B
+
+   * -
+     - ``core42/jais-13b-chat``
+     - JAIS 13B
+
+   * -
+     - ``core42/jais-30b-chat-v3``
+     - JAIS 30B
+
+   * - ``$model_repo``
+     - ``amd/Meta-Llama-3.1-8B-Instruct-FP8-KV``
+     - Llama 3.1 8B
+
+   * - (``float8``)
+     - ``amd/Meta-Llama-3.1-70B-Instruct-FP8-KV``
+     - Llama 3.1 70B
+
+   * -
+     - ``amd/Meta-Llama-3.1-405B-Instruct-FP8-KV``
+     - Llama 3.1 405B
+
+   * -
+     - ``amd/Mixtral-8x7B-Instruct-v0.1-FP8-KV``
+     - Mixtral 8x7B
+
+   * -
+     - ``amd/Mixtral-8x22B-Instruct-v0.1-FP8-KV``
+     - Mixtral 8x22B
+
+   * - ``$num_gpu``
+     - 1 or 8
+     - Number of GPUs
+
+   * - ``$datatype``
+     - ``float16`` or ``float8``
+     - Data type
+
+.. _vllm-benchmark-run-benchmark:
+
+Running the benchmark on the MI300X accelerator
+-----------------------------------------------
+
+Here are some examples of running the benchmark with various options.
+See :ref:`Options <vllm-benchmark-standalone-options>` for the list of
+options and their descriptions.
+
+Example 1: latency benchmark
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ 
+Use this command to benchmark the latency of the Llama 3.1 8B model on one GPU with the ``float16`` and ``float8`` data types.
+
+.. code-block::
+
+   ./vllm_benchmark_report.sh -s latency -m meta-llama/Meta-Llama-3.1-8B-Instruct -g 1 -d float16
+   ./vllm_benchmark_report.sh -s latency -m amd/Meta-Llama-3.1-8B-Instruct-FP8-KV -g 1 -d float8
+
+Find the latency reports at:
+
+- ``./reports_float16/summary/Meta-Llama-3.1-8B-Instruct_latency_report.csv``
+
+- ``./reports_float8/summary/Meta-Llama-3.1-8B-Instruct-FP8-KV_latency_report.csv``
+
+Example 2: throughput benchmark
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Use this command to benchmark the throughput of the Llama 3.1 8B model on one GPU with the ``float16`` and ``float8`` data types.
+
+.. code-block:: shell
+
+   ./vllm_benchmark_report.sh -s throughput -m meta-llama/Meta-Llama-3.1-8B-Instruct -g 1 -d float16
+   ./vllm_benchmark_report.sh -s throughput -m amd/Meta-Llama-3.1-8B-Instruct-FP8-KV -g 1 -d float8
+
+Find the throughput reports at:
+
+- ``./reports_float16/summary/Meta-Llama-3.1-8B-Instruct_throughput_report.csv``
+
+- ``./reports_float8/summary/Meta-Llama-3.1-8B-Instruct-FP8-KV_throughput_report.csv``
+
+.. raw:: html
+
+   <style>
+   mjx-container[jax="CHTML"][display="true"] {
+       text-align: left;
+       margin: 0;
+   }
+   </style>
+
+.. note::
+
+   Throughput is calculated as:
+
+   - .. math:: throughput\_tot = requests \times (\mathsf{\text{input lengths}} + \mathsf{\text{output lengths}}) / elapsed\_time
+
+   - .. math:: throughput\_gen = requests \times \mathsf{\text{output lengths}} / elapsed\_time
+
+Further reading
+===============
+
+- For application performance optimization strategies for HPC and AI workloads,
+  including inference with vLLM, see :doc:`/how-to/tuning-guides/mi300x/workload`.
+
+- To learn more about the options for latency and throughput benchmark scripts,
+  see `<https://github.com/ROCm/vllm/tree/main/benchmarks>`_.
+
+- To learn more about system settings and management practices to configure your system for
+  MI300X accelerators, see :doc:`/how-to/system-optimization/mi300x`.
+
+- To learn how to run LLM models from Hugging Face or your own model, see
+  :doc:`Using ROCm for AI </how-to/rocm-for-ai/index>`.
+
+- To learn how to optimize inference on LLMs, see
+  :doc:`Fine-tuning LLMs and inference optimization </how-to/llm-fine-tuning-optimization/index>`.
+
+- For a list of other ready-made Docker images for ROCm, see the
+  :doc:`Docker image support matrix <rocm-install-on-linux:reference/docker-image-support-matrix>`.
+
+- To compare with the previous version of the ROCm vLLM Docker image for performance validation, refer to
+  `LLM inference performance validation on AMD Instinct MI300X (ROCm 6.2.0) <https://rocm.docs.amd.com/en/docs-6.2.0/how-to/performance-validation/mi300x/vllm-benchmark.html>`_.
+
--- a/docs/how-to/rocm-for-ai/deploy-your-model.rst
+++ b/docs/how-to/rocm-for-ai/deploy-your-model.rst
@@ -46,9 +46,7 @@ Validating vLLM performance

 ROCm provides a prebuilt optimized Docker image for validating the performance of LLM inference with vLLM 
 on the MI300X accelerator. The Docker image includes ROCm, vLLM, PyTorch, and tuning files in the CSV 
-format. For more information, see the guide to 
-`LLM inference performance validation with vLLM on the AMD Instinct™ MI300X accelerator <https://github.com/ROCm/MAD/blob/develop/benchmark/vllm/README.md>`_ 
-on the ROCm GitHub repository.
+format. For more information, see :doc:`/how-to/performance-validation/mi300x/vllm-benchmark`.

 .. _rocm-for-ai-serve-hugging-face-tgi:

--- a/docs/how-to/rocm-for-ai/install.rst
+++ b/docs/how-to/rocm-for-ai/install.rst
@@ -22,7 +22,7 @@ If you’re new to ROCm, refer to the :doc:`ROCm quick start install guide for L
 <rocm-install-on-linux:install/quick-start>`.

 If you’re using a Radeon GPU for graphics-accelerated applications, refer to the
-:doc:`Radeon installation instructions <radeon:docs/install/install-radeon>`.
+`Radeon installation instructions <https://rocm.docs.amd.com/projects/radeon/en/docs-6.1.3/docs/install/native_linux/install-radeon.html>`_.

 ROCm supports multiple :doc:`installation methods <rocm-install-on-linux:install/install-overview>`:

--- a/docs/how-to/system-optimization/mi100.md
+++ b/docs/how-to/system-optimization/mi100.md
@@ -342,8 +342,8 @@ If SMT is enabled by setting "CCD/Core/Thread Enablement > SMT Control" to
 (logical) cores of the system:

 * In the server BIOS, set IOMMU to "Enabled".
-* When configuring the Grub boot loader, add the following arguments for the
-  Linux kernel: `amd_iommu=on iommu=pt`
+* When configuring the Grub boot loader, add the following argument for the
+  Linux kernel: `iommu=pt`
 * Update Grub to use the modified configuration:

  ```shell
@@ -355,7 +355,7 @@ If SMT is enabled by setting "CCD/Core/Thread Enablement > SMT Control" to

  ```none
  [...]
-  [   0.000000] Kernel command line: [...] amd_iommu=on iommu=pt
+  [   0.000000] Kernel command line: [...] iommu=pt
     [...]
  ```

--- a/docs/how-to/system-optimization/mi200.md
+++ b/docs/how-to/system-optimization/mi200.md
@@ -327,8 +327,8 @@ If SMT is enabled by setting "CCD/Core/Thread Enablement > SMT Control" to
 (logical) cores of the system:

 * In the server BIOS, set IOMMU to "Enabled".
-* When configuring the Grub boot loader, add the following arguments for the
-  Linux kernel: `amd_iommu=on iommu=pt`
+* When configuring the Grub boot loader, add the following argument for the
+  Linux kernel: `iommu=pt`
 * Update Grub to use the modified configuration:

  ```shell
@@ -340,7 +340,7 @@ If SMT is enabled by setting "CCD/Core/Thread Enablement > SMT Control" to

  ```none
  [...]
-  [   0.000000] Kernel command line: [...] amd_iommu=on iommu=pt
+  [   0.000000] Kernel command line: [...] iommu=pt
     [...]
  ```

--- a/docs/how-to/system-optimization/mi300x.rst
+++ b/docs/how-to/system-optimization/mi300x.rst
@@ -299,7 +299,7 @@ For a system that has AMD host CPUs add this to ``GRUB_CMDLINE_LINUX``:

 .. code-block:: text

-   amd_iommu=on iommu=pt
+   iommu=pt

 Otherwise, if the system has Intel host CPUs add this instead to
 ``GRUB_CMDLINE_LINUX``:
@@ -500,7 +500,7 @@ If SMT is enabled by setting ``CCD/Core/Thread Enablement > SMT Control`` to

 #. In the server BIOS, set IOMMU to ``Enabled``.

-#. When configuring the GRUB boot loader, add the following arguments for the Linux kernel: ``amd_iommu=on iommu=pt``.
+#. When configuring the GRUB boot loader, add the following argument for the Linux kernel: ``iommu=pt``.

 #. Update GRUB.

@@ -515,7 +515,7 @@ If SMT is enabled by setting ``CCD/Core/Thread Enablement > SMT Control`` to
 .. code-block:: shell

   [...]
-   [   0.000000] Kernel command line: [...] amd_iommu=on iommu=pt
+   [   0.000000] Kernel command line: [...] iommu=pt
   [...]

 Once the system is properly configured, ROCm software can be
--- a/docs/how-to/system-optimization/w6000-v620.md
+++ b/docs/how-to/system-optimization/w6000-v620.md
@@ -111,7 +111,7 @@ sudo virsh net-start default /*to enable Virtual network by default
 Enable input-output memory management unit (IOMMU) in GRUB settings by adding the following line to `/etc/default/grub`:

 ```none
-GRUB_CMDLINE_LINUX_DEFAULT="quiet splash amd_iommu=on" for AMD CPU
+GRUB_CMDLINE_LINUX_DEFAULT="quiet splash" for AMD CPU
 ```

 Update grub and reboot
--- a/docs/how-to/tuning-guides/mi300x/index.rst
+++ b/docs/how-to/tuning-guides/mi300x/index.rst
@@ -8,6 +8,8 @@ accelerators. They include detailed instructions on system settings and
 application tuning suggestions to help you fully leverage the capabilities of
 these accelerators, thereby achieving optimal performance.

+* :doc:`/how-to/performance-validation/mi300x/vllm-benchmark`
+
 * :doc:`/how-to/tuning-guides/mi300x/system`

 * :doc:`/how-to/tuning-guides/mi300x/workload`
--- a/docs/how-to/tuning-guides/mi300x/workload.rst
+++ b/docs/how-to/tuning-guides/mi300x/workload.rst
@@ -152,9 +152,7 @@ address any new bottlenecks that may emerge.

 ROCm provides a prebuilt optimized Docker image that has everything required to implement
 the tips in this section. It includes ROCm, vLLM, PyTorch, and tuning files in the CSV 
-format. For more information, see the guide to 
-`LLM inference performance validation with vLLM on the AMD Instinct™ MI300X accelerator <https://github.com/ROCm/MAD/blob/develop/benchmark/vllm/README.md>`_ 
-on the ROCm GitHub repository.
+format. For more information, see :doc:`/how-to/performance-validation/mi300x/vllm-benchmark`.

 .. _mi300x-profiling-tools:

@@ -378,11 +376,10 @@ Refer to `vLLM documentation <https://docs.vllm.ai/en/latest/models/performance.
 for additional performance tips. :ref:`fine-tuning-llms-vllm` describes vLLM
 usage with ROCm.

-ROCm provides a prebuilt optimized Docker image for validating the performance of LLM inference with vLLM 
-on the MI300X accelerator. The Docker image includes ROCm, vLLM, PyTorch, and tuning files in the CSV 
-format. For more information, see the guide to 
-`LLM inference performance validation with vLLM on the AMD Instinct™ MI300X accelerator <https://github.com/ROCm/MAD/blob/develop/benchmark/vllm/README.md>`_ 
-on the ROCm GitHub repository.
+ROCm provides a prebuilt optimized Docker image for validating the performance
+of LLM inference with vLLM on the MI300X accelerator. The Docker image includes
+ROCm, vLLM, PyTorch, and tuning files in the CSV format. For more information,
+see :doc:`/how-to/performance-validation/mi300x/vllm-benchmark`.

 Maximize throughput
 -------------------
--- a/docs/index.md
+++ b/docs/index.md
@@ -23,57 +23,41 @@ Installation instructions are available from:
 ROCm documentation is organized into the following categories:

 ::::{grid} 1 2 2 2
+:gutter: 3
 :class-container: rocm-doc-grid

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ./data/banner-compatibility.jpg
-:img-alt: Compatibility information
-:padding: 2
+:::{grid-item-card} Compatibility
+:class-body: rocm-card-banner rocm-hue-2

 * [Compatibility matrix](./compatibility/compatibility-matrix.rst)
 * {doc}`Linux system requirements<rocm-install-on-linux:reference/system-requirements>`
 * {doc}`Windows system requirements<rocm-install-on-windows:reference/system-requirements>`
 * {doc}`Third-party support<rocm-install-on-linux:reference/3rd-party-support-matrix>`
-* {doc}`User/kernel space<rocm-install-on-linux:reference/user-kernel-space-compat-matrix>`
-* {doc}`Docker<rocm-install-on-linux:reference/docker-image-support-matrix>`
-* {doc}`OpenMP<llvm-project:conceptual/openmp>`
-* [Precision support](./compatibility/precision-support.rst)
-* {doc}`ROCm on Radeon GPUs<radeon:index>`
+* {doc}`User and kernel-space support matrix<rocm-install-on-linux:reference/user-kernel-space-compat-matrix>`
+* {doc}`Docker image support matrix<rocm-install-on-linux:reference/docker-image-support-matrix>`
+* {doc}`Use ROCm on Radeon GPUs<radeon:index>`
 :::

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ./data/banner-howto.jpg
-:img-alt: How-to documentation
-:padding: 2
+:::{grid-item-card} How to
+:class-body: rocm-card-banner rocm-hue-12

 * [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](./how-to/system-optimization/mi300x.rst)
-  * [AMD Instinct MI300A](./how-to/system-optimization/mi300a.rst)
-  * [AMD Instinct MI200](./how-to/system-optimization/mi200.md)
-  * [AMD Instinct MI100](./how-to/system-optimization/mi100.md)
-  * [AMD Instinct RDNA2](./how-to/system-optimization/w6000-v620.md)
-* [AMD Instinct MI300X tuning guides](./how-to/tuning-guides/mi300x/index.rst)
-  * [System tuning](./how-to/tuning-guides/mi300x/system.rst)
-  * [Workload tuning](./how-to/tuning-guides/mi300x/workload.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)
 * [System debugging](./how-to/system-debugging.md)
-* [GPU-enabled MPI](./how-to/gpu-enabled-mpi.rst)
+* [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)  
-* [GitHub examples](https://github.com/amd/rocm-examples)
+* [ROCm examples](https://github.com/amd/rocm-examples)
 :::

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ./data/banner-conceptual.jpg
-:img-alt: Conceptual documentation
-:padding: 2
+:::{grid-item-card} Conceptual
+:class-body: rocm-card-banner rocm-hue-8

-* [GPU architecture](./conceptual/gpu-arch.md)
+* [GPU architecture overview](./conceptual/gpu-arch.md)
 * [GPU memory](./conceptual/gpu-memory.md)
 * [File structure (Linux FHS)](./conceptual/file-reorg.md)
 * [GPU isolation techniques](./conceptual/gpu-isolation.md)
@@ -84,21 +68,13 @@ ROCm documentation is organized into the following categories:
 :::

 <!-- markdownlint-disable MD051 -->
-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ./data/banner-reference.jpg
-:img-alt: Reference documentation
-:padding: 2
+:::{grid-item-card} Reference
+:class-body: rocm-card-banner rocm-hue-6

-* [Libraries](./reference/api-libraries.md)
-  * [Artificial intelligence](#artificial-intelligence-apis)
-  * [C++ primitives](#cpp-primitives)
-  * [Communication](#communication-libraries)
-  * [Math](#math-apis)
-  * [Random number generators](#random-number-apis)
-  * [HIP runtime](#hip-runtime)
-* [ROCm tools and compilers](./reference/rocm-tools.md)
-* [GPU hardware specifications](./reference/gpu-arch-specs.rst)
+* [ROCm libraries](./reference/api-libraries.md)
+* [ROCm tools, compilers, and runtimes](./reference/rocm-tools.md)
+* [Accelerator and  GPU hardware specifications](./reference/gpu-arch-specs.rst)
+* [Precision support](./reference/precision-support.rst)
 :::
 <!-- markdownlint-enable MD051 -->

--- a/docs/reference/api-libraries.md
+++ b/docs/reference/api-libraries.md
@@ -9,15 +9,13 @@
 # ROCm libraries

 ::::{grid} 1 2 2 2
+:gutter: 3
 :class-container: rocm-doc-grid

 (artificial-intelligence-apis)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-ai.jpg
-:img-alt: Artificial intelligence APIs
-:padding: 2
+:::{grid-item-card} Machine Learning and Computer Vision
+:class-body: rocm-card-banner rocm-hue-3

 * {doc}`Composable Kernel <composable_kernel:index>`
 * {doc}`MIGraphX <amdmigraphx:index>`
@@ -31,11 +29,8 @@

 (cpp-primitives)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-cpp-primitives.jpg
-:img-alt: C++ primitives
-:padding: 2
+:::{grid-item-card} Primitives
+:class-body: rocm-card-banner rocm-hue-12

 * {doc}`hipCUB <hipcub:index>`
 * {doc}`hipTensor <hiptensor:index>`
@@ -45,22 +40,16 @@

 (communication-libraries)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-communication.jpg
-:img-alt: Communication APIs
-:padding: 2
+:::{grid-item-card} Communication
+:class-body: rocm-card-banner rocm-hue-7

 * {doc}`RCCL <rccl:index>`
 :::

 (math-apis)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-math.jpg
-:img-alt: Math APIs
-:padding: 2
+:::{grid-item-card} Math
+:class-body: rocm-card-banner rocm-hue-6

 * [half](https://github.com/ROCm/half)
 * {doc}`hipBLAS <hipblas:index>` / {doc}`rocBLAS <rocblas:index>`
--- a/docs/compatibility/precision-support.rst
+++ b/docs/compatibility/precision-support.rst
--- a/docs/reference/rocm-tools.md
+++ b/docs/reference/rocm-tools.md
@@ -9,15 +9,13 @@
 # ROCm tools, compilers, and runtimes

 ::::{grid} 1 2 2 2
+:gutter: 3
 :class-container: rocm-doc-grid

 (system-tools)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-system.jpg
-:img-alt: System tools
-:padding: 2
+:::{grid-item-card} System Management
+:class-body: rocm-card-banner rocm-hue-1

 * {doc}`AMD SMI <amdsmi:index>`
 * {doc}`ROCm Data Center Tool <rdc:index>`
@@ -28,11 +26,8 @@

 (performance-tools)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-performance.jpg
-:img-alt: Performance tools
-:padding: 2
+:::{grid-item-card} Performance
+:class-body: rocm-card-banner rocm-hue-6

 * {doc}`Omniperf <omniperf:index>`
 * {doc}`Omnitrace <omnitrace:index>`
@@ -44,11 +39,8 @@

 (development-tools)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-development.jpg
-:img-alt: Development tools
-:padding: 2
+:::{grid-item-card} Development
+:class-body: rocm-card-banner rocm-hue-1

 * {doc}`ROCm CMake <rocmcmakebuildtools:index>`
 * {doc}`HIPIFY <hipify:index>`
@@ -59,11 +51,8 @@

 (compilers)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-compilers.jpg
-:img-alt: Compilers
-:padding: 2
+:::{grid-item-card} Compilers
+:class-body: rocm-card-banner rocm-hue-8

 * {doc}`ROCm Compilers <llvm-project:index>`
 * {doc}`HIPCC <hipcc:index>`
@@ -72,11 +61,8 @@

 (runtimes)=

-:::{grid-item-card}
-:class-card: sd-text-black
-:img-top: ../data/reference/banner-runtimes.jpg
-:img-alt: Runtimes
-:padding: 2
+:::{grid-item-card} Runtimes
+:class-body: rocm-card-banner rocm-hue-12

 * {doc}`AMD Common Language Runtime (CLR) <hip:understand/amd_clr>`
 * {doc}`HIP <hip:index>`
--- a/docs/release/versions.md
+++ b/docs/release/versions.md
@@ -8,6 +8,7 @@

 | Version | Release date |
 | ------- | ------------ |
+| [6.2.1](https://rocm.docs.amd.com/en/docs-6.2.1/) | September 20, 2024 |
 | [6.2.0](https://rocm.docs.amd.com/en/docs-6.2.0/) | August 2, 2024 |
 | [6.1.2](https://rocm.docs.amd.com/en/docs-6.1.2/) | June 4, 2024 |
 | [6.1.1](https://rocm.docs.amd.com/en/docs-6.1.1/) | May 8, 2024 |
--- a/docs/sphinx/_toc.yml.in
+++ b/docs/sphinx/_toc.yml.in
@@ -70,9 +70,11 @@ subtrees:
      - file: how-to/system-optimization/w6000-v620.md
        title: AMD RDNA 2
  - file: how-to/tuning-guides/mi300x/index.rst
-    title: AMD MI300X tuning guides
+    title: AMD MI300X performance validation and tuning
    subtrees:
    - entries:
+      - file: how-to/performance-validation/mi300x/vllm-benchmark.rst
+        title: Performance validation
      - file: how-to/tuning-guides/mi300x/system.rst
        title: System tuning
      - file: how-to/tuning-guides/mi300x/workload.rst
@@ -100,13 +102,17 @@ subtrees:
  - file: compatibility/compatibility-matrix.rst
    title: Compatibility matrix
  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/system-requirements.html
-    title: Linux
+    title: Linux system requirements
  - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html
-    title: Windows
-  - file: compatibility/precision-support.rst
-    title: Precision support
+    title: Windows system requirements
  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/3rd-party-support-matrix.html
-    title: Third-party
+    title: Third-party support
+  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/user-kernel-space-compat-matrix.html
+    title: User and kernel-space support matrix
+  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/docker-image-support-matrix.html
+    title: Docker image support matrix
+  - url: https://rocm.docs.amd.com/projects/radeon/en/latest/index.html
+    title: Use ROCm on Radeon GPUs

 - caption: Conceptual
  entries:
@@ -163,6 +169,8 @@ subtrees:
      title: ROCm tools, compilers, and runtimes
    - file: reference/gpu-arch-specs.rst
      title: Hardware specifications
+    - file: reference/precision-support.rst
+      title: Precision support

 - caption: Contribute
  entries:
--- a/docs/sphinx/requirements.in
+++ b/docs/sphinx/requirements.in
@@ -1,2 +1,2 @@
-rocm-docs-core==1.7.2
+rocm-docs-core==1.8.1
 sphinx-reredirects
--- a/docs/sphinx/requirements.txt
+++ b/docs/sphinx/requirements.txt
@@ -92,7 +92,7 @@ requests==2.32.3
    # via
    #   pygithub
    #   sphinx
-rocm-docs-core==1.7.2
+rocm-docs-core==1.8.1
    # via -r requirements.in
 smmap==5.0.1
    # via gitdb
--- a/docs/temp/conceptual-index.md
+++ b/docs/temp/conceptual-index.md
@@ -1,54 +0,0 @@
-# Conceptual documentation
-
-:::::{grid} 1 1 2 2
-:gutter: 1
-
-:::{grid-item-card}
-**[Compiler nomenclature](./compiler-disambiguation.md)**
-
-ROCm ships multiple compilers of varying origins and purposes. This article
-disambiguates compiler naming used throughout the documentation.
-
-:::
-
-:::{grid-item-card}
-**[Using CMake](./cmake-packages.rst)**
-
-ROCm components ship with 1st party CMake support. This article details how that
-support works and how to use it.
-
-:::
-
-:::{grid-item-card}
-**[Linux folder structure reorganization](./file-reorg.md)**
-
-ROCm™ packages have adopted the Linux foundation file system hierarchy standard
-to ensure ROCm components follow open source conventions for Linux-based
-distributions.
-
-:::
-
-:::{grid-item-card}
-**[GPU isolation techniques](./gpu-isolation.md)**
-
-Restricting the access of applications to a subset of GPUs, aka isolating GPUs
-allows users to hide GPU resources from programs.
-
-:::
-
-:::{grid-item-card}
-**[GPU architectures](./gpu-arch.md)**
-
-AMD documentation around architectural details from both the CDNA and RDNA
-product lines.
-
-:::
-
-:::{grid-item-card}
-**[GPU memory](./gpu-memory.md)**
-
-Learn about the different types of memory allocations.
-
-:::
-
-:::::
--- a/docs/temp/gpu_libraries.md
+++ b/docs/temp/gpu_libraries.md
@@ -1 +0,0 @@
-# GPU Libraries
--- a/docs/temp/how-to-index.md
+++ b/docs/temp/how-to-index.md
@@ -1,34 +0,0 @@
-# How-to documentation
-
-:::::{grid} 1 1 2 2
-:gutter: 1
-
-:::{grid-item-card}
-**[Tuning guides](./tuning-guides/index.md)**
-
-Use case-specific system setup and tuning guides.
-
-:::
-
-:::{grid-item-card}
-**[Deep-learning guide](./deep-learning-rocm.md)**
-
-Installation of various deep learning frameworks and applications.
-
-:::
-
-:::{grid-item-card}
-**[GPU-enabled MPI](./gpu-enabled-mpi.rst)**
-
-This chapter exemplifies how to set up Open MPI with the ROCm platform.
-
-:::
-
-:::{grid-item-card}
-**[System debugging guide](./system-debugging.md)**
-
-Useful commands to debug misbehaving ROCm installations.
-
-:::
-
-:::::
--- a/docs/temp/install-index.md
+++ b/docs/temp/install-index.md
@@ -1,30 +0,0 @@
-# ROCm tutorials
-
-:::::{grid} 1 1 2 2
-:gutter: 1
-
-:::{grid-item-card}
-**[Installing ROCm](./install/index.md)**
-
-Learn how to install ROCm on Linux and Windows.
-
-:::
-
-:::{grid-item-card}
-**[ROCm examples](https://github.com/amd/rocm-examples)**
-
-Sample code demonstrating the HIP API and ROCm-accelerated domain libraries.
-
-:::
-
-:::{grid-item-card}
-**Artificial intelligence**
-
-Detailed walkthroughs of specific artificial intelligence use cases using ROCm acceleration.
-
-* [Implementing Inception v3 on ROCm with PyTorch](../conceptual/ai-pytorch-inception.md)
-* [Optimizing inference with MIGraphX](../conceptual/ai-migraphx-optimization.md)
-
-:::
-
-:::::
--- a/docs/temp/kernel_userspace.md
+++ b/docs/temp/kernel_userspace.md
@@ -1 +0,0 @@
-# Kernel and User Space Compatibility
--- a/docs/temp/packaging_guidelines.md
+++ b/docs/temp/packaging_guidelines.md
@@ -1 +0,0 @@
-# Packaging Guidelines
--- a/docs/temp/rocm-a-z.md
+++ b/docs/temp/rocm-a-z.md
@@ -1,64 +0,0 @@
-# ROCm A-Z
-
-:::{table}
-:name: rocm-a-z
-
-| ROCm product | Description |
-| :---------------- | :------------ |
-| [AMD Compute Language Runtimes (CLR)](https://github.com/ROCm/clr) | Contains source code for AMD's compute languages runtimes: {doc}`HIP <hip:index>` and OpenCL |
-| [AMDMIGraphX](https://github.com/ROCm/AMDMIGraphX/) | A graph inference engine that accelerates machine learning model inference |
-| [AOMP](https://github.com/ROCm/aomp/) | A scripted build of [LLVM](https://github.com/ROCm/llvm-project) and supporting software |
-| [Asynchronous Task and Memory Interface (ATMI)](https://github.com/ROCm/atmi/) | A runtime framework for efficient task management in heterogeneous CPU-GPU systems |
-| [Composable Kernel](https://rocm.docs.amd.com/projects/composable_kernel/en/latest/) | A library that aims to provide a programming model for writing performance critical kernels for machine learning workloads across multiple architectures |
-| [Flang](https://github.com/ROCm/flang/) | An out-of-tree Fortran compiler targeting LLVM |
-| [Half-precision floating point library (half)](https://github.com/ROCm/half/) | A C++ header-only library that provides an IEEE 754 conformant, 16-bit half-precision floating-point type along with corresponding arithmetic operators, type conversions, and common mathematical functions |
-| {doc}`HIP <hip:index>` | AMD’s GPU programming language extension and the GPU runtime |
-| [hipBLAS](https://github.com/ROCm/hipBLAS/) | A BLAS-marshaling library that supports [rocBLAS](https://rocm.docs.amd.com/projects/rocBLAS/en/latest/) and cuBLAS backends |
-| [HIPCC](https://rocm.docs.amd.com/projects/HIPCC/en/latest/) | A compiler driver utility that calls Clang or NVCC and passes the appropriate include and library options for the target compiler and HIP infrastructure |
-| [hipCUB](https://rocm.docs.amd.com/projects/hipCUB/en/latest/) | A thin header-only wrapper library on top of [rocPRIM](https://rocm.docs.amd.com/projects/rocPRIM/en/latest/) or CUB that allows project porting using the CUB library to the HIP layer |
-| [hipFFT](https://rocm.docs.amd.com/projects/hipFFT/en/latest/) | An FFT-marshalling library that supports rocFFT or cuFFT backends |
-| [hipfort](https://rocm.docs.amd.com/projects/hipfort/en/latest/) | A Fortran interface library for accessing GPU Kernels |
-| {doc}`HIPIFY <hipify:index>` | A set of tools for translating CUDA source code into portable HIP C++ |
-| [hipify-clang](https://rocm.docs.amd.com/projects/HIPIFY/en/latest/hipify-clang.html) | A Clang-based tool for translating CUDA sources into HIP sources |
-| [hipify-perl](https://rocm.docs.amd.com/projects/HIPIFY/en/latest/hipify-perl.html) | An autogenerated, perl-based script that translates CUDA source code into portable HIP C++ |
-| [hipSOLVER](https://rocm.docs.amd.com/projects/hipSOLVER/en/latest/) | A LAPACK-marshalling library that supports [rocSOLVER](https://rocm.docs.amd.com/projects/rocSOLVER/en/latest/) and cuSOLVER backends |
-| [hipSPARSE](https://rocm.docs.amd.com/projects/hipSPARSE/en/latest/)  | A SPARSE-marshalling library that supports [rocSPARSE](https://rocm.docs.amd.com/projects/rocSPARSE/en/latest/) and cuSPARSE backends |
-| [hipTensor](https://github.com/ROCm/hipTensor) | AMD's C++ library for accelerating tensor primitives based on the composable kernel library |
-| [LLVM](https://github.com/ROCm/llvm-project) | A toolkit for the construction of highly optimized compilers, optimizers, and run-time environments |
-| [MIGraphX](https://rocm.docs.amd.com/projects/AMDMIGraphX/en/latest/) | A graph inference engine that accelerates machine learning model inference |
-| [MIOpen](https://rocm.docs.amd.com/projects/MIOpen/en/latest/) | An open source deep-learning library |
-| [MIOpenGEMM](https://github.com/ROCm/MIOpenGEMM) | An OpenCL general matrix multiplication (GEMM) API and kernel generator |
-| [MIOpenTensile](https://github.com/ROCm/MIOpenTensile) | Provides host-callable interfaces to Tensile library |
-| [MIVisionX](https://rocm.docs.amd.com/projects/MIVisionX/en/latest/doxygen/html/index.html) | A set of comprehensive computer vision and machine learning libraries, utilities, and applications |
-| [Radeon Compute Profiler (RCP)](https://github.com/GPUOpen-Tools/radeon_compute_profiler/) | A performance analysis tool that gathers data from the API run-time and GPU for OpenCL and ROCm/HSA applications |
-| [RCCL](https://rocm.docs.amd.com/projects/rccl/en/latest/) | A standalone library that provides multi-GPU and multi-node collective communication primitives |
-| [rocAL](https://rocm.docs.amd.com/projects/rocAL/en/latest/doxygen/html/index.html) | An augmentation library designed to decode and process images and videos |
-| [rocALUTION](https://rocm.docs.amd.com/projects/rocALUTION/en/latest/) | A sparse linear algebra library for exploring fine-grained parallelism on ROCm runtime and toolchains |
-| [RocBandwidthTest](https://github.com/ROCm/rocm_bandwidth_test/) | Captures the performance characteristics of buffer copying and kernel read/write operations |
-| [rocBLAS](https://rocm.docs.amd.com/projects/rocBLAS/en/latest/)| A BLAS implementation (in the HIP programming language) on the ROCm runtime and toolchains |
-| [rocFFT](https://rocm.docs.amd.com/projects/rocFFT/en/latest/) | A software library for computing fast Fourier transforms (FFTs) written in HIP |
-| [ROCK-Kernel-Driver](https://github.com/ROCm/ROCK-Kernel-Driver/) | An AMDGPU Driver with KFD that is used by ROCm |
-| [ROCm Augmentation Library (rocAL)](https://rocm.docs.amd.com/projects/rocAL/en/latest/doxygen/html/index.html) | An augmentation library designed to decode and process images and videos |
-| [ROCmCC](https://rocm.docs.amd.com/en/latest/reference/rocmcc/rocmcc.html) | A Clang/LLVM-based compiler |
-| [ROCm cmake](https://github.com/ROCm/rocm-cmake) | A collection of CMake modules for common build and development tasks |
-| [ROCm Data Center Tool](https://rocm.docs.amd.com/projects/rdc/en/latest/) | Simplifies administration and addresses key infrastructure challenges in AMD GPUs in cluster and data-center environments |
-| [ROCm Debug Agent Library (ROCdebug-agent)](https://github.com/ROCm/rocr_debug_agent/) | A library that can print the state of all AMD GPU wavefronts that caused a queue error by sending a SIGQUIT signal to the process while the program is running |
-| [ROCm Debugger (ROCgdb)](https://rocm.docs.amd.com/projects/ROCgdb/en/latest/) | A source-level debugger for Linux, based on the GNU Debugger (GDB) |
-| [ROCm Debugger API (ROCdbgapi)](https://rocm.docs.amd.com/projects/ROCdbgapi/en/latest/) | The ROCm debugger library |
-| [rocminfo](https://github.com/ROCm/rocminfo/) | Reports system information |
-| [ROCm SMI](https://github.com/ROCm/rocm_smi_lib/) | A C library for Linux that provides a user space interface for applications to monitor and control GPU applications |
-| [ROCm Validation Suite](https://rocm.docs.amd.com/projects/ROCmValidationSuite/en/latest/) | A tool for detecting and troubleshooting common problems affecting AMD GPUs running in a high-performance computing environment |
-| [rocPRIM](https://rocm.docs.amd.com/projects/rocPRIM/en/latest/) | A header-only library for HIP parallel primitives |
-| [ROCProfiler](https://rocm.docs.amd.com/projects/rocprofiler/en/latest/profiler_home_page.html) | A profiling tool for HIP applications |
-| [rocRAND](https://rocm.docs.amd.com/projects/rocRAND/en/latest/) | Provides functions that generate pseudorandom and quasirandom numbers |
-| [ROCR-Runtime](https://github.com/ROCm/ROCR-Runtime/) | User-mode API interfaces and libraries necessary for host applications to launch compute kernels on available HSA ROCm kernel agents |
-| [rocSOLVER](https://rocm.docs.amd.com/projects/rocSOLVER/en/latest/) | An implementation of LAPACK routines on the ROCm platform, implemented in the HIP programming language and optimized for AMD’s latest discrete GPUs |
-| [rocSPARSE](https://rocm.docs.amd.com/projects/rocSPARSE/en/latest/) | Exposes a common interface that provides BLAS for sparse computation implemented on ROCm runtime and toolchains (in the HIP programming language) |
-| [rocThrust](https://rocm.docs.amd.com/projects/rocThrust/en/latest/) | A parallel algorithm library |
-| [ROCT-Thunk-Interface](https://github.com/ROCm/ROCT-Thunk-Interface/) | User-mode API interfaces used to interact with the ROCk driver |
-| [ROCTracer](https://rocm.docs.amd.com/projects/roctracer/en/latest/) | Intercepts runtime API calls and traces asynchronous activity |
-| [rocWMMA](https://rocm.docs.amd.com/projects/rocWMMA/en/latest/index.html) | A C++ library for accelerating mixed-precision matrix multiply-accumulate (MMA) operations |
-| [Tensile](https://github.com/ROCm/Tensile) | A tool for creating benchmark-driven backend libraries for GEMMs, GEMM-like problems, and general N-dimensional tensor contractions |
-| [TransferBench](https://rocm.docs.amd.com/projects/TransferBench/en/latest/) | A utility to benchmark simultaneous transfers between user-specified devices (CPUs/GPUs) |
-
-:::
--- a/docs/temp/troubleshooting.md
+++ b/docs/temp/troubleshooting.md
@@ -1,50 +0,0 @@
-# Troubleshooting
-
-**Q: What do I do if I get this error when trying to run PyTorch:**
-
-```bash
-hipErrorNoBinaryForGPU: Unable to find code object for all current devices!
-```
-
-Ans: The error denotes that the installation of PyTorch and/or other
-dependencies or libraries do not support the current GPU.
-
-**Workaround:**
-
-To implement a workaround, follow these steps:
-
-1. Confirm that the hardware supports the ROCm stack. Refer to
-{ref}`linux-support` and {ref}`windows-support`.
-
-2. Determine the gfx target.
-
-    ```bash
-    rocminfo | grep gfx
-    ```
-
-3. Check if PyTorch is compiled with the correct gfx target.
-
-    ```bash
-    TORCHDIR=$( dirname $( python3 -c 'import torch; print(torch.__file__)' ) )
-    roc-obj-ls -v $TORCHDIR/lib/libtorch_hip.so # check for gfx target
-    ```
-
-:::{note}
-    Recompile PyTorch with the right gfx target if compiling from the source if
-    the hardware is not supported. For wheels or Docker installation, contact
-    ROCm support [^ROCm_issues].
-:::
-
-**Q: Why am I unable to access Docker or GPU in user accounts?**
-
-Ans: Ensure that the user is added to docker, video, and render Linux groups as
-described in the ROCm Installation Guide at {ref}`linux_group_permissions`.
-
-**Q: Can I install PyTorch directly on bare metal?**
-
-Ans: Bare-metal installation of PyTorch is supported through wheels. Refer to
-Option 2: Install PyTorch Using Wheels Package. See {doc}`PyTorch for ROCm<rocm-install-on-linux:pytorch-install>` for more information.
-
-**Q: How do I profile PyTorch workloads?**
-
-Ans: Use the PyTorch Profiler to profile GPU kernels on ROCm.
--- a/tools/autotag/README.md
+++ b/tools/autotag/README.md
@@ -20,16 +20,16 @@
 * Run this for 5.6.0 (change for whatever version you require)
 * `GITHUB_ACCESS_TOKEN=my_token_here`

-To generate the changelog from 5.0.0 up to and including 6.1.2:
+To generate the changelog from 5.0.0 up to and including 6.2.0:

 ```sh
-python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --do-previous --compile_file ../../CHANGELOG.md --branch release/rocm-rel-6.1 6.1.2
+python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --starting-version=5.0.0 --compile_file ../../CHANGELOG.md --branch release/rocm-rel-6.2 6.2.0
 ```

-To generate the release notes only for 6.1.2:
+To generate the release notes only for 6.2.0:

 ```sh
-python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --compile_file ../../RELEASE.md --branch release/rocm-rel-6.1 6.1.2
+python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --compile_file ../../RELEASE.md --branch release/rocm-rel-6.2 6.2.0
 ```

 ### Notes
@@ -37,7 +37,7 @@ python3 tag_script.py -t $GITHUB_ACCESS_TOKEN --no-release --no-pulls --compile_
 > If branch cannot be found, edit default.xml at root.
 > Sometimes the script doesn't know whether to include or exclude an entry for a specific release. Continue this part by accepting (Y) or rejecting (N) entries.
 > The end result should be a newly generated changelog in the project root.
-> Compiling the changelog without the `--do-previous`-flag will always think that all libraries are new since no previous version of said library has been parsed.
+> If the `--starting-version` flag is not set, the script will not get changelogs from previous versions.
 > Trying to run without a token is possible but GitHub enforces stricter rate limits and is therefore not advised.

 * Copy over the first part of the changelog and replace the old release notes in RELEASE.md.
--- a/tools/autotag/tag_script.py
+++ b/tools/autotag/tag_script.py
@@ -91,7 +91,7 @@ class TaggingArgs(argparse.Namespace):
        return defaults + (self._exclude if self._exclude is not None else [])


-def parse_args() -> TaggingArgs:
+def parse_arguments() -> TaggingArgs:
    """Parse arguments."""

    def add_arg_pair(
@@ -153,7 +153,10 @@ def parse_args() -> TaggingArgs:
    )
    add_arg_pair(parser, "release", "the tag & release.")
    add_arg_pair(parser, "pulls", "the pull requests to internal repos.")
-    add_arg_pair(parser, "previous", " use previous versions as required.")
+    parser.add_argument(
+        "--starting-version",
+        help="The starting version for the autotag script.",
+    )
    parser.add_argument(
        "--manifest-url",
        help="The url to download the manifest.xml file from.",
@@ -183,7 +186,7 @@ def parse_args() -> TaggingArgs:

 def run_tagging():
    """Run the tagging/releasing process on each specified library."""
-    args = parse_args()
+    args = parse_arguments()

    # Use the manifest included in the ROCm GitHub repository by default.
    if args.manifest_url is None:
@@ -239,7 +242,7 @@ def run_tagging():
        "compilers",
        "runtimes",
    ]
-    projects = [ ]
+    projects = []
    for project in manifest_tree.iterfind(".//project"):
        if project.get("category") in included_categories:
            projects.append(project)
@@ -250,8 +253,8 @@ def run_tagging():
         entry.get("category"),
        ) for entry in projects)

-    # Get all the relevant ROCm releases, and only the last version if not doing previous.
-    minimum_version = "5.0.0" if args.previous else args.version
+    # Get all the relevant ROCm releases
+    minimum_version = args.version if not args.starting_version else args.starting_version
    releases = release_bundle_factory.create_data_dict(args.version, component_information, minimum_version)

    # Process the individual releases.
@@ -260,10 +263,11 @@ def run_tagging():
        for (_, library) in release.libraries.items():
            # Parse the changelog for each library and each version
            try:
+                is_starting_version_set = True if args.starting_version else False
                success = PROCESSORS[library.name](
                    library,
                    TEMPLATES[library.name],
-                    args.previous,
+                    is_starting_version_set,
                    Version(version) < Version(args.version)
                )
            except Exception as e:
--- a/tools/autotag/templates/changelog.jinja
+++ b/tools/autotag/templates/changelog.jinja
@@ -1,58 +1,75 @@
-# Release notes
-<!-- Do not edit this file! This file is autogenerated with -->
+<!-- Do not edit this file!                                 -->
+<!-- This file is autogenerated with                        -->
 <!--   tools/autotag/tag_script.py                          -->
-
 <!-- Disable lints since this is an auto-generated file.    -->
 <!-- markdownlint-disable blanks-around-headers             -->
 <!-- markdownlint-disable no-duplicate-header               -->
 <!-- markdownlint-disable no-blanks-blockquote              -->
 <!-- markdownlint-disable ul-indent                         -->
 <!-- markdownlint-disable no-trailing-spaces                -->
-{#-
-<!-- Disable lints that conflict with jinja.                -->
 <!-- markdownlint-disable reference-links-images            -->
 <!-- markdownlint-disable no-missing-space-atx              -->
-#}
-
-<!-- spellcheck-disable -->
-
-This page contains the release notes for AMD ROCm™ Software.
-
+<!-- spellcheck-disable                                     -->
 {%- for version, release in releases %}
+# ROCm {{version}} release notes

-------------------
-
-## ROCm {{version}}
-{{- "\n\n" -}}
 {%- set highlights = "./highlights/" ~ version ~ ".md" %}
 {%- include highlights ignore missing -%}
 {{- "\n\n" -}}
 {%- set support = "./support/" ~ version ~ ".md" %}
 {%- include support ignore missing -%}
+{{- "\n\n" -}}

-### Library changes in ROCm {{version}}
+## ROCm components

-| Category | Group | Name | Version | Repository |
-|----------|-------|------|---------|------------|
+<div class="pst-scrollable-table-container">
+    <table id="rocm-rn-components" class="table">
+        <thead>
+            <tr>
+                <th>Category</th>
+                <th>Group</th>
+                <th>Name</th>
+                <th>Version</th>
+                <th></th>
+            </tr>
+        </thead>
+        <colgroup>
+            <col span="1">
+            <col span="1">
+        </colgroup>
+        <tbody>
 {%- for lib_name in release.libraries %}
 {%- set lib = release.libraries[lib_name] %}
 {%- if rocm_ver_by_lib_ver[lib_name][lib.lib_version] == version and (prev_lib_ver[lib_name][lib.lib_version] | default([]) | length > 0) and lib.lib_version %}
-| {{ lib.category }} | {{ lib.group }} | [{{ lib_name }}]({{ lib.documentation_page }}) | {{prev_lib_ver[lib_name][lib.lib_version]}} ⇒ [{{ lib.lib_version }}]({{ lib.release_url }}) | [ROCm/{{ lib_name }}]({{ lib.repository_url }}) |
+            <tr>
+                <th>{{ lib.category }}</th>
+                <th>{{ lib.group }}</th>
+                <td><a href="{{ lib.documentation_page }}">{{ lib_name }}</a></td>
+                <td>{{ prev_lib_ver[lib_name][lib.lib_version] }}&nbsp;&Rightarrow;&nbsp;<a href="{{ lib.release_url }}">{{ lib.lib_version }}</a></td>
+                <td><a href="{{ lib.repository_url }}"><i class="fab fa-github fa-lg"></i></a></td>
+            </tr>
 {%- elif lib.lib_version %}
-| {{ lib.category }} | {{ lib.group }} | [{{ lib_name }}]({{ lib.documentation_page }}) | [{{ lib.lib_version }}]({{ lib.release_url }}) | [ROCm/{{ lib_name }}]({{ lib.repository_url }}) |
+            <tr>
+                <th>{{ lib.category }}</th>
+                <th>{{ lib.group }}</th>
+                <td><a href="{{ lib.documentation_page }}">{{ lib_name }}</a></td>
+                <td><a href="{{ lib.release_url }}">{{ lib.lib_version }}</a></td>
+                <td><a href="{{ lib.repository_url }}"><i class="fab fa-github fa-lg"></i></a></td>
+            </tr>
 {%- endif %}
-{%- endfor %}
+{%- endfor %}{# lib_name in release.libraries #}
+        </tbody>
+    </table>
+</div>

 {%- for lib_name, lib in release.libraries | dictsort %}
 {%- if rocm_ver_by_lib_ver[lib_name][lib.lib_version] == version and lib.lib_version%}

-#### {{lib_name}}
-
-{{lib.message}}
+### **{{lib_name}}** ({{ lib.lib_version }})

 {%- for type, change in lib.data.changes.items() %}

-##### {{type|title}}
+#### {{type|title}}

 {{change|trim|e}}

@@ -66,6 +83,9 @@ This page contains the release notes for AMD ROCm™ Software.
 {%- set known_issues = "./known_issues/" ~ version ~ ".md" %}
 {%- include known_issues ignore missing -%}
 {{- "\n\n" -}}
+{%- set resolved_issues = "./resolved_issues/" ~ version ~ ".md" %}
+{%- include resolved_issues ignore missing -%}
+{{- "\n\n" -}}
 {%- set upcoming_changes = "./upcoming_changes/" ~ version ~ ".md" %}
 {%- include upcoming_changes ignore missing -%}

--- a/tools/autotag/templates/highlights/5.3.0.md
+++ b/tools/autotag/templates/highlights/5.3.0.md
@@ -184,5 +184,5 @@ clinfo, and HelloWord.cl and cause a system crash.
 * IRQ remapping does not support X2APIC mode
 * NMI error

-Workaround: To avoid the system crash, add `amd_iommu=on iommu=pt` as the kernel bootparam, as
+Workaround: To avoid the system crash, add `iommu=pt` as the kernel bootparam, as
 indicated in the warning message.
--- a/tools/autotag/templates/highlights/6.2.1.md
+++ b/tools/autotag/templates/highlights/6.2.1.md
@@ -0,0 +1,34 @@
+### 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/6.2.1/how-to/llm-fine-tuning-optimization/model-acceleration-libraries.html)
+and [PyTorch's FBGEMM GitHub repository](https://github.com/pytorch/FBGEMM).
+
+### ROCm Offline Installer Creator changes
+
+The [ROCm Offline Installer Creator 6.2.1](https://rocm.docs.amd.com/projects/install-on-linux/en/6.2.1/install/rocm-offline-installer.html) introduces several new features and improvements including:
+
+* 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/6.2.1/understand/programming_model.html). 
+* The [HIP virtual memory management](https://rocm.docs.amd.com/projects/HIP/en/6.2.1/how-to/virtual_memory.html) and [HIP virtual memory management API](https://rocm.docs.amd.com/projects/HIP/en/6.2.1/reference/virtual_memory_reference.html) topics have been added.
+
+```{note}
+The ROCm documentation, like all ROCm projects, is open source and available on GitHub. To contribute to ROCm documentation, see the [ROCm documentation contribution guidelines](https://rocm.docs.amd.com/en/latest/contribute/contributing.html).
+```
--- a/tools/autotag/templates/known_issues/6.2.1.md
+++ b/tools/autotag/templates/known_issues/6.2.1.md
@@ -0,0 +1,9 @@
+### 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.
--- a/tools/autotag/templates/support/6.2.1.md
+++ b/tools/autotag/templates/support/6.2.1.md
@@ -0,0 +1,5 @@
+## Operating system and hardware support changes
+
+ROCm 6.2.1 adds support for Ubuntu 24.04.1 (kernel: 6.8 [GA]).
+
+See the [Compatibility matrix](https://rocm.docs.amd.com/en/docs-6.2.1/compatibility/compatibility-matrix.html) for the full list of supported operating systems and hardware architectures.
--- a/tools/autotag/templates/upcoming_changes/6.2.1.md
+++ b/tools/autotag/templates/upcoming_changes/6.2.1.md
@@ -0,0 +1,7 @@
+### 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,16 +67,18 @@ endef

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 SKIP_LIT_TESTS=0
 BUILD_MANPAGES="ON"
+STATIC_FLAG=

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+    init_rocm_common_cmake_params

    CC=${ROCM_PATH}/bin/amdclang \
    CXX=$(set_build_variables CXX) \
    cmake \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DHIP_COMPILER=clang \
        -DCMAKE_PREFIX_PATH="${ROCM_PATH};${ROCM_PATH}/share/rocm/cmake/" \
+        ${LAUNCHER_FLAGS} \
        -DCPACK_GENERATOR="${PKGTYPE^^}" \
        -DROCM_PATCH_VERSION=$ROCM_LIBPATCH_VERSION \
        -DBUILD_ADDRESS_SANITIZER="${ADDRESS_SANITIZER}" \
--- a/tools/rocm-build/build_rocal.sh
+++ b/tools/rocm-build/build_rocal.sh
@@ -0,0 +1,53 @@
+#!/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
+
+    mkdir -p $BUILD_DIR && cd $BUILD_DIR
+
+    python3 ${COMPONENT_SRC}/rocAL-setup.py
+
+    cmake -DAMDRPP_PATH=$ROCM_PATH ${COMPONENT_SRC}
+    make -j${PROC}
+    cmake --build . --target PyPackageInstall
+    sudo make install
+    sudo make package
+    sudo chown -R $(id -u):$(id -g) ${BUILD_DIR}
+
+    rm -rf _CPack_Packages/ && find -name '*.o' -delete
+    mkdir -p $PACKAGE_DIR
+    cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
+    show_build_cache_stats
+}
+
+clean_rocal() {
+    echo "Cleaning rocAL build directory: ${BUILD_DIR} ${PACKAGE_DIR}"
+    rm -rf "$BUILD_DIR" "$PACKAGE_DIR"
+    echo "Done!"
+}
+
+stage2_command_args "$@"
+
+case $TARGET in
+    build) build_rocal ;;
+    outdir) print_output_directory ;;
+    clean) clean_rocal ;;
+    *) die "Invalid target $TARGET" ;;
+esac
--- a/tools/rocm-build/build_rocalution.sh
+++ b/tools/rocm-build/build_rocalution.sh
@@ -22,6 +22,7 @@ build_rocalution() {
    echo "CXX compiler: $CXX"

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

+    init_rocm_common_cmake_params
+
    CXX=$(set_build_variables CXX)\
    cmake \
        ${LAUNCHER_FLAGS} \
-        $(rocm_common_cmake_params) \
+        "${rocm_math_common_cmake_params[@]}" \
        -DAMDGPU_TARGETS=${GPU_TARGETS} \
        -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip;${ROCM_PATH}/hip/cmake" \
        -DROCPRIM_ROOT="${ROCM_PATH}/rocprim" \
--- a/Show More
+++ b/Show More