Column 6.1.5 added to historical compatibility matrix in ROCm 6.2.0 (#4632 )

* Column 6.1.5 added to historical compatibility matrix * Support table fixed * RHEL note updated
Merge pull request #3977 from peterjunpark/docs/6.2.0
2026-01-11 07:38:17 -05:00 · 2025-04-15 15:18:36 -04:00 · 2024-10-30 18:44:27 -04:00 · 2024-10-30 18:37:06 -04:00 · 2024-10-30 14:25:43 -04:00 · 2024-09-19 12:31:08 -08:00
153 changed files with 3388 additions and 6165 deletions
--- a/.azuredevops/ci-builds/aomp.yml
+++ b/.azuredevops/ci-builds/aomp.yml
@@ -4,21 +4,11 @@ variables:

 resources:
  repositories:
-  - repository: aomp_repo
+  - repository: release_repo
    type: github
    endpoint: ROCm
    name: ROCm/aomp
-    ref: amd-staging
-  - repository: aomp-extras_repo
-    type: github
-    endpoint: ROCm
-    name: ROCm/aomp-extras
-    ref: amd-staging
-  - repository: flang_repo
-    type: github
-    endpoint: ROCm
-    name: ROCm/flang
-    ref: amd-staging
+    ref: aomp-dev
  - repository: llvm-project_repo
    type: github
    endpoint: ROCm
@@ -36,4 +26,4 @@ pr: none
 jobs:
  - template: ${{ variables.CI_COMPONENT_PATH }}/aomp.yml
    parameters:
-      checkoutRepo: aomp_repo
+      checkoutRepo: release_repo
--- a/.azuredevops/components/AMDMIGraphX.yml
+++ b/.azuredevops/components/AMDMIGraphX.yml
@@ -11,7 +11,6 @@ parameters:
    - git
    - cmake
    - ninja-build
-    - libdrm-dev
    - libnuma-dev
    - python3-pip
    - python3-venv
@@ -35,21 +34,17 @@ parameters:
 - name: rocmDependencies
  type: object
  default:
-    - aomp
-    - aomp-extras
-    - clr
-    - composable_kernel
-    - hipBLAS
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - MIOpen
    - rocm-cmake
+    - llvm-project
    - ROCR-Runtime
-    - rocBLAS
+    - clr
    - rocminfo
    - rocMLIR
-    - rocprofiler-register
+    - MIOpen
+    - aomp
+    - aomp-extras
+    - rocBLAS
+    - composable_kernel

 jobs:
 - job: AMDMIGraphX
@@ -79,7 +74,7 @@ jobs:
    parameters:
      dependencySource: fixed
      fixedComponentName: half
-      fixedPipelineIdentifier: ${{ variables.HALF560_PIPELINE_ID }}
+      fixedPipelineIdentifier: $(half560-pipeline-id)
      skipLibraryLinking: true
      skipLlvmSymlink: true
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
@@ -99,7 +94,6 @@ jobs:
        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
        -DCMAKE_BUILD_TYPE=Release
        -DGPU_TARGETS=$(JOB_GPU_TARGET)
-        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm/llvm;$(Agent.BuildDirectory)/rocm
        -DHALF_INCLUDE_DIR=$(Agent.BuildDirectory)/rocm/include
        -DMIGRAPHX_USE_COMPOSABLEKERNEL=OFF
--- a/.azuredevops/components/HIP.yml
+++ b/.azuredevops/components/HIP.yml
@@ -21,6 +21,7 @@ parameters:
  type: object
  default:
    - llvm-project
+    - ROCT-Thunk-Interface
    - ROCR-Runtime
    - rocprofiler-register
 - name: rocmDependenciesNvidia
@@ -100,7 +101,6 @@ jobs:
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
      pipModules: ${{ parameters.pipModules }}
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
 # checkout triggering repo (either HIP or clr)
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
--- a/.azuredevops/components/HIPIFY.yml
+++ b/.azuredevops/components/HIPIFY.yml
@@ -11,97 +11,42 @@ parameters:
    - cmake
    - ninja-build
    - libnuma-dev
-    - python3-dev
-    - python3-pip
-    - python-is-python3
-    - mesa-common-dev
-    - ccache
-    - cuda-toolkit
-    - cudnn
+- name: rocmDependencies
+  type: object
+  default:
+    - llvm-project

 jobs:
 - job: HIPIFY
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  - name: UPSTREAM_LLVM_GIT_URL
-    value: https://github.com/llvm/llvm-project.git
-  - name: UPSTREAM_LLVM_TAG
-    value: llvmorg-18.1.2
-  pool: ${{ variables.MEDIUM_BUILD_POOL }}
+  pool:
+    vmImage: ${{ variables.BASE_BUILD_POOL }}
  workspace:
    clean: all
  steps:
-  - task: Bash@3
-    displayName: 'Register CUDA packages'
-    inputs:
-      targetType: inline
-      script: |
-        sudo mkdir --parents --mode=0755 /etc/apt/keyrings
-        wget -q -O- https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-archive-keyring.gpg | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/cuda-archive-keyring.gpg > /dev/null
-        echo "deb [signed-by=/etc/apt/trusted.gpg.d/cuda-archive-keyring.gpg] https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/ /" | sudo tee /etc/apt/sources.list.d/cuda-ubuntu2204-x86_64.list
-        sudo apt update
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
-  - task: Bash@3
-    displayName: git clone upstream llvm-project
-    inputs:
-      targetType: inline
-      script: git clone $(UPSTREAM_LLVM_GIT_URL) --depth=1 --branch $(UPSTREAM_LLVM_TAG) --recurse-submodules
-      workingDirectory: $(Pipeline.Workspace)
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
-  - script: |
-      mkdir -p $(CCACHE_DIR)
-      echo "##vso[task.prependpath]/usr/lib/ccache:/usr/local/cuda/bin"
-    displayName: Update path for cuda and ccache
-  - task: Cache@2
-    displayName: Ccache caching
-    inputs:
-      key: HIPIFY | $(Agent.OS) | "$(UPSTREAM_LLVM_TAG)"
-      path: $(CCACHE_DIR)
-      restoreKeys: HIPIFY | $(Agent.OS)
+  - 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-cmake.yml
    parameters:
-      componentName: upstream-llvm
-      cmakeBuildDir: $(Pipeline.Workspace)/llvm-project/llvm/build
-      installDir: $(Pipeline.Workspace)/llvm
      extraBuildFlags: >-
        -DCMAKE_BUILD_TYPE=Release
-        -DLLVM_ENABLE_PROJECTS=clang
-        -DLLVM_INCLUDE_TESTS=OFF
-        -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-        -DCMAKE_C_COMPILER_LAUNCHER=ccache
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm/llvm
+        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
        -GNinja
-  - task: Bash@3
-    displayName: python install lit
-    inputs:
-      targetType: inline
-      script: sudo python3 $(Pipeline.Workspace)/llvm-project/llvm/utils/lit/setup.py install
-  - task: Bash@3
-    displayName: install FileCheck
-    inputs:
-      targetType: inline
-      script: cp $(Pipeline.Workspace)/llvm-project/llvm/build/bin/FileCheck $(Pipeline.Workspace)/llvm/bin
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
-    parameters:
-      componentName: HIPIFY
-      extraBuildFlags: >-
-        -DHIPIFY_CLANG_TESTS=ON
-        -DCMAKE_BUILD_TYPE=Release
-        -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda/targets/x86_64-linux
-        -DCUDA_DNN_ROOT_DIR=/usr/local/cuda/targets/x86_64-linux
-        -DCMAKE_PREFIX_PATH=$(Pipeline.Workspace)/llvm;/usr/local/cuda/targets/x86_64-linux/lib
-        -DLLVM_EXTERNAL_LIT=$(Pipeline.Workspace)/llvm-project/llvm/build/bin/llvm-lit
-      multithreadFlag: -- -j32
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: HIPIFY
-      testDir: $(Build.SourcesDirectory)/build
-      testExecutable: make
-      testParameters: test-hipify
-      testPublishResults: false
--- a/.azuredevops/components/MIOpen.yml
+++ b/.azuredevops/components/MIOpen.yml
@@ -41,7 +41,7 @@ jobs:
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool: ${{ variables.MEDIUM_BUILD_POOL }}
+  pool: ${{ variables.LARGE_DISK_BUILD_POOL }}
  workspace:
    clean: all
  strategy:
--- a/.azuredevops/components/MIVisionX.yml
+++ b/.azuredevops/components/MIVisionX.yml
@@ -58,20 +58,6 @@ parameters:
    - AMDMIGraphX
    - rpp
    - rocDecode
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - half
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - MIOpen
-    - rocBLAS
-    - rocprofiler-register
-    - ROCR-Runtime
-    - roctracer
-    - rpp

 jobs:
 - job: MIVisionX
@@ -117,52 +103,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: MIVisionX_testing
-  dependsOn: MIVisionX
-  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
-  # anything in /opt may be persistent across runs
-  # so we need to remove the symlink if it already exists
-  - script: |
-      sudo rm -f /opt/rocm
-      sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
-      mkdir mivisionx-tests
-      cd mivisionx-tests
-      cmake /opt/rocm/share/mivisionx/test
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: MIVisionX
-      testDir: 'mivisionx-tests'
--- a/.azuredevops/components/ROCR-Runtime.yml
+++ b/.azuredevops/components/ROCR-Runtime.yml
@@ -16,6 +16,7 @@ parameters:
  type: object
  default:
    - llvm-project
+    - ROCT-Thunk-Interface
    - rocprofiler-register

 jobs:
@@ -48,5 +49,5 @@ jobs:
    parameters:
      extraBuildFlags: >-
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
-        -DBUILD_SHARED_LIBS=ON
+      cmakeBuildDir: 'src/build'
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
--- a/.azuredevops/components/ROCmValidationSuite.yml
+++ b/.azuredevops/components/ROCmValidationSuite.yml
@@ -19,8 +19,6 @@ parameters:
  type: object
  default:
    - clr
-    - hipBLAS-common
-    - hipBLASLt
    - hipRAND
    - llvm-project
    - rocBLAS
@@ -30,19 +28,7 @@ parameters:
    - rocprofiler-register
    - ROCR-Runtime
    - rocRAND
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - hipRAND
-    - llvm-project
-    - rocBLAS
-    - rocm_smi_lib
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocRAND
+    - ROCT-Thunk-Interface

 jobs:
 - job: ROCmValidationSuite
@@ -94,47 +80,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: ROCmValidationSuite_testing
-  dependsOn: ROCmValidationSuite
-  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: ROCmValidationSuite
-      testExecutable: $(Agent.BuildDirectory)/rocm/bin/rvs -c $(Agent.BuildDirectory)/rocm/share/rocm-validation-suite/conf/MI300X/gst_single.conf
-      testParameters: ''
-      testDir: $(Agent.BuildDirectory)
-      testPublishResults: false
--- a/.azuredevops/components/amdsmi.yml
+++ b/.azuredevops/components/amdsmi.yml
@@ -32,30 +32,3 @@ jobs:
      extraBuildFlags: >-
        -DBUILD_TESTS=ON
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
- job: amdsmi_testing
-  dependsOn: amdsmi
-  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/test.yml
-    parameters:
-      componentName: amdsmi
-      testDir: '$(Agent.BuildDirectory)'
-      testExecutable: './rocm/share/amd_smi/tests/amdsmitst'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/aomp.yml
+++ b/.azuredevops/components/aomp.yml
@@ -5,8 +5,9 @@ parameters:
 - name: checkoutRef
  type: string
  default: ''
-# reference:
-# https://github.com/ROCm/aomp/blob/aomp-dev/docs/SOURCEINSTALL_PREREQUISITE.md
+- name: offloadEnabled
+  type: boolean
+  default: false
 - name: aptPackages
  type: object
  default:
@@ -29,52 +30,21 @@ parameters:
    - libsystemd-dev
    - libssl-dev
    - libstdc++-12-dev
-    - ccache
-    - libgmp-dev
-    - libmpfr-dev
-    - texinfo
-    - libbison-dev
-    - bison
-    - flex
-    - libbabeltrace-dev
-    - libncurses5-dev
-    - liblzma-dev
-    - 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.
-  #
-  # snippet from https://github.com/ROCm/aomp/blob/aomp-dev/bin/build_aomp.sh#L131-L134
-  #
-  # For ROCM build (AOMP_STANDALONE_BUILD=0) the components roct, rocr,
-  # libdevice, project, comgr, rocminfo, hipamd, rocdbgapi, rocgdb,
-  # roctracer, rocprofiler, rocm_smi_lib, and amdsmi should be found
-  # in ROCM in /opt/rocm.  The ROCM build only needs these components:
 - name: rocmDependencies
  type: object
  default:
-    - amdsmi
-    - clr
-    - llvm-project
-    - ROCdbgapi
-    - ROCgdb
    - rocm-cmake
-    - rocm-core
-    - rocminfo
-    - rocm_smi_lib
-    - rocprofiler-register
+    - llvm-project
    - ROCR-Runtime
-    - roctracer
+    - ROCT-Thunk-Interface

 jobs:
 - job: aomp
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool: ${{ variables.MEDIUM_BUILD_POOL }}
+  pool:
+    vmImage: ${{ variables.BASE_BUILD_POOL }}
  workspace:
    clean: all
  steps:
@@ -82,16 +52,9 @@ jobs:
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
-# checkout the repos tied to openmp-extras, plus llvm-project
  - 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
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
-    parameters:
-      checkoutRepo: flang_repo
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: llvm-project_repo
@@ -104,385 +67,56 @@ jobs:
      # manual build case: triggered by ROCm/ROCm repo
      ${{ elseif ne(parameters.checkoutRef, '') }}:
        dependencySource: tag-builds
-# Because clang is not being rebuilt and to separate downloaded ROCm
-# dependencies from the new artifacts, we use temporary symbolic links
-# for the compilation and installation to go through.
-  - script: |
-      sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
-      mkdir -p $(Build.BinariesDirectory)/bin
-      ln -s $(Agent.BuildDirectory)/rocm/llvm/bin/clang $(Build.BinariesDirectory)/bin/clang
-      ln -s $(Agent.BuildDirectory)/rocm/llvm/bin/clang++ $(Build.BinariesDirectory)/bin/clang++
-      ln -s $(Agent.BuildDirectory)/rocm/llvm/bin/llvm-config $(Build.BinariesDirectory)/bin/llvm-config
-      ln -s $(Agent.BuildDirectory)/rocm/llvm $(Build.BinariesDirectory)/llvm
-    displayName: Extra build environment setup
-# We follow the sequence described in the aomp repo instructions
-# https://github.com/ROCm/aomp/blob/aomp-dev/docs/SOURCEINSTALL.md
-# But instead of calling build_aomp.sh directly, we have to split up the calls to build each component
-# in order for the omp.h header file to be both be published as an artifact,
-# and be found when building subsequent components.
-# Environment variables specified per bash script were determined from looking through the
-# individual scripts and iteratively testing compilation.
-# Splitting up the build_aomp.sh call is also easier for debugging within Azure, as the former
-# method leads to a giant build log compared to separate logs per script call.
-#
-# Components compiled and the order for non-standalone build found at
-# https://github.com/ROCm/aomp/blob/aomp-dev/bin/build_aomp.sh#L135-L143
-  - task: Bash@3
-    displayName: Build Prereq
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_prereq.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-  - task: Bash@3
-    displayName: Build extras
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_extras.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_EXTRAS: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install extras
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_extras.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_EXTRAS: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Build openmp
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_openmp.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_LEGACY_OPENMP: 1
-      AOMP_USE_NINJA: 1
-      ALTAOMP: $(Agent.BuildDirectory)/rocm/llvm
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_OPENMP: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install openmp
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_openmp.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_LEGACY_OPENMP: 1
-      AOMP_USE_NINJA: 1
-      ALTAOMP: $(Agent.BuildDirectory)/rocm/llvm
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_OPENMP: $(Build.BinariesDirectory)
-  - script: ln -s $(Build.BinariesDirectory)/include/omp.h $(Build.SourcesDirectory)/llvm-project/llvm/include/omp.h
-    displayName: Link omp header
-  - task: Bash@3
-    displayName: Build offload
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_offload.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_LEGACY_OPENMP: 1
-      AOMP_USE_NINJA: 1
-      ALTAOMP: $(Agent.BuildDirectory)/rocm/llvm
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_OPENMP: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install offload
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_offload.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_LEGACY_OPENMP: 1
-      AOMP_USE_NINJA: 1
-      ALTAOMP: $(Agent.BuildDirectory)/rocm/llvm
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_OPENMP: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Build flang-legacy
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_flang-legacy.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install flang-legacy
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_flang-legacy.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Build pgmath
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_pgmath.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_FLANG: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install pgmath
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_pgmath.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_FLANG: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Build flang
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_flang.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_FLANG: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install flang
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_flang.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_FLANG: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Build flang_runtime
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_flang_runtime.sh
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_FLANG: $(Build.BinariesDirectory)
-  - task: Bash@3
-    displayName: Install flang_runtime
-    inputs:
-      filePath: $(Build.SourcesDirectory)/aomp/bin/build_flang_runtime.sh
-      arguments: install
-    env:
-      AOMP_REPOS: $(Build.SourcesDirectory)
-      AOMP_PROJECT_REPO_NAME: llvm-project
-      AOMP_STANDALONE_BUILD: 0
-      AOMP_BUILD_SANITIZER: 0
-      AOMP_BUILD_DEBUG: 0
-      AOMP_USE_NINJA: 1
-      INSTALL_PREFIX: $(Build.BinariesDirectory)
-      CMAKE_INSTALL_PREFIX: $(Build.BinariesDirectory)
-      LLVM_PROJECT_ROOT: $(Build.SourcesDirectory)/llvm-project
-      AOMP: $(Build.BinariesDirectory)
-      AOMP_INSTALL_DIR: $(Build.BinariesDirectory)
-      INSTALL_FLANG: $(Build.BinariesDirectory)
-# Clean up build environment before publish artifact
-  - script: |
-      rm $(Build.BinariesDirectory)/bin/clang
-      rm $(Build.BinariesDirectory)/bin/clang++
-      rm $(Build.BinariesDirectory)/bin/llvm-config
-      rm $(Build.BinariesDirectory)/llvm
-    displayName: Remove temporary symbolic links
-# Copy the files to artifact staging temporarily to clean up binaries directory
-# and then copy files back to llvm subdirectory in the cleaned up binaries directory
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-prepare-package.yml
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
-      sourceDir: $(Build.BinariesDirectory)
-      targetDir: $(Build.ArtifactStagingDirectory)
-  - task: DeleteFiles@1
-    displayName: 'Cleanup Binaries Directory'
-    inputs:
-      SourceFolder: '$(Build.BinariesDirectory)'
-      Contents: '/**/*'
-      RemoveDotFiles: true
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-prepare-package.yml
-    parameters:
-      sourceDir: $(Build.ArtifactStagingDirectory)
-      targetDir: $(Build.BinariesDirectory)/llvm
-  - task: DeleteFiles@1
-    displayName: 'Cleanup Staging Directory'
-    inputs:
-      SourceFolder: $(Build.ArtifactStagingDirectory)
-      Contents: '/**/*'
-      RemoveDotFiles: true
+      componentName: llvm-openmp
+      extraBuildFlags: >-
+        -DOPENMP_ENABLE_LIBOMPTARGET=1
+        -DOPENMP_TEST_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
+        -DOPENMP_TEST_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
+        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
+        -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
+        -DLIBOMPTARGET_AMDGCN_GFXLIST=gfx700;gfx701;gfx801;gfx803;gfx900;gfx902;gfx906;gfx908;gfx90a;gfx90c;gfx940;gfx941;gfx942;gfx1030;gfx1031;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103
+        -DDEVICELIBS_ROOT=$(Build.SourcesDirectory)/llvm-project/amd/device-libs
+        -DLIBOMP_COPY_EXPORTS=OFF
+        -DLLVM_DIR=$(Agent.BuildDirectory)/rocm/llvm
+        -DLLVM_MAIN_INCLUDE_DIR=$(Build.SourcesDirectory)/llvm-project/llvm/include
+        -DLIBOMPTARGET_LLVM_INCLUDE_DIRS=$(Build.SourcesDirectory)/llvm-project/llvm/include
+        -DCUDA_TOOLKIT_ROOT_DIR=OFF
+        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm/llvm;$(Agent.BuildDirectory)/rocm;$(Agent.BuildDirectory)/rocm/lib/cmake
+        -DCMAKE_BUILD_TYPE=Release
+        -DCMAKE_SKIP_BUILD_RPATH=TRUE
+        -DCMAKE_SKIP_INSTALL_RPATH=TRUE
+        -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ORIGIN:$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib
+        -DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib
+        -DCMAKE_MODULE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ORIGIN:$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib
+        -GNinja
+      cmakeBuildDir: $(Build.SourcesDirectory)/llvm-project/openmp/build
+      installDir: $(Build.BinariesDirectory)/llvm
+# offload does not exist for recent releases, so use CI conditional
+  - ${{ if eq(parameters.offloadEnabled, true) }}:
+    - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+      parameters:
+        componentName: llvm-offload
+        extraBuildFlags: >-
+          -DOPENMP_ENABLE_LIBOMPTARGET=1
+          -DOPENMP_TEST_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
+          -DOPENMP_TEST_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
+          -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
+          -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
+          -DLIBOMPTARGET_AMDGCN_GFXLIST=gfx700;gfx701;gfx801;gfx803;gfx900;gfx902;gfx906;gfx908;gfx90a;gfx90c;gfx940;gfx941;gfx942;gfx1030;gfx1031;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103
+          -DLLVM_DIR=$(Agent.BuildDirectory)/rocm/llvm
+          -DLLVM_MAIN_INCLUDE_DIR=$(Build.SourcesDirectory)/llvm-project/llvm/include
+          -DLIBOMPTARGET_LLVM_INCLUDE_DIRS=$(Build.SourcesDirectory)/llvm-project/llvm/include
+          -DCUDA_TOOLKIT_ROOT_DIR=OFF
+          -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm/llvm;$(Agent.BuildDirectory)/rocm;$(Agent.BuildDirectory)/rocm/lib/cmake
+          -DCMAKE_BUILD_TYPE=Release
+          -DCMAKE_SKIP_BUILD_RPATH=TRUE
+          -DCMAKE_SKIP_INSTALL_RPATH=TRUE
+          -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ORIGIN:$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib
+          -DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib
+          -DCMAKE_MODULE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ORIGIN:$ORIGIN/../lib:$ORIGIN/../../lib:$ORIGIN/../../../lib
+          -GNinja
+        cmakeBuildDir: $(Build.SourcesDirectory)/llvm-project/offload/build
+        installDir: $(Build.BinariesDirectory)/llvm
  - 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/composable_kernel.yml
+++ b/.azuredevops/components/composable_kernel.yml
@@ -13,7 +13,6 @@ parameters:
    - git
    - python3-pip
    - libdrm-dev
-    - ccache
 - name: rocmDependencies
  type: object
  default:
@@ -23,24 +22,13 @@ parameters:
    - clr
    - rocminfo
    - rocprofiler-register
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - composable_kernel
-    - llvm-project
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: composable_kernel
-  timeoutInMinutes: 240
+  timeoutInMinutes: 180
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  - name: DAY_STRING
-    value: $[format('{0:ddMMyyyy}', pipeline.startTime)]
  pool: ${{ variables.ULTRA_BUILD_POOL }}
  workspace:
    clean: all
@@ -68,26 +56,11 @@ jobs:
      # manual build case: triggered by ROCm/ROCm repo
      ${{ elseif ne(parameters.checkoutRef, '') }}:
        dependencySource: tag-builds
-  - 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: composable_kernel | $(Agent.OS) | $(JOB_GPU_TARGET) | $(DAY_STRING) | $(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++
-      path: $(CCACHE_DIR)
-      restoreKeys: |
-        composable_kernel | $(Agent.OS) | $(JOB_GPU_TARGET) | $(DAY_STRING)
-        composable_kernel | $(Agent.OS) | $(JOB_GPU_TARGET)
-        composable_kernel | $(Agent.OS)
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
        -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
        -DCMAKE_HIP_FLAGS="-Wno-missing-include-dirs"
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
        -DCMAKE_BUILD_TYPE=Release
@@ -96,51 +69,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: composable_kernel_testing
-  dependsOn: composable_kernel
-  condition: succeeded()
-  variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
-  - name: TEST_LOG_FILE
-    value: $(Pipeline.Workspace)/ckTestLog.log
-  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: Iterate through test scripts
-    inputs:
-      targetType: inline
-      script: |
-        for file in ./test_*; do
-          ./$file | tee -a $(TEST_LOG_FILE)
-        done
-      workingDirectory: $(Agent.BuildDirectory)/rocm/bin
--- a/.azuredevops/components/half.yml
+++ b/.azuredevops/components/half.yml
@@ -53,13 +53,3 @@ jobs:
        -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-  # only run test03 because test11 has too many test cases, taking way too long
-  - task: Bash@3
-    displayName: test03
-    inputs:
-      targetType: inline
-      script: |
-        make clean
-        make test03
-        ./bin/test
-      workingDirectory: $(Build.SourcesDirectory)/test
--- a/.azuredevops/components/hip-tests.yml
+++ b/.azuredevops/components/hip-tests.yml
@@ -1,144 +0,0 @@
-parameters:
- name: checkoutRepo
-  type: string
-  default: 'self'
- name: checkoutRef
-  type: string
-  default: ''
- name: aptPackages
-  type: object
-  default:
-    - cmake
-    - ninja-build
-    - git
-    - libnuma-dev
-    - mesa-common-dev
-    - ocl-icd-libopencl1
-    - ocl-icd-opencl-dev
-    - opencl-headers
-    - libglu1-mesa-dev
-    - freeglut3-dev
-    - libboost-all-dev
-    - python3-pip
- name: rocmDependencies
-  type: object
-  default:
-    - llvm-project
-    - ROCR-Runtime
-    - clr
-    - rocminfo
-    - rocprofiler-register
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
-
-# HIP with AMD backend
-jobs:
- job: hip_tests
-  variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
-  - name: HIP_ROCCLR_HOME
-    value: $(Agent.BuildDirectory)/rocm
-  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/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 }}
-      # 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
-  # compile hip-tests
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
-    parameters:
-      componentName: hip-tests
-      cmakeSourceDir: '../catch'
-      customBuildTarget: build_tests
-      extraBuildFlags: >-
-        -DHIP_PLATFORM=amd
-        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
-        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
-        -DHIP_PATH=$(Agent.BuildDirectory)/rocm
-        -DOFFLOAD_ARCH_STR="--offload-arch=$(JOB_GPU_TARGET)"
-        -GNinja
-  - 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
@@ -31,21 +31,6 @@ parameters:
    - rocBLAS
    - rocSPARSE
    - rocSOLVER
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - rocm-cmake
-    - ROCR-Runtime
-    - rocminfo
-    - rocprofiler-register
-    - rocBLAS
-    - rocSPARSE
-    - rocSOLVER

 jobs:
 - job: hipBLAS
@@ -69,7 +54,18 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aocl.yml
+  - task: Bash@3
+    displayName: 'Download AOCL'
+    inputs:
+      targetType: inline
+      script: wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-1/aocl-linux-aocc-4.1.0_1_amd64.deb
+      workingDirectory: '$(Pipeline.Workspace)'
+  - task: Bash@3
+    displayName: 'Install AOCL'
+    inputs:
+      targetType: inline
+      script: sudo apt install --yes ./aocl-linux-aocc-4.1.0_1_amd64.deb
+      workingDirectory: '$(Pipeline.Workspace)'
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
@@ -95,46 +91,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipBLAS_testing
-  dependsOn: hipBLAS
-  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: hipBLAS
-      testExecutable: $(Agent.BuildDirectory)/rocm/bin/hipblas-test
-      testParameters: '--yaml hipblas_smoke.yaml --gtest_output=xml:./test_output.xml --gtest_color=yes'
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
--- a/.azuredevops/components/hipBLASLt.yml
+++ b/.azuredevops/components/hipBLASLt.yml
@@ -8,17 +8,13 @@ parameters:
 - name: aptPackages
  type: object
  default:
+    - gfortran
    - git
    - libdrm-dev
    - libmsgpack-dev
-    - libnuma-dev
    - ninja-build
    - python3-pip
    - python3-venv
-    - gfortran
-    - libomp-dev
-    - libblas-dev
-    - ccache
 - name: pipModules
  type: object
  default:
@@ -26,27 +22,12 @@ parameters:
 - name: rocmDependencies
  type: object
  default:
-    - aomp
    - clr
    - hipBLAS-common
    - llvm-project
    - rocminfo
-    - rocm_smi_lib
    - rocprofiler-register
    - ROCR-Runtime
-    - roctracer
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - hipBLAS-common
-    - llvm-project
-    - rocminfo
-    - rocm_smi_lib
-    - rocprofiler-register
-    - ROCR-Runtime
-    - roctracer

 jobs:
 - job: hipBLASLt
@@ -66,7 +47,7 @@ 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.ULTRA_BUILD_POOL }}
+  pool: ${{ variables.MEDIUM_BUILD_POOL }}
  workspace:
    clean: all
  strategy:
@@ -101,7 +82,6 @@ jobs:
 # $(Pipeline.Workspace)/deps is a temporary folder for the build process
 # $(Pipeline.Workspace)/s/deps is part of the hipBLASLt repo
  - script: mkdir $(Pipeline.Workspace)/deps
-    displayName: Create temp folder for external dependencies
 # hipBLASLt already has a CMake script for external deps, so we can just run that
 # https://github.com/ROCm/hipBLASLt/blob/develop/deps/CMakeLists.txt
  - script: cmake $(Pipeline.Workspace)/s/deps
@@ -113,79 +93,19 @@ 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=
        -DTensile_CODE_OBJECT_VERSION=default
        -DTensile_LIBRARY_FORMAT=msgpack
        -DCMAKE_PREFIX_PATH="$(Agent.BuildDirectory)/rocm"
-        -DBUILD_CLIENTS_TESTS=ON
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
-
- job: hipBLASLt_testing
-  dependsOn: hipBLASLt
-  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: hipBLASLt
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './hipblaslt-test'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes --gtest_filter=*pre_checkin*'
--- a/.azuredevops/components/hipCUB.yml
+++ b/.azuredevops/components/hipCUB.yml
@@ -10,7 +10,7 @@ parameters:
  default:
    - cmake
    - ninja-build
-    - libgtest-dev
+    - googletest
    - git
    - python3-pip
 - name: rocmDependencies
@@ -21,15 +21,6 @@ parameters:
    - rocminfo
    - rocPRIM
    - ROCR-Runtime
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - rocPRIM
-    - ROCR-Runtime
-    - rocprofiler-register

 jobs:
 - job: hipCUB
@@ -75,44 +66,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipCUB_testing
-  dependsOn: hipCUB
-  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: hipCUB
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/hipcub'
--- a/.azuredevops/components/hipFFT.yml
+++ b/.azuredevops/components/hipFFT.yml
@@ -27,19 +27,6 @@ parameters:
    - rocminfo
    - rocFFT
    - aomp
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - hipRAND
-    - llvm-project
-    - rocFFT
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocRAND
-
 jobs:
 - job: hipFFT
  variables:
@@ -93,46 +80,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipFFT_testing
-  dependsOn: hipFFT
-  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: hipFFT
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './hipfft-test'
-      testParameters: '--test_prob 0.002 --gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/hipRAND.yml
+++ b/.azuredevops/components/hipRAND.yml
@@ -20,15 +20,6 @@ parameters:
    - clr
    - rocminfo
    - rocRAND
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocRAND

 jobs:
 - job: hipRAND
@@ -79,44 +70,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipRAND_testing
-  dependsOn: hipRAND
-  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: hipRAND
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/hipRAND'
--- a/.azuredevops/components/hipSOLVER.yml
+++ b/.azuredevops/components/hipSOLVER.yml
@@ -27,21 +27,6 @@ parameters:
    - ROCR-Runtime
    - rocSPARSE
    - rocSOLVER
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - hipBLAS-common
-    - hipBLASLt
-    - hipSPARSE
-    - rocBLAS
-    - rocm-cmake
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocSOLVER
-    - rocSPARSE

 jobs:
 - job: hipSOLVER
@@ -99,46 +84,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipSOLVER_testing
-  dependsOn: hipSOLVER
-  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: hipSOLVER
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './hipsolver-test'
-      testParameters: '--gtest_filter="*checkin*" --gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/hipSPARSE.yml
+++ b/.azuredevops/components/hipSPARSE.yml
@@ -25,18 +25,6 @@ parameters:
    - rocprofiler-register
    - ROCR-Runtime
    - rocSPARSE
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - hipBLAS-common
-    - hipBLASLt
-    - rocBLAS
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocSPARSE

 jobs:
 - job: hipSPARSE
@@ -93,46 +81,3 @@ jobs:
    parameters:
      artifactName: testMatrices
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipSPARSE_testing
-  dependsOn: hipSPARSE
-  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: hipSPARSE
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './hipsparse-test'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/hipSPARSELt.yml
+++ b/.azuredevops/components/hipSPARSELt.yml
@@ -13,37 +13,21 @@ parameters:
    - libmsgpack-dev
    - git
    - python3-pip
-    - gfortran
-    - libgfortran5
-    - libomp-dev
-    - libopenblas-dev
 - name: pipModules
  type: object
  default:
    - joblib
+# rocm dependencies should match dependencies-rocm.yml
 - name: rocmDependencies
  type: object
  default:
-    - aomp
+    - llvm-project
+    - ROCR-Runtime
    - clr
+    - rocminfo
+    - rocprofiler-register
    - hipSPARSE
-    - llvm-project
    - rocBLAS
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - llvm-project
-    - hipBLAS-common
-    - hipBLASLt
-    - rocBLAS
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: hipSPARSELt
@@ -87,22 +71,6 @@ jobs:
      # manual build case: triggered by ROCm/ROCm repo
      ${{ elseif ne(parameters.checkoutRef, '') }}:
        dependencySource: tag-builds
-# Build and install gtest and lapack
-# $(Pipeline.Workspace)/deps is a temporary folder for the build process
-# $(Pipeline.Workspace)/s/deps is part of the hipSPARSELt repo
-  - script: mkdir $(Pipeline.Workspace)/deps
-    displayName: Create temp folder for external dependencies
-# hipSPARSELt already has a CMake script for external deps, so we can just run that
-# https://github.com/ROCm/hipSPARSELt/blob/develop/deps/CMakeLists.txt
-  - script: cmake $(Pipeline.Workspace)/s/deps
-    displayName: Configure hipSPARSELt external dependencies
-    workingDirectory: $(Pipeline.Workspace)/deps
-  - script: make
-    displayName: Build hipSPARSELt external dependencies
-    workingDirectory: $(Pipeline.Workspace)/deps
-  - script: sudo make install
-    displayName: Install hipSPARSELt external dependencies
-    workingDirectory: $(Pipeline.Workspace)/deps
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
    parameters:
      extraBuildFlags: >-
@@ -116,45 +84,7 @@ jobs:
        -DTensile_LIBRARY_FORMAT=msgpack
        -DCMAKE_PREFIX_PATH="$(Agent.BuildDirectory)/rocm"
        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
-        -DBUILD_CLIENTS_TESTS=ON
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipSPARSELt_testing
-  dependsOn: hipSPARSELt
-  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-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: hipSPARSELt
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './hipsparselt-test'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes --gtest_filter=*pre_checkin*'
--- a/.azuredevops/components/hipTensor.yml
+++ b/.azuredevops/components/hipTensor.yml
@@ -21,14 +21,6 @@ parameters:
    - clr
    - rocminfo
    - composable_kernel
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: hipTensor
@@ -75,46 +67,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: hipTensor_testing
-  timeoutInMinutes: 90
-  dependsOn: hipTensor
-  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: hipTensor
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/hiptensor'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/hipfort.yml
+++ b/.azuredevops/components/hipfort.yml
@@ -11,137 +11,26 @@ 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: ${{ variables.MEDIUM_BUILD_POOL }}
+  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 }}
-  - 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
+        -DHIPFORT_INSTALL_DIR=/tmp/hipfort
  - 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 }}
-  - 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
@@ -41,7 +41,6 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
-      skipLlvmSymlink: true
      # CI case: download latest default branch build
      ${{ if eq(parameters.checkoutRef, '') }}:
        dependencySource: staging
@@ -104,14 +103,6 @@ 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/rccl.yml
+++ b/.azuredevops/components/rccl.yml
@@ -16,7 +16,6 @@ parameters:
    - git
    - ninja-build
    - libstdc++-12-dev
-    - libnuma-dev
 - name: rocmDependencies
  type: object
  default:
@@ -31,20 +30,6 @@ 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
@@ -66,12 +51,10 @@ jobs:
  - 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 }}
-      submoduleBehaviour: recursive
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
@@ -98,47 +81,3 @@ 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,35 +18,16 @@ parameters:
    - autoconf
    - libtool
    - pkg-config
-    - libdrm-dev
-    - libyaml-cpp-dev
 - name: rocmDependencies
  type: object
  default:
-    - amdsmi
-    - clr
-    - llvm-project
-    - rocBLAS
    - rocm-cmake
+    - llvm-project
+    - ROCR-Runtime
+    - clr
    - 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
@@ -56,12 +37,6 @@ 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:
@@ -73,7 +48,6 @@ 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
@@ -97,71 +71,11 @@ 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/rocAL.yml
+++ b/.azuredevops/components/rocAL.yml
@@ -25,7 +25,6 @@ parameters:
    - libturbojpeg-dev
    - libjpeg-turbo-official=3.0.2-20240124
    - libopencv-dev
-    - --allow-downgrades # for libjpeg-turbo
 - name: pipModules
  type: object
  default:
@@ -45,17 +44,6 @@ parameters:
    - rpp
    - MIVisionX
    - aomp
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - half
-    - llvm-project
-    - MIVisionX
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rpp

 jobs:
 - job: rocAL
@@ -154,81 +142,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocAL_testing
-  dependsOn: rocAL
-  condition: succeeded()
-  variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
-  - name: ROCM_PATH
-    value: $(Agent.BuildDirectory)/rocm
-  - name: CMAKE_INCLUDE_PATH
-    value: $(Agent.BuildDirectory)/rocm/include/rocal
-  pool: $(JOB_TEST_POOL)
-  workspace:
-    clean: all
-  strategy:
-    matrix:
-      gfx942:
-        JOB_GPU_TARGET: gfx942
-        JOB_TEST_POOL: ${{ variables.GFX942_TEST_POOL }}
-  steps:
-  - task: Bash@3
-    displayName: 'Register libjpeg-turbo packages'
-    inputs:
-      targetType: inline
-      script: |
-        sudo mkdir --parents --mode=0755 /etc/apt/keyrings
-        wget -q -O- https://packagecloud.io/dcommander/libjpeg-turbo/gpgkey | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/libjpeg-turbo.gpg > /dev/null
-        echo "deb [signed-by=/etc/apt/trusted.gpg.d/libjpeg-turbo.gpg] https://packagecloud.io/dcommander/libjpeg-turbo/any/ any main" | sudo tee /etc/apt/sources.list.d/libjpeg-turbo.list
-        sudo apt update
-        apt-cache show libjpeg-turbo-official | grep Version
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
-    parameters:
-      aptPackages: ${{ parameters.aptPackages }}
-  - 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: Link libjpeg-turbo
-    inputs:
-      targetType: inline
-      script: |
-        echo /opt/libjpeg-turbo/lib64 | sudo tee /etc/ld.so.conf.d/libjpeg-turbo.conf
-        sudo ldconfig -v
-  - task: Bash@3
-    displayName: Build rocAL tests
-    inputs:
-      targetType: inline
-      script: |
-        mkdir rocAL-tests
-        cd rocAL-tests
-        cmake $(Agent.BuildDirectory)/rocm/share/rocal/test
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocAL
-      testDir: rocAL-tests
-      reloadAMDGPU: true
-  - task: Bash@3
-    displayName: Clean up libjpeg-turbo
-    inputs:
-      targetType: inline
-      script: |
-        sudo rm /etc/ld.so.conf.d/libjpeg-turbo.conf
-        sudo ldconfig -v
--- a/.azuredevops/components/rocALUTION.yml
+++ b/.azuredevops/components/rocALUTION.yml
@@ -28,21 +28,6 @@ parameters:
    - ROCR-Runtime
    - rocRAND
    - rocSPARSE
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - rocBLAS
-    - rocminfo
-    - rocPRIM
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocRAND
-    - rocSPARSE

 jobs:
 - job: rocALUTION
@@ -94,46 +79,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocALUTION_testing
-  dependsOn: rocALUTION
-  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: rocALUTION
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './rocalution-test'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/rocBLAS.yml
+++ b/.azuredevops/components/rocBLAS.yml
@@ -24,7 +24,6 @@ parameters:
  type: object
  default:
    - joblib
-    - pyyaml
 - name: rocmDependencies
  type: object
  default:
@@ -38,20 +37,6 @@ parameters:
    - rocm-core
    - aomp
    - aomp-extras
-    - hipBLAS-common
-    - hipBLASLt
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - rocminfo
-    - rocprofiler-register
-    - rocm_smi_lib
-    - ROCR-Runtime

 jobs:
 - job: rocBLAS
@@ -84,7 +69,28 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aocl.yml
+  - task: Bash@3
+    displayName: 'Download AOCL'
+    inputs:
+      targetType: inline
+      workingDirectory: '$(Pipeline.Workspace)'
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        script: wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        script: wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-1/aocl-linux-aocc-4.1.0_1_amd64.deb
+  - task: Bash@3
+    displayName: 'Install AOCL'
+    inputs:
+      targetType: inline
+      workingDirectory: '$(Pipeline.Workspace)'
+      # CI case: download latest default branch build
+      ${{ if eq(parameters.checkoutRef, '') }}:
+        script: sudo apt install --yes ./aocl-linux-gcc-4.2.0_1_amd64.deb
+      # manual build case: triggered by ROCm/ROCm repo
+      ${{ elseif ne(parameters.checkoutRef, '') }}:
+        script: sudo apt install --yes ./aocl-linux-aocc-4.1.0_1_amd64.deb
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
@@ -117,47 +123,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocBLAS_testing
-  dependsOn: rocBLAS
-  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 }}
-      pipModules: ${{ parameters.pipModules }}
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
-    parameters:
-      gpuTarget: $(JOB_GPU_TARGET)
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
-    parameters:
-      ${{ if eq(parameters.checkoutRef, '') }}:
-        dependencySource: staging
-      ${{ elseif ne(parameters.checkoutRef, '') }}:
-        dependencySource: tag-builds
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
-    parameters:
-      dependencyList: ${{ parameters.rocmTestDependencies }}
-      gpuTarget: $(JOB_GPU_TARGET)
-      ${{ if eq(parameters.checkoutRef, '') }}:
-        dependencySource: staging
-      ${{ elseif ne(parameters.checkoutRef, '') }}:
-        dependencySource: tag-builds
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocBLAS
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './rocblas-test'
-      testParameters: '--yaml rocblas_smoke.yaml --gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/rocDecode.yml
+++ b/.azuredevops/components/rocDecode.yml
@@ -30,13 +30,6 @@ parameters:
    - rocminfo
    - rocm-core
    - rocprofiler-register
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: rocDecode
@@ -85,51 +78,3 @@ jobs:
        -DCMAKE_BUILD_TYPE=Release
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
- job: rocDecode_testing
-  dependsOn: rocDecode
-  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
-  # anything in /opt may be persistent across runs
-  # so we need to remove the symlink if it already exists
-  - script: |
-      sudo rm -rf /opt/rocm
-      sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
-      mkdir rocDecode-tests
-      cd rocDecode-tests
-      cmake /opt/rocm/share/rocdecode/test
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocDecode
-      testDir: 'rocDecode-tests'
-  - script: sudo rm /opt/rocm
--- a/.azuredevops/components/rocFFT.yml
+++ b/.azuredevops/components/rocFFT.yml
@@ -19,28 +19,15 @@ parameters:
 - name: rocmDependencies
  type: object
  default:
-    - aomp
-    - clr
-    - hipRAND
    - llvm-project
-    - rocm-cmake
+    - ROCR-Runtime
+    - clr
    - rocminfo
    - rocprofiler-register
-    - ROCR-Runtime
-    - rocRAND
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
    - hipRAND
-    - llvm-project
-    - rocm-cmake
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime
    - rocRAND
-
+    - rocm-cmake
+    - aomp
 jobs:
 - job: rocFFT
  variables:
@@ -92,46 +79,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocFFT_testing
-  dependsOn: rocFFT
-  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: rocFFT
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './rocfft-test'
-      testParameters: '--test_prob 0.004 --gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/rocMLIR.yml
+++ b/.azuredevops/components/rocMLIR.yml
@@ -12,23 +12,14 @@ parameters:
    - ninja-build
    - git
    - python3-pip
-    - libdrm-dev
- name: pipModules
-  type: object
-  default:
-    - tomli
 - name: rocmDependencies
  type: object
  default:
    - llvm-project
    - rocm-cmake
-    - clr
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
- job: rocMLIR_library
+- job: rocMLIR
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
@@ -39,7 +30,6 @@ jobs:
  - 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:
@@ -63,63 +53,3 @@ jobs:
        -DBUILD_FAT_LIBROCKCOMPILER=1
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
-# compiling and running test on the test system together
- job: rocMLIR_testing
-  variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
-  pool: ${{ variables.GFX942_TEST_POOL }}
-  workspace:
-    clean: all
-  strategy:
-    matrix:
-      gfx942:
-        JOB_GPU_TARGET: gfx942
-  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
-  - task: Bash@3
-    displayName: ROCm symbolic link
-    inputs:
-      targetType: inline
-      script: sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
-    parameters:
-      installEnabled: false
-      extraBuildFlags: >-
-        -DCMAKE_BUILD_TYPE=Release
-        -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
-        -DCMAKE_C_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang
-        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
-        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
-        -DROCM_TEST_CHIPSET=$(JOB_GPU_TARGET)
-        -GNinja
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocMLIR
-      testDir: $(Build.SourcesDirectory)/build
-      testExecutable: ninja
-      testParameters: check-rocmlir
--- a/.azuredevops/components/rocPRIM.yml
+++ b/.azuredevops/components/rocPRIM.yml
@@ -21,14 +21,6 @@ parameters:
    - ROCR-Runtime
    - clr
    - rocminfo
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - ROCR-Runtime
-    - rocprofiler-register

 jobs:
 - job: rocPRIM
@@ -74,44 +66,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocPRIM_testing
-  dependsOn: rocPRIM
-  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: rocPRIM
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/rocprim'
--- a/.azuredevops/components/rocPyDecode.yml
+++ b/.azuredevops/components/rocPyDecode.yml
@@ -1,87 +0,0 @@
-parameters:
- name: checkoutRepo
-  type: string
-  default: 'self'
- name: checkoutRef
-  type: string
-  default: ''
- name: aptPackages
-  type: object
-  default:
-    - python3-pip
-    - cmake
-    - ninja-build
-    - pkg-config
-    - ffmpeg
-    - libavcodec-dev
-    - libavformat-dev
-    - libavutil-dev
-    - libva-dev
-    - libdrm-dev
-    - pybind11-dev
-    - python3-pybind11
-    - libdlpack-dev
- name: pipModules
-  type: object
-  default:
-    - -i
-    - https://test.pypi.org/simple
-    - hip-python
- name: rocmDependencies
-  type: object
-  default:
-    - rocm-cmake
-    - llvm-project
-    - ROCR-Runtime
-    - clr
-    - rocminfo
-    - rocm-core
-    - rocprofiler-register
-    - rocDecode
-
-jobs:
- job: rocPyDecode
-  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-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_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
-        -DCMAKE_BUILD_TYPE=Release
-        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
-        -DCMAKE_INSTALL_PREFIX_PYTHON=$(Build.BinariesDirectory)
-        -GNinja
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-    parameters:
-      gpuTarget: $(JOB_GPU_TARGET)
--- a/.azuredevops/components/rocRAND.yml
+++ b/.azuredevops/components/rocRAND.yml
@@ -21,14 +21,6 @@ parameters:
    - ROCR-Runtime
    - clr
    - rocminfo
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: rocRAND
@@ -76,44 +68,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocRAND_testing
-  dependsOn: rocRAND
-  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: rocRAND
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/rocRAND'
--- a/.azuredevops/components/rocSOLVER.yml
+++ b/.azuredevops/components/rocSOLVER.yml
@@ -20,30 +20,15 @@ parameters:
 - name: rocmDependencies
  type: object
  default:
-    - clr
-    - hipSPARSE
-    - llvm-project
-    - rocBLAS
    - rocm-cmake
-    - rocminfo
-    - rocPRIM
-    - ROCR-Runtime
-    - rocSPARSE
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - hipSPARSE
    - llvm-project
-    - rocBLAS
-    - rocm-cmake
-    - rocminfo
-    - rocPRIM
-    - rocprofiler-register
    - ROCR-Runtime
+    - clr
+    - rocminfo
+    - rocBLAS
+    - rocPRIM
    - rocSPARSE
+    - hipSPARSE

 jobs:
 - job: rocSOLVER
@@ -109,46 +94,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocSOLVER_testing
-  dependsOn: rocSOLVER
-  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: rocSOLVER
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './rocsolver-test'
-      testParameters: '--gtest_filter="*checkin*" --gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/rocSPARSE.yml
+++ b/.azuredevops/components/rocSPARSE.yml
@@ -29,17 +29,6 @@ parameters:
    - rocminfo
    - rocPRIM
    - rocprofiler-register
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - rocBLAS
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: rocSPARSE
@@ -102,48 +91,3 @@ jobs:
    parameters:
      artifactName: testMatrices
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocSPARSE_testing
-  timeoutInMinutes: 90
-  dependsOn: rocSPARSE
-  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: rocSPARSE
-      testDir: '$(Agent.BuildDirectory)/rocm/bin'
-      testExecutable: './rocsparse-test'
-      testParameters: '--gtest_filter="*quick*" --gtest_output=xml:./test_output.xml --gtest_color=yes'
-
--- a/.azuredevops/components/rocThrust.yml
+++ b/.azuredevops/components/rocThrust.yml
@@ -24,16 +24,6 @@ parameters:
    - rocminfo
    - rocPRIM
    - ROCR-Runtime
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocminfo
-    - rocPRIM
-    - ROCR-Runtime
-    - hipRAND
-    - rocprofiler-register

 jobs:
 - job: rocThrust
@@ -79,44 +69,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocThrust_testing
-  dependsOn: rocThrust
-  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: rocThrust
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/rocthrust'
--- a/.azuredevops/components/rocWMMA.yml
+++ b/.azuredevops/components/rocWMMA.yml
@@ -28,20 +28,6 @@ parameters:
    - rocBLAS
    - aomp
    - rocm_smi_lib
- name: rocmTestDependencies
-  type: object
-  default:
-    - aomp
-    - clr
-    - hipBLAS-common
-    - hipBLASLt
-    - llvm-project
-    - rocBLAS
-    - rocm-cmake
-    - rocm_smi_lib
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: rocWMMA
@@ -89,45 +75,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocWMMA_testing
-  timeoutInMinutes: 90
-  dependsOn: rocWMMA
-  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: rocWMMA
-      testDir: '$(Agent.BuildDirectory)/rocm/bin/rocwmma'
--- a/.azuredevops/components/rocm-cmake.yml
+++ b/.azuredevops/components/rocm-cmake.yml
@@ -44,7 +44,5 @@ jobs:
      git config --global user.email "you@example.com"
      git config --global user.name "Your Name"
    displayName: "ctest setup"
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocm-cmake
+#  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
--- a/.azuredevops/components/rocm-core.yml
+++ b/.azuredevops/components/rocm-core.yml
@@ -29,5 +29,5 @@ jobs:
        -DCPACK_GENERATOR=DEB
        -DCPACK_DEBIAN_PACKAGE_RELEASE="local.9999~99.99"
        -DCPACK_RPM_PACKAGE_RELEASE="local.9999"
-        -DROCM_VERSION="$(next-release)"
+        -DROCM_VERSION="$(last-release)"
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
--- a/.azuredevops/components/rocm-examples.yml
+++ b/.azuredevops/components/rocm-examples.yml
@@ -8,51 +8,20 @@ parameters:
 - name: aptPackages
  type: object
  default:
-    - cmake
    - libglfw3-dev
-    - python3-pip
 - name: rocmDependencies
  type: object
  default:
    - AMDMIGraphX
    - clr
    - hipBLAS
-    - hipBLAS-common
-    - hipBLASLt
    - hipCUB
-    - hipFFT
    - HIPIFY
    - hipRAND
    - hipSOLVER
    - hipSPARSE
    - llvm-project
    - rocBLAS
-    - rocFFT
-    - rocPRIM
-    - rocprofiler-register
-    - ROCR-Runtime
-    - rocRAND
-    - rocSOLVER
-    - rocSPARSE
-    - rocThrust
- name: rocmTestDependencies
-  type: object
-  default:
-    - AMDMIGraphX
-    - clr
-    - hipBLAS
-    - hipBLAS-common
-    - hipBLASLt
-    - hipCUB
-    - hipFFT
-    - HIPIFY
-    - hipRAND
-    - hipSOLVER
-    - hipSPARSE
-    - llvm-project
-    - rocBLAS
-    - rocFFT
-    - rocminfo
    - rocPRIM
    - rocprofiler-register
    - ROCR-Runtime
@@ -66,7 +35,8 @@ jobs:
  variables:
  - group: common
  - template: /.azuredevops/variables-global.yml
-  pool: ${{ variables.MEDIUM_BUILD_POOL }}
+  pool:
+    vmImage: ${{ variables.BASE_BUILD_POOL }}
  workspace:
    clean: all
  strategy:
@@ -76,13 +46,13 @@ jobs:
      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/preamble.yml
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
    parameters:
      checkoutRepo: ${{ parameters.checkoutRepo }}
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
+    parameters:
+      aptPackages: ${{ parameters.aptPackages }}
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
@@ -100,72 +70,8 @@ jobs:
        -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
        -DROCM_ROOT=$(Agent.BuildDirectory)/rocm
-        -DAMDGPU_TARGETS=$(JOB_GPU_TARGET)
        -DCMAKE_HIP_ARCHITECTURES=$(JOB_GPU_TARGET)
        -DCMAKE_EXE_LINKER_FLAGS=-fgpu-rdc
-  - task: Bash@3
-    displayName: Move rocm-examples binaries to rocm/examples
-    inputs:
-      targetType: inline
-      script: |
-        mkdir -p $(Build.BinariesDirectory)/examples
-        mv $(Build.BinariesDirectory)/bin/* $(Build.BinariesDirectory)/examples
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: rocm_examples_testing
-  dependsOn: rocm_examples
-  condition: succeeded()
-  variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
-  - name: TEST_LOG_FILE
-    value: $(Pipeline.Workspace)/rocm-examplesTestLog.log
-  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: Unload and reload AMDGPU
-    inputs:
-      targetType: inline
-      script: |
-        sudo modprobe -r amdgpu
-        sudo modprobe amdgpu
-  - task: Bash@3
-    displayName: Iterate through examples
-    inputs:
-      targetType: inline
-      script: |
-        for file in *; do
-          echo Now running: $file
-          ./$file | tee -a $(TEST_LOG_FILE)
-        done
-      workingDirectory: $(Agent.BuildDirectory)/rocm/examples
--- a/.azuredevops/components/rocm_bandwidth_test.yml
+++ b/.azuredevops/components/rocm_bandwidth_test.yml
@@ -24,11 +24,7 @@ parameters:
    - rocminfo
    - rocprofiler-register
    - ROCR-Runtime
- name: rocmTestDependencies
-  type: object
-  default:
-    - rocprofiler-register
-    - ROCR-Runtime
+    - ROCT-Thunk-Interface

 jobs:
 - job: rocm_bandwidth_test
@@ -69,40 +65,3 @@ jobs:
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm;$(Agent.BuildDirectory)/rocm/include;$(Agent.BuildDirectory)/rocm/include/hsa
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
- job: rocm_bandwidth_test_testing
-  dependsOn: rocm_bandwidth_test
-  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 }}
-      pipModules: ${{ parameters.pipModules }}
-  - 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.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: rocm_bandwidth_test
-      testDir: '$(Agent.BuildDirectory)'
-      testExecutable: './rocm/bin/rocm-bandwidth-test'
-      testParameters: ''
-      testPublishResults: false
--- a/.azuredevops/components/rocm_smi_lib.yml
+++ b/.azuredevops/components/rocm_smi_lib.yml
@@ -26,27 +26,3 @@ jobs:
        -DBUILD_TESTS=ON
        -DROCM_DEP_ROCMCORE=ON
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
- job: rocm_smi_lib_testing
-  dependsOn: rocm_smi_lib
-  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/preamble.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocm_smi_lib
-      testDir: '$(Agent.BuildDirectory)'
-      testExecutable: './rocm/share/rocm_smi/rsmitst_tests/rsmitst'
-      testParameters: '--gtest_output=xml:./test_output.xml --gtest_color=yes'
--- a/.azuredevops/components/rocminfo.yml
+++ b/.azuredevops/components/rocminfo.yml
@@ -10,11 +10,6 @@ parameters:
  default:
    - ROCR-Runtime
    - rocprofiler-register
- name: rocmTestDependencies
-  type: object
-  default:
-    - ROCR-Runtime
-    - rocprofiler-register

 jobs:
 - job: rocminfo
@@ -33,7 +28,6 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
-      skipLlvmSymlink: true
      # CI case: download latest default branch build
      ${{ if eq(parameters.checkoutRef, '') }}:
        dependencySource: staging
@@ -46,43 +40,3 @@ jobs:
        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
        -DROCRTST_BLD_TYPE=release
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
- job: rocminfo_testing
-  dependsOn: rocminfo
-  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/preamble.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
-  - 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: rocminfo
-      testDir: '$(Agent.BuildDirectory)'
-      testExecutable: './rocm/bin/rocminfo'
-      testParameters: ''
-      testPublishResults: false
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocm_agent_enumerator
-      testDir: '$(Agent.BuildDirectory)'
-      testExecutable: './rocm/bin/rocm_agent_enumerator'
-      testParameters: ''
-      testPublishResults: false
--- a/.azuredevops/components/rocprofiler.yml
+++ b/.azuredevops/components/rocprofiler.yml
@@ -39,6 +39,7 @@ parameters:
    - rocminfo
    - ROCR-Runtime
    - rocprofiler-register
+    - ROCT-Thunk-Interface
    - roctracer

 jobs:
@@ -68,12 +69,29 @@ 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
+# Manually download aqlprofile, hard-coded 6.1.0 version
+  - task: Bash@3
+    displayName: 'Download aqlprofile'
+    inputs:
+      targetType: inline
+      script: wget -nv https://repo.radeon.com/rocm/misc/aqlprofile/ubuntu-22.04/hsa-amd-aqlprofile_1.0.0.60200.60200-crdnnh.14213~22.04_amd64.deb
+      workingDirectory: '$(Pipeline.Workspace)'
+  - task: Bash@3
+    displayName: 'Extract aqlprofile'
+    inputs:
+      targetType: inline
+      script: |
+        mkdir hsa-amd-aqlprofile
+        dpkg-deb -R hsa-amd-aqlprofile_1.0.0.60200.60200-crdnnh.14213~22.04_amd64.deb hsa-amd-aqlprofile
+      workingDirectory: '$(Pipeline.Workspace)'
+  - task: Bash@3
+    displayName: 'Move aqlprofile'
+    inputs:
+      targetType: inline
+      script: |
+        mkdir -p $(Agent.BuildDirectory)/rocm
+        cp -R hsa-amd-aqlprofile/opt/rocm-6.2.0-14213/* $(Agent.BuildDirectory)/rocm
+      workingDirectory: '$(Pipeline.Workspace)'
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
    parameters:
      dependencyList: ${{ parameters.rocmDependencies }}
--- a/.azuredevops/components/rocr_debug_agent.yml
+++ b/.azuredevops/components/rocr_debug_agent.yml
@@ -12,8 +12,6 @@ parameters:
    - ninja-build
    - libelf-dev
    - libdw-dev
-    - libstdc++-12-dev
-    - python-is-python3
 - name: rocmDependencies
  type: object
  default:
@@ -24,15 +22,6 @@ parameters:
    - rocminfo
    - ROCR-Runtime
    - rocprofiler-register
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - ROCdbgapi
-    - rocminfo
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: rocr_debug_agent
@@ -69,52 +58,3 @@ jobs:
        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
        -GNinja
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-
- job: rocr_debug_agent_testing
-  dependsOn: rocr_debug_agent
-  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
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
-    parameters:
-      componentName: rocr_debug_agent-tests
-      extraBuildFlags: >-
-        -DCMAKE_MODULE_PATH=$(Agent.BuildDirectory)/rocm/lib/cmake;$(Agent.BuildDirectory)/rocm/lib/cmake/hip
-        -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
-        -DROCM_PATH=$(Agent.BuildDirectory)/rocm
-      cmakeBuildDir: '$(Agent.BuildDirectory)/rocm/src/rocm-debug-agent-test'
-      cmakeSourceDir: '.'
-      installEnabled: false
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
-    parameters:
-      componentName: rocr_debug_agent
-      testDir: '$(Agent.BuildDirectory)/rocm/src/rocm-debug-agent-test'
--- a/.azuredevops/components/roctracer.yml
+++ b/.azuredevops/components/roctracer.yml
@@ -25,13 +25,6 @@ parameters:
    - rocprofiler-register
    - clr
    - rocminfo
- name: rocmTestDependencies
-  type: object
-  default:
-    - clr
-    - llvm-project
-    - rocprofiler-register
-    - ROCR-Runtime

 jobs:
 - job: roctracer
@@ -81,47 +74,3 @@ jobs:
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
    parameters:
      gpuTarget: $(JOB_GPU_TARGET)
-
- job: roctracer_testing
-  dependsOn: roctracer
-  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: roctracer
-      testExecutable: $(Agent.BuildDirectory)/rocm/share/roctracer/run_tests.sh
-      testParameters: ''
-      testDir: $(Agent.BuildDirectory)
-      testPublishResults: false
--- a/.azuredevops/nightly/pytorch.yml
+++ b/.azuredevops/nightly/pytorch.yml
@@ -54,14 +54,6 @@ parameters:
    - libdrm-amdgpu1
    - ccache
    - zip
-    - libjpeg-turbo-official
-    - libjpeg-dev
-    - libwebp-dev
-    - libfreetype-dev
-    - gnutls-bin
-    - ffmpeg
-    - libopenblas-dev
-    - liblapack-dev
 - name: pipModules
  type: object
  default:
@@ -84,9 +76,6 @@ parameters:
    - ninja
    - packaging
    - optree>=0.12.0
-  # list for vision
-    - auditwheel
-    - future
 # list from https://github.com/pytorch/builder/blob/main/manywheel/build_rocm.sh
 - name: rocmDependencies
  type: object
@@ -157,6 +146,8 @@ jobs:
    value: 3.10
  - name: PYTORCH_ROOT
    value: $(Build.SourcesDirectory)/pytorch
+  - name: CMAKE_ARGS
+    value: -GNinja
  - name: DESIRED_DEVTOOLSET
    value: cxx11-abi
  pool: ${{ variables.ULTRA_BUILD_POOL }}
@@ -166,16 +157,6 @@ jobs:
 # copy environment setup from https://github.com/pytorch/builder/blob/main/manywheel/Dockerfile
 # but instead of centos, use ubuntu environment
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-cmake-latest.yml
-  - task: Bash@3
-    displayName: 'Register libjpeg-turbo packages'
-    inputs:
-      targetType: inline
-      script: |
-        sudo mkdir --parents --mode=0755 /etc/apt/keyrings
-        wget -q -O- https://packagecloud.io/dcommander/libjpeg-turbo/gpgkey | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/libjpeg-turbo.gpg > /dev/null
-        echo "deb [signed-by=/etc/apt/trusted.gpg.d/libjpeg-turbo.gpg] https://packagecloud.io/dcommander/libjpeg-turbo/any/ any main" | sudo tee /etc/apt/sources.list.d/libjpeg-turbo.list
-        sudo apt update
-        apt-cache show libjpeg-turbo-official | grep Version
  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-other.yml
    parameters:
      aptPackages: ${{ parameters.aptPackages }}
@@ -212,6 +193,12 @@ jobs:
      targetType: inline
      script: git clone https://github.com/pytorch/pytorch.git --depth=1 --recurse-submodules
      workingDirectory: $(Build.SourcesDirectory)
+  - task: Bash@3
+    displayName: Patch out forced GPU testing block in pytorch build script
+    inputs:
+      targetType: inline
+      script: git apply $(Build.SourcesDirectory)/.azuredevops/patches/pytorch/0001-ROCm-CI-patches.patch
+      workingDirectory: $(Build.SourcesDirectory)/builder
  - task: Bash@3
    displayName: Install patchelf
    inputs:
@@ -244,7 +231,8 @@ jobs:
    displayName: Install AOTriton Shared Library
    inputs:
      targetType: inline
-      script: sudo bash ./common/install_aotriton.sh /opt/rocm
+      script: |
+        sudo bash ./common/install_aotriton.sh /opt/rocm
      workingDirectory: $(Build.SourcesDirectory)/pytorch/.ci/docker
  - task: Bash@3
    displayName: Run ROCm Build Script
@@ -257,65 +245,16 @@ jobs:
        GPU_TARGET=$(JOB_GPU_TARGET)
        DESIRED_PYTHON=$(DESIRED_PYTHON)
        PYTORCH_ROOT=$(PYTORCH_ROOT)
-        CMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
+        CMAKE_ARGS=$(CMAKE_ARGS)
        AOTRITON_INSTALLED_PREFIX=$(AOTRITON_INSTALLED_PREFIX)
        DESIRED_DEVTOOLSET=$(DESIRED_DEVTOOLSET)
        TORCH_PACKAGE_NAME=torch.$(ROCM_BRANCH).$(JOB_GPU_TARGET)
        PYTORCH_BUILD_VERSION=$(cat $(Build.SourcesDirectory)/pytorch/version.txt | cut -da -f1)
        PYTORCH_BUILD_NUMBER=$(date -u +%Y%m%d)
-        SKIP_ALL_TESTS=1
        bash ./manywheel/build_rocm.sh
      workingDirectory: $(Build.SourcesDirectory)/builder
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-prepare-package.yml
-    parameters:
-      sourceDir: /remote/wheelhouserocm$(ROCM_VERSION)
-      contentsString: '*.whl'
-# common helper source for pytorch vision and audio
-  - task: Bash@3
-    displayName: git clone pytorch test-infra
-    inputs:
-      targetType: inline
-      script: git clone https://github.com/pytorch/test-infra.git --depth=1 --recurse-submodules
-      workingDirectory: $(Build.SourcesDirectory)
-  - task: Bash@3
-    displayName: install package helper
-    inputs:
-      targetType: inline
-      script: python3 -m pip install test-infra/tools/pkg-helpers
-      workingDirectory: $(Build.SourcesDirectory)
-  - task: Bash@3
-    displayName: pytorch pkg helpers
-    inputs:
-      targetType: inline
-      script: CU_VERSION=${CU_VERSION} CHANNEL=${CHANNEL} python -m pytorch_pkg_helpers
-# get torch vision source and build
-  - task: Bash@3
-    displayName: git clone pytorch vision
-    inputs:
-      targetType: inline
-      script: git clone https://github.com/pytorch/vision.git --depth=1 --recurse-submodules
-      workingDirectory: $(Build.SourcesDirectory)
-  - task: Bash@3
-    displayName: Build vision
-    inputs:
-      targetType: inline
-      script: >-
-        BUILD_VERSION=$(ROCM_BRANCH).$(JOB_GPU_TARGET)-$(cat $(Build.SourcesDirectory)/pytorch/version.txt | cut -da -f1)$(date -u +%Y%m%d)
-        python3 setup.py bdist_wheel
-      workingDirectory: $(Build.SourcesDirectory)/vision
-  - task: Bash@3
-    displayName: Relocate vision
-    inputs:
-      targetType: inline
-      script: python3 packaging/wheel/relocate.py
-      workingDirectory: $(Build.SourcesDirectory)/vision
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-prepare-package.yml
-    parameters:
-      sourceDir: $(Build.SourcesDirectory)/vision/dist
-      contentsString: '*.whl'
-      clean: false
  - task: PublishPipelineArtifact@1
-    displayName: 'wheel file Publish'
+    displayName: 'ROCm pytorch wheel file Publish'
    retryCountOnTaskFailure: 3
    inputs:
-      targetPath: $(Build.BinariesDirectory)
+      targetPath: /remote/wheelhouserocm$(ROCM_VERSION)
--- a/.azuredevops/nightly/rocm-nightly.yml
+++ b/.azuredevops/nightly/rocm-nightly.yml
@@ -49,6 +49,7 @@ parameters:
    - rocr_debug_agent
    - rocSOLVER
    - rocSPARSE
+    - ROCT-Thunk-Interface
    - rocThrust
    - roctracer
    - rocWMMA
--- a/.azuredevops/patches/pytorch/0001-ROCm-CI-patches.patch
+++ b/.azuredevops/patches/pytorch/0001-ROCm-CI-patches.patch
@@ -0,0 +1,40 @@
+From b2d3c88f7a8b179e814e72f76f27e25c82659200 Mon Sep 17 00:00:00 2001
+From: Joseph Macaranas <Joseph.Macaranas@amd.com>
+Date: Tue, 30 Jul 2024 05:43:06 -0400
+Subject: [PATCH] ROCm CI patches
+
+---
+ manywheel/build_common.sh | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/manywheel/build_common.sh b/manywheel/build_common.sh
+index 08ca924..52c468f 100644
+--- a/manywheel/build_common.sh
+++ b/manywheel/build_common.sh
+@@ -475,11 +475,9 @@ if [[ -z "$BUILD_PYTHONLESS" ]]; then
+   fi
+ 
+   pip uninstall -y "$TORCH_PACKAGE_NAME"
+-  
+   if [[ "$USE_SPLIT_BUILD" == "true" ]]; then
+     pip install "$TORCH_NO_PYTHON_PACKAGE_NAME" --no-index -f /$WHEELHOUSE_DIR --no-dependencies -v
+   fi
+-  
+   pip install "$TORCH_PACKAGE_NAME" --no-index -f /$WHEELHOUSE_DIR --no-dependencies -v
+ 
+   # Print info on the libraries installed in this wheel
+@@ -491,11 +489,4 @@ if [[ -z "$BUILD_PYTHONLESS" ]]; then
+       ldd "$installed_lib" || true
+   done
+ 
+-  # Run the tests
+-  echo "$(date) :: Running tests"
+-  pushd "$PYTORCH_ROOT"
+-  LD_LIBRARY_PATH=/usr/local/nvidia/lib64 \
+-          "${SOURCE_DIR}/../run_tests.sh" manywheel "${py_majmin}" "$DESIRED_CUDA"
+-  popd
+-  echo "$(date) :: Finished tests"
+ fi
+-- 
+2.44.0.windows.1
+
--- a/.azuredevops/tag-builds/aomp.yml
+++ b/.azuredevops/tag-builds/aomp.yml
@@ -9,26 +9,16 @@ parameters:

 resources:
  repositories:
-  - repository: aomp_repo
+  - repository: release_repo
    type: github
    endpoint: ROCm
    name: ROCm/aomp
    ref: ${{ parameters.checkoutRef }}
-  - repository: aomp-extras_repo
-    type: github
-    endpoint: ROCm
-    name: ROCm/aomp-extras
-    ref: ${{ parameters.checkoutRef }}
-  - repository: flang_repo
-    type: github
-    endpoint: ROCm
-    name: ROCm/flang
-    ref: ${{ parameters.checkoutRef }}
  - repository: llvm-project_repo
    type: github
    endpoint: ROCm
    name: ROCm/llvm-project
-    ref: amd-staging
+    ref: ${{ parameters.checkoutRef }}

 trigger: none
 pr: none
@@ -36,5 +26,5 @@ pr: none
 jobs:
  - template: ${{ variables.CI_COMPONENT_PATH }}/aomp.yml
    parameters:
-      checkoutRepo: aomp_repo
+      checkoutRepo: release_repo
      checkoutRef: ${{ parameters.checkoutRef }}
--- a/.azuredevops/tag-builds/hip-tests.yml
+++ b/.azuredevops/tag-builds/hip-tests.yml
@@ -1,29 +0,0 @@
-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/hip-tests
-    ref: ${{ parameters.checkoutRef }}
-
-trigger: none
-pr: none
-
-jobs:
-  - template: ${{ variables.CI_COMPONENT_PATH }}/hip-tests.yml
-    parameters:
-      checkoutRepo: release_repo
-      checkoutRef: ${{ parameters.checkoutRef }}
--- a/.azuredevops/tag-builds/rocPyDecode.yml
+++ b/.azuredevops/tag-builds/rocPyDecode.yml
@@ -1,29 +0,0 @@
-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/rocPyDecode
-    ref: ${{ parameters.checkoutRef }}
-
-trigger: none
-pr: none
-
-jobs:
-  - template: ${{ variables.CI_COMPONENT_PATH }}/rocPyDecode.yml
-    parameters:
-      checkoutRepo: release_repo
-      checkoutRef: ${{ parameters.checkoutRef }}
--- a/.azuredevops/templates/steps/artifact-download.yml
+++ b/.azuredevops/templates/steps/artifact-download.yml
@@ -64,27 +64,16 @@ parameters:
    rocPRIM: develop
    rocprofiler-register: amd-mainline
    rocprofiler: amd-staging
-    ROCR-Runtime: amd-staging
+    ROCR-Runtime: master
    rocRAND: develop
    rocr_debug_agent: amd-staging
    rocSOLVER: develop
    rocSPARSE: develop
+    ROCT-Thunk-Interface: master
    rocThrust: develop
    roctracer: amd-staging
    rocWMMA: develop
-    rpp: develop
- name: allowPartiallySucceededBuilds
-  type: object
-  default:
-    - amdsmi
-    - aomp
-    - HIPIFY
-    - rccl
-    - rdc
-    - rocm-cmake
-    - rocm_smi_lib
-    - rocFFT
-    - MIVisionX
+    rpp: master
 # BELOW REQUIRED IF useDefaultBranch false
 - name: branchName
  type: string
@@ -106,7 +95,7 @@ steps:
      branchName: refs/heads/${{ parameters.defaultBranchList[parameters.componentName] }}
    ${{ else }}:
      branchName: ${{ parameters.branchName }}
-    ${{ if containsValue(parameters.allowPartiallySucceededBuilds, parameters.componentName) }}:
+    ${{ if in(parameters.componentName, 'rocm-cmake') }}:
      allowPartiallySucceededBuilds: true
    targetPath: '$(Pipeline.Workspace)/d'
 - task: ExtractFiles@1
--- a/.azuredevops/templates/steps/build-cmake.yml
+++ b/.azuredevops/templates/steps/build-cmake.yml
@@ -14,9 +14,6 @@ parameters:
 - name: cmakeSourceDir
  type: string
  default: '..'
- name: customBuildTarget
-  type: string
-  default: ''
 - name: cmakeTarget
  type: string
  default: 'install'
@@ -52,10 +49,7 @@ steps:
  displayName: '${{parameters.componentName }} Build'
  inputs:
    workingDirectory: ${{ parameters.cmakeBuildDir }}
-    ${{ if eq(parameters.customBuildTarget, '') }}:
-      cmakeArgs: '--build ${{ parameters.cmakeTargetDir }} ${{ parameters.multithreadFlag }}'
-    ${{ else }}:
-      cmakeArgs: '--build ${{ parameters.cmakeTargetDir }} --target ${{ parameters.customBuildTarget }} ${{ parameters.multithreadFlag }}'
+    cmakeArgs: '--build ${{ parameters.cmakeTargetDir }} ${{ parameters.multithreadFlag }}'
    retryCountOnTaskFailure: 10
 - script: df -h
  displayName: Disk space after build
--- a/.azuredevops/templates/steps/ccache.yml
+++ b/.azuredevops/templates/steps/ccache.yml
@@ -1,14 +1,11 @@
 # to use ccache, run this template step before build-cmake.yml
 # and add this cmake flag to extraBuildFlags
 # -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
-variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
 steps:
 - task: Cache@2
  displayName: Ccache caching
  inputs:
    key: 'ccache | "$(Agent.OS)" | $(Build.SourceVersion)'
-    path: ${{ variables.CCACHE_DIR }}
+    path: $(CCACHE_DIR)
    restoreKeys: |
      ccache | "$(Agent.OS)"
--- a/.azuredevops/templates/steps/dependencies-aocl.yml
+++ b/.azuredevops/templates/steps/dependencies-aocl.yml
@@ -1,27 +0,0 @@
-parameters:
- name: repositoryUrl
-  type: string
-  default: https://download.amd.com/developer/eula/aocl/aocl-4-2
- name: packageName
-  type: string
-  default: aocl-linux-gcc-4.2.0_1_amd64.deb
-
-steps:
- task: Bash@3
-  displayName: Download AOCL
-  inputs:
-    targetType: inline
-    workingDirectory: $(Pipeline.Workspace)
-    script: wget -nv ${{ parameters.repositoryUrl }}/${{ parameters.packageName }}
- task: Bash@3
-  displayName: Install AOCL
-  inputs:
-    targetType: inline
-    workingDirectory: $(Pipeline.Workspace)
-    script: sudo apt install -y ./${{ parameters.packageName }}
- task: Bash@3
-  displayName: Clean up AOCL
-  inputs:
-    targetType: inline
-    workingDirectory: $(Pipeline.Workspace)
-    script: rm -f ${{ parameters.packageName }}
--- a/.azuredevops/templates/steps/dependencies-aqlprofile.yml
+++ b/.azuredevops/templates/steps/dependencies-aqlprofile.yml
@@ -1,47 +0,0 @@
-parameters:
- name: dependencySource
-  type: string
-  default: staging
-  values:
-    - staging
-    - tag-builds
- name: repositoryUrl
-  type: object
-  default: 
-    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-66~22.04_amd64.deb
-    tag-builds: hsa-amd-aqlprofile_1.0.0.60200.60200-66~22.04_amd64.deb
-
-steps:
- task: Bash@3
-  displayName: 'Download aqlprofile'
-  inputs:
-    targetType: inline
-    script: wget -nv ${{ parameters.repositoryUrl[parameters.dependencySource] }}/${{ parameters.packageName[parameters.dependencySource] }}
-    workingDirectory: '$(Pipeline.Workspace)'
- task: Bash@3
-  displayName: 'Extract aqlprofile'
-  inputs:
-    targetType: inline
-    script: |
-      mkdir hsa-amd-aqlprofile
-      dpkg-deb -R ${{ parameters.packageName[parameters.dependencySource] }} hsa-amd-aqlprofile
-    workingDirectory: '$(Pipeline.Workspace)'
- task: Bash@3
-  displayName: 'Copy aqlprofile files'
-  inputs:
-    targetType: inline
-    script: |
-      mkdir -p $(Agent.BuildDirectory)/rocm
-      cp -R hsa-amd-aqlprofile/opt/rocm-*/* $(Agent.BuildDirectory)/rocm
-    workingDirectory: '$(Pipeline.Workspace)'
- task: Bash@3
-  displayName: 'Clean up aqlprofile'
-  inputs:
-    targetType: inline
-    script: rm -rf hsa-amd-aqlprofile ${{ parameters.packageName[parameters.dependencySource] }}
-    workingDirectory: '$(Pipeline.Workspace)'
--- a/.azuredevops/templates/steps/dependencies-cmake-latest.yml
+++ b/.azuredevops/templates/steps/dependencies-cmake-latest.yml
@@ -5,6 +5,6 @@ steps:
  inputs:
    targetType: inline
    script: |
-      sudo apt purge cmake -y
+      sudo apt purge cmake
      sudo snap install cmake --classic
      hash -r
--- a/.azuredevops/templates/steps/dependencies-other.yml
+++ b/.azuredevops/templates/steps/dependencies-other.yml
@@ -12,23 +12,31 @@ steps:
  displayName: 'sudo apt-get update'
  inputs:
    targetType: inline
-    script: sudo DEBIAN_FRONTEND=noninteractive apt-get --yes update
+    script: sudo apt-get --yes update
+  env:
+    DEBIAN_FRONTEND: noninteractive
 - task: Bash@3
  displayName: 'sudo apt-get upgrade'
  inputs:
    targetType: inline
-    script: sudo DEBIAN_FRONTEND=noninteractive apt-get --yes upgrade
+    script: sudo apt-get --yes upgrade
+  env:
+    DEBIAN_FRONTEND: noninteractive
 - task: Bash@3
  displayName: 'sudo apt-get fix'
  inputs:
    targetType: inline
-    script: sudo DEBIAN_FRONTEND=noninteractive apt-get --yes --fix-broken install
+    script: sudo apt --yes --fix-broken install
+  env:
+    DEBIAN_FRONTEND: noninteractive
 - ${{ if gt(length(parameters.aptPackages), 0) }}:
  - task: Bash@3
    displayName: 'sudo apt-get install ...'
    inputs:
      targetType: inline
-      script: sudo DEBIAN_FRONTEND=noninteractive apt-get --yes install ${{ join(' ', parameters.aptPackages) }}
+      script: sudo apt-get --yes install ${{ join(' ', parameters.aptPackages) }}
+    env:
+      DEBIAN_FRONTEND: noninteractive
 - ${{ if gt(length(parameters.pipModules), 0) }}:
  - task: Bash@3
    displayName: 'pip install  ...'
--- a/.azuredevops/templates/steps/dependencies-rocm.yml
+++ b/.azuredevops/templates/steps/dependencies-rocm.yml
@@ -29,115 +29,115 @@ parameters:
 - name: stagingPipelineIdentifiers
  type: object
  default:
-    AMDMIGraphX: $(AMDMIGRAPHX_PIPELINE_ID)
-    amdsmi: $(AMDSMI_PIPELINE_ID)
-    aomp-extras: $(AOMP_EXTRAS_PIPELINE_ID)
-    aomp: $(AOMP_PIPELINE_ID)
-    clr: $(CLR_PIPELINE_ID)
-    composable_kernel: $(COMPOSABLE_KERNEL_PIPELINE_ID)
-    half: $(HALF_PIPELINE_ID)
-    HIP: $(HIP_PIPELINE_ID)
-    hipBLAS: $(HIPBLAS_PIPELINE_ID)
-    hipBLAS-common: $(HIPBLAS_COMMON_PIPELINE_ID)
-    hipBLASLt: $(HIPBLASLT_PIPELINE_ID)
-    hipCUB: $(HIPCUB_PIPELINE_ID)
-    hipFFT: $(HIPFFT_PIPELINE_ID)
-    hipfort: $(HIPFORT_PIPELINE_ID)
-    HIPIFY: $(HIPIFY_PIPELINE_ID)
-    hipRAND: $(HIPRAND_PIPELINE_ID)
-    hipSOLVER: $(HIPSOLVER_PIPELINE_ID)
-    hipSPARSE: $(HIPSPARSE_PIPELINE_ID)
-    hipSPARSELt: $(HIPSPARSELT_PIPELINE_ID)
-    hipTensor: $(HIPTENSOR_PIPELINE_ID)
-    llvm-project: $(LLVM_PROJECT_PIPELINE_ID)
-    MIOpen: $(MIOpen_PIPELINE_ID)
-    MIVisionX: $(MIVISIONX_PIPELINE_ID)
-    rccl: $(RCCL_PIPELINE_ID)
-    rdc: $(RDC_PIPELINE_ID)
-    rocAL: $(ROCAL_PIPELINE_ID)
-    rocALUTION: $(ROCALUTION_PIPELINE_ID)
-    rocBLAS: $(ROCBLAS_PIPELINE_ID)
-    ROCdbgapi: $(ROCDBGAPI_PIPELINE_ID)
-    rocDecode: $(ROCDECODE_PIPELINE_ID)
-    rocFFT: $(ROCFFT_PIPELINE_ID)
-    ROCgdb: $(ROCGDB_PIPELINE_ID)
-    rocm-cmake: $(ROCM_CMAKE_PIPELINE_ID)
-    rocm-core: $(ROCM_CORE_PIPELINE_ID)
-    rocm-examples: $(ROCM_EXAMPLES_PIPELINE_ID)
-    rocminfo: $(ROCMINFO_PIPELINE_ID)
-    rocMLIR: $(ROCMLIR_PIPELINE_ID)
-    ROCmValidationSuite: $(ROCMVALIDATIONSUITE_PIPELINE_ID)
-    rocm_bandwidth_test: $(ROCM_BANDWIDTH_TEST_PIPELINE_ID)
-    rocm_smi_lib: $(ROCM_SMI_LIB_PIPELINE_ID)
-    rocPRIM: $(ROCPRIM_PIPELINE_ID)
-    rocprofiler-register: $(ROCPROFILER_REGISTER_PIPELINE_ID)
-    rocprofiler: $(ROCPROFILER_PIPELINE_ID)
-    ROCR-Runtime: $(ROCR_RUNTIME_PIPELINE_ID)
-    rocRAND: $(ROCRAND_PIPELINE_ID)
-    rocr_debug_agent: $(ROCR_DEBUG_AGENT_PIPELINE_ID)
-    rocSOLVER: $(ROCSOLVER_PIPELINE_ID)
-    rocSPARSE: $(ROCSPARSE_PIPELINE_ID)
-    ROCT-Thunk-Interface: $(ROCT_THUNK_INTERFACE_PIPELINE_ID)
-    rocThrust: $(ROCTHRUST_PIPELINE_ID)
-    roctracer: $(ROCTRACER_PIPELINE_ID)
-    rocWMMA: $(ROCWMMA_PIPELINE_ID)
-    rpp: $(RPP_PIPELINE_ID)
+    AMDMIGraphX: $(amdmigraphx-pipeline-id)
+    amdsmi: $(amdsmi-pipeline-id)
+    aomp-extras: $(aomp-extras-pipeline-id)
+    aomp: $(aomp-pipeline-id)
+    clr: $(clr-pipeline-id)
+    composable_kernel: $(composable-kernel-pipeline-id)
+    half: $(half-pipeline-id)
+    HIP: $(hip-pipeline-id)
+    hipBLAS: $(hipblas-pipeline-id)
+    hipBLASLt: $(hipblaslt-pipeline-id)
+    hipBLAS-common: $(hipblas-common-pipeline-id)
+    hipCUB: $(hipcub-pipeline-id)
+    hipFFT: $(hipfft-pipeline-id)
+    hipfort: $(hipfort-pipeline-id)
+    HIPIFY: $(hipify-pipeline-id)
+    hipRAND: $(hiprand-pipeline-id)
+    hipSOLVER: $(hipsolver-pipeline-id)
+    hipSPARSE: $(hipsparse-pipeline-id)
+    hipSPARSELt: $(hipsparselt-pipeline-id)
+    hipTensor: $(hiptensor-pipeline-id)
+    llvm-project: $(llvm-project-pipeline-id)
+    MIOpen: $(miopen-pipeline-id)
+    MIVisionX: $(mivisionx-pipeline-id)
+    rccl: $(rccl-pipeline-id)
+    rdc: $(rdc-pipeline-id)
+    rocAL: $(rocal-pipeline-id)
+    rocALUTION: $(rocalution-pipeline-id)
+    rocBLAS: $(rocblas-pipeline-id)
+    ROCdbgapi : $(rocdbgapi-pipeline-id)
+    rocDecode: $(rocdecode-pipeline-id)
+    rocFFT: $(rocfft-pipeline-id)
+    ROCgdb: $(rocgdb-pipeline-id)
+    rocm-cmake: $(rocm-cmake-pipeline-id)
+    rocm-core: $(rocm-core-pipeline-id)
+    rocm-examples: $(rocm-examples-pipeline-id)
+    rocminfo: $(rocminfo-pipeline-id)
+    rocMLIR: $(rocmlir-pipeline-id)
+    ROCmValidationSuite: $(rocmvalidationsuite-pipeline-id)
+    rocm_bandwidth_test: $(rocm-bandwidth-test-pipeline-id)
+    rocm_smi_lib: $(rocm-smi-lib-pipeline-id)
+    rocPRIM: $(rocprim-pipeline-id)
+    rocprofiler-register: $(rocprofiler-register-pipeline-id)
+    rocprofiler: $(rocprofiler-pipeline-id)
+    ROCR-Runtime: $(rocr-runtime-pipeline-id)
+    rocRAND: $(rocrand-pipeline-id)
+    rocr_debug_agent: $(rocr-debug-agent-pipeline-id)
+    rocSOLVER: $(rocsolver-pipeline-id)
+    rocSPARSE: $(rocsparse-pipeline-id)
+    ROCT-Thunk-Interface: $(roct-thunk-interface-pipeline-id)
+    rocThrust: $(rocthrust-pipeline-id)
+    roctracer: $(roctracer-pipeline-id)
+    rocWMMA: $(rocwmma-pipeline-id)
+    rpp: $(rpp-pipeline-id)
 - name: taggedPipelineIdentifiers
  type: object
  default:
-    AMDMIGraphX: $(AMDMIGRAPHX_TAGGED_PIPELINE_ID)
-    amdsmi: $(AMDSMI_TAGGED_PIPELINE_ID)
-    aomp-extras: $(AOMP_EXTRAS_TAGGED_PIPELINE_ID)
-    aomp: $(AOMP_TAGGED_PIPELINE_ID)
-    clr: $(CLR_TAGGED_PIPELINE_ID)
-    composable_kernel: $(COMPOSABLE_KERNEL_TAGGED_PIPELINE_ID)
-    half: $(HALF_TAGGED_PIPELINE_ID)
-    HIP: $(HIP_TAGGED_PIPELINE_ID)
-    hipBLAS: $(HIPBLAS_TAGGED_PIPELINE_ID)
-    hipBLAS-common: $(HIPBLAS_COMMON_TAGGED_PIPELINE_ID)
-    hipBLASLt: $(HIPBLASLT_TAGGED_PIPELINE_ID)
-    hipCUB: $(HIPCUB_TAGGED_PIPELINE_ID)
-    hipFFT: $(HIPFFT_TAGGED_PIPELINE_ID)
-    hipfort: $(HIPFORT_TAGGED_PIPELINE_ID)
-    HIPIFY: $(HIPIFY_TAGGED_PIPELINE_ID)
-    hipRAND: $(HIPRAND_TAGGED_PIPELINE_ID)
-    hipSOLVER: $(HIPSOLVER_TAGGED_PIPELINE_ID)
-    hipSPARSE: $(HIPSPARSE_TAGGED_PIPELINE_ID)
-    hipSPARSELt: $(HIPSPARSELT_TAGGED_PIPELINE_ID)
-    hipTensor: $(HIPTENSOR_TAGGED_PIPELINE_ID)
-    llvm-project: $(LLVM_PROJECT_TAGGED_PIPELINE_ID)
-    MIOpen: $(MIOpen_TAGGED_PIPELINE_ID)
-    MIVisionX: $(MIVISIONX_TAGGED_PIPELINE_ID)
-    rccl: $(RCCL_TAGGED_PIPELINE_ID)
-    rdc: $(RDC_TAGGED_PIPELINE_ID)
-    rocAL: $(ROCAL_TAGGED_PIPELINE_ID)
-    rocALUTION: $(ROCALUTION_TAGGED_PIPELINE_ID)
-    rocBLAS: $(ROCBLAS_TAGGED_PIPELINE_ID)
-    ROCdbgapi: $(ROCDBGAPI_TAGGED_PIPELINE_ID)
-    rocDecode: $(ROCDECODE_TAGGED_PIPELINE_ID)
-    rocFFT: $(ROCFFT_TAGGED_PIPELINE_ID)
-    ROCgdb: $(ROCGDB_TAGGED_PIPELINE_ID)
-    rocm-cmake: $(ROCM_CMAKE_TAGGED_PIPELINE_ID)
-    rocm-core: $(ROCM_CORE_TAGGED_PIPELINE_ID)
-    rocm-examples: $(ROCM_EXAMPLES_TAGGED_PIPELINE_ID)
-    rocminfo: $(ROCMINFO_TAGGED_PIPELINE_ID)
-    rocMLIR: $(ROCMLIR_TAGGED_PIPELINE_ID)
-    ROCmValidationSuite: $(ROCMVALIDATIONSUITE_TAGGED_PIPELINE_ID)
-    rocm_bandwidth_test: $(ROCM_BANDWIDTH_TEST_TAGGED_PIPELINE_ID)
-    rocm_smi_lib: $(ROCM_SMI_LIB_TAGGED_PIPELINE_ID)
-    rocPRIM: $(ROCPRIM_TAGGED_PIPELINE_ID)
-    rocprofiler-register: $(ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID)
-    rocprofiler: $(ROCPROFILER_TAGGED_PIPELINE_ID)
-    ROCR-Runtime: $(ROCR_RUNTIME_TAGGED_PIPELINE_ID)
-    rocRAND: $(ROCRAND_TAGGED_PIPELINE_ID)
-    rocr_debug_agent: $(ROCR_DEBUG_AGENT_TAGGED_PIPELINE_ID)
-    rocSOLVER: $(ROCSOLVER_TAGGED_PIPELINE_ID)
-    rocSPARSE: $(ROCSPARSE_TAGGED_PIPELINE_ID)
-    ROCT-Thunk-Interface: $(ROCT_THUNK_INTERFACE_TAGGED_PIPELINE_ID)
-    rocThrust: $(ROCTHRUST_TAGGED_PIPELINE_ID)
-    roctracer: $(ROCTRACER_TAGGED_PIPELINE_ID)
-    rocWMMA: $(ROCWMMA_TAGGED_PIPELINE_ID)
-    rpp: $(RPP_TAGGED_PIPELINE_ID)
+    AMDMIGraphX: $(amdmigraphx-tagged-pipeline-id)
+    amdsmi: $(amdsmi-tagged-pipeline-id)
+    aomp-extras: $(aomp-extras-tagged-pipeline-id)
+    aomp: $(aomp-tagged-pipeline-id)
+    clr: $(clr-tagged-pipeline-id)
+    composable_kernel: $(composable-kernel-tagged-pipeline-id)
+    half: $(half-tagged-pipeline-id)
+    HIP: $(hip-tagged-pipeline-id)
+    hipBLAS: $(hipblas-tagged-pipeline-id)
+    hipBLASLt: $(hipblaslt-tagged-pipeline-id)
+    hipBLAS-common: $(hipblas-common-tagged-pipeline-id)
+    hipCUB: $(hipcub-tagged-pipeline-id)
+    hipFFT: $(hipfft-tagged-pipeline-id)
+    hipfort: $(hipfort-tagged-pipeline-id)
+    HIPIFY: $(hipify-tagged-pipeline-id)
+    hipRAND: $(hiprand-tagged-pipeline-id)
+    hipSOLVER: $(hipsolver-tagged-pipeline-id)
+    hipSPARSE: $(hipsparse-tagged-pipeline-id)
+    hipSPARSELt: $(hipsparselt-tagged-pipeline-id)
+    hipTensor: $(hiptensor-tagged-pipeline-id)
+    llvm-project: $(llvm-project-tagged-pipeline-id)
+    MIOpen: $(miopen-tagged-pipeline-id)
+    MIVisionX: $(mivisionx-tagged-pipeline-id)
+    rccl: $(rccl-tagged-pipeline-id)
+    rdc: $(rdc-tagged-pipeline-id)
+    rocAL: $(rocal-tagged-pipeline-id)
+    rocALUTION: $(rocalution-tagged-pipeline-id)
+    rocBLAS: $(rocblas-tagged-pipeline-id)
+    ROCdbgapi : $(rocdbgapi-tagged-pipeline-id)
+    rocDecode: $(rocdecode-tagged-pipeline-id)
+    rocFFT: $(rocfft-tagged-pipeline-id)
+    ROCgdb: $(rocgdb-tagged-pipeline-id)
+    rocm-cmake: $(rocm-cmake-tagged-pipeline-id)
+    rocm-core: $(rocm-core-tagged-pipeline-id)
+    rocm-examples: $(rocm-examples-tagged-pipeline-id)
+    rocminfo: $(rocminfo-tagged-pipeline-id)
+    rocMLIR: $(rocmlir-tagged-pipeline-id)
+    ROCmValidationSuite: $(rocmvalidationsuite-tagged-pipeline-id)
+    rocm_bandwidth_test: $(rocm-bandwidth-test-tagged-pipeline-id)
+    rocm_smi_lib: $(rocm-smi-lib-tagged-pipeline-id)
+    rocPRIM: $(rocprim-tagged-pipeline-id)
+    rocprofiler-register: $(rocprofiler-register-tagged-pipeline-id)
+    rocprofiler: $(rocprofiler-tagged-pipeline-id)
+    ROCR-Runtime: $(rocr-runtime-tagged-pipeline-id)
+    rocRAND: $(rocrand-tagged-pipeline-id)
+    rocr_debug_agent: $(rocr-debug-agent-tagged-pipeline-id)
+    rocSOLVER: $(rocsolver-tagged-pipeline-id)
+    rocSPARSE: $(rocsparse-tagged-pipeline-id)
+    ROCT-Thunk-Interface: $(roct-thunk-interface-tagged-pipeline-id)
+    rocThrust: $(rocthrust-tagged-pipeline-id)
+    roctracer: $(roctracer-tagged-pipeline-id)
+    rocWMMA: $(rocwmma-tagged-pipeline-id)
+    rpp: $(rpp-tagged-pipeline-id)
 # set to true if you're calling this template file multiple files in same pipeline
 # only leave last call false to optimize sequence
 - name: skipLibraryLinking
@@ -241,14 +241,6 @@ steps:
    inputs:
      targetType: inline
      script: sudo ln -s $(Agent.BuildDirectory)/rocm/llvm $(Agent.BuildDirectory)/rocm/lib/llvm
-  - task: Bash@3
-    displayName: Symlink executables from rocm/llvm/bin to rocm/bin
-    inputs:
-      targetType: inline
-      script: |
-        for file in amdclang amdclang++ amdclang-cl amdclang-cpp amdflang amdlld aompcc mygpu mycpu offload-arch; do
-          sudo ln -s $(Agent.BuildDirectory)/rocm/llvm/bin/$file $(Agent.BuildDirectory)/rocm/bin/$file
-        done
 - task: Bash@3
  displayName: 'List downloaded ROCm files'
  inputs:
@@ -265,15 +257,15 @@ steps:
 # OS ignores if the ROCm lib folder shows up more than once
      ${{ if eq(parameters.extractToMnt, true) }}:
        script: |
-          echo /mnt/rocm/lib | sudo tee /etc/ld.so.conf.d/rocm-ci.conf
-          echo /mnt/rocm/llvm/lib | sudo tee -a /etc/ld.so.conf.d/rocm-ci.conf
-          sudo cat /etc/ld.so.conf.d/rocm-ci.conf
+          echo /mnt/rocm/lib | sudo tee -a /etc/ld.so.conf
+          echo /mnt/rocm/llvm/lib | sudo tee -a /etc/ld.so.conf
+          sudo cat /etc/ld.so.conf
          sudo ldconfig -v
          ldconfig -p
      ${{ else }}:
        script: |
-          echo $(Agent.BuildDirectory)/rocm/lib | sudo tee /etc/ld.so.conf.d/rocm-ci.conf
-          echo $(Agent.BuildDirectory)/rocm/llvm/lib | sudo tee -a /etc/ld.so.conf.d/rocm-ci.conf
-          sudo cat /etc/ld.so.conf.d/rocm-ci.conf
+          echo $(Agent.BuildDirectory)/rocm/lib | sudo tee -a /etc/ld.so.conf
+          echo $(Agent.BuildDirectory)/rocm/llvm/lib | sudo tee -a /etc/ld.so.conf
+          sudo cat /etc/ld.so.conf
          sudo ldconfig -v
          ldconfig -p
--- a/.azuredevops/templates/steps/local-artifact-download.yml
+++ b/.azuredevops/templates/steps/local-artifact-download.yml
@@ -1,45 +0,0 @@
-parameters:
-  - name: gpuTarget
-    type: string
-    default: ''
-  # Set buildType to specific to download artifacts from previous builds, useful for saving time when debugging
-  - name: buildType
-    type: string
-    default: current
-    values:
-      - current
-      - specific
-  # Must be set if buildType == specific
-  # Set definitionId to the pipeline ID and buildId to the specific build ID
-  - name: definitionId
-    type: string
-    default: 0
-  - name: buildId
-    type: string
-    default: 0
-
-steps:
-  - task: DownloadPipelineArtifact@2
-    displayName: 'Download Pipeline Build'
-    inputs:
-      ${{ if eq(parameters.buildType, 'specific') }}:
-        buildType: specific
-        buildVersionToDownload: specific
-        project: ROCm-CI
-        definition: ${{ parameters.definitionId }}
-        buildId: ${{ parameters.buildId }}
-      itemPattern: '**/*${{ parameters.gpuTarget }}*'
-      targetPath: $(System.ArtifactsDirectory)
-  - task: ExtractFiles@1
-    displayName: 'Extract Pipeline Build'
-    inputs:
-      archiveFilePatterns: '$(System.ArtifactsDirectory)/**/*.tar.gz'
-      destinationFolder: '$(Agent.BuildDirectory)/rocm'
-      cleanDestinationFolder: false
-      overwriteExistingFiles: true
-  - task: DeleteFiles@1
-    displayName: 'Clean up Compressed Pipeline Build'
-    inputs:
-      SourceFolder: '$(System.ArtifactsDirectory)'
-      Contents: '/**/*.tar.xz'
-      RemoveDotFiles: true
--- a/.azuredevops/templates/steps/test.yml
+++ b/.azuredevops/templates/steps/test.yml
@@ -10,36 +10,15 @@ parameters:
  default: 'ctest'
 - name: testParameters
  type: string
-  default: '-VV --output-on-failure --force-new-ctest-process --output-junit test_output.xml'
+  default: '--output-on-failure --force-new-ctest-process --output-junit test_output.xml'
 - name: testOutputFile
  type: string
  default: test_output.xml
 - name: testOutputFormat
  type: string
-  default: 'JUnit'
-  values:
-    - JUnit
-    - NUnit
-    - VSTest
-    - XUnit
-    - CTest
- name: testPublishResults
-  type: boolean
-  default: true
- name: reloadAMDGPU
-  type: boolean
-  default: false
+  default: 'junit'

 steps:
-# Avoids occasional AMDGPU driver issues with opening /dev/kfd
- ${{ if parameters.reloadAMDGPU }}:
-  - task: Bash@3
-    displayName: Unload and reload AMDGPU
-    inputs:
-      targetType: inline
-      script: |
-        sudo modprobe -r amdgpu
-        sudo modprobe amdgpu
 # run test, continue on failure to publish results
 # and to publish build artifacts
 - task: Bash@3
@@ -49,11 +28,9 @@ steps:
    targetType: inline
    script: ${{ parameters.testExecutable }} ${{ parameters.testParameters }}
    workingDirectory: ${{ parameters.testDir }}
- ${{ if parameters.testPublishResults }}:
-  - task: PublishTestResults@2
-    displayName: '${{ parameters.componentName }} Publish Results'
-    inputs:
-      searchFolder: ${{ parameters.testDir }}
-      testResultsFormat: ${{ parameters.testOutputFormat }}
-      testResultsFiles: '**/${{ parameters.testOutputFile }}'
-    condition: succeededOrFailed()
+- task: PublishTestResults@2
+  displayName: '${{ parameters.componentName }} Publish Results'
+  inputs:
+    testResultsFormat: ${{ parameters.testOutputFormat }}
+    testResultsFiles: '**/${{ parameters.testOutputFile }}'
+  condition: succeededOrFailed()
--- a/.azuredevops/variables-global.yml
+++ b/.azuredevops/variables-global.yml
@@ -23,8 +23,6 @@ variables:
  value: rocm-ci_build_pool
 - name: LARGE_DISK_BUILD_POOL
  value: rocm-ci_larger_base_disk_pool
- name: GFX942_TEST_POOL
-  value: gfx942_test_pool
 - name: LATEST_RELEASE_TAG
  value: rocm-6.1.0
 - name: DOCKER_IMAGE_NAME
@@ -33,275 +31,3 @@ variables:
  value: 6.1
 - name: KEYRING_VERSION
  value: 6.1
- name: AMDMIGRAPHX_GFX942_TEST_PIPELINE_ID
-  value: 197
- name: AMDMIGRAPHX_PIPELINE_ID
-  value: 113
- name: AMDMIGRAPHX_TAGGED_PIPELINE_ID
-  value: 60
- name: AMDSMI_PIPELINE_ID
-  value: 99
- name: AMDSMI_TAGGED_PIPELINE_ID
-  value: 33
- name: AOMP_EXTRAS_PIPELINE_ID
-  value: 111
- name: AOMP_EXTRAS_TAGGED_PIPELINE_ID
-  value: 75
- name: AOMP_PIPELINE_ID
-  value: 115
- name: AOMP_TAGGED_PIPELINE_ID
-  value: 76
- name: CCACHE_DIR
-  value: $(Pipeline.Workspace)/ccache
- name: CLR_PIPELINE_ID
-  value: 145
- name: CLR_TAGGED_PIPELINE_ID
-  value: 71
- name: COMPOSABLE_KERNEL_GFX942_TEST_PIPELINE_ID
-  value: 179
- name: COMPOSABLE_KERNEL_PIPELINE_ID
-  value: 86
- name: COMPOSABLE_KERNEL_TAGGED_PIPELINE_ID
-  value: 38
- name: FLANG_LEGACY_PIPELINE_ID
-  value: 77
- name: FLANG_LEGACY_TAGGED_PIPELINE_ID
-  value: 77
- name: HALF_PIPELINE_ID
-  value: 101
- name: HALF_TAGGED_PIPELINE_ID
-  value: 11
- name: HALF560_PIPELINE_ID
-  value: 66
- name: HALF560_TAGGED_PIPELINE_ID
-  value: 66
- name: HIP_PIPELINE_ID
-  value: 93
- name: HIP_TAGGED_PIPELINE_ID
-  value: 31
- name: HIPBLAS_COMMON_PIPELINE_ID
-  value: 223
- name: HIPBLAS_COMMON_TAGGED_PIPELINE_ID
-  value: 224
- name: HIPBLAS_GFX942_TEST_PIPELINE_ID
-  value: 202
- name: HIPBLAS_PIPELINE_ID
-  value: 87
- name: HIPBLAS_TAGGED_PIPELINE_ID
-  value: 44
- name: HIPBLASLT_GFX942_TEST_PIPELINE_ID
-  value: 187
- name: HIPBLASLT_PIPELINE_ID
-  value: 112
- name: HIPBLASLT_TAGGED_PIPELINE_ID
-  value: 45
- name: HIPCUB_GFX942_TEST_PIPELINE_ID
-  value: 186
- name: HIPCUB_PIPELINE_ID
-  value: 97
- name: HIPCUB_TAGGED_PIPELINE_ID
-  value: 46
- name: HIPFFT_GFX942_TEST_PIPELINE_ID
-  value: 198
- name: HIPFFT_PIPELINE_ID
-  value: 121
- name: HIPFFT_TAGGED_PIPELINE_ID
-  value: 12
- name: HIPFORT_PIPELINE_ID
-  value: 102
- name: HIPFORT_TAGGED_PIPELINE_ID
-  value: 34
- name: HIPIFY_PIPELINE_ID
-  value: 92
- name: HIPIFY_TAGGED_PIPELINE_ID
-  value: 13
- name: HIPRAND_GFX942_TEST_PIPELINE_ID
-  value: 188
- name: HIPRAND_PIPELINE_ID
-  value: 90
- name: HIPRAND_TAGGED_PIPELINE_ID
-  value: 42
- name: HIPSOLVER_GFX942_TEST_PIPELINE_ID
-  value: 201
- name: HIPSOLVER_PIPELINE_ID
-  value: 84
- name: HIPSOLVER_TAGGED_PIPELINE_ID
-  value: 52
- name: HIPSPARSE_GFX942_TEST_PIPELINE_ID
-  value: 195
- name: HIPSPARSE_PIPELINE_ID
-  value: 83
- name: HIPSPARSE_TAGGED_PIPELINE_ID
-  value: 14
- name: HIPSPARSELT_GFX942_TEST_PIPELINE_ID
-  value: 200
- name: HIPSPARSELT_PIPELINE_ID
-  value: 104
- name: HIPSPARSELT_TAGGED_PIPELINE_ID
-  value: 53
- name: HIPTENSOR_GFX942_TEST_PIPELINE_ID
-  value: 192
- name: HIPTENSOR_PIPELINE_ID
-  value: 105
- name: HIPTENSOR_TAGGED_PIPELINE_ID
-  value: 56
- name: LAST_RELEASE
-  value: 6.1.0
- name: LLVM_PROJECT_PIPELINE_ID
-  value: 2
- name: LLVM_PROJECT_TAGGED_PIPELINE_ID
-  value: 8
- name: MIOPEN_PIPELINE_ID
-  value: 108
- name: MIOPEN_TAGGED_PIPELINE_ID
-  value: 58
- name: MIVISIONX_PIPELINE_ID
-  value: 80
- name: MIVISIONX_TAGGED_PIPELINE_ID
-  value: 18
- name: RCCL_GFX942_TEST_PIPELINE_ID
-  value: 184
- name: RCCL_PIPELINE_ID
-  value: 107
- name: RCCL_TAGGED_PIPELINE_ID
-  value: 15
- name: RDC_PIPELINE_ID
-  value: 100
- name: RDC_TAGGED_PIPELINE_ID
-  value: 59
- name: REIMAGE_ORG
-  value: AGS-ROCm-CI
- name: REIMAGE_REPO
-  value: cirrascale-reimage-automation
- name: ROCAL_PIPELINE_ID
-  value: 151
- name: ROCALUTION_GFX942_TEST_PIPELINE_ID
-  value: 196
- name: ROCALUTION_PIPELINE_ID
-  value: 89
- name: ROCALUTION_TAGGED_PIPELINE_ID
-  value: 16
- name: ROCBLAS_GFX942_TEST_PIPELINE_ID
-  value: 185
- name: ROCBLAS_PIPELINE_ID
-  value: 85
- name: ROCBLAS_TAGGED_PIPELINE_ID
-  value: 32
- name: ROCDBGAPI_PIPELINE_ID
-  value: 135
- name: ROCDBGAPI_TAGGED_PIPELINE_ID
-  value: 17
- name: ROCDECODE_PIPELINE_ID
-  value: 79
- name: ROCDECODE_TAGGED_PIPELINE_ID
-  value: 21
- name: ROCFFT_GFX942_TEST_PIPELINE_ID
-  value: 189
- name: ROCFFT_PIPELINE_ID
-  value: 120
- name: ROCFFT_TAGGED_PIPELINE_ID
-  value: 19
- name: ROCGDB_PIPELINE_ID
-  value: 134
- name: ROCGDB_TAGGED_PIPELINE_ID
-  value: 50
- name: ROCM_BANDWIDTH_TEST_PIPELINE_ID
-  value: 88
- name: ROCM_BANDWIDTH_TEST_TAGGED_PIPELINE_ID
-  value: 23
- name: ROCM_CMAKE_PIPELINE_ID
-  value: 6
- name: ROCM_CMAKE_TAGGED_PIPELINE_ID
-  value: 7
- name: ROCM_CORE_PIPELINE_ID
-  value: 103
- name: ROCM_CORE_TAGGED_PIPELINE_ID
-  value: 22
- name: ROCM_EXAMPLES_GFX942_TEST_PIPELINE_ID
-  value: 204
- name: ROCM_SMI_LIB_PIPELINE_ID
-  value: 96
- name: ROCM_SMI_LIB_TAGGED_PIPELINE_ID
-  value: 47
- name: ROCMINFO_PIPELINE_ID
-  value: 91
- name: ROCMINFO_TAGGED_PIPELINE_ID
-  value: 27
- name: ROCMLIR_PIPELINE_ID
-  value: 229
- name: ROCMLIR_TAGGED_PIPELINE_ID
-  value: 62
- name: ROCMVALIDATIONSUITE_PIPELINE_ID
-  value: 106
- name: ROCMVALIDATIONSUITE_TAGGED_PIPELINE_ID
-  value: 43
- name: ROCPRIM_GFX942_TEST_PIPELINE_ID
-  value: 180
- name: ROCPRIM_PIPELINE_ID
-  value: 82
- name: ROCPRIM_TAGGED_PIPELINE_ID
-  value: 20
- name: ROCPROFILER_GFX942_TEST_PIPELINE_ID
-  value: 190
- name: ROCPROFILER_PIPELINE_ID
-  value: 143
- name: ROCPROFILER_REGISTER_PIPELINE_ID
-  value: 1
- name: ROCPROFILER_REGISTER_TAGGED_PIPELINE_ID
-  value: 25
- name: ROCPROFILER_TAGGED_PIPELINE_ID
-  value: 28
- name: ROCR_DEBUG_AGENT_PIPELINE_ID
-  value: 136
- name: ROCR_DEBUG_AGENT_TAGGED_PIPELINE_ID
-  value: 29
- name: ROCR_RUNTIME_PIPELINE_ID
-  value: 10
- name: ROCR_RUNTIME_TAGGED_PIPELINE_ID
-  value: 24
- name: ROCRAND_GFX942_TEST_PIPELINE_ID
-  value: 183
- name: ROCRAND_PIPELINE_ID
-  value: 95
- name: ROCRAND_TAGGED_PIPELINE_ID
-  value: 41
- name: ROCSOLVER_GFX942_TEST_PIPELINE_ID
-  value: 199
- name: ROCSOLVER_PIPELINE_ID
-  value: 81
- name: ROCSOLVER_TAGGED_PIPELINE_ID
-  value: 55
- name: ROCSPARSE_GFX942_TEST_PIPELINE_ID
-  value: 191
- name: ROCSPARSE_PIPELINE_ID
-  value: 98
- name: ROCSPARSE_TAGGED_PIPELINE_ID
-  value: 67
- name: ROCT_THUNK_INTERFACE_PIPELINE_ID
-  value: 3
- name: ROCT_THUNK_INTERFACE_TAGGED_PIPELINE_ID
-  value: 9
- name: ROCTHRUST_GFX942_TEST_PIPELINE_ID
-  value: 194
- name: ROCTHRUST_PIPELINE_ID
-  value: 94
- name: ROCTHRUST_TAGGED_PIPELINE_ID
-  value: 26
- name: ROCTRACER_GFX942_TEST_PIPELINE_ID
-  value: 181
- name: ROCTRACER_PIPELINE_ID
-  value: 141
- name: ROCTRACER_TAGGED_PIPELINE_ID
-  value: 30
- name: ROCWMMA_GFX942_TEST_PIPELINE_ID
-  value: 193
- name: ROCWMMA_PIPELINE_ID
-  value: 109
- name: ROCWMMA_TAGGED_PIPELINE_ID
-  value: 57
- name: RPP_GFX942_TEST_PIPELINE_ID
-  value: 182
- name: RPP_PIPELINE_ID
-  value: 78
- name: RPP_TAGGED_PIPELINE_ID
-  value: 39
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -3,20 +3,19 @@

 version: 2

-sphinx:
-   configuration: docs/conf.py
-
-formats: [htmlzip]
-
-python:
-   install:
-   - requirements: docs/sphinx/requirements.txt
-
 build:
   os: ubuntu-22.04
   tools:
      python: "3.10"
   apt_packages:
     - "doxygen"
-     - "gfortran" # For pre-processing fortran sources
     - "graphviz" # For dot graphs in doxygen
+
+python:
+   install:
+   - requirements: docs/sphinx/requirements.txt
+
+sphinx:
+   configuration: docs/conf.py
+
+formats: []
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -36,6 +36,7 @@ Bluefield
 Bootloader
 CCD
 CDNA
+CHTML
 CIFAR
 CLI
 CLion
@@ -53,7 +54,6 @@ CSC
 CSE
 CSV
 CSn
-CTest
 CTests
 CU
 CUDA
@@ -70,6 +70,7 @@ Concretized
 Conda
 ConnectX
 CuPy
+Dashboarding
 DDR
 DF
 DGEMM
@@ -98,7 +99,6 @@ ENDPGM
 EPYC
 ESXi
 EoS
-FBGEMM
 FFT
 FFTs
 FFmpeg
@@ -112,7 +112,6 @@ Flang
 Fortran
 Fuyu
 GALB
-GCC
 GCD
 GCDs
 GCN
@@ -178,7 +177,6 @@ Interop
 Intersphinx
 Intra
 Ioffe
-Jinja
 JSON
 Jupyter
 KFD
@@ -225,8 +223,8 @@ Megatron
 Mellanox
 Mellanox's
 Meta's
-Miniconda
 MirroredStrategy
+Mixtral
 Multicore
 Multithreaded
 MyEnvironment
@@ -272,6 +270,8 @@ OpenMPI
 OpenSSL
 OpenVX
 OpenXLA
+Oversubscription
+PagedAttention
 PCC
 PCI
 PCIe
@@ -293,6 +293,7 @@ PowerShell
 PyPi
 PyTorch
 Qcycles
+Qwen
 RAII
 RAS
 RCCL
@@ -388,7 +389,6 @@ UAC
 UC
 UCC
 UCX
-UE
 UIF
 UMC
 USM
@@ -457,7 +457,6 @@ blit
 bootloader
 boson
 bosons
-br
 buildable
 bursty
 bzip
@@ -561,6 +560,7 @@ hipfort
 hipify
 hipsolver
 hipsparse
+hlist
 hotspotting
 hpc
 hpp
@@ -584,8 +584,8 @@ intra
 invariants
 invocating
 ipo
+jax
 kdb
-kfd
 latencies
 libfabric
 libjpeg
@@ -604,6 +604,7 @@ migraphx
 miopen
 miopengemm
 mivisionx
+mjx
 mkdir
 mlirmiopen
 mtypes
@@ -628,7 +629,6 @@ performant
 perl
 pragma
 pre
-prebuild
 prebuilt
 precompiled
 preconditioner
@@ -655,7 +655,6 @@ quasirandom
 queueing
 rccl
 rdc
-rdma
 reStructuredText
 redirections
 refactorization
@@ -721,10 +720,8 @@ subexpression
 subfolder
 subfolders
 submodule
-submodules
 supercomputing
 symlink
-symlinks
 td
 tensorfloat
 th
--- 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.2.x
+~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.0.x
 ~/bin/repo sync
 ```

@@ -76,8 +76,8 @@ 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.1
-~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.2.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml
+export ROCM_VERSION=6.1.0   # or 6.1.1 6.1.2
+~/bin/repo init -u http://github.com/ROCm/ROCm.git -b roc-6.1.x -m tools/rocm-build/rocm-${ROCM_VERSION}.xml
 ~/bin/repo sync

 # --------------------------------------
@@ -87,11 +87,9 @@ export ROCM_VERSION=6.2.1
 # Option 1: Start a docker container
 # Pulling required base docker images:
 # Ubuntu20.04 built from ROCm/tools/rocm-build/docker/ubuntu20/Dockerfile
-docker pull rocm/rocm-build-ubuntu-20.04:6.2
+docker pull rocm/rocm-build-ubuntu-20.04:6.1
 # Ubuntu22.04 built from ROCm/tools/rocm-build/docker/ubuntu22/Dockerfile
-docker pull rocm/rocm-build-ubuntu-22.04:6.2
-# Ubuntu24.04 built from ROCm/tools/rocm-build/docker/ubuntu24/Dockerfile
-docker pull rocm/rocm-build-ubuntu-24.04:6.2
+docker pull rocm/rocm-build-ubuntu-22.04:6.1

 # Start docker container and mount the source code folder:
 docker run -ti \
@@ -110,16 +108,10 @@ docker run -ti \
 # Option 2: Install required packages into the host machine
 # For ubuntu20.04 system
 cd ROCm/tools/rocm-build/docker/ubuntu20
-cp * /tmp && cd /tmp
 bash install-prerequisites.sh
 # For ubuntu22.04 system
 cd ROCm/tools/rocm-build/docker/ubuntu22
-cp * /tmp && cd /tmp
 bash install-prerequisities.sh
-# For ubuntu24.04 system
-cd ROCm/tools/rocm-build/docker/ubuntu24
-cp * /tmp && cd /tmp
-bash install-prerequisites.sh

 # --------------------------------------
 # Step 3: Run build command line
@@ -146,17 +138,13 @@ make -f ROCm/tools/rocm-build/ROCm.mk T_rocblas
 out/ubuntu-20.04/20.04/deb/
 # Find built packages in ubuntu22.04:
 out/ubuntu-22.04/22.04/deb/
-# Find built packages in ubuntu24.04:
-out/ubuntu-24.04/24.04/deb/

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

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

-Use this matrix to view the ROCm compatibility and system requirements across successive major and minor releases.
+Use this matrix to view the ROCm compatibility 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.1", "6.2.0", "6.1.0"
+      :header: "ROCm Version", "6.2.0", "6.1.2", "6.0.0"
      :stub-columns: 1

-      :ref:`Operating Systems & kernels <OS-kernel-versions>`,Ubuntu 24.04,Ubuntu 24.04,
-      ,"Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.5, 22.04.4","Ubuntu 22.04.4, 22.04.3"
-      ,,,"Ubuntu 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:`Operating Systems <rocm-install-on-linux:reference/system-requirements>`, "Ubuntu 24.04","",""
+      ,"Ubuntu 22.04.5 [#Ubuntu220405]_, 22.04.4","Ubuntu 22.04.5 [#Ubuntu220405]_, 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:",,
      :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_621]_,gfx942 [#mi300_620]_, gfx942 [#mi300_610]_
+      ,gfx942 [#mi300_620]_, gfx942 [#mi300_612]_, gfx942 [#mi300_600]_
      ,gfx90a,gfx90a,gfx90a
      ,gfx908,gfx908,gfx908
      ,,,
-      FRAMEWORK SUPPORT,.. _framework-support-compatibility-matrix:,,
-      :doc:`PyTorch <rocm-install-on-linux:install/3rd-party/pytorch-install>`,"2.3, 2.2, 2.1, 2.0, 1.13","2.3, 2.2, 2.1, 2.0, 1.13","2.1, 2.0, 1.13"
-      :doc:`TensorFlow <rocm-install-on-linux:install/3rd-party/tensorflow-install>`,"2.16.1, 2.15.1, 2.14.1","2.16.1, 2.15.1, 2.14.1","2.15, 2.14, 2.13"
+      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"
      :doc:`JAX <rocm-install-on-linux:install/3rd-party/jax-install>`,0.4.26,0.4.26,0.4.26
-      `ONNX Runtime <https://onnxruntime.ai/docs/build/eps.html#amd-migraphx>`_,1.17.3,1.17.3,1.17.3
+      `ONNX Runtime <https://onnxruntime.ai/docs/build/eps.html#amd-migraphx>`_,1.17.3,1.17.3,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 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 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
+      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
      ,,,
-      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:,,
+      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.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
+      :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
      ,,,
-      COMMUNICATION,.. _commlibs-support-compatibility-matrix:,,
-      :doc:`RCCL <rccl:index>`,2.20.5,2.20.5,2.18.6
+      COMMUNICATION,".. _commlibs-support-compatibility-matrix:",,
+      :doc:`RCCL <rccl:index>`,2.20.5,2.18.6,2.18.3
      ,,,
-      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.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:`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:`hipFORT <hipfort:index>`,0.4.0,0.4.0,0.4.0
-      :doc:`hipRAND <hiprand:index>`,2.11.0,2.11.0,2.10.16
-      :doc:`hipSOLVER <hipsolver:index>`,2.2.0,2.2.0,2.1.0
-      :doc:`hipSPARSE <hipsparse:index>`,3.1.1,3.1.1,3.0.1
-      :doc:`hipSPARSELt <hipsparselt:index>`,0.2.1,0.2.1,0.1.0
-      :doc:`rocALUTION <rocalution:index>`,3.2.0,3.2.0,3.1.1
-      :doc:`rocBLAS <rocblas:index>`,4.2.1,4.2.0,4.1.0
-      :doc:`rocFFT <rocfft:index>`,1.0.29,1.0.28,1.0.26
-      :doc:`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
+      :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
      ,,,
-      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
+      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
      ,,,
      SUPPORT LIBS,,,
-      `hipother <https://github.com/ROCm/hipother>`_,6.2.41134,6.2.41133,6.1.40091
-      `rocm-core <https://github.com/ROCm/rocm-core>`_,6.2.1,6.2.0,6.1.0
-      `ROCT-Thunk-Interface <https://github.com/ROCm/ROCT-Thunk-Interface>`_,20240607.4.05,20240607.1.4246,20240125.3.30
+      `hipother <https://github.com/ROCm/hipother>`_,6.2.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
      ,,,
-      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>`,1.0.0,1.0.0,0.3.0
+      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
      :doc:`rocminfo <rocminfo:index>`,1.0.0,1.0.0,1.0.0
-      :doc:`ROCm SMI <rocm_smi_lib:index>`,7.3.0,7.3.0,7.0.0
-      :doc:`ROCm Validation Suite <rocmvalidationsuite:index>`,rocm-6.2.1,rocm-6.2.0,rocm-6.1.0
+      :doc:`ROCm 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
      ,,,
      PERFORMANCE TOOLS,,,
-      :doc:`Omniperf <omniperf:index>`,2.0.1,2.0.1,N/A
-      :doc:`Omnitrace <omnitrace:index>`,1.11.2,1.11.2,N/A
+      :doc:`Omniperf <omniperf:index>`,2.0.1,N/A,N/A
+      :doc:`Omnitrace <omnitrace:index>`,1.11.2,N/A,N/A
      :doc:`ROCm Bandwidth Test <rocm_bandwidth_test:index>`,1.4.0,1.4.0,1.4.0
-      :doc:`ROCProfiler <rocprofiler:index>`,2.0.60201,2.0.60200,2.0.60100
-      :doc:`ROCprofiler-SDK <rocprofiler-sdk:index>`,0.4.0,0.4.0,N/A
-      :doc:`ROCTracer <roctracer:index>`,4.1.60201,4.1.60200,4.1.60100
+      :doc:`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
      ,,,
      DEVELOPMENT TOOLS,,,
-      :doc:`HIPIFY <hipify:index>`,18.0.0.24332,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:`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:`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,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.24332,18.0.0.24232,17.0.0.24103
-      :doc:`llvm-project <llvm-project:index>`,18.0.0.24332,18.0.0.24232,17.0.0.24103
-      `OpenMP <https://github.com/ROCm/llvm-project/tree/amd-staging/openmp>`_,18.0.0.24332,18.0.0.24232,17.0.0.24103
+      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
      ,,,
-      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
+      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
      `OpenCL Runtime <https://github.com/ROCm/clr/tree/develop/opencl>`_,2.0.0,2.0.0,2.0.0
-      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.14.0,1.13.0,1.13.0
+      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.13.0,1.13.0,1.12.0


 .. rubric:: Footnotes

-.. [#red-hat94] RHEL 9.4 is supported only on AMD Instinct MI300A.
+.. [#Ubuntu220405] Preview support of Ubuntu 22.04.5 only
+.. [#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_610] **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.
-.. [#kfd_support] ROCm provides forward and backward compatibility between the Kernel Fusion Driver (KFD) and its user space software for +/- 2 releases. These are the compatibility combinations that are currently supported.
-
-
-.. _OS-kernel-versions:
-
-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, "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
- 
+.. [#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.

 ..
   Footnotes and ref anchors in below historical tables should be appended with "-past-60", to differentiate from the 
@@ -205,20 +160,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: compatibility-matrix-historical-6.0.csv
+      :file: ../data/reference/compatibility-matrix-historical-6.0.csv
      :widths: 20,10,10,10,10,10,10,10
      :header-rows: 1
      :stub-columns: 1
   
   .. rubric:: Footnotes

-   .. [#red-hat94-past-60] RHEL 9.4 is supported only on AMD Instinct MI300A.
+   .. [#Ubuntu220405-past-60] Preview support of Ubuntu 22.04.5 only
+   .. [#red-hat94-past-60] **For ROCm 6.1** - 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. These are the compatibility combinations that are currently supported.
+
--- a/docs/compatibility/precision-support.rst
+++ b/docs/compatibility/precision-support.rst
--- 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 compatibility/compatibility-matrix-historical-6.0.csv ../_readthedocs/html/downloads/compatibility-matrix-historical-6.0.csv")
+os.system("cp data/reference/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.1"
-release = "6.2.1"
+version = "6.2.0"
+release = "6.2.0"
 setting_all_article_info = True
 all_article_info_os = ["linux", "windows"]
 all_article_info_author = ""

 # pages with specific settings
 article_pages = [
-    {"file": "about/release-notes", "os": ["linux", "windows"], "date": "2024-09-20"},
-    {"file": "about/changelog", "os": ["linux", "windows"], "date": "2024-09-20"},
+    {"file": "about/release-notes", "os": ["linux", "windows"], "date": "2024-08-02"},
+    {"file": "about/changelog", "os": ["linux", "windows"], "date": "2024-08-02"},
    {"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
@@ -0,0 +1,114 @@
+ROCm Version,6.2.0, 6.1.5, 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.5 [#Ubuntu220405-past-60]_,22.04.4, 22.04.3","Ubuntu 22.04.5 [#Ubuntu220405-past-60]_,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","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.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","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","SLES 15 SP5, SP4"
+      ,,,CentOS 7.9,CentOS 7.9,CentOS 7.9,CentOS 7.9,CentOS 7.9
+      ,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,Oracle Linux 8.9 [#oracle89-past-60]_,,,
+      ,.. _architecture-support-compatibility-matrix-past-60:,,,,,,
+      :doc:`Architecture <rocm-install-on-linux:reference/system-requirements>`,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3,CDNA3
+      ,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2,CDNA2
+      ,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA,CDNA
+      ,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3,RDNA3
+      ,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2,RDNA2
+      ,.. _gpu-support-compatibility-matrix-past-60:,,,,,,
+      :doc:`GPU / LLVM target <rocm-install-on-linux:reference/system-requirements>`,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100,gfx1100
+      ,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030,gfx1030
+      ,gfx942 [#mi300_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
+      ,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.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.15.0, 2.14.0, 2.13.1","2.14.0, 2.13.1, 2.12.1","2.14.0, 2.13.1, 2.12.1"
+      :doc:`JAX <rocm-install-on-linux:install/3rd-party/jax-install>`,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26,0.4.26
+      `ONNX Runtime <https://onnxruntime.ai/docs/build/eps.html#amd-migraphx>`_,1.17.3,1.17.3,1.17.3,1.17.3,1.17.3,1.14.1,1.14.1
+      ,,,,,,,
+      THIRD PARTY COMMS,.. _thirdpartycomms-support-compatibility-matrix-past-60:,,,,,,
+      `UCC <https://github.com/ROCm/ucc>`_,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.3.0,>=1.2.0,>=1.2.0
+      `UCX <https://github.com/ROCm/ucx>`_,>=1.15.0,>=1.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.1.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.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,1.1.0
+      :doc:`MIGraphX <amdmigraphx:index>`,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.1.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,2.5.0
+      :doc:`RPP <rpp:index>`,1.8.0,1.5.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,1.0.0
+      :doc:`rocDecode <rocdecode:index>`,0.6.0,0.6.0,0.6.0,0.5.0,0.5.0,N/A,N/A
+      :doc:`rocPyDecode <rocpydecode:index>`,0.1.0,N/A,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.6,2.18.3,2.18.3
+      ,,,,,,,
+      MATH LIBS,.. _mathlibs-support-compatibility-matrix-past-60:,,,,,,
+      `half <https://github.com/ROCm/half>`_ ,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0
+      :doc:`hipBLAS <hipblas:index>`,2.2.0,2.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.7.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.14,1.0.13,1.0.13
+      :doc:`hipFORT <hipfort:index>`,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0,0.4.0
+      :doc:`hipRAND <hiprand:index>`,2.11.0,2.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.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.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.0,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.1.1,3.0.3,3.0.3
+      :doc:`rocBLAS <rocblas:index>`,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.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.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.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.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.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.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.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.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.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.1,3.0.0,3.0.0
+      ,,,,,,,
+      SUPPORT LIBS,,,,,,,
+      `hipother <https://github.com/ROCm/hipother>`_,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.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.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.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>`,1.0.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
+      :doc:`ROCm SMI <rocm_smi_lib:index>`,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.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,N/A,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,N/A
+      :doc:`ROCm Bandwidth Test <rocm_bandwidth_test:index>`,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0,1.4.0
+      :doc:`ROCProfiler <rocprofiler:index>`,2.0.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,N/A,N/A,N/A,N/A,N/A,N/A
+      :doc:`ROCTracer <roctracer:index>`,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.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.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.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.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.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
+      ,,,,,,,
+      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,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,1.0.0
+      `Flang <https://github.com/ROCm/flang>`_,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.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.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.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.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
+      :doc:`ROCR-Runtime <rocr-runtime:index>`,1.13.0,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/llm-fine-tuning-optimization/model-acceleration-libraries.rst
+++ b/docs/how-to/llm-fine-tuning-optimization/model-acceleration-libraries.rst
@@ -251,287 +251,3 @@ page describes the options.

 Learn more about optimizing kernels with TunableOp in
 :ref:`Optimizing Triton kernels <mi300x-tunableop>`.
-
-
-FBGEMM and FBGEMM_GPU
-=====================
-
-FBGEMM (Facebook General Matrix Multiplication) is a low-precision, high-performance CPU kernel library
-for matrix-matrix multiplications and convolutions. It is used for server-side inference
-and as a back end for PyTorch quantized operators. FBGEMM offers optimized on-CPU performance for reduced precision calculations,
-strong performance on native tensor formats, and the ability to generate
-high-performance shape- and size-specific kernels at runtime.
-
-FBGEMM_GPU collects several high-performance PyTorch GPU operator libraries  
-for use in training and inference. It provides efficient table-batched embedding functionality,
-data layout transformation, and quantization support.
-
-For more information about FBGEMM and FBGEMM_GPU, see the `PyTorch FBGEMM GitHub <https://github.com/pytorch/FBGEMM>`_
-and the `PyTorch FBGEMM documentation <https://pytorch.org/FBGEMM/>`_.
-The `Meta blog post about FBGEMM <https://engineering.fb.com/2018/11/07/ml-applications/fbgemm/>`_ provides
-additional background about the library.
-
-Installing FBGEMM_GPU
----------------------
-
-Installing FBGEMM_GPU consists of the following steps:
-
-*  Set up an isolated Miniconda environment
-*  Install ROCm using Docker or the :doc:`package manager <rocm-install-on-linux:install/native-install/index>`
-*  Install the nightly `PyTorch <https://pytorch.org/>`_ build
-*  Complete the pre-build and build tasks
-  
-.. note::
-
-   FBGEMM_GPU doesn't require the installation of FBGEMM. To optionally install
-   FBGEMM, see the `FBGEMM install instructions <https://pytorch.org/FBGEMM/fbgemm-development/BuildInstructions.html>`_.
-
-Set up the Miniconda environment
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-To install Miniconda, use the following commands.
-
-#. Install a `Miniconda environment <https://docs.anaconda.com/miniconda/>`_ for reproducible builds.
-   All subsequent commands run inside this environment.
-
-   .. code-block:: shell
-
-      export PLATFORM_NAME="$(uname -s)-$(uname -m)"
-
-      # Set the Miniconda prefix directory
-      miniconda_prefix=$HOME/miniconda
-
-      # Download the Miniconda installer
-      wget -q "https://repo.anaconda.com/miniconda/Miniconda3-latest-${PLATFORM_NAME}.sh" -O miniconda.sh
-
-      # Run the installer
-      bash miniconda.sh -b -p "$miniconda_prefix" -u
-
-      # Load the shortcuts
-      . ~/.bashrc
-
-      # Run updates
-      conda update -n base -c defaults -y conda
-
-#. Create a Miniconda environment with Python 3.12:
-
-   .. code-block:: shell
-
-      env_name=<ENV NAME>
-      python_version=3.12
-
-      # Create the environment
-      conda create -y --name ${env_name} python="${python_version}"
-
-      # Upgrade PIP and pyOpenSSL package
-      conda run -n ${env_name} pip install --upgrade pip
-      conda run -n ${env_name} python -m pip install pyOpenSSL>22.1.0
-
-#. Install additional build tools:
-
-   .. code-block:: shell
-
-      conda install -n ${env_name} -y \
-         click \
-         cmake \
-         hypothesis \
-         jinja2 \
-         make \
-         ncurses \
-         ninja \
-         numpy \
-         scikit-build \
-         wheel
-
-Install the ROCm components
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-FBGEMM_GPU can run in a ROCm Docker container or in conjunction with the full ROCm installation.
-The Docker method is recommended because it requires fewer steps and provides a stable environment.
-
-To run FBGEMM_GPU in the Docker container, pull the `Minimal Docker image for ROCm <https://hub.docker.com/r/rocm/rocm-terminal>`_.
-This image includes all preinstalled ROCm packages required to integrate FBGEMM. To pull
-and run the ROCm Docker image, use this command:
-
-.. code-block:: shell
-
-   # Run for ROCm 6.2.0
-   docker run -it --network=host --shm-size 16G --device=/dev/kfd --device=/dev/dri --group-add video \
-   --cap-add=SYS_PTRACE --security-opt seccomp=unconfined --ipc=host rocm/rocm-terminal:6.2 /bin/bash
-
-.. note::
-
-   The `Full Docker image for ROCm <https://hub.docker.com/r/rocm/dev-ubuntu-20.04>`_, which includes all
-   ROCm packages, can also be used. However, it results in a very large container, so the minimal
-   Docker image is recommended.
-
-You can also install ROCm using the package manager. FBGEMM_GPU requires the installation of the full ROCm package.
-For more information, see :doc:`the ROCm installation guide <rocm-install-on-linux:install/detailed-install>`.
-The ROCm package also requires the :doc:`MIOpen <miopen:index>` component as a dependency. 
-To install MIOpen, use the ``apt install`` command.
-
-.. code-block:: shell
-
-   apt install hipify-clang miopen-hip miopen-hip-dev
-
-Install PyTorch
-^^^^^^^^^^^^^^^^^^^^^^^
-
-Install `PyTorch <https://pytorch.org/>`_ using ``pip`` for the most reliable and consistent results.
-
-#. Install the nightly PyTorch build using ``pip``.
-
-   .. code-block:: shell
-
-      # Install the latest nightly, ROCm variant
-      conda run -n ${env_name} pip install --pre torch --index-url https://download.pytorch.org/whl/nightly/rocm6.2/
-
-#. Ensure PyTorch loads correctly. Verify the version and variant of the installation using an ``import`` test.
-
-   .. code-block:: shell
-
-      # Ensure that the package loads properly
-      conda run -n ${env_name} python -c "import torch.distributed"
-
-      # Verify the version and variant of the installation
-      conda run -n ${env_name} python -c "import torch; print(torch.__version__)"
-
-Perform the prebuild and build
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-#. Clone the FBGEMM repository and the relevant submodules. Use ``pip`` to install the 
-   components in ``requirements.txt``. Run the following commands inside the Miniconda environment.
-
-   .. code-block:: shell
-
-      # Select a version tag
-      FBGEMM_VERSION=v0.8.0
-
-      # Clone the repo along with its submodules
-      git clone https://github.com/pytorch/FBGEMM.git --branch=v0.8.0 --recursive fbgemm_${FBGEMM_VERSION}
-
-      # Install additional required packages for building and testing
-      cd fbgemm_${FBGEMM_VERSION}/fbgemm_gpu
-      pip install requirements.txt
-
-#. Clear the build cache to remove stale build information.
-
-   .. code-block:: shell
-
-      # !! Run in fbgemm_gpu/ directory inside the Conda environment !!
-
-      python setup.py clean
-
-#. Set the wheel build variables, including the package name, Python version tag, and Python platform name.
-
-   .. code-block:: shell
-
-      # Set the package name depending on the build variant
-      export package_name=fbgemm_gpu_rocm
-
-      # Set the Python version tag.  It should follow the convention `py<major><minor>`,
-      # for example, Python 3.12 --> py312
-      export python_tag=py312
-
-      # Determine the processor architecture
-      export ARCH=$(uname -m)
-
-      # Set the Python platform name for the Linux case
-      export python_plat_name="manylinux2014_${ARCH}"
-
-#. Build FBGEMM_GPU for the ROCm platform. Set ``ROCM_PATH`` to the path to your ROCm installation. 
-   Run these commands from the ``fbgemm_gpu/`` directory inside the Miniconda environment.
-
-   .. code-block:: shell
-
-      # !! Run in the fbgemm_gpu/ directory inside the Conda environment !!
-
-      export ROCM_PATH=</path/to/rocm>
-
-      # Build for the target architecture of the ROCm device installed on the machine (for example, 'gfx942;gfx90a')
-      # See :doc:`The Linux system requirements <../../reference/system-requirements>` for a list of supported GPUs.
-      export PYTORCH_ROCM_ARCH=$(${ROCM_PATH}/bin/rocminfo | grep -o -m 1 'gfx.*')
-
-      # Build the wheel artifact only
-      python setup.py bdist_wheel \
-         --package_variant=rocm \
-         --python-tag="${python_tag}" \
-         --plat-name="${python_plat_name}" \
-         -DHIP_ROOT_DIR="${ROCM_PATH}" \
-         -DCMAKE_C_FLAGS="-DTORCH_USE_HIP_DSA" \
-         -DCMAKE_CXX_FLAGS="-DTORCH_USE_HIP_DSA"
-
-      # Build and install the library into the Conda environment
-      python setup.py install \
-         --package_variant=rocm \
-         -DHIP_ROOT_DIR="${ROCM_PATH}" \
-         -DCMAKE_C_FLAGS="-DTORCH_USE_HIP_DSA" \
-         -DCMAKE_CXX_FLAGS="-DTORCH_USE_HIP_DSA"  
-
-Post-build validation
----------------------
-
-After building FBGEMM_GPU, run some verification checks to ensure the build is correct. Continue
-to run all commands inside the ``fbgemm_gpu/`` directory inside the Miniconda environment.
-
-#. The build process generates many build artifacts and C++ templates, so
-   it is important to confirm no undefined symbols remain.
-
-   .. code-block:: shell
-
-      # !! Run in fbgemm_gpu/ directory inside the Conda environment !!
-
-      # Locate the built .SO file
-      fbgemm_gpu_lib_path=$(find . -name fbgemm_gpu_py.so)
-
-      # Check that the undefined symbols don't include fbgemm_gpu-defined functions
-      nm -gDCu "${fbgemm_gpu_lib_path}" | sort
-
-#. Verify the referenced version number of ``GLIBCXX`` and the presence of certain function symbols:
-
-   .. code-block:: shell
-
-      # !! Run in fbgemm_gpu/ directory inside the Conda environment !!
-
-      # Locate the built .SO file
-      fbgemm_gpu_lib_path=$(find . -name fbgemm_gpu_py.so)
-
-      # Note the versions of GLIBCXX referenced by the .SO
-      # The libstdc++.so.6 available on the install target must support these versions
-      objdump -TC "${fbgemm_gpu_lib_path}" | grep GLIBCXX | sed 's/.*GLIBCXX_\([.0-9]*\).*/GLIBCXX_\1/g' | sort -Vu | cat
-
-      # Test for the existence of a given function symbol in the .SO
-      nm -gDC "${fbgemm_gpu_lib_path}" | grep " fbgemm_gpu::merge_pooled_embeddings("
-      nm -gDC "${fbgemm_gpu_lib_path}" | grep " fbgemm_gpu::jagged_2d_to_dense("
-
-Testing FBGEMM
----------------------
-
-FBGEMM includes tests and benchmarks to validate performance. To run these tests,
-you must use ROCm 5.7 or a more recent version on the host and container. To run FBGEMM tests,
-follow these instructions:
-
-.. code-block:: shell
-
-   # !! Run inside the Conda environment !!
-
-   # From the /fbgemm_gpu/ directory
-   cd test
-
-   export FBGEMM_TEST_WITH_ROCM=1
-   # Enable for debugging failed kernel executions
-   export HIP_LAUNCH_BLOCKING=1
-
-   # Run the test
-   python -m pytest -v -rsx -s -W ignore::pytest.PytestCollectionWarning split_table_batched_embeddings_test.py
-
-To run the FBGEMM_GPU ``uvm`` test, use these commands. These tests only support the AMD MI210 and 
-more recent accelerators. 
-
-.. code-block:: shell
-
-   # Run this inside the Conda environment from the /fbgemm_gpu/ directory
-   export HSA_XNACK=1
-   cd test
-
-   python -m pytest -v -rsx -s -W ignore::pytest.PytestCollectionWarning ./uvm/uvm_test.py
--- a/docs/how-to/performance-validation/mi300x/vllm-benchmark.rst
+++ b/docs/how-to/performance-validation/mi300x/vllm-benchmark.rst
@@ -0,0 +1,334 @@
+.. 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.0 <https://github.com/ROCm/ROCm>`_
+
+* `vLLM 0.4.3 <https://docs.vllm.ai/en/latest>`_
+
+* `PyTorch 2.4.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.
+
+.. _vllm-benchmark-vllm:
+
+.. note::
+
+   vLLM is a toolkit and library for LLM inference and
+   serving. It deploys the PagedAttention algorithm, which reduces memory
+   consumption and increases throughput by leveraging dynamic key and value
+   allocation in GPU memory. vLLM also incorporates many LLM acceleration
+   and quantization algorithms. In addition, AMD implements high-performance
+   custom kernels and modules in vLLM to enhance performance further. 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_ubuntu22.04_py3.9_vllm_7c5fd50
+
+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 eight models are pre-configured to collect latency and
+throughput performance data, users 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_mistral-7b``
+
+   * ``pyt_vllm_qwen2-7b``
+
+   * ``pyt_vllm_jais-13b``
+
+   * ``pyt_vllm_jais-30b``
+
+.. _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_ubuntu22.04_py3.9_vllm_7c5fd50
+   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 unified_docker_vllm rocm/vllm:rocm6.2_mi300_ubuntu22.04_py3.9_vllm_7c5fd50
+
+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
+
+Multiprocessing distributed executor
+--------------------------------------
+
+To optimize vLLM performance, add the multiprocessing API server argument ``--distributed-executor-backend mp``.
+
+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
+
+   * - 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
+
+   * -
+     - ``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
+
+   * -
+     - ``core42/jais-13b-chat``
+     - JAIS 13B
+
+   * -
+     - ``core42/jais-30b-chat-v3``
+     - JAIS 30B
+
+   * - ``$num_gpu``
+     - 1 or 8
+     - Number of GPUs
+
+   * - ``$datatype``
+     - ``float16``
+     - 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.
+
+Latency benchmark example
+^^^^^^^^^^^^^^^^^^^^^^^^^
+ 
+Use this command to benchmark the latency of the Llama 3.1 8B model on one GPU with the ``float16`` data type.
+
+.. code-block::
+
+   ./vllm_benchmark_report.sh -s latency -m meta-llama/Meta-Llama-3.1-8B-Instruct -g 1 -d float16
+
+Find the latency report at:
+
+- ``./reports_float16/summary/Meta-Llama-3.1-8B-Instruct_latency_report.csv``
+
+Throughput benchmark example
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+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
+
+Find the throughput reports at:
+
+- ``./reports_float16/summary/Meta-Llama-3.1-8B-Instruct_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>`.
+
--- 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/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,40 +23,50 @@ 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} Compatibility
-:class-body: rocm-card-banner rocm-hue-2
+:::{grid-item-card}
+:class-card: sd-text-black
+:img-top: ./data/banner-compatibility.jpg
+:img-alt: Compatibility information
+:padding: 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 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>`
+* {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>`
 :::

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

 * [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 tuning guides](./how-to/tuning-guides/mi300x/index.rst)
+* [AMD Instinct MI300X performance validation and tuning](./how-to/tuning-guides/mi300x/index.rst)
 * [System debugging](./how-to/system-debugging.md)
-* [Using MPI](./how-to/gpu-enabled-mpi.rst)
+* [GPU-enabled MPI](./how-to/gpu-enabled-mpi.rst)
 * [Using advanced compiler features](./conceptual/compiler-topics.md)
 * [Setting the number of CUs](./how-to/setting-cus)  
-* [ROCm examples](https://github.com/amd/rocm-examples)
+* [GitHub examples](https://github.com/amd/rocm-examples)
 :::

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

-* [GPU architecture overview](./conceptual/gpu-arch.md)
+* [GPU architecture](./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)
@@ -67,13 +77,21 @@ ROCm documentation is organized into the following categories:
 :::

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

-* [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)
+* [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)
 :::
 <!-- markdownlint-enable MD051 -->

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

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

 (artificial-intelligence-apis)=

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

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

 (cpp-primitives)=

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

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

 (communication-libraries)=

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

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

 (math-apis)=

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

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

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

 (system-tools)=

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

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

 (performance-tools)=

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

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

 (development-tools)=

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

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

 (compilers)=

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

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

 (runtimes)=

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

 * {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,7 +8,6 @@

 | 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,17 +102,13 @@ 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 system requirements
+    title: Linux
  - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html
-    title: Windows system requirements
+    title: Windows
+  - file: compatibility/precision-support.rst
+    title: Precision support
  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/3rd-party-support-matrix.html
-    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
+    title: Third-party

 - caption: Conceptual
  entries:
@@ -167,8 +165,6 @@ 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.8.1
+rocm-docs-core==1.8.0
 sphinx-reredirects
--- a/docs/sphinx/requirements.txt
+++ b/docs/sphinx/requirements.txt
@@ -6,9 +6,9 @@
 #
 accessible-pygments==0.0.5
    # via pydata-sphinx-theme
-alabaster==0.7.16
+alabaster==1.0.0
    # via sphinx
-babel==2.15.0
+babel==2.16.0
    # via
    #   pydata-sphinx-theme
    #   sphinx
@@ -16,9 +16,9 @@ beautifulsoup4==4.12.3
    # via pydata-sphinx-theme
 breathe==4.35.0
    # via rocm-docs-core
-certifi==2024.7.4
+certifi==2024.8.30
    # via requests
-cffi==1.16.0
+cffi==1.17.1
    # via
    #   cryptography
    #   pynacl
@@ -42,7 +42,7 @@ gitdb==4.0.11
    # via gitpython
 gitpython==3.1.43
    # via rocm-docs-core
-idna==3.7
+idna==3.10
    # via requests
 imagesize==1.4.1
    # via sphinx
@@ -56,11 +56,11 @@ markdown-it-py==3.0.0
    #   myst-parser
 markupsafe==2.1.5
    # via jinja2
-mdit-py-plugins==0.4.1
+mdit-py-plugins==0.4.2
    # via myst-parser
 mdurl==0.1.2
    # via markdown-it-py
-myst-parser==3.0.1
+myst-parser==4.0.0
    # via rocm-docs-core
 packaging==24.1
    # via
@@ -72,18 +72,18 @@ pydata-sphinx-theme==0.15.4
    # via
    #   rocm-docs-core
    #   sphinx-book-theme
-pygithub==2.3.0
+pygithub==2.4.0
    # via rocm-docs-core
 pygments==2.18.0
    # via
    #   accessible-pygments
    #   pydata-sphinx-theme
    #   sphinx
-pyjwt[crypto]==2.8.0
+pyjwt[crypto]==2.9.0
    # via pygithub
 pynacl==1.5.0
    # via pygithub
-pyyaml==6.0.1
+pyyaml==6.0.2
    # via
    #   myst-parser
    #   rocm-docs-core
@@ -92,15 +92,15 @@ requests==2.32.3
    # via
    #   pygithub
    #   sphinx
-rocm-docs-core==1.8.1
+rocm-docs-core==1.8.0
    # via -r requirements.in
 smmap==5.0.1
    # via gitdb
 snowballstemmer==2.2.0
    # via sphinx
-soupsieve==2.5
+soupsieve==2.6
    # via beautifulsoup4
-sphinx==7.3.7
+sphinx==8.0.2
    # via
    #   breathe
    #   myst-parser
@@ -116,25 +116,25 @@ sphinx-book-theme==1.1.3
    # via rocm-docs-core
 sphinx-copybutton==0.5.2
    # via rocm-docs-core
-sphinx-design==0.6.0
+sphinx-design==0.6.1
    # via rocm-docs-core
 sphinx-external-toc==1.0.1
    # via rocm-docs-core
-sphinx-notfound-page==1.0.2
+sphinx-notfound-page==1.0.4
    # via rocm-docs-core
 sphinx-reredirects==0.1.5
    # via -r requirements.in
-sphinxcontrib-applehelp==1.0.8
+sphinxcontrib-applehelp==2.0.0
    # via sphinx
-sphinxcontrib-devhelp==1.0.6
+sphinxcontrib-devhelp==2.0.0
    # via sphinx
-sphinxcontrib-htmlhelp==2.0.5
+sphinxcontrib-htmlhelp==2.1.0
    # via sphinx
 sphinxcontrib-jsmath==1.0.1
    # via sphinx
-sphinxcontrib-qthelp==1.0.7
+sphinxcontrib-qthelp==2.0.0
    # via sphinx
-sphinxcontrib-serializinghtml==1.1.10
+sphinxcontrib-serializinghtml==2.0.0
    # via sphinx
 tomli==2.0.1
    # via sphinx
@@ -142,7 +142,7 @@ typing-extensions==4.12.2
    # via
    #   pydata-sphinx-theme
    #   pygithub
-urllib3==2.2.2
+urllib3==2.2.3
    # via
    #   pygithub
    #   requests
--- a/docs/temp/conceptual-index.md
+++ b/docs/temp/conceptual-index.md
@@ -0,0 +1,54 @@
+# 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
@@ -0,0 +1 @@
+# GPU Libraries
--- a/docs/temp/how-to-index.md
+++ b/docs/temp/how-to-index.md
@@ -0,0 +1,34 @@
+# 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
@@ -0,0 +1,30 @@
+# 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
@@ -0,0 +1 @@
+# Kernel and User Space Compatibility
--- a/docs/temp/packaging_guidelines.md
+++ b/docs/temp/packaging_guidelines.md
@@ -0,0 +1 @@
+# Packaging Guidelines
--- a/docs/temp/rocm-a-z.md
+++ b/docs/temp/rocm-a-z.md
@@ -0,0 +1,64 @@
+# 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
@@ -0,0 +1,50 @@
+# 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.2.0:
+To generate the changelog from 5.0.0 up to and including 6.1.2:

 ```sh
-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
+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
 ```

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

 ```sh
-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
+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
 ```

 ### 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.
-> If the `--starting-version` flag is not set, the script will not get changelogs from previous versions.
+> 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.
 > 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_arguments() -> TaggingArgs:
+def parse_args() -> TaggingArgs:
    """Parse arguments."""

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

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

    # Use the manifest included in the ROCm GitHub repository by default.
    if args.manifest_url is None:
@@ -242,7 +239,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)
@@ -253,8 +250,8 @@ def run_tagging():
         entry.get("category"),
        ) for entry in projects)

-    # Get all the relevant ROCm releases
-    minimum_version = args.version if not args.starting_version else args.starting_version
+    # 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
    releases = release_bundle_factory.create_data_dict(args.version, component_information, minimum_version)

    # Process the individual releases.
@@ -263,11 +260,10 @@ 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],
-                    is_starting_version_set,
+                    args.previous,
                    Version(version) < Version(args.version)
                )
            except Exception as e:
--- a/tools/autotag/templates/changelog.jinja
+++ b/tools/autotag/templates/changelog.jinja
@@ -1,75 +1,58 @@
-<!-- Do not edit this file!                                 -->
-<!-- This file is autogenerated with                        -->
+# Release notes
+<!-- 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                                     -->
-{%- for version, release in releases %}
-# ROCm {{version}} release notes
+#}

+<!-- spellcheck-disable -->
+
+This page contains the release notes for AMD ROCm™ Software.
+
+{%- for version, release in releases %}
+
+-------------------
+
+## 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" -}}

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

-<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>
+| Category | Group | Name | Version | Repository |
+|----------|-------|------|---------|------------|
 {%- 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 %}
-            <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>
+| {{ 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 }}) |
 {%- elif lib.lib_version %}
-            <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>
+| {{ lib.category }} | {{ lib.group }} | [{{ lib_name }}]({{ lib.documentation_page }}) | [{{ lib.lib_version }}]({{ lib.release_url }}) | [ROCm/{{ lib_name }}]({{ lib.repository_url }}) |
 {%- endif %}
-{%- endfor %}{# lib_name in release.libraries #}
-        </tbody>
-    </table>
-</div>
+{%- endfor %}

 {%- 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.lib_version }})
+#### {{lib_name}}
+
+{{lib.message}}

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

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

 {{change|trim|e}}

@@ -83,9 +66,6 @@
 {%- 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Pratik Basyal	6815b69793	Column 6.1.5 added to historical compatibility matrix in ROCm 6.2.0 (#4632 ) * Column 6.1.5 added to historical compatibility matrix * Support table fixed * RHEL note updated	2025-04-15 15:18:36 -04:00
Peter Park	2f192a4768	Merge pull request #3977 from peterjunpark/docs/6.2.0 Update links to vllm perf validation doc (#3971)	2024-10-30 18:44:27 -04:00
Peter Park	0f80a3b068	Update links to vllm perf validation doc (#3971 ) * update links to vllm perf validation doc * add PagedAttention to wordlist (cherry picked from commit `0fe08d93d7`) fix link	2024-10-30 18:37:06 -04:00
Peter Park	c5bf17e358	add vllm performance validation doc (#3965 ) update perf validation doc add model names to wordlist update for 6.2.0 add 6.2.0 version of perf validation wordlist add feedback from @lpaoletti links fix margin update links remove unified rm unused files rm unused files fix unintended change fix extra link	2024-10-30 14:25:43 -04:00
Sam Wu	5b7315f5b1	Merge pull request #3760 from amd-jnovotny/fix-radeon-link-docs620 Cherry-pick to docs/6.2.0: Fix Radeon link and point at R6.1.3 as absolute link (#3757)	2024-09-19 12:31:08 -08:00
Jeffrey Novotny	4302900e68	Fix Radeon link and point at R6.1.3 as absolute link (#3757 )	2024-09-19 16:26:37 -04:00
Jeffrey Novotny	fe5fe6c4d0	Merge pull request #3738 from amd-jnovotny/align-rocrand-api-change-docs620 Cherry-pick to docs/6.2.0: Update link to rocRAND data type support	2024-09-17 14:56:36 -04:00
Jeffrey Novotny	aa5e1b98a9	Update link to rocRAND data type support	2024-09-17 14:29:02 -04:00
Sam Wu	8789d63887	Update documentation requirements	2024-09-16 10:13:56 -08:00
Sam Wu	0f61f2e8e0	Merge pull request #3723 from peterjunpark/docs/6.2.0 Docs/6.2.0: add missing make command to bitsandbytes install commands (#3722)	2024-09-13 11:12:40 -08:00
Peter Park	f9586abf5a	add missing make command to bitsandbytes install commands (#3722 )	2024-09-13 13:22:52 -04:00
Sam Wu	14f9c58e3a	Merge pull request #3718 from spolifroni-amd/spolifroni-amd/cherry-pick-broken-RN-link-fix cherry pick broken release notes link fix	2024-09-13 08:11:03 -08:00
Sandra Polifroni	41383b3c77	Fixed broken links for tensile, rocprofiler, roctracer, hipify, rocm-cmake	2024-09-13 10:25:04 -04:00
spolifroni-amd	2e7231fad2	Merge pull request #3686 from spolifroni-amd/spolifroni-amd/cherry-pick-comptableupdate-6.2.0 cherry pick compatibility table update	2024-09-12 16:49:14 -04:00
Young Hui - AMD	ae158f00f6	Update TensorFlow versions compatibility-matrix-historical-6.0.csv	2024-09-06 13:57:44 -04:00
Sandra Polifroni	275448a26e	updated the tensorflow compatibility to be the consistent across all compatibility and version tables	2024-09-06 13:57:22 -04:00
spolifroni-amd	f6bf909ad1	Merge pull request #3674 from spolifroni-amd/spolifroni-amd/cherry-pick-link-fix-in-6.2.0 Fixed broken link to RISC-V documentation	2024-09-05 15:41:06 -04:00
Jeffrey Novotny	6ae116f03c	Add introduction and links to the new guide to the vLLM optimized Doc… (#3637 ) (#3678 ) * Add introduction and links to the new guide to the vLLM optimized Docker image on AMD Infinity Hub * Update target link for the Docker vLLM guide * Change target URL * Change link target URL again	2024-09-04 17:22:32 -04:00
Sandra Polifroni	0c19e2da62	Fixed broken link to RISC-V documentation	2024-09-04 10:51:32 -04:00
Peter Park	73d9fb01ab	Merge pull request #3666 from peterjunpark/docs/6.2.0 Docs/6.2.0: Add model quantization doc fixes	2024-09-03 12:35:57 -04:00
Peter Park	42085c14e6	Fix intersphinx links (#3668 ) * fix links in install.rst * fix links in sys opt guides	2024-09-03 12:33:05 -04:00
Peter Park	e4774085da	remove unneeded file (#3663 )	2024-09-03 10:39:54 -04:00
ozziemoreno	b6f9b58984	Update model-quantization.rst to import `BitsAndBytesConfig` from transformers library (#3638 )	2024-09-03 10:39:51 -04:00
Jeffrey Novotny	3b94287182	Merge pull request #3658 from amd-jnovotny/mi300a-updates-docs620 Cherry pick to docs/6.2.0: MI300A updates	2024-08-29 10:16:36 -04:00
Jeffrey Novotny	6366347c59	Expand the section on changing thread affinity (#3653 ) * Expand the section on changing thread affinity * Clarify the methods for configuring allocatable memory settings * Small correction	2024-08-29 09:56:48 -04:00
Jeffrey Novotny	fc17a21260	Correct ttm to amdttm (#3648 ) (#3651 ) Co-authored-by: Chris Kime <Christopher.Kime@amd.com>	2024-08-28 10:33:41 -04:00
Young Hui - AMD	e625ee55f6	Merge develop into docs/6.2.0 (#3621 ) * Fix for hipother External CI pipeline (#3597) Recompilation of hip for AMD backend uses Microsoft-hosted agent, so no need to worry about VM costs if we re-build for any hipother repo changes. * Add a section on increasing memory allocation to the MI300A system op… (#3587) * Add a section on increasing memory allocation to the MI300A system optimization guide * Addition to wordlist * Change GB to GiB for consistency * Standardize GiB/KiB spacing * Minor wording changes * External CI: fix rocDecode CXX compiler (#3593) * External CI: enable clr and rocMLIR latestFromBranch downloads (#3604) * fix ROCdbgapi version number (#3605) * Update Compatibility Matrix for 6.2.0 (#3600) * add rocAL, hipCC, CLR. Rearrange order of some items to align with stack diagram. Update UCC versions * update llvm-project to point to docs page instead of GitHub * External CI: multi-gfx nightly ROCm builds (#3611) * External CI: create llvm symlink in all components (#3612) * External CI: Add hipBLAS-common to hipBLASLt dependency list (#3613) * add hipBLAS-common as dependency * add test variables * revert test variable * Build(deps): Bump rocm-docs-core from 1.7.0 to 1.7.1 in /docs/sphinx (#3614) Bumps [rocm-docs-core](https://github.com/ROCm/rocm-docs-core) from 1.7.0 to 1.7.1. - [Release notes](https://github.com/ROCm/rocm-docs-core/releases) - [Changelog](https://github.com/ROCm/rocm-docs-core/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ROCm/rocm-docs-core/compare/v1.7.0...v1.7.1) --- updated-dependencies: - dependency-name: rocm-docs-core dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * External CI: add hipBLAS-common to MIOpen (#3616) * External CI: make llvm-project symlink optional (#3617) * External CI: Pipeline dependency adjustments for hipBLAS-common (#3618) * External CI: use root disk for ROCm nightly build (#3619) * External CI: fix HIP pipeline ID for copyHIP (#3620) * Add rocPyDecode with other changes (#3609) --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Joseph Macaranas <145489236+amd-jmacaran@users.noreply.github.com> Co-authored-by: Jeffrey Novotny <jnovotny@amd.com> Co-authored-by: Daniel Su <danielsu@amd.com> Co-authored-by: Peter Park <peter.park@amd.com> Co-authored-by: alexxu-amd <159800977+alexxu-amd@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: randyh62 <42045079+randyh62@users.noreply.github.com>	2024-08-20 17:16:54 -04:00
Sam Wu	78a93b63b2	Merge pull request #3603 from amd-jnovotny/mi300a-memory-alloc-docs620 cherry-pick to docs/6.2.0: Add a section on increasing memory allocation to the MI300A system optimization guide	2024-08-16 10:20:58 -06:00
Jeffrey Novotny	b7be98cf43	Add a section on increasing memory allocation to the MI300A system op… (#3587 ) * Add a section on increasing memory allocation to the MI300A system optimization guide * Addition to wordlist * Change GB to GiB for consistency * Standardize GiB/KiB spacing * Minor wording changes	2024-08-16 08:45:34 -04:00
Sam Wu	4c0199abd9	Merge pull request #3596 from samjwu/update620 Update docs/6.2.0 with documentation fixes and requirement update	2024-08-15 13:38:29 -06:00
Jeffrey Novotny	84d44a7c3c	Merge pull request #3565 from amd-jnovotny/peak-tflops-typo-docs620 Fix typo for TFLOPs metric in MI250 architecture page: cherry pick to docs/6.2.0	2024-08-12 10:15:37 -04:00
Jeffrey Novotny	f622b8796b	Fix typo for TFLOPs metric in MI250 architecture page	2024-08-12 10:02:59 -04:00
Jeffrey Novotny	6b2987d9b5	Merge pull request #3529 from amd-jnovotny/update-llama-link-620 Fix link to meta-llama finetuning recipes - 6.2.0	2024-08-09 08:50:47 -04:00
Jeffrey Novotny	4c65fa36da	Merge branch 'upstreamdocs620llama' into jnovollama620	2024-08-09 08:37:57 -04:00
Sam Wu	18a14f8187	Merge pull request #3556 from peterjunpark/docs/6.2.0 docs/6.2.0: Fix intersphinx links (#3546)	2024-08-08 15:05:31 -06:00
Jeffrey Novotny	b9183c1b7d	Merge pull request #3534 from amd-jnovotny/rocr-link-fix-620 Use intersphinx link to rocr debug agent - 6.2.0	2024-08-08 16:55:11 -04:00
Peter Park	6c1ec0e9a4	Fix intersphinx links (#3546 ) * update fw install links * fix more intersphinx links * fix more links	2024-08-08 16:54:52 -04:00
Jeffrey Novotny	f8fcdbeac6	Merge branch 'upstreamdocs620' into jnovo620	2024-08-08 16:29:42 -04:00
Sam Wu	0411a5a806	Merge pull request #3549 from samjwu/cp620 Cherry pick #3526 to docs/6.2.0	2024-08-08 14:28:07 -06:00
Peter Park	52ea80d262	Spellcheck fixes in release notes templates (#3526 ) * fix spelling in 5.4.x templates * add to wordlist * update templates update wordlist * remove extra_components rm extra_components * fix spelling	2024-08-08 12:11:40 -06:00
Jeffrey Novotny	a9d53e3d4e	Fix link to rocr debug agent	2024-08-06 16:22:54 -04:00
Jeffrey Novotny	5ab19055ee	Fix link to meta-llama finetuning recipes	2024-08-06 15:34:38 -04:00
Peter Park	a6f550d716	Merge pull request #3516 from ROCm/develop Fix links in release notes	2024-08-02 20:56:49 -04:00
Young Hui - AMD	c835c16d68	Fix offline installer link in 6.2 release notes (#3513 ) (#3514 )	2024-08-02 20:39:38 -04:00
Sam Wu	af8f67a155	Merge branch 'roc-6.2.x' into docs/6.2.0	2024-08-02 17:00:15 -06:00
Sam Wu	c32d002239	Merge pull request #3511 from ROCm/roc-6.2.x Merge roc-6.2.x into docs/6.2.0	2024-08-02 16:58:31 -06:00
Sam Wu	16dc949166	Update version list with 6.2.0 (#3505 ) (#3506 ) (#3507 )	2024-08-02 18:01:45 -04:00
Peter Park	bf36a27e0b	Merge pull request #3503 from ROCm/roc-6.2.x Merge roc-6.2.x into docs/6.2.0	2024-08-02 15:47:06 -04:00