Add refeence to HIP 7.0 is coming blog for upcoming changes

update rocSHMEM xrefs

.azuredevops/components/AMDMIGraphX.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -32,12 +27,12 @@ parameters:
   type: object
   default:
     - https://github.com/RadeonOpenCompute/rbuild/archive/master.tar.gz
-    - "onnx>=1.14.1"
-    - "numpy>=1.21.6"
-    - "typing>=3.7.4"
-    - "pytest>=6.0.1"
-    - "packaging>=23.0"
-    - "protobuf>=3.20.2"
+    - onnx>=1.14.1
+    - numpy>=1.21.6
+    - typing>=3.7.4
+    - pytest>=6.0.1
+    - packaging>=23.0
+    - protobuf>=3.20.2
 - name: rocmDependencies
   type: object
   default:
@@ -120,7 +115,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -151,8 +145,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/HIP.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -47,7 +42,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -72,13 +67,11 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependenciesAMD }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
 # compile clr
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       componentName: clr
-      cmakeBuildDir: '$(Build.SourcesDirectory)/clr/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/clr'
+      cmakeBuildDir: 'clr/build'
       extraBuildFlags: >-
         -DHIP_COMMON_DIR=$(Build.SourcesDirectory)/HIP
         -DHIP_PLATFORM=amd
@@ -106,7 +99,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -132,15 +125,13 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependenciesNvidia }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - script: 'ls -1R $(Agent.BuildDirectory)/rocm'
     displayName: 'Artifact listing'
 # compile clr
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       componentName: clr
-      cmakeBuildDir: '$(Build.SourcesDirectory)/clr/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/clr'
+      cmakeBuildDir: 'clr/build'
       extraBuildFlags: >-
         -DHIP_COMMON_DIR=$(Build.SourcesDirectory)/HIP
         -DHIP_PLATFORM=nvidia

.azuredevops/components/HIPIFY.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -73,7 +68,6 @@ jobs:
     parameters:
       componentName: upstream-llvm
       cmakeBuildDir: $(Pipeline.Workspace)/llvm-project/llvm/build
-      cmakeSourceDir: $(Pipeline.Workspace)/llvm-project/llvm
       installDir: $(Pipeline.Workspace)/llvm
       extraBuildFlags: >-
         -DCMAKE_BUILD_TYPE=Release

.azuredevops/components/MIOpen.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -82,7 +77,7 @@ jobs:
     - template: /.azuredevops/variables-global.yml
     - name: ROCM_PATH
       value: $(Agent.BuildDirectory)/rocm
-    pool: ${{ variables.HIGH_BUILD_POOL }}
+    pool: ${{ variables.MEDIUM_BUILD_POOL }}
     workspace:
       clean: all
     steps:
@@ -102,7 +97,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - task: Bash@3
       displayName: Build and install other dependencies
       inputs:
@@ -113,7 +107,7 @@ jobs:
           mkdir -p $(Agent.BuildDirectory)/miopen-deps
           export CXX=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang++
           export CC=$(Agent.BuildDirectory)/rocm/llvm/bin/amdclang
-          cmake -P install_deps.cmake --prefix $(Agent.BuildDirectory)/miopen-deps --generator Ninja
+          cmake -P install_deps.cmake --prefix $(Agent.BuildDirectory)/miopen-deps
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -148,8 +142,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -214,7 +207,7 @@ jobs:
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
       parameters:
         componentName: MIOpen
-        testParameters: '--output-on-failure --force-new-ctest-process --output-junit test_output.xml --exclude-regex "test_rnn_seq_api|GPU_Conv2dTuningAsm_FP32"'
+        testParameters: '--output-on-failure --force-new-ctest-process --output-junit test_output.xml --exclude-regex test_rnn_seq_api'
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/docker-container.yml
       parameters:
         aptPackages: ${{ parameters.aptPackages }}

.azuredevops/components/MIVisionX.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -108,7 +103,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -135,8 +129,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/ROCR-Runtime.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -47,7 +42,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -63,7 +58,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-
@@ -84,8 +78,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/ROCdbgapi.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -29,7 +24,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -45,7 +40,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-

.azuredevops/components/ROCgdb.yml

@@ -5,17 +5,11 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 # reference: https://github.com/ROCm/ROCgdb/blob/amd-staging/README-ROCM.md
 - name: aptPackages
   type: object
   default:
     - bison
-    - cmake
     - dejagnu
     - flex
     - libbabeltrace-dev
@@ -40,72 +34,19 @@ parameters:
 - name: jobMatrix
   type: object
   default:
-    testJobs:
+    buildTestJobs:
       - gfx942:
         target: gfx942
       - gfx90a:
         target: gfx90a
 
 jobs:
-- job: ROCgdb
-  variables:
-  - group: common
-  - template: /.azuredevops/variables-global.yml
-  - name: PKG_CONFIG_PATH
-    value: $(Agent.BuildDirectory)/rocm/share/pkgconfig
-  pool:
-    vmImage: ${{ variables.BASE_BUILD_POOL }}
-  workspace:
-    clean: all
-  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-aqlprofile.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
-    parameters:
-      checkoutRef: ${{ parameters.checkoutRef }}
-      dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-autotools.yml
-    parameters:
-      configureFlags: >-
-        --program-prefix=roc
-        --enable-64-bit-bfd
-        --enable-targets="x86_64-linux-gnu,amdgcn-amd-amdhsa"
-        --disable-ld
-        --disable-gas
-        --disable-gdbserver
-        --disable-sim
-        --enable-tui
-        --disable-gdbtk
-        --disable-shared
-        --disable-gprofng
-        --with-expat
-        --with-system-zlib
-        --without-guile
-        --with-babeltrace
-        --with-lzma
-        --with-python=python3
-        --with-rocm-dbgapi=$(Agent.BuildDirectory)/rocm
-        LDFLAGS="-Wl,--enable-new-dtags,-rpath=$(Agent.BuildDirectory)/rocm/lib"
-      makeCallPrefix: LD_RUN_PATH='${ORIGIN}/../lib'
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml
-
-- ${{ each job in parameters.jobMatrix.testJobs }}:
-  - job: ROCgdb_test_${{ job.target }}
-    dependsOn: ROCgdb
+- ${{ each job in parameters.jobMatrix.buildTestJobs }}:
+  - job: ROCgdb_build_test_${{ job.target }}
     condition:
-      and(succeeded(),
+      and(
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -128,7 +69,6 @@ jobs:
       parameters:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-autotools.yml
       parameters:
         configureFlags: >-
@@ -152,6 +92,8 @@ jobs:
           --with-rocm-dbgapi=$(Agent.BuildDirectory)/rocm
           LDFLAGS="-Wl,--enable-new-dtags,-rpath=$(Agent.BuildDirectory)/rocm/lib"
         makeCallPrefix: LD_RUN_PATH='${ORIGIN}/../lib'
+    - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
+    - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
     - task: Bash@3
       displayName: Setup test environment
       inputs:
@@ -160,6 +102,7 @@ jobs:
           # Assuming that /opt is no longer persistent across runs, test environments are fully ephemeral
           sudo ln -s $(Agent.BuildDirectory)/rocm /opt/rocm
           echo "##vso[task.prependpath]/opt/rocm/bin"
+    - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/gpu-diagnostics.yml
     - task: Bash@3
       displayName: check-gdb

.azuredevops/components/ROCmValidationSuite.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -27,7 +22,6 @@ parameters:
   type: object
   default:
     - amdsmi
-    - aomp
     - clr
     - hipBLAS-common
     - hipBLASLt
@@ -44,7 +38,6 @@ parameters:
   type: object
   default:
     - amdsmi
-    - aomp
     - clr
     - hipBLAS-common
     - hipBLASLt
@@ -103,14 +96,12 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
           -DROCM_PATH=$(Agent.BuildDirectory)/rocm
           -DCMAKE_CXX_COMPILER=$(Agent.BuildDirectory)/rocm/llvm/bin/clang++
           -DCMAKE_PREFIX_PATH=$(Agent.BuildDirectory)/rocm
-          -DCMAKE_CXX_FLAGS=-I$(Agent.BuildDirectory)/rocm/llvm/include
           -DCPACK_PACKAGING_INSTALL_PREFIX=$(Build.BinariesDirectory)
           -GNinja
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
@@ -135,8 +126,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/Tensile.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -51,7 +46,7 @@ jobs:
   - template: /.azuredevops/variables-global.yml
   - name: ROCM_PATH
     value: $(Agent.BuildDirectory)/rocm
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -68,7 +63,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
   - task: Bash@3
     displayName: Create wheel file
@@ -110,8 +104,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/TransferBench.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -72,7 +67,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -98,8 +92,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/amdsmi.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -63,8 +58,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/aomp-extras.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -28,7 +23,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -44,7 +39,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       componentName: aomp-extras

.azuredevops/components/aomp.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 # reference:
 # https://github.com/ROCm/aomp/blob/aomp-dev/docs/SOURCEINSTALL_PREREQUISITE.md
 - name: aptPackages
@@ -113,12 +108,10 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       componentName: extras
       cmakeBuildDir: '$(Build.SourcesDirectory)/aomp-extras/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/aomp-extras'
       installDir: '$(Build.BinariesDirectory)/llvm'
       extraBuildFlags: >-
         -DLLVM_DIR=$(Agent.BuildDirectory)/rocm/llvm
@@ -130,7 +123,6 @@ jobs:
     parameters:
       componentName: openmp
       cmakeBuildDir: '$(Build.SourcesDirectory)/llvm-project/openmp/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/llvm-project/openmp'
       installDir: '$(Build.BinariesDirectory)/llvm'
       extraBuildFlags: >-
         -DCMAKE_PREFIX_PATH="$(Agent.BuildDirectory)/rocm;$(Build.BinariesDirectory)"
@@ -157,7 +149,6 @@ jobs:
     parameters:
       componentName: offload
       cmakeBuildDir: '$(Build.SourcesDirectory)/llvm-project/offload/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/llvm-project/offload'
       installDir: '$(Build.BinariesDirectory)/llvm'
       extraBuildFlags: >-
         -DCMAKE_PREFIX_PATH="$(Agent.BuildDirectory)/rocm;$(Build.BinariesDirectory)"
@@ -185,8 +176,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/composable_kernel.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -76,7 +71,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - script: |
         mkdir -p $(CCACHE_DIR)
         echo "##vso[task.prependpath]/usr/lib/ccache"
@@ -123,8 +117,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/copyHIP.yml

@@ -26,11 +26,9 @@ jobs:
     parameters:
       componentName: HIP
       pipelineId: $(HIP_PIPELINE_ID)
-  - task: Bash@3
-    displayName: Copy HIP artifacts
-    inputs:
-      targetType: inline
-      script: cp -a $(Agent.BuildDirectory)/rocm/* $(Build.BinariesDirectory)/
+  - template:  ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-prepare-package.yml
+    parameters:
+      sourceDir: $(Agent.BuildDirectory)/rocm
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml

.azuredevops/components/half.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -30,7 +25,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -46,7 +41,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-

.azuredevops/components/hip-tests.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -80,7 +75,6 @@ jobs:
       parameters:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     # compile hip-tests
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
@@ -115,8 +109,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/hipBLAS-common.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -34,7 +29,7 @@ jobs:
   - name: ROCM_PATH
     value: $(Agent.BuildDirectory)/rocm
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -50,7 +45,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-

.azuredevops/components/hipBLAS.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -94,7 +89,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -127,12 +121,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/hipBLASLt.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -27,7 +22,7 @@ parameters:
   type: object
   default:
     - joblib
-    - "packaging>=22.0"
+    - packaging>=22.0
     - --upgrade
 - name: rocmDependencies
   type: object
@@ -103,7 +98,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - task: Bash@3
       displayName: Add ROCm binaries to PATH
       inputs:
@@ -185,14 +179,15 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
     - name: ROCM_PATH
       value: $(Agent.BuildDirectory)/rocm
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/hipCUB.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -72,7 +67,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -100,8 +94,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/hipFFT.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -84,7 +79,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -118,8 +112,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/hipRAND.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -75,7 +70,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -107,8 +101,7 @@ jobs:
     condition:
         and(succeeded(),
           eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-          not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-          eq(${{ parameters.aggregatePipeline }}, False)
+          not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
         )
     variables:
     - group: common

.azuredevops/components/hipSOLVER.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -87,13 +82,11 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
   # build external gtest and lapack
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         componentName: external
-        cmakeBuildDir: '$(Build.SourcesDirectory)/deps/build'
-        cmakeSourceDir: '$(Build.SourcesDirectory)/deps'
+        cmakeBuildDir: 'deps/build'
         installDir: '$(Pipeline.Workspace)/deps-install'
         extraBuildFlags: >-
           -DBUILD_BOOST=OFF
@@ -129,12 +122,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/hipSPARSE.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -82,7 +77,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -122,12 +116,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/hipSPARSELt.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -96,7 +91,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
   # 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
@@ -156,8 +150,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/hipTensor.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -71,7 +66,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -101,12 +95,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/hipfort.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -81,7 +76,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -117,8 +111,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/llvm-project.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -50,7 +45,6 @@ jobs:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
       skipLlvmSymlink: true
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       componentName: rocm-llvm
@@ -83,8 +77,7 @@ jobs:
         -DROCM_LLVM_BACKWARD_COMPAT_LINK=$(Build.BinariesDirectory)/llvm
         -DROCM_LLVM_BACKWARD_COMPAT_LINK_TARGET=./lib/llvm
         -GNinja
-      cmakeBuildDir: '$(Build.SourcesDirectory)/llvm/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/llvm'
+      cmakeBuildDir: 'llvm/build'
       installDir: '$(Build.BinariesDirectory)/llvm'
 # use llvm-lit to run unit tests for llvm, clang, and lld
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
@@ -122,8 +115,7 @@ jobs:
       extraBuildFlags: >-
         -DCMAKE_PREFIX_PATH="$(Build.SourcesDirectory)/llvm/build"
         -DCMAKE_BUILD_TYPE=Release
-      cmakeBuildDir: '$(Build.SourcesDirectory)/amd/device-libs/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/amd/device-libs'
+      cmakeBuildDir: 'amd/device-libs/build'
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       componentName: comgr
@@ -131,8 +123,7 @@ jobs:
         -DCMAKE_PREFIX_PATH="$(Build.SourcesDirectory)/llvm/build;$(Build.SourcesDirectory)/amd/device-libs/build"
         -DCOMGR_DISABLE_SPIRV=1
         -DCMAKE_BUILD_TYPE=Release
-      cmakeBuildDir: '$(Build.SourcesDirectory)/amd/comgr/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/amd/comgr'
+      cmakeBuildDir: 'amd/comgr/build'
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
     parameters:
       componentName: comgr
@@ -145,8 +136,7 @@ jobs:
       extraBuildFlags: >-
         -DCMAKE_BUILD_TYPE=Release
         -DHIPCC_BACKWARD_COMPATIBILITY=OFF
-      cmakeBuildDir: '$(Build.SourcesDirectory)/amd/hipcc/build'
-      cmakeSourceDir: '$(Build.SourcesDirectory)/amd/hipcc'
+      cmakeBuildDir: 'amd/hipcc/build'
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml

.azuredevops/components/rccl.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -77,7 +72,7 @@ jobs:
     - template: /.azuredevops/variables-global.yml
     - name: HIP_ROCCLR_HOME
       value: $(Build.BinariesDirectory)/rocm
-    pool: ${{ variables.HIGH_BUILD_POOL }}
+    pool: ${{ variables.MEDIUM_BUILD_POOL }}
     workspace:
       clean: all
     steps:
@@ -95,7 +90,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -130,8 +124,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rdc.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -94,7 +89,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
   # Build grpc
     - task: Bash@3
       displayName: 'git clone grpc'
@@ -105,7 +99,6 @@ jobs:
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         cmakeBuildDir: $(Build.SourcesDirectory)/grpc/build
-        cmakeSourceDir: $(Build.SourcesDirectory)/grpc
         installDir: $(Build.SourcesDirectory)/bin
         extraBuildFlags: >-
           -DgRPC_INSTALL=ON
@@ -142,8 +135,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocAL.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -125,7 +120,6 @@ jobs:
       parameters:
         componentName: PyBind11
         cmakeBuildDir: '$(Build.SourcesDirectory)/pybind11/build'
-        cmakeSourceDir: '$(Build.SourcesDirectory)/pybind11'
         customInstallPath: false
         installEnabled: false
         extraBuildFlags: >-
@@ -142,7 +136,6 @@ jobs:
       parameters:
         componentName: RapidJSON
         cmakeBuildDir: '$(Build.SourcesDirectory)/rapidjson/build'
-        cmakeSourceDir: '$(Build.SourcesDirectory)/rapidjson'
         customInstallPath: false
         installEnabled: false
         extraBuildFlags: >-
@@ -158,7 +151,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -190,8 +182,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -202,6 +193,7 @@ jobs:
       value: $(Agent.BuildDirectory)/rocm/include/rocal
     pool:
       name: ${{ job.target }}_test_pool
+      demands: firstRenderDeviceAccess
     workspace:
       clean: all
     steps:

.azuredevops/components/rocALUTION.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -90,7 +85,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -123,8 +117,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocBLAS.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -106,7 +101,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -151,12 +145,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/rocDecode.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -78,7 +73,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-
@@ -98,8 +92,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -108,6 +101,7 @@ jobs:
       value: $(Agent.BuildDirectory)/rocm
     pool:
       name: ${{ job.target }}_test_pool
+      demands: firstRenderDeviceAccess
     workspace:
       clean: all
     steps:

.azuredevops/components/rocFFT.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -84,7 +79,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -119,8 +113,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocJPEG.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -80,7 +75,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -89,8 +83,6 @@ jobs:
           -GNinja
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
-      parameters:
-        gpuTarget: ${{ job.target }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml
     # - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/docker-container.yml
     #   parameters:
@@ -104,8 +96,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -114,6 +105,7 @@ jobs:
       value: $(Agent.BuildDirectory)/rocm
     pool:
       name: ${{ job.target }}_test_pool
+      demands: firstRenderDeviceAccess
     workspace:
       clean: all
     steps:
@@ -123,8 +115,6 @@ jobs:
         registerROCmPackages: true
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/preamble.yml
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/local-artifact-download.yml
-      parameters:
-        gpuTarget: ${{ job.target }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-aqlprofile.yml
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
       parameters:
@@ -150,3 +140,4 @@ jobs:
         environment: test
         gpuTarget: ${{ job.target }}
         registerROCmPackages: true
+        optSymLink: true

.azuredevops/components/rocMLIR.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -67,7 +62,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-
@@ -93,8 +87,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocPRIM.yml

@@ -5,17 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-- name: sparseCheckout
-  type: boolean
-  default: false
-- name: sparseCheckoutDir
-  type: string
-  default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -72,14 +61,11 @@ jobs:
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/checkout.yml
       parameters:
         checkoutRepo: ${{ parameters.checkoutRepo }}
-        sparseCheckout: ${{ parameters.sparseCheckout }}
-        sparseCheckoutDir: ${{ parameters.sparseCheckoutDir }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/dependencies-rocm.yml
       parameters:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -107,8 +93,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocPyDecode.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -82,7 +77,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - task: Bash@3
       displayName: 'Save Python Package Paths'
       inputs:
@@ -158,8 +152,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -168,6 +161,7 @@ jobs:
       value: $(Agent.BuildDirectory)/rocm
     pool:
       name: ${{ job.target }}_test_pool
+      demands: firstRenderDeviceAccess
     workspace:
       clean: all
     steps:

.azuredevops/components/rocRAND.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -75,7 +70,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -104,8 +98,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocSOLVER.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -93,7 +88,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         componentName: lapack
@@ -105,7 +99,6 @@ jobs:
           -DLAPACKE=OFF
           -GNinja
         cmakeBuildDir: '$(Build.SourcesDirectory)/lapack/build'
-        cmakeSourceDir: '$(Build.SourcesDirectory)/lapack'
         installDir: '$(Pipeline.Workspace)/deps-install'
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
@@ -138,12 +131,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/rocSPARSE.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -34,7 +29,6 @@ parameters:
     - rocminfo
     - rocPRIM
     - rocprofiler-register
-    - roctracer
 - name: rocmTestDependencies
   type: object
   default:
@@ -86,7 +80,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -133,12 +126,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/rocThrust.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -76,7 +71,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -104,8 +98,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocWMMA.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -70,7 +65,7 @@ jobs:
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
-    pool: ${{ variables.HIGH_BUILD_POOL }}
+    pool: ${{ variables.MEDIUM_BUILD_POOL }}
     workspace:
       clean: all
     steps:
@@ -86,7 +81,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -119,12 +113,13 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
     - template: /.azuredevops/variables-global.yml
+    - name: AMD_COMGR_CACHE
+      value: 0
     pool: ${{ job.target }}_test_pool
     workspace:
       clean: all

.azuredevops/components/rocm-cmake.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -31,7 +26,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all

.azuredevops/components/rocm-core.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -22,7 +17,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all

.azuredevops/components/rocm-examples.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -105,7 +100,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         # https://github.com/ROCm/HIP/issues/2203
@@ -142,8 +136,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -183,7 +176,6 @@ jobs:
       parameters:
         componentName: rocm-examples
         testDir: $(Build.SourcesDirectory)/build
-        testParameters: '--output-on-failure --force-new-ctest-process --output-junit test_output.xml --exclude-regex "rocfft_callback"'
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/docker-container.yml
       parameters:
         aptPackages: ${{ parameters.aptPackages }}

.azuredevops/components/rocm_bandwidth_test.yml

@@ -5,12 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
-
 - name: aptPackages
   type: object
   default:
@@ -55,7 +49,7 @@ jobs:
     value: $(Agent.BuildDirectory)/rocm
   - name: ROCR_LIB_DIR
     value: $(Agent.BuildDirectory)/rocm
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -72,7 +66,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-
@@ -97,8 +90,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocm_smi_lib.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -33,7 +28,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -64,8 +59,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocminfo.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -43,7 +38,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -60,7 +55,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
       skipLlvmSymlink: true
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
@@ -78,8 +72,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocprofiler-compute.yml

@@ -5,17 +5,10 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
     - cmake
-    - libdw-dev
-    - libtbb-dev
     - locales
     - ninja-build
     - python3-pip
@@ -24,10 +17,10 @@ parameters:
   default:
     - astunparse==1.6.2
     - colorlover
-    - "dash>=1.12.0"
+    - dash>=1.12.0
     - matplotlib
-    - "numpy>=1.17.5"
-    - "pandas>=1.4.3"
+    - numpy>=1.17.5
+    - pandas>=1.4.3
     - pymongo
     - pyyaml
     - tabulate
@@ -121,7 +114,6 @@ jobs:
         dependencyList: ${{ parameters.rocmDependencies }}
         dependencySource: ${{ job.dependencySource }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -148,8 +140,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common
@@ -191,9 +182,12 @@ jobs:
       displayName: Add ROCm binaries to PATH
       inputs:
         targetType: inline
-        script: |
-          echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/bin"
-          echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/llvm/bin"
+        script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/bin"
+    - task: Bash@3
+      displayName: Add ROCm compilers to PATH
+      inputs:
+        targetType: inline
+        script: echo "##vso[task.prependpath]$(Agent.BuildDirectory)/rocm/llvm/bin"
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -212,6 +206,18 @@ jobs:
         componentName: rocprofiler-compute
         testDir: $(Build.BinariesDirectory)/libexec/rocprofiler-compute
         testExecutable: ROCM_PATH=$(Agent.BuildDirectory)/rocm ctest
+    - task: Bash@3
+      displayName: Remove ROCm binaries from PATH
+      condition: always()
+      inputs:
+        targetType: inline
+        script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/bin;;' -e 's;^/;;' -e 's;/$;;')"
+    - task: Bash@3
+      displayName: Remove ROCm compilers from PATH
+      condition: always()
+      inputs:
+        targetType: inline
+        script: echo "##vso[task.setvariable variable=PATH]$(echo $PATH | sed -e 's;:$(Agent.BuildDirectory)/rocm/llvm/bin;;' -e 's;^/;;' -e 's;/$;;')"
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/docker-container.yml
       parameters:
         aptPackages: ${{ parameters.aptPackages }}

.azuredevops/components/rocprofiler-register.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -22,7 +17,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -38,13 +33,19 @@ jobs:
     parameters:
       componentName: rocprofiler-register
       extraBuildFlags: >-
-        -DCMAKE_PREFIX_PATH=$(Build.BinariesDirectory)
-        -DROCPROFILER_REGISTER_BUILD_TESTS=ON
-        -DROCPROFILER_REGISTER_BUILD_SAMPLES=ON
         -GNinja
+  - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
+    parameters:
+      componentName: rocprofiler-register-tests
+      extraBuildFlags: >-
+        -DCMAKE_PREFIX_PATH=$(Build.BinariesDirectory)
+        -GNinja
+      cmakeBuildDir: 'tests/build'
+      installEnabled: false
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/test.yml
     parameters:
       componentName: rocprofiler-register
+      testDir: 'tests/build'
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-upload.yml
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/artifact-links.yml

.azuredevops/components/rocprofiler-sdk.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -36,7 +31,7 @@ parameters:
     - pandas
     - perfetto
     - pycobertura
-    - "pytest>=6.2.5"
+    - pytest>=6.2.5
     - pyyaml
 - name: rocmDependencies
   type: object
@@ -94,7 +89,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - task: Bash@3
       displayName: Add Python site-packages binaries to path
       inputs:
@@ -131,8 +125,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocprofiler-systems.yml

@@ -6,11 +6,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -21,7 +16,6 @@ parameters:
     - bzip2
     - clang
     - cmake
-    - chrpath
     - environment-modules
     - ffmpeg
     - g++-12
@@ -67,7 +61,6 @@ parameters:
     - rocprofiler-register
     - rocprofiler-sdk
     - ROCR-Runtime
-    - roctracer
 
 - name: jobMatrix
   type: object
@@ -110,7 +103,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - task: Bash@3
       displayName: Add ROCm binaries to PATH
       inputs:
@@ -132,7 +124,6 @@ jobs:
           -DDYNINST_BUILD_BOOST=ON
           -DROCPROFSYS_USE_PAPI=ON
           -DROCPROFSYS_USE_MPI=ON
-          -DCMAKE_CXX_FLAGS=-I$(Agent.BuildDirectory)/rocm/include/rocjpeg
           -DGPU_TARGETS=${{ job.target }}
           -GNinja
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/manifest.yml
@@ -156,8 +147,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     timeoutInMinutes: 180
     variables:
@@ -167,6 +157,7 @@ jobs:
       value: $(Agent.BuildDirectory)/rocm
     pool:
       name: ${{ job.target }}_test_pool
+      demands: firstRenderDeviceAccess
     workspace:
       clean: all
     steps:
@@ -206,7 +197,6 @@ jobs:
           -DDYNINST_BUILD_BOOST=ON
           -DROCPROFSYS_USE_PAPI=ON
           -DROCPROFSYS_USE_MPI=ON
-          -DCMAKE_CXX_FLAGS=-I$(Agent.BuildDirectory)/rocm/include/rocjpeg
           -DGPU_TARGETS=${{ job.target }}
           -GNinja
     - task: Bash@3

.azuredevops/components/rocprofiler.yml

@@ -5,12 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
-
 - name: aptPackages
   type: object
   default:
@@ -89,7 +83,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -122,8 +115,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rocr_debug_agent.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -54,7 +49,7 @@ jobs:
   variables:
   - group: common
   - template: /.azuredevops/variables-global.yml
-  pool:
+  pool: 
     vmImage: ${{ variables.BASE_BUILD_POOL }}
   workspace:
     clean: all
@@ -70,7 +65,6 @@ jobs:
     parameters:
       checkoutRef: ${{ parameters.checkoutRef }}
       dependencyList: ${{ parameters.rocmDependencies }}
-      aggregatePipeline: ${{ parameters.aggregatePipeline }}
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       extraBuildFlags: >-
@@ -92,8 +86,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/roctracer.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -82,7 +77,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -113,8 +107,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/components/rpp.yml

@@ -5,11 +5,6 @@ parameters:
 - name: checkoutRef
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 - name: aptPackages
   type: object
   default:
@@ -89,7 +84,6 @@ jobs:
         checkoutRef: ${{ parameters.checkoutRef }}
         dependencyList: ${{ parameters.rocmDependencies }}
         gpuTarget: ${{ job.target }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
     - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
       parameters:
         extraBuildFlags: >-
@@ -119,8 +113,7 @@ jobs:
     condition:
       and(succeeded(),
         eq(variables['ENABLE_${{ upper(job.target) }}_TESTS'], 'true'),
-        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName'])),
-        eq(${{ parameters.aggregatePipeline }}, False)
+        not(containsValue(split(variables['DISABLED_${{ upper(job.target) }}_TESTS'], ','), variables['Build.DefinitionName']))
       )
     variables:
     - group: common

.azuredevops/dependencies/grpc.yml

@@ -38,7 +38,6 @@ jobs:
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       cmakeBuildDir: $(Agent.BuildDirectory)/grpc/build
-      cmakeSourceDir: $(Agent.BuildDirectory)/grpc
       extraBuildFlags: >-
         -DgRPC_INSTALL=ON
         -DgRPC_BUILD_TESTS=OFF

.azuredevops/dependencies/gtest.yml

@@ -38,7 +38,6 @@ jobs:
   - template: ${{ variables.CI_TEMPLATE_PATH }}/steps/build-cmake.yml
     parameters:
       cmakeBuildDir: $(Agent.BuildDirectory)/googletest/build
-      cmakeSourceDir: $(Agent.BuildDirectory)/googletest
       extraBuildFlags: >-
         -DGTEST_FORCE_SHARED_CRT=ON
         -DCMAKE_DEBUG_POSTFIX=d

.azuredevops/nightly/pytorch.yml

@@ -68,7 +68,7 @@ parameters:
   default:
     - cmake
     - astunparse
-    - "expecttest>=0.2.1"
+    - expecttest>=0.2.1
     - hypothesis
     - numpy
     - psutil
@@ -76,8 +76,8 @@ parameters:
     - requests
     - setuptools==75.8.0
     - types-dataclasses
-    - "typing-extensions>=4.8.0"
-    - "sympy>=1.13.0"
+    - typing-extensions>=4.8.0
+    - sympy>=1.13.0
     - filelock
     - networkx
     - jinja2
@@ -85,8 +85,8 @@ parameters:
     - lintrunner
     - ninja
     - packaging
-    - "optree>=0.13.0"
-    - "click>=8.0.3"
+    - optree>=0.13.0
+    - click>=8.0.3
   # list for vision
     - auditwheel
     - future

.azuredevops/scripts/download-manifest-artifacts/download-manifest-artifacts.py

@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import requests
-import argparse
-from pathlib import Path
-
-def get_builds(entries, gpu_target, output):
-    already_downloaded = {}
-    for entry in entries:
-        already_downloaded = _get_builds(entry, gpu_target, already_downloaded, output)
-
-def _get_builds(entry, gpu_target, already_downloaded, output):
-    print()
-    print(f"{entry['buildNumber']} - {entry['buildId']} - {entry['repoName']}")
-    if already_downloaded.get(entry['buildId']):
-        print('Skipping, already downloaded from build ' + entry['buildId'])
-        return already_downloaded
-
-    artifacts_url = f"https://dev.azure.com/ROCm-CI/ROCm-CI/_apis/build/builds/{entry['buildId']}/artifacts?api-version=7.1"
-    artifacts = requests.get(artifacts_url).json()
-    for artifact in artifacts['value']:
-        if 'gfx' in artifact['name'] and gpu_target not in artifact['name']:
-            continue
-
-        print('Artifact name: ' + artifact['name'])
-        print('File size: ~' +
-              str(round(int(artifact['resource']['properties']['artifactsize'])/1000000, 2)) + ' MB')
-        download_url = f"{artifact['resource']['downloadUrl']}"
-        download = requests.get(download_url)
-
-        zip_file = Path(output) / f"{artifact['name']}.zip"
-        with open(zip_file, 'wb') as f:
-            f.write(download.content)
-        already_downloaded[entry['buildId']] = True
-
-    return already_downloaded
-
-def main():
-    parser = argparse.ArgumentParser(description="Command line tool for downloading external ci artifacts")
-    parser.add_argument('--target', type=str, dest="target", choices=["gfx90a", "gfx942"], help="Target gfx")
-    parser.add_argument('--manifest', type=str, dest="manifest", help='JSON manifest url or path to local manifest')
-    parser.add_argument('--output_dir', type=str, dest="output", help='Path to download directory')
-    args = parser.parse_args()
-
-    manifest = args.manifest
-    gpu_target = args.target
-
-    if not gpu_target:
-        print("Enter the GPU target (gfx942, gfx90a)")
-        gpu_target = input()
-
-    if not manifest:
-        print("Enter the manifest file (URL or local path)")
-        manifest = input()
-
-    if 'http' in manifest:
-        data = requests.get(manifest).json()
-    else:
-        with open(manifest, 'r') as f:
-            data = json.load(f)
-
-    entries = [e for e in data['current']]
-    entries.extend([e for e in data['dependencies']])
-    get_builds(entries, gpu_target, args.output)
-
-if __name__ == "__main__":
-    main()

.azuredevops/scripts/download-manifest-artifacts/requirements.txt

@@ -1 +0,0 @@
-requests

.azuredevops/templates/steps/artifact-download.yml

@@ -12,11 +12,6 @@ parameters:
 - name: fileFilter
   type: string
   default: ''
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 
 steps:
 - task: Bash@3
@@ -32,23 +27,17 @@ steps:
 - task: DownloadPipelineArtifact@2
   displayName: Download ${{ parameters.componentName }}
   inputs:
-    ${{ if eq(parameters.aggregatePipeline, false) }}:
-      buildType: 'specific'
-      project: ROCm-CI
-      definition: ${{ parameters.pipelineId }}
-      specificBuildWithTriggering: true
-      itemPattern: '**/*${{ parameters.fileFilter }}*'
-      # aomp is a special case, since the trigger file is under ROCm/ROCm instead of the component repo
-      ${{ if notIn(parameters.componentName, 'aomp') }}:
-        buildVersionToDownload: latestFromBranch # default is 'latest'
-      branchName: refs/heads/${{ parameters.branchName }}
-      allowPartiallySucceededBuilds: $(allowPartiallySucceededBuilds)
-      targetPath: '$(Pipeline.Workspace)/d'
-    ${{ else }}:
-      buildType: 'current'
-      itemPattern: '**/${{ parameters.componentName }}*${{ parameters.fileFilter }}*'
-      allowPartiallySucceededBuilds: $(allowPartiallySucceededBuilds)
-      targetPath: '$(Pipeline.Workspace)/d'
+    buildType: 'specific'
+    project: ROCm-CI
+    definition: ${{ parameters.pipelineId }}
+    specificBuildWithTriggering: true
+    itemPattern: '**/*${{ parameters.fileFilter }}*'
+    # aomp is a special case, since the trigger file is under ROCm/ROCm instead of the component repo
+    ${{ if notIn(parameters.componentName, 'aomp') }}:
+      buildVersionToDownload: latestFromBranch # default is 'latest'
+    branchName: refs/heads/${{ parameters.branchName }}
+    allowPartiallySucceededBuilds: $(allowPartiallySucceededBuilds)
+    targetPath: '$(Pipeline.Workspace)/d'
 - task: ExtractFiles@1
   displayName: Extract ${{ parameters.componentName }}
   inputs:

.azuredevops/templates/steps/build-cmake.yml

@@ -10,10 +10,10 @@ parameters:
   default: ''
 - name: cmakeBuildDir
   type: string
-  default: $(Agent.BuildDirectory)/s/build
+  default: 'build'
 - name: cmakeSourceDir
   type: string
-  default: $(Agent.BuildDirectory)/s
+  default: '..'
 - name: customBuildTarget
   type: string
   default: ''
@@ -46,7 +46,7 @@ steps:
     ${{ if eq(parameters.customInstallPath, true) }}:
       cmakeArgs: -DCMAKE_INSTALL_PREFIX=${{ parameters.installDir }} ${{ parameters.extraBuildFlags }} ${{ parameters.cmakeSourceDir }}
     ${{ else }}:
-      cmakeArgs: ${{ parameters.extraBuildFlags }} ${{ parameters.cmakeSourceDir }}
+      cmakeArgs: ${{ parameters.extraBuildFlags }} ..
 - ${{ if parameters.printDiskSpace }}:
   - script: df -h
     displayName: Disk space before build

.azuredevops/templates/steps/checkout.yml

@@ -4,12 +4,6 @@ parameters:
 - name: checkoutRepo
   type: string
   default: 'self'
-- name: sparseCheckout
-  type: boolean
-  default: false
-- name: sparseCheckoutDir
-  type: string
-  default: ''
 # submodule download behaviour
 # change to 'recursive' for repos with submodules
 - name: submoduleBehaviour
@@ -21,13 +15,3 @@ steps:
     clean: true
     submodules: ${{ parameters.submoduleBehaviour }}
     retryCountOnTaskFailure: 3
-    fetchFilter: blob:none
-    ${{ if eq(parameters.sparseCheckout, true) }}:
-      sparseCheckoutDirectories: ${{ parameters.sparseCheckoutDir }}
-      path: sparse
-  - ${{ if eq(parameters.sparseCheckout, true) }}:
-    - task: Bash@3
-      displayName: Symlink sparse checkout
-      inputs:
-        targetType: inline
-        script: ln -s $(Agent.BuildDirectory)/sparse/${{ parameters.sparseCheckoutDir }} $(Agent.BuildDirectory)/s

.azuredevops/templates/steps/dependencies-rocm.yml

@@ -31,11 +31,6 @@ parameters:
 - name: setupHIPLibrarySymlinks
   type: boolean
   default: false
-# set to true if doing full build of ROCm stack
-# and dependencies are pulled from same pipeline
-- name: aggregatePipeline
-  type: boolean
-  default: false
 
 - name: componentVarList
   type: object
@@ -359,7 +354,6 @@ steps:
       parameters:
         componentName: ${{ split(dependency, ':')[0] }}
         pipelineId: ${{ parameters.componentVarList[split(dependency, ':')[0]].pipelineId }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
         ${{ if parameters.componentVarList[split(dependency, ':')[0]].hasGpuTarget }}:
           fileFilter: "${{ split(dependency, ':')[1] }}*${{ parameters.gpuTarget }}"
         # dependencySource = staging
@@ -389,7 +383,6 @@ steps:
       parameters:
         componentName: ${{ dependency }}
         pipelineId: ${{ parameters.componentVarList[dependency].pipelineId }}
-        aggregatePipeline: ${{ parameters.aggregatePipeline }}
         ${{ if parameters.componentVarList[dependency].hasGpuTarget }}:
           fileFilter: ${{ parameters.gpuTarget }}
         # dependencySource = staging
@@ -463,7 +456,7 @@ steps:
   displayName: 'List downloaded ROCm files'
   inputs:
     targetType: inline
-    script: ls -la1R $(Agent.BuildDirectory)/rocm
+    script: ls -1R $(Agent.BuildDirectory)/rocm
 - ${{ if eq(parameters.skipLibraryLinking, false) }}:
   - task: Bash@3
     displayName: 'Link ROCm shared libraries'

.azuredevops/templates/steps/docker-container-commit.yml

@@ -1,82 +0,0 @@
-# This template creates and uploads a Docker image from the current environment
-# It uses `docker commit` to do so, which can provide more accurate images than the standard template
-# It requires the following conditions:
-# - Job must be run inside a Docker container
-# - The container's external name must be the same as the container's internal hostname
-# - Docker must be installed inside said container and given sufficient permissions
-# Currently, it is only usable for test jobs run on our self-managed systems
-# Jobs run on Azure VMs will not be able to use this template (most if not all build jobs)
-
-parameters:
-- name: gpuTarget
-  type: string
-  default: ''
-- name: environment
-  type: string
-  default: build
-  values:
-    - build
-    - test
-    - combined
-    - amd
-    - nvidia
-- name: extraPaths
-  type: string
-  default: ''
-- name: extraEnvVars
-  type: object
-  default: []
-- name: forceDockerCreation
-  type: boolean
-  default: false
-
-steps:
-  - task: Bash@3
-    displayName: Commit container and initialize Dockerfile
-    condition: or(and(failed(), not(contains(variables['DOCKER_SKIP_GFX'], variables['JOB_GPU_TARGET']))), ${{ eq(parameters.forceDockerCreation, true) }})
-    inputs:
-      workingDirectory: $(Pipeline.Workspace)
-      targetType: inline
-      script: |
-        docker commit $(hostname) az-ci-temp-image:latest
-        echo "FROM az-ci-temp-image:latest" > Dockerfile
-        echo "RUN sudo groupmod -g $(getent group render | awk -F: '{print $3}') render" >> Dockerfile
-        echo "RUN sudo groupmod -g $(getent group docker | awk -F: '{print $3}') docker" >> Dockerfile
-        echo "ENV PATH='$PATH:${{ parameters.extraPaths }}'" >> Dockerfile
-        echo "ENTRYPOINT [\"/bin/bash\"]" >> Dockerfile
-  - ${{ each extraEnvVar in parameters.extraEnvVars }}:
-    - task: Bash@3
-      displayName: Add extra environment variables
-      condition: or(and(failed(), not(contains(variables['DOCKER_SKIP_GFX'], variables['JOB_GPU_TARGET']))), ${{ eq(parameters.forceDockerCreation, true) }})
-      inputs:
-        workingDirectory: $(Pipeline.Workspace)
-        targetType: inline
-        script: echo "ENV ${{ split(extraEnvVar, ':::')[0] }}='${{ split(extraEnvVar, ':::')[1] }}'" >> Dockerfile
-  - task: Bash@3
-    displayName: Print Dockerfile
-    condition: or(and(failed(), not(contains(variables['DOCKER_SKIP_GFX'], variables['JOB_GPU_TARGET']))), ${{ eq(parameters.forceDockerCreation, true) }})
-    inputs:
-      workingDirectory: $(Pipeline.Workspace)
-      targetType: inline
-      script: cat Dockerfile
-  - task: Docker@2
-    displayName: Build and upload Docker image
-    condition: or(and(failed(), not(contains(variables['DOCKER_SKIP_GFX'], variables['JOB_GPU_TARGET']))), ${{ eq(parameters.forceDockerCreation, true) }})
-    inputs:
-      containerRegistry: 'ContainerService3'
-      ${{ if ne(parameters.gpuTarget, '') }}:
-        repository: '$(Build.DefinitionName)-${{ parameters.environment }}-${{ parameters.gpuTarget }}'
-      ${{ else }}:
-        repository: '$(Build.DefinitionName)-${{ parameters.environment }}'
-      Dockerfile: '$(Pipeline.Workspace)/Dockerfile'
-      buildContext: '$(Pipeline.Workspace)'
-  - task: Bash@3
-    condition: or(and(failed(), not(contains(variables['DOCKER_SKIP_GFX'], variables['JOB_GPU_TARGET']))), ${{ eq(parameters.forceDockerCreation, true) }})
-    displayName: "!! Docker Image URL !!"
-    inputs:
-      workingDirectory: $(Pipeline.Workspace)
-      targetType: inline
-      ${{ if ne(parameters.gpuTarget, '') }}:
-        script: echo "rocmexternalcicd.azurecr.io/$(Build.DefinitionName)-${{ parameters.environment }}-${{ parameters.gpuTarget }}:$(Build.BuildId)" | tr '[:upper:]' '[:lower:]'
-      ${{ else }}:
-        script: echo "rocmexternalcicd.azurecr.io/$(Build.DefinitionName)-${{ parameters.environment }}:$(Build.BuildId)" | tr '[:upper:]' '[:lower:]'

.azuredevops/templates/steps/docker-container.yml

@@ -106,7 +106,6 @@ parameters:
   type: object
   default:
     - gfx90a
-    - gfx942
 
 steps:
 # these steps should only be run if there was a failure or warning
@@ -335,7 +334,7 @@ steps:
   - task: Docker@2
     condition: or(and(failed(), ${{ not(containsValue(parameters.dockerSkipGfx, parameters.gpuTarget)) }}), ${{ eq(parameters.forceDockerCreation, true) }})
     inputs:
-      containerRegistry: 'ContainerService3'
+      containerRegistry: 'ContainerService'
       ${{ if ne(parameters.gpuTarget, '') }}:
         repository: '$(Build.DefinitionName)-${{ parameters.environment }}-${{ parameters.gpuTarget }}'
       ${{ else }}:
@@ -349,6 +348,6 @@ steps:
       workingDirectory: $(Pipeline.Workspace)
       targetType: inline
       ${{ if ne(parameters.gpuTarget, '') }}:
-        script: echo "rocmexternalcicd.azurecr.io/$(Build.DefinitionName)-${{ parameters.environment }}-${{ parameters.gpuTarget }}:$(Build.BuildId)" | tr '[:upper:]' '[:lower:]'
+        script: echo "rocmexternalcicd.azurecr.io/$(Build.DefinitionName)-${{ parameters.environment }}-${{ parameters.gpuTarget }}:$(Build.BuildId)"
       ${{ else }}:
-        script: echo "rocmexternalcicd.azurecr.io/$(Build.DefinitionName)-${{ parameters.environment }}:$(Build.BuildId)" | tr '[:upper:]' '[:lower:]'
+        script: echo "rocmexternalcicd.azurecr.io/$(Build.DefinitionName)-${{ parameters.environment }}:$(Build.BuildId)"

.azuredevops/templates/steps/miopen-get-ck-build.yml

@@ -54,7 +54,7 @@ steps:
       fi
 
       echo "Downloading CK artifact from $ARTIFACT_URL"
-      wget --tries=5 --waitretry=10 --retry-connrefused -nv $ARTIFACT_URL -O $(System.ArtifactsDirectory)/ck.zip
+      wget -nv $ARTIFACT_URL -O $(System.ArtifactsDirectory)/ck.zip
       unzip $(System.ArtifactsDirectory)/ck.zip -d $(System.ArtifactsDirectory)
       mkdir -p $(Agent.BuildDirectory)/rocm
       tar -zxvf $(System.ArtifactsDirectory)/$ARTIFACT_NAME/*.tar.gz -C $(Agent.BuildDirectory)/rocm

.azuredevops/variables-global.yml

@@ -30,13 +30,13 @@ variables:
 - name: GFX90A_TEST_POOL
   value: gfx90a_test_pool
 - name: LATEST_RELEASE_VERSION
-  value: 6.4.0
+  value: 6.3.4
 - name: REPO_RADEON_VERSION
-  value: 6.4
+  value: 6.3.4
 - name: NEXT_RELEASE_VERSION
-  value: 6.5.0
+  value: 6.4.0
 - name: LATEST_RELEASE_TAG
-  value: rocm-6.4.0
+  value: rocm-6.3.4
 - name: DOCKER_SKIP_GFX
   value: gfx90a
 - name: AMDMIGRAPHX_GFX942_TEST_PIPELINE_ID

CHANGELOG.md

@@ -125,7 +125,8 @@ Some workaround options are as follows:
 - The `pasid` field in struct `amdsmi_process_info_t` will be deprecated in a future ROCm release.
 
 ```{note}
-See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples, and in-depth descriptions.
+See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples,
+and in-depth descriptions.
 ```
 
 ### **AMDMIGraphX** (2.12.0)
@@ -735,7 +736,8 @@ The following lists the backward incompatible changes planned for upcoming major
 - Fixed `rsmi_dev_target_graphics_version_get`, `rocm-smi --showhw`, and `rocm-smi --showprod` not displaying graphics version correctly for Instinct MI200 series, MI100 series, and RDNA3-based GPUs. 
 
 ```{note}
-See the full [ROCm SMI changelog](https://github.com/ROCm/rocm_smi_lib/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples, and in-depth descriptions.
+See the full [ROCm SMI changelog](https://github.com/ROCm/rocm_smi_lib/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples,
+and in-depth descriptions.
 ```
 
 ### **ROCm Systems Profiler** (1.0.0)

RELEASE.md

@@ -260,7 +260,7 @@ Click {fab}`github` to go to the component's source code on GitHub.
                 <td><a href="https://github.com/ROCm/rccl"><i class="fab fa-github fa-lg"></i></a></td>
             </tr>
             <tr>
-            <td><a href="https://github.com/ROCm/rocSHMEM">rocSHMEM</a></td>
+            <td><a href="https://rocm.docs.amd.com/projects/rocSHMEM/en/docs-6.4.0/index.html">rocSHMEM</a></td>
                 <td>2.0.0</td>
                 <td><a href="https://github.com/ROCm/rocSHMEM"><i class="fab fa-github fa-lg"></i></a></td>
             </tr>
@@ -634,7 +634,8 @@ Some workaround options are as follows:
 - The `pasid` field in struct `amdsmi_process_info_t` will be deprecated in a future ROCm release.
 
 ```{note}
-See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples, and in-depth descriptions.
+See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples,
+and in-depth descriptions.
 ```
 
 ### **AMDMIGraphX** (2.12.0)
@@ -766,17 +767,17 @@ See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/roc
 
 #### Changed
 
-* `roc-obj` tools is deprecated and will be removed in an upcoming release.
+* The `roc-obj` tools have been deprecated and will be removed in a future release.
 
-    - Perl package installation is not required, and users will need to install this themselves if they want to.
-    - Support for ROCm Object tooling has moved into `llvm-objdump` provided by package `rocm-llvm`.
+   -	`llvm-objdump`, `llvm-objcopy`, and `llvm-readobj` will be enhanced to provide similar functionality as that provided by the `roc-obj` tools . The LLVM tools are available in the `rocm-llvm` pkg.
+   -	While not related to the deprecation, also note that the `roc-obj` tools’ package dependency on Perl has been changed to recommended. It is the user’s responsibility to install Perl to use these tools.
 
 * SDMA retainer logic is removed for engine selection in operation of runtime buffer copy.
 
 #### Optimized
 
 * `hipGraphLaunch` parallelism is improved for complex data-parallel graphs.
-* Make the round-robin queue selection in command scheduling. For multi-streams execution, HSA queue from null stream lock is freed and won't occupy the queue ID after the kernel in the stream is finished.
+* Round-robin queue mechanism is updated for command scheduling. For multi-streams execution, HSA queue from null stream lock is freed and won't occupy the queue ID after the kernel in the stream is finished.
 * The HIP runtime doesn't free bitcode object before code generation. It adds a cache, which allows compiled code objects to be reused instead of recompiling. This improves performance on multi-GPU systems.
 * Runtime now uses unified copy approach:
 
@@ -785,6 +786,11 @@ See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/roc
     - The default environment variable `GPU_FORCE_BLIT_COPY_SIZE` is set to `16`, which limits the kernel copy to sizes less than 16 KB, while copies larger than that would be handled by `SDMA` engine.
     - Blit code is refactored, and ASAN instrumentation is cleaned up.
 
+* HIP runtime uses signals without interrupts:
+
+    - In active wait mode, uses signals without interrupts by default.
+    - Only when a callback is required, switches to the interrupts.
+
 #### Resolved issues
 
 * Out-of-memory error on Microsoft Windows. When the user calls `hipMalloc` for device memory allocation while specifying a size larger than the available device memory, the HIP runtime fixes the error in the API implementation, allocating the available device memory plus system memory (shared virtual memory).
@@ -795,13 +801,15 @@ See the full [AMD SMI changelog](https://github.com/ROCm/amdsmi/blob/release/roc
 
 The following lists the backward incompatible changes planned for upcoming major ROCm releases.
 
-* Signature changes in APIs to correspond with NVIDIA CUDA APIs,
+* Signature changes in APIs to match corresponding CUDA APIs,
 
     - `hiprtcCreateProgram`
     - `hiprtcCompileProgram`
     - `hipCtxGetApiVersion`
 
 * Behavior of `hipPointerGetAttributes` is changed to match corresponding CUDA API in version 11 and later releases.
+* Behavior of `hipFree` is changed to match corresponding CUDA API `cudaFree`.
+* HIP vector constructor changes for `hipComplex`.
 * Return error/value code updates in the following hip APIs to match the corresponding CUDA APIs,
 
     - `hipModuleLaunchKernel`
@@ -1244,7 +1252,8 @@ The following lists the backward incompatible changes planned for upcoming major
 - Fixed `rsmi_dev_target_graphics_version_get`, `rocm-smi --showhw`, and `rocm-smi --showprod` not displaying graphics version correctly for Instinct MI200 series, MI100 series, and RDNA3-based GPUs. 
 
 ```{note}
-See the full [ROCm SMI changelog](https://github.com/ROCm/rocm_smi_lib/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples, and in-depth descriptions.
+See the full [ROCm SMI changelog](https://github.com/ROCm/rocm_smi_lib/blob/release/rocm-rel-6.4/CHANGELOG.md) for details, examples,
+and in-depth descriptions.
 ```
 
 ### **ROCm Systems Profiler** (1.0.0)
@@ -1723,7 +1732,7 @@ and will be disabled in a future release.
 
 * The `__AMDGCN_WAVEFRONT_SIZE__` macro and `__AMDGCN_WAVEFRONT_SIZE` alias will be removed in an upcoming release.
   It is recommended to remove any use of this macro. For more information, see
-  [AMDGPU support](https://rocm.docs.amd.com/projects/llvm-project/en/docs-6.3.2/LLVM/clang/html/AMDGPUSupport.html).
+  [AMDGPU support](https://rocm.docs.amd.com/projects/llvm-project/en/docs-6.4.0/LLVM/clang/html/AMDGPUSupport.html).
 * `warpSize` will only be available as a non-`constexpr` variable. Where required,
   the wavefront size should be queried via the `warpSize` variable in device code,
   or via `hipGetDeviceProperties` in host code. Neither of these will result in a compile-time constant. 
@@ -1761,4 +1770,5 @@ There are a number of upcoming changes planned for HIP runtime API in an upcomin
 that are not backward compatible with prior releases. Most of these changes increase 
 alignment between HIP and CUDA APIs or behavior. Some of the upcoming changes are to 
 clean up header files, remove namespace collision, and have a clear separation between 
-`hipRTC` and HIP runtime. For more information refer to [HIP Upcoming changes](#hip-6-4-0).
+`hipRTC` and HIP runtime. For more information, see [HIP Upcoming changes](#hip-6-4-0)
+or [HIP 7.0 Is Coming: What You Need to Know to Stay Ahead](https://rocm.blogs.amd.com/ecosystems-and-partners/transition-to-hip-7.0:-guidance-on-upcoming-compatibility-changes/README.html).

docs/compatibility/compatibility-matrix-historical-6.0.csv

@@ -52,7 +52,7 @@ ROCm Version,6.4.0,6.3.3,6.3.2,6.3.1,6.3.0,6.2.4,6.2.2,6.2.1,6.2.0, 6.1.5, 6.1.2
       ,,,,,,,,,,,,,,,
       COMMUNICATION,.. _commlibs-support-compatibility-matrix-past-60:,,,,,,,,,,,,,,
       :doc:`RCCL <rccl:index>`,2.22.3,2.21.5,2.21.5,2.21.5,2.21.5,2.20.5,2.20.5,2.20.5,2.20.5,2.18.6,2.18.6,2.18.6,2.18.6,2.18.3,2.18.3
-`rocSHMEM <https://github.com/ROCm/rocSHMEM>`_,2.0.0,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A
+      :doc:`rocSHMEM <rocSHMEM:index>`,2.0.0,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A,N/A
       ,,,,,,,,,,,,,,,
       MATH LIBS,.. _mathlibs-support-compatibility-matrix-past-60:,,,,,,,,,,,,,,
       `half <https://github.com/ROCm/half>`_ ,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0,1.12.0

docs/compatibility/compatibility-matrix.rst

@@ -77,7 +77,7 @@ compatibility and system requirements.
       ,,,
       COMMUNICATION,.. _commlibs-support-compatibility-matrix:,,
       :doc:`RCCL <rccl:index>`,2.22.3,2.21.5,2.20.5
-      `rocSHMEM <https://github.com/ROCm/rocSHMEM>`_ ,2.0.0,N/A,N/A
+      :doc:`rocSHMEM <rocSHMEM:index>`,2.0.0,N/A,N/A
       ,,,
       MATH LIBS,.. _mathlibs-support-compatibility-matrix:,,
       `half <https://github.com/ROCm/half>`_ ,1.12.0,1.12.0,1.12.0

docs/how-to/system-debugging.md

@@ -0,0 +1,68 @@
+---
+myst:
+  html_meta:
+    "description": "Learn more about common system-level debugging measures for ROCm."
+    "keywords": "env, var, sys, PCIe, troubleshooting, admin, error"
+---
+
+# System debugging
+
+## ROCm language and system-level debug, flags, and environment variables
+
+Kernel options to avoid: the Ethernet port getting renamed every time you change graphics cards, `net.ifnames=0 biosdevname=0`
+
+## ROCr error code
+
+* 2 Invalid Dimension
+* 4 Invalid Group Memory
+* 8 Invalid (or Null) Code
+* 32 Invalid Format
+* 64 Group is too large
+* 128 Out of VGPRs
+* 0x80000000 Debug Options
+
+## Command to dump firmware version and get Linux kernel version
+
+`sudo cat /sys/kernel/debug/dri/1/amdgpu_firmware_info`
+
+`uname -a`
+
+## Debug flags
+
+Debug messages when developing/debugging base ROCm driver. You could enable the printing from `libhsakmt.so` by setting an environment variable, `HSAKMT_DEBUG_LEVEL`. Available debug levels are 3-7. The higher level you set, the more messages will print.
+
+* `export HSAKMT_DEBUG_LEVEL=3` : Only pr_err() prints.
+
+* `export HSAKMT_DEBUG_LEVEL=4` : pr_err() and pr_warn() print.
+
+* `export HSAKMT_DEBUG_LEVEL=5` : We currently do not implement “notice”. Setting to 5 is same as setting to 4.
+
+* `export HSAKMT_DEBUG_LEVEL=6` : pr_err(), pr_warn(), and pr_info print.
+
+* `export HSAKMT_DEBUG_LEVEL=7` : Everything including pr_debug prints.
+
+## ROCr level environment variables for debug
+
+`HSA_ENABLE_SDMA=0`
+
+`HSA_ENABLE_INTERRUPT=0`
+
+`HSA_SVM_GUARD_PAGES=0`
+
+`HSA_DISABLE_CACHE=1`
+
+## Turn off page retry on GFX9/Vega devices
+
+`sudo -s`
+
+`echo 1 > /sys/module/amdkfd/parameters/noretry`
+
+## HIP environment variables 3.x
+
+### OpenCL debug flags
+
+`AMD_OCL_WAIT_COMMAND=1 (0 = OFF, 1 = On)`
+
+## PCIe-debug
+
+For information on how to debug and profile HIP applications, see {doc}`hip:how-to/debugging`

docs/index.md

@@ -42,6 +42,7 @@ ROCm documentation is organized into the following categories:
 * [Use ROCm for HPC](./how-to/rocm-for-hpc/index.rst)
 * [System optimization](./how-to/system-optimization/index.rst)
 * [AMD Instinct MI300X performance validation and tuning](./how-to/tuning-guides/mi300x/index.rst)
+* [System debugging](./how-to/system-debugging.md)
 * [Use advanced compiler features](./conceptual/compiler-topics.md)
 * [Set the number of CUs](./how-to/setting-cus)
 * [Troubleshoot BAR access limitation](./how-to/Bar-Memory.rst)

docs/reference/api-libraries.md

@@ -45,7 +45,7 @@
 (communication-libraries)=
 
 * {doc}`RCCL <rccl:index>`
-* [rocSHMEM](https://github.com/ROCm/rocSHMEM)
+* {doc}`rocSHMEM <rocSHMEM:index>`
 :::
 
 :::{grid-item-card} Math

docs/reference/gpu-arch-specs.rst

@@ -296,7 +296,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -314,7 +314,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -332,7 +332,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -350,7 +350,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -368,7 +368,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -386,7 +386,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -404,7 +404,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -422,7 +422,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -440,7 +440,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -519,7 +519,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -537,7 +537,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -555,7 +555,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -573,7 +573,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -591,7 +591,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 768
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -609,7 +609,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 11
           - 0
         *
@@ -627,7 +627,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -645,7 +645,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -663,7 +663,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -681,7 +681,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -699,7 +699,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -717,7 +717,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -735,7 +735,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -753,7 +753,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -771,7 +771,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *
@@ -789,7 +789,7 @@ For more information about ROCm hardware compatibility, see the ROCm `Compatibil
           - 16
           - 32
           - 512
-          - 16
+          - 32
           - 10
           - 3
         *

docs/sphinx/_toc.yml.in

@@ -12,14 +12,14 @@ subtrees:
   - file: compatibility/compatibility-matrix.rst
     title: Compatibility matrix
     entries:
-    - url: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/reference/system-requirements.html
+    - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/reference/system-requirements.html
       title: Linux system requirements
     - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/reference/system-requirements.html
       title: Windows system requirements
 
 - caption: Install
   entries:
-  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/latest/
+  - url: https://rocm.docs.amd.com/projects/install-on-linux/en/${branch}/
     title: ROCm on Linux
   - url: https://rocm.docs.amd.com/projects/install-on-windows/en/${branch}/
     title: HIP SDK on Windows
@@ -109,6 +109,7 @@ subtrees:
     title: System optimization
   - file: how-to/gpu-performance/mi300x.rst
     title: AMD Instinct MI300X performance guides
+  - file: how-to/system-debugging.md
   - file: conceptual/compiler-topics.md
     title: Use advanced compiler features
     subtrees:
@@ -122,7 +123,7 @@ subtrees:
   - file: how-to/setting-cus
     title: Set the number of CUs
   - file: how-to/Bar-Memory.rst
-    title: Troubleshoot BAR access limitation
+    title: Troubleshoot BAR access limitation  
   - url: https://github.com/amd/rocm-examples
     title: ROCm examples
 

docs/sphinx/requirements.txt

@@ -2,54 +2,55 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile docs/sphinx/requirements.in
+#    pip-compile requirements.in
 #
 accessible-pygments==0.0.5
     # via pydata-sphinx-theme
 alabaster==1.0.0
     # via sphinx
+appnope==0.1.4
+    # via ipykernel
 asttokens==3.0.0
     # via stack-data
-attrs==25.1.0
+attrs==25.3.0
     # via
     #   jsonschema
     #   jupyter-cache
     #   referencing
-babel==2.16.0
+babel==2.17.0
     # via
     #   pydata-sphinx-theme
     #   sphinx
-beautifulsoup4==4.12.3
+beautifulsoup4==4.13.3
     # via pydata-sphinx-theme
-breathe==4.35.0
+breathe==4.36.0
     # via rocm-docs-core
-certifi==2024.8.30
+certifi==2025.1.31
     # via requests
 cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.4.0
+charset-normalizer==3.4.1
     # via requests
-click==8.1.7
+click==8.1.8
     # via
     #   jupyter-cache
     #   sphinx-external-toc
 comm==0.2.2
     # via ipykernel
-cryptography==44.0.1
+cryptography==44.0.2
     # via pyjwt
-debugpy==1.8.12
+debugpy==1.8.14
     # via ipykernel
-decorator==5.1.1
+decorator==5.2.1
     # via ipython
 defusedxml==0.7.1
     # via sphinxcontrib-datatemplates
-deprecated==1.2.15
+deprecated==1.2.18
     # via pygithub
 docutils==0.21.2
     # via
-    #   breathe
     #   myst-parser
     #   pydata-sphinx-theme
     #   sphinx
@@ -57,16 +58,14 @@ exceptiongroup==1.2.2
     # via ipython
 executing==2.2.0
     # via stack-data
-fastjsonschema==2.20.0
+fastjsonschema==2.21.1
     # via
     #   nbformat
     #   rocm-docs-core
-gitdb==4.0.11
+gitdb==4.0.12
     # via gitpython
-gitpython==3.1.43
+gitpython==3.1.44
     # via rocm-docs-core
-greenlet==3.1.1
-    # via sqlalchemy
 idna==3.10
     # via requests
 imagesize==1.4.1
@@ -77,7 +76,7 @@ importlib-metadata==8.6.1
     #   myst-nb
 ipykernel==6.29.5
     # via myst-nb
-ipython==8.31.0
+ipython==8.35.0
     # via
     #   ipykernel
     #   myst-nb
@@ -117,9 +116,9 @@ mdit-py-plugins==0.4.2
     # via myst-parser
 mdurl==0.1.2
     # via markdown-it-py
-myst-nb==1.1.2
+myst-nb==1.2.0
     # via rocm-docs-core
-myst-parser==4.0.0
+myst-parser==4.0.1
     # via myst-nb
 nbclient==0.10.2
     # via
@@ -135,16 +134,17 @@ nest-asyncio==1.6.0
 packaging==24.2
     # via
     #   ipykernel
+    #   pydata-sphinx-theme
     #   sphinx
 parso==0.8.4
     # via jedi
 pexpect==4.9.0
     # via ipython
-platformdirs==4.3.6
+platformdirs==4.3.7
     # via jupyter-core
 prompt-toolkit==3.0.50
     # via ipython
-psutil==6.1.1
+psutil==7.0.0
     # via ipykernel
 ptyprocess==0.7.0
     # via pexpect
@@ -152,19 +152,19 @@ pure-eval==0.2.3
     # via stack-data
 pycparser==2.22
     # via cffi
-pydata-sphinx-theme==0.16.0
+pydata-sphinx-theme==0.15.4
     # via
     #   rocm-docs-core
     #   sphinx-book-theme
-pygithub==2.5.0
+pygithub==2.6.1
     # via rocm-docs-core
-pygments==2.18.0
+pygments==2.19.1
     # via
     #   accessible-pygments
     #   ipython
     #   pydata-sphinx-theme
     #   sphinx
-pyjwt[crypto]==2.10.0
+pyjwt[crypto]==2.10.1
     # via pygithub
 pynacl==1.5.0
     # via pygithub
@@ -178,7 +178,7 @@ pyyaml==6.0.2
     #   rocm-docs-core
     #   sphinx-external-toc
     #   sphinxcontrib-datatemplates
-pyzmq==26.2.0
+pyzmq==26.4.0
     # via
     #   ipykernel
     #   jupyter-client
@@ -192,13 +192,13 @@ requests==2.32.3
     #   sphinx
 rocm-docs-core==1.18.2
     # via -r requirements.in
-rpds-py==0.22.3
+rpds-py==0.24.0
     # via
     #   jsonschema
     #   referencing
 six==1.17.0
     # via python-dateutil
-smmap==5.0.1
+smmap==5.0.2
     # via gitdb
 snowballstemmer==2.2.0
     # via sphinx
@@ -220,7 +220,7 @@ sphinx==8.1.3
     #   sphinx-sitemap
     #   sphinxcontrib-datatemplates
     #   sphinxcontrib-runcmd
-sphinx-book-theme==1.1.3
+sphinx-book-theme==1.1.4
     # via rocm-docs-core
 sphinx-copybutton==0.5.2
     # via rocm-docs-core
@@ -228,7 +228,7 @@ sphinx-design==0.6.1
     # via rocm-docs-core
 sphinx-external-toc==1.0.1
     # via rocm-docs-core
-sphinx-notfound-page==1.0.4
+sphinx-notfound-page==1.1.0
     # via rocm-docs-core
 sphinx-reredirects==0.1.6
     # via -r requirements.in
@@ -250,13 +250,13 @@ sphinxcontrib-runcmd==0.2.0
     # via sphinxcontrib-datatemplates
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-sqlalchemy==2.0.37
+sqlalchemy==2.0.40
     # via jupyter-cache
 stack-data==0.6.3
     # via ipython
 tabulate==0.9.0
     # via jupyter-cache
-tomli==2.1.0
+tomli==2.2.1
     # via sphinx
 tornado==6.4.2
     # via
@@ -272,21 +272,22 @@ traitlets==5.14.3
     #   matplotlib-inline
     #   nbclient
     #   nbformat
-typing-extensions==4.12.2
+typing-extensions==4.13.2
     # via
+    #   beautifulsoup4
     #   ipython
     #   myst-nb
     #   pydata-sphinx-theme
     #   pygithub
     #   referencing
     #   sqlalchemy
-urllib3==2.2.3
+urllib3==2.4.0
     # via
     #   pygithub
     #   requests
 wcwidth==0.2.13
     # via prompt-toolkit
-wrapt==1.17.0
+wrapt==1.17.2
     # via deprecated
 zipp==3.21.0
     # via importlib-metadata

docs/what-is-rocm.rst

@@ -52,7 +52,7 @@ Communication
   :header: "Component", "Description"
 
   ":doc:`RCCL <rccl:index>`", "Standalone library that provides multi-GPU and multi-node collective communication primitives"
-  "`rocSHMEM <https://github.com/ROCm/rocSHMEM>`_", "Runtime that provides GPU-centric networking through an OpenSHMEM-like interface. This intra-kernel networking library simplifies application code complexity and enables more fine-grained communication/computation overlap than traditional host-driven networking"
+  ":doc:`rocSHMEM <rocSHMEM:index>`", "An intra-kernel networking library that provides GPU-centric networking through an OpenSHMEM-like interface"
 
 Math
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tools/rocm-build/ROCm.mk

@@ -12,36 +12,17 @@ RELEASE_FLAG?=-r
 ASAN_DEP:=
 ifeq (${ENABLE_ADDRESS_SANITIZER},true)
 	ASAN_DEP=lightning
-	SANITIZER_FLAG=--address_sanitizer
-endif
-
-# Set STATIC_FLAG for static builds
-ifeq (${ENABLE_STATIC_BUILDS},true)
-	STATIC_FLAG=-s
+	SANITIZER_FLAG=-a
 endif
 
 export INFRA_REPO:=ROCm/tools/rocm-build
 
-# # commannds to be run at makefile read time
-# # should only output $$OUT_DIR to stdout
-# # In an ideal world this would be another target
-# define INITBUILD
-# source ${INFRA_REPO}/envsetup.sh >/dev/null 2>&1;
-# [ -w "$${ROCM_INSTALL_PATH}" ] || sudo mkdir -p -m 775 "$${ROCM_INSTALL_PATH}" ;
-# sudo chown "$$(id -u):$$(id -g)" "$${ROCM_INSTALL_PATH}" "/home/$$(id -un)" ;
-# mkdir -p ${HOME}/.ccache ;
-# echo $${OUT_DIR} ;
-# endef
-
 OUT_DIR:=$(shell . ${INFRA_REPO}/envsetup.sh >/dev/null 2>&1 ; echo $${OUT_DIR})
 ROCM_INSTALL_PATH:=$(shell . ${INFRA_REPO}/envsetup.sh >/dev/null 2>&1 ; echo $${ROCM_INSTALL_PATH})
 
 $(info OUT_DIR=${OUT_DIR})
 $(info ROCM_INSTALL_PATH=${ROCM_INSTALL_PATH})
 
-# define SILENT to be empty to see the runner invocation
-SILENT?= @
-
 # -------------------------------------------------------------------------
 # Internal stuff. Could be put in a different file to hide it.
 # Internal macros, they need to be defined before being used.
@@ -66,8 +47,7 @@ endif
 # It should not be needed.
 define adddep =
 $(strip $(call peval,components+= $(1) $(2))
-$(call peval,$(1)_DEPS += $(2))
-$(foreach comp,$(strip $2),$(call peval,${OUT_DIR}/logs/${1}.txt: ${OUT_DIR}/logs/${comp}.txt))
+$(foreach comp,$(strip $2),$(call peval,${OUT_DIR}/logs/${1}: ${OUT_DIR}/logs/${comp}))
 )
 endef
 # End of internal stuff that is needed at the start of the file
@@ -87,7 +67,6 @@ endef
 
 $(call adddep,amd_smi_lib,${ASAN_DEP})
 $(call adddep,aqlprofile,${ASAN_DEP} rocr)
-$(call adddep,aqlprofiletest,lightning rocminfo aqlprofile opencl_on_rocclr hip_on_rocclr)
 $(call adddep,comgr,lightning devicelibs)
 $(call adddep,dbgapi,rocr comgr)
 $(call adddep,devicelibs,lightning)
@@ -104,29 +83,27 @@ $(call adddep,rocm-core,${ASAN_DEP})
 $(call adddep,rocm-gdb,dbgapi)
 $(call adddep,rocminfo,${ASAN_DEP} rocr)
 $(call adddep,rocprofiler-register,${ASAN_DEP})
-$(call adddep,rocprofiler-sdk,${ASAN_DEP} rocr aqlprofile opencl_on_rocclr hip_on_rocclr comgr rccl rocdecode)
+$(call adddep,rocprofiler-sdk,${ASAN_DEP} rocr aqlprofile opencl_on_rocclr hip_on_rocclr comgr)
 $(call adddep,rocprofiler-systems,${ASAN_DEP} hipcc rocr hip_on_rocclr rocm_smi_lib rocprofiler roctracer rocprofiler-sdk)
 $(call adddep,rocprofiler,${ASAN_DEP} rocr roctracer aqlprofile opencl_on_rocclr hip_on_rocclr comgr)
 $(call adddep,rocprofiler-compute,${ASAN_DEP})
 $(call adddep,rocr,${ASAN_DEP} lightning rocm_smi_lib devicelibs rocprofiler-register)
 $(call adddep,rocr_debug_agent,${ASAN_DEP} hip_on_rocclr rocr dbgapi)
-$(call adddep,rocrsamples,lightning devicelibs rocr )
 $(call adddep,roctracer,${ASAN_DEP} rocr hip_on_rocclr)
 
-
 # rocm-dev points to all possible last finish components of Stage1 build.
-rocm-dev-components :=amd_smi_lib aqlprofile aqlprofiletest comgr dbgapi devicelibs hip_on_rocclr hipcc hipify_clang \
+rocm-dev-components :=amd_smi_lib aqlprofile comgr dbgapi devicelibs hip_on_rocclr hipcc hipify_clang \
 	lightning rocprofiler-compute opencl_on_rocclr openmp_extras rocm_bandwidth_test rocm_smi_lib \
 	rocm-cmake rocm-core rocm-gdb rocminfo rocprofiler-register rocprofiler-sdk rocprofiler-systems \
-	rocprofiler rocr rocr_debug_agent rocrsamples roctracer
-$(call adddep,rocm-dev,$(filter-out ${NOBUILD},${rocm-dev-components}))
+	rocprofiler rocr rocr_debug_agent roctracer
+$(call adddep,rocm-dev,$(filter-out ${NOBUILD} kernel_ubuntu,${rocm-dev-components}))
 
 $(call adddep,amdmigraphx,hip_on_rocclr half rocblas miopen-hip lightning hipcc hiptensor)
 $(call adddep,composable_kernel,lightning hipcc hip_on_rocclr rocm-cmake)
 $(call adddep,half,rocm-cmake)
 $(call adddep,hipblas-common,lightning)
 $(call adddep,hipblas,hip_on_rocclr rocblas rocsolver lightning hipcc)
-$(call adddep,hipblaslt,hip_on_rocclr openmp_extras lightning hipcc hipblas-common roctracer)
+$(call adddep,hipblaslt,hip_on_rocclr openmp_extras lightning hipcc hipblas-common rocm-dev)
 $(call adddep,hipcub,hip_on_rocclr rocprim lightning hipcc)
 $(call adddep,hipfft,hip_on_rocclr openmp_extras rocfft rocrand hiprand lightning hipcc)
 $(call adddep,hipfort,rocblas hipblas rocsparse hipsparse rocfft hipfft rocrand hiprand rocsolver hipsolver lightning hipcc)
@@ -136,34 +113,26 @@ $(call adddep,hipsparse,hip_on_rocclr rocsparse lightning hipcc)
 $(call adddep,hipsparselt,hip_on_rocclr hipsparse lightning hipcc openmp_extras)
 $(call adddep,hiptensor,hip_on_rocclr composable_kernel lightning hipcc)
 $(call adddep,miopen-deps,lightning hipcc)
-$(call adddep,miopen-hip,rocm-core composable_kernel half hip_on_rocclr miopen-deps hipblas hipblaslt rocrand roctracer lightning hipcc)
+$(call adddep,miopen-hip,composable_kernel half hip_on_rocclr miopen-deps hipblas hipblaslt rocrand roctracer lightning hipcc)
 $(call adddep,mivisionx,amdmigraphx miopen-hip rpp lightning hipcc)
 $(call adddep,rccl,rocm-core hip_on_rocclr rocr lightning hipcc rocm_smi_lib hipify_clang)
-$(call adddep,rdc,amd_smi_lib rocprofiler-sdk rocm_smi_lib rocprofiler  rocmvalidationsuite)
+$(call adddep,rdc,rocm_smi_lib rocprofiler rocmvalidationsuite)
 $(call adddep,rocalution,rocblas rocsparse rocrand lightning hipcc)
-$(call adddep,rocblas,rocminfo hip_on_rocclr openmp_extras lightning hipcc hipblaslt)
+$(call adddep,rocblas,hip_on_rocclr openmp_extras lightning hipcc hipblaslt)
 $(call adddep,rocal,mivisionx)
-$(call adddep,rocdecode,hip_on_rocclr lightning hipcc)
+$(call adddep,rocdecode,hip_on_rocclr lightning hipcc amdmigraphx)
 $(call adddep,rocfft,hip_on_rocclr rocrand hiprand lightning hipcc openmp_extras)
-$(call adddep,rocjpeg,hip_on_rocclr lightning hipcc)
+$(call adddep,rocjpeg,hip_on_rocclr lightning hipcc rocm-dev)
 $(call adddep,rocmvalidationsuite,hip_on_rocclr rocr hipblas hiprand hipblaslt rocm-core lightning hipcc rocm_smi_lib)
 $(call adddep,rocprim,hip_on_rocclr lightning hipcc)
 $(call adddep,rocrand,hip_on_rocclr lightning hipcc)
-$(call adddep,rocshmem,rccl )
 $(call adddep,rocsolver,hip_on_rocclr rocblas rocsparse rocprim lightning hipcc)
 $(call adddep,rocsparse,hip_on_rocclr rocprim lightning hipcc)
 $(call adddep,rocthrust,hip_on_rocclr rocprim lightning hipcc)
 $(call adddep,rocwmma,hip_on_rocclr rocblas lightning hipcc rocm-cmake rocm_smi_lib)
 $(call adddep,rpp,half lightning hipcc openmp_extras)
 $(call adddep,transferbench,hip_on_rocclr lightning hipcc)
-ifneq ($(filter rocm-dev upload-rocm-dev, ${MAKECMDGOALS}),)
-	components = $(rocm-dev-components)
-endif
-$(call adddep,rocm,$(filter-out ${NOBUILD} rocm,${components}))
 
-ifeq ($(DISTRO_NAME),rhel)
-    WHL_GEN :=
-endif
 
 # -------------------------------------------------------------------------
 # The rest of the file is internal
@@ -196,7 +165,7 @@ ifeq (${toplevel},)
 define toplevel =
 
 # The "target" make, this builds the package if it is out of date
-T_$1: ${OUT_DIR}/logs/$1.txt FRC
+T_$1: ${OUT_DIR}/logs/$1 FRC
 	:              $1 built
 
 # The "upload" for $1, it uploads the packages for $1 to the central storage
@@ -207,26 +176,25 @@ U_$1: T_$1 FRC
 # The "clean" for $1, it just marks the target as not existing so it will be built
 # in the future.
 C_$1: FRC
-	rm -f ${OUT_DIR}/logs/$1.txt ${OUT_DIR}/logs/$1.repackaged
+	rm -f ${OUT_DIR}/logs/$1 ${OUT_DIR}/logs/$1.repackaged
 
-# parallel build
-${OUT_DIR}/logs/$1.txt: | ${OUT_DIR}/logs
-ifneq ($(wildcard ${OUT_DIR}/logs/$1.repackaged),) # {
+# parallel build {
+${OUT_DIR}/logs/$1: | ${OUT_DIR}/logs
+ifneq ($(wildcard ${OUT_DIR}/logs/$1.repackaged),)
 	@echo  Skipping build of $1 as it has already been repackaged
-	cat $${@:.txt=.repackaged} > $$@
-	rm -f $${@:.txt=.repackaged}
+	cat $$@.repackaged > $$@
+	rm -f $$@.repackaged
 else # } {
 	@echo  $1 started due to $$? | sed "s:${OUT_DIR}/logs/::g"
 # Build in a subshell so we get the time output
 # Pass in jobserver info using the RMAKE variable
-# Allow project specific flags e..g. ROCMBUILD_lightning.
-	${RMAKE}${SILENT}( if set -x && source $${INFRA_REPO}/envsetup.sh && \
-	rm -f $${@:$1.txt=1.Errors.$1.txt} $$@ $${@:.txt=.repackaged} && \
-	$${INFRA_REPO}/runner $1 $${RELEASE_FLAG} $${SANITIZER_FLAG} $${STATIC_FLAG} ${ROCMBUILD_$1}; \
-	then mv $${@:$1.txt=2.Inprogress.$1.txt} $$@ ; \
-	else mv $${@:$1.txt=2.Inprogress.$1.txt} $${@:$1.txt=1.Errors.$1.txt} ;\
-		echo Error in $1 >&2 ; exit 1 ;\
-	fi ) > $${@:$1.txt=2.Inprogress.$1.txt} 2>&1
+	${RMAKE}@( if set -x && source $${INFRA_REPO}/envsetup.sh && \
+	rm -f $$@.errors $$@ $$@.repackaged && \
+	$${INFRA_REPO}/build_$1.sh -c && \
+	time bash -x $${INFRA_REPO}/build_$1.sh $${RELEASE_FLAG} $${SANITIZER_FLAG} && $${INFRA_REPO}/post_inst_pkg.sh "$1" ; \
+	then mv $$@.inprogress $$@ ; \
+	else mv $$@.inprogress $$@.errors ; echo Error in $1 >&2 ; exit 1 ;\
+	fi ) > $$@.inprogress 2>&1
 endif # }
 
 # end of toplevel macro
@@ -259,45 +227,22 @@ upload-rocm-dev: $(addprefix U_,$(filter-out ${NOBUILD},${components}))
 rocm-dev: $(addprefix T_,$(filter-out ${NOBUILD},${components}))
 	@echo rocm-dev built
 
-ifeq ($(DISTRO_NAME),almalinux)
-	@sudo chmod -R 777 "/home/builder"
-endif
-
-# This code is broken. It stops us exiting a container and
-# starting a new one and continueing the build. The attempt
-# is to have run-once code.
 ${OUT_DIR}/logs:
 	sudo mkdir -p -m 775 "${ROCM_INSTALL_PATH}" && \
 	sudo chown -R "$(shell id -u):$(shell id -g)" "/opt"
-	sudo chown "$(shell id -u):$(shell id -g)" "/home/$(shell id -un)"
+	sudo chown -R "$(shell id -u):$(shell id -g)" "/home/$(shell id -un)"
 	mkdir -p "${@}"
 	mkdir -p ${HOME}/.ccache
 
 ##help clean: remove the output directory and recreate it
 clean:
 	[ -n "${OUT_DIR}" ] && rm -rf "${OUT_DIR}"
-#	mkdir -p ${OUT_DIR}/logs
+	mkdir -p ${OUT_DIR}/logs
 
 .SECONDARY: ${components:%=${OUT_DIR}/logs/%}
 
 .PHONY: all clean repack help list_components
 
-# get_all_deps: Recursively get all dependencies for a given component.
-# Usage: $(call get_all_deps,component_name,)
-# - component_name: The name of the component to get dependencies for.
-# - The second parameter is an internal parameter used to track already
-#   processed components to avoid circular dependencies.
-define get_all_deps
-$(if $(filter $(1),$(2)),,\
-	$(sort $(1) $(foreach d,$($(1)_DEPS),$(call get_all_deps,$d,$(1) $(2))))
-)
-endef
-
-##help deps_<component>: output the dependencies for <component>
-deps_%:
-	@echo "=== Dependencies for [$*] ==="
-	@echo "$(filter-out $*,$(call get_all_deps,$*,))"
-
 ##help list_components: output the list of components
 ##help : Hint make list_components | paste - - - | column -t
 list_components:

tools/rocm-build/build_amd_smi_lib.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 
 source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
 
@@ -9,9 +10,7 @@ printUsage() {
     echo "  -c,  --clean              Removes all amd_smi build artifacts"
     echo "  -r,  --release            Build non-debug version amd_smi (default is debug)"
     echo "  -a,  --address_sanitizer  Enable address sanitizer"
-    echo "  -s,  --static             Component/Build does not support static builds just accepting this param & ignore. No effect of the param on this build"
-    echo "  -w,  --wheel              Creates python wheel package of amd-smi. 
-                                      It needs to be used along with -r option"
+    echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
     echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of type referred to by pkg_type"
     echo "  -p,  --package <type>     Specify packaging format"
     echo "  -h,  --help               Prints this help"
@@ -26,6 +25,7 @@ printUsage() {
 PROJ_NAME="amdsmi"
 PACKAGE_ROOT="$(getPackageRoot)"
 TARGET="build"
+
 PACKAGE_LIB=$(getLibPath)
 PACKAGE_INCLUDE="$(getIncludePath)"
 AMDSMI_BUILD_DIR=$(getBuildPath $PROJ_NAME)
@@ -42,7 +42,7 @@ SHARED_LIBS="ON"
 CLEAN_OR_OUT=0;
 PKGTYPE="deb"
 
-VALID_STR=`getopt -o hcraswo:p: --long help,clean,release,static,wheel,address_sanitizer,outdir:,package: -- "$@"`
+VALID_STR=`getopt -o hcraso:p: --long help,clean,release,static,address_sanitizer,outdir:,package: -- "$@"`
 eval set -- "$VALID_STR"
 
 while true ;
@@ -60,8 +60,6 @@ do
                 ADDRESS_SANITIZER=true ; shift ;;
         (-s | --static)
                 ack_and_skip_static ;;
-        (-w | --wheel)
-                WHEEL_PACKAGE=true ; shift ;;
         (-o | --outdir)
                 TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
         (-p | --package)
@@ -137,7 +135,7 @@ verifyEnvSetup
 
 case $TARGET in
     (clean) clean_amdsmi ;;
-    (build) build_amdsmi; build_wheel "$AMDSMI_BUILD_DIR" "$PROJ_NAME" ;;
+    (build) build_amdsmi ;;
     (outdir) print_output_directory ;;
     (*) die "Invalid target $TARGET" ;;
 esac

tools/rocm-build/build_amdmigraphx.sh

@@ -1,42 +1,41 @@
 #!/bin/bash
 
 set -ex
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src AMDMIGraphX
 
 build_amdmigraphx() {
     echo "Start build"
 
-    if [ "${ENABLE_STATIC_BUILDS}" == "true" ]; then
-        ack_and_skip_static
-    fi
-
     cd $COMPONENT_SRC
 
     if ! command -v rbuild &> /dev/null; then
         pip3 install https://github.com/RadeonOpenCompute/rbuild/archive/master.tar.gz
     fi
 
-    # Remove CK
-    xargs -d '\n' -a ${OUT_DIR}/ck.files rm -- || true
-
     if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
          set_asan_env_vars
          set_address_sanitizer_on
     fi
 
+    if [ -n "$GPU_ARCHS" ]; then
+        GPU_TARGETS="$GPU_ARCHS"
+    else
+        GPU_TARGETS="gfx900;gfx906;gfx908;gfx90a;gfx1030;gfx1100;gfx1101;gfx1102;gfx942;gfx1200;gfx1201"
+    fi
     init_rocm_common_cmake_params
 
     mkdir -p ${BUILD_DIR} && rm -rf ${BUILD_DIR}/* && mkdir -p ${HOME}/amdmigraphx && rm -rf ${HOME}/amdmigraphx/*
     rbuild package -d "${HOME}/amdmigraphx" -B "${BUILD_DIR}" \
-        --cxx="$(set_build_variables __CLANG++__)" \
-        --cc="$(set_build_variables __CLANG__)" \
+        --cxx="${ROCM_PATH}/llvm/bin/clang++" \
+        --cc="${ROCM_PATH}/llvm/bin/clang" \
         "${rocm_math_common_cmake_params[@]}" \
         -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_LIB_RPATH" \
+	    -DGPU_TARGETS="${GPU_TARGETS}" \
         -DCMAKE_INSTALL_RPATH=""
 
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
     cd $BUILD_DIR && cmake --build . -- install -j${PROC}
 
     show_build_cache_stats
@@ -51,7 +50,7 @@ clean_amdmigraphx() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_amdmigraphx; build_wheel ;;
+    build) build_amdmigraphx ;;
     outdir) print_output_directory ;;
     clean) clean_amdmigraphx ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_clang-ocl.sh

@@ -1,136 +0,0 @@
-#!/bin/bash
-
-source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
-
-printUsage() {
-    echo
-    echo "Usage: $(basename "${BASH_SOURCE}") [-c|-r|-h] [makeopts]"
-    echo
-    echo "Options:"
-    echo "  -c,  --clean              Removes all clang-ocl build artifacts"
-    echo "  -r,  --release            Build non-debug version clang-ocl (default is debug)"
-    echo "  -a,  --address_sanitizer  Enable address sanitizer"
-    echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
-                                      type referred to by pkg_type"
-    echo "  -h,  --help               Prints this help"
-    echo "  -s,  --static             Supports static CI by accepting this param & not bailing out. No effect of the param though"
-    echo
-
-    return 0
-}
-
-
-TARGET="build"
-CLANG_OCL_DEST="$(getBinPath)"
-CLANG_OCL_SRC_ROOT="$CLANG_OCL_ROOT"
-CLANG_OCL_BUILD_DIR="$(getBuildPath clang-ocl)"
-
-MAKEARG="$DASH_JAY"
-PACKAGE_ROOT="$(getPackageRoot)"
-PACKAGE_UTILS="$(getUtilsPath)"
-CLANG_OCL_PACKAGE_DEB="$PACKAGE_ROOT/deb/clang-ocl"
-CLANG_OCL_PACKAGE_RPM="$PACKAGE_ROOT/rpm/clang-ocl"
-BUILD_TYPE="Debug"
-SHARED_LIBS="ON"
-CLEAN_OR_OUT=0;
-MAKETARGET="deb"
-PKGTYPE="deb"
-
-
-VALID_STR=`getopt -o hcraso:g: --long help,clean,release,clean,static,address_sanitizer,outdir:,gpu_list: -- "$@"`
-eval set -- "$VALID_STR"
-
-while true ;
-do
-    case "$1" in
-        (-h | --help)
-                printUsage ; exit 0;;
-        (-c | --clean)
-                TARGET="clean" ; ((CLEAN_OR_OUT|=1)) ; shift ;;
-        (-r | --release)
-                MAKEARG="$MAKEARG BUILD_TYPE=rel" ;  BUILD_TYPE="Release" ; shift ;;
-        (-a | --address_sanitizer)
-                set_asan_env_vars
-                set_address_sanitizer_on ; shift ;;
-        (-s | --static)
-                SHARED_LIBS="OFF" ; shift ;;
-        (-o | --outdir)
-                TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
-        (-g | --gpu_list )
-                GPU_LIST=$2; shift 2 ;;
-        --)     shift; break;;
-        (*)
-                echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] ">&2 ; exit 20;;
-    esac
-
-done
-
-RET_CONFLICT=1
-check_conflicting_options $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
-if [ $RET_CONFLICT -ge 30 ]; then
-   print_vars $API_NAME $TARGET $BUILD_TYPE $SHARED_LIBS $CLEAN_OR_OUT $PKGTYPE $MAKETARGET
-   exit $RET_CONFLICT
-fi
-
-clean_clang-ocl() {
-    echo "Removing clang-ocl"
-    rm -rf $CLANG_OCL_DEST/clang-ocl
-    rm -rf $CLANG_OCL_BUILD_DIR
-    rm -rf $CLANG_OCL_PACKAGE_DEB
-    rm -rf $CLANG_OCL_PACKAGE_RPM
-}
-
-build_clang-ocl() {
-    if [ ! -d "$CLANG_OCL_BUILD_DIR" ]; then
-        mkdir -p $CLANG_OCL_BUILD_DIR
-        pushd $CLANG_OCL_BUILD_DIR
-
-        if [ -e $PACKAGE_ROOT/lib/bitcode/opencl.amdgcn.bc ]; then
-            BC_DIR="$ROCM_INSTALL_PATH/lib"
-        else
-            BC_DIR="$ROCM_INSTALL_PATH/amdgcn/bitcode"
-        fi
-
-        cmake \
-            $(rocm_cmake_params) \
-            -DDISABLE_CHECKS="ON" \
-            -DCLANG_BIN="$ROCM_INSTALL_PATH/llvm/bin" \
-            -DBITCODE_DIR="$BC_DIR" \
-	    $(rocm_common_cmake_params) \
-            -DCPACK_SET_DESTDIR="OFF" \
-            $CLANG_OCL_SRC_ROOT
-
-        echo "Making clang-ocl:"
-        cmake --build . -- $MAKEARG
-        cmake --build . -- $MAKEARG install
-        cmake --build . -- $MAKEARG package
-        popd
-    fi
-
-    copy_if DEB "${CPACKGEN:-"DEB;RPM"}" "$CLANG_OCL_PACKAGE_DEB" $CLANG_OCL_BUILD_DIR/rocm-clang-ocl*.deb
-    copy_if RPM "${CPACKGEN:-"DEB;RPM"}" "$CLANG_OCL_PACKAGE_RPM" $CLANG_OCL_BUILD_DIR/rocm-clang-ocl*.rpm
-}
-
-
-print_output_directory() {
-     case ${PKGTYPE} in
-         ("deb")
-             echo ${CLANG_OCL_PACKAGE_DEB};;
-         ("rpm")
-             echo ${CLANG_OCL_PACKAGE_RPM};;
-         (*)
-             echo "Invalid package type \"${PKGTYPE}\" provided for -o" >&2; exit 1;;
-     esac
-     exit
-}
-
-case $TARGET in
-    (clean) clean_clang-ocl ;;
-    (build) build_clang-ocl ;;
-   (outdir) print_output_directory ;;
-        (*) die "Invalid target $TARGET" ;;
-esac
-
-echo "Operation complete"
-exit 0
-

tools/rocm-build/build_comgr.sh

@@ -14,7 +14,6 @@ printUsage() {
         type referred to by pkg_type"
     echo "  -h,  --help               Prints this help"
     echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
-    echo "  -w,  --wheel              Creates python wheel package of comgr. It needs to be used along with -r option"
     echo "  -l,  --link_llvm_static   Link to LLVM statically.  Default is to dynamically link to LLVM; requires that LLVM dylibs are created."
     echo
     echo "Possible values for <type>:"
@@ -25,7 +24,6 @@ printUsage() {
     return 0
 }
 
-## Build environment variables
 API_NAME=amd_comgr
 PROJ_NAME=$API_NAME
 LIB_NAME=lib${API_NAME}
@@ -35,8 +33,8 @@ PACKAGE_ROOT=$(getPackageRoot)
 PACKAGE_LIB=$(getLibPath)
 PACKAGE_INCLUDE=$(getIncludePath)
 BUILD_DIR=$(getBuildPath $API_NAME)
-PACKAGE_DEB=$PACKAGE_ROOT/deb/$PROJ_NAME
-PACKAGE_RPM=$PACKAGE_ROOT/rpm/$PROJ_NAME
+PACKAGE_DEB=$(getPackageRoot)/deb/$API_NAME
+PACKAGE_RPM=$(getPackageRoot)/rpm/$API_NAME
 PACKAGE_PREFIX=$ROCM_INSTALL_PATH
 BUILD_TYPE=Debug
 MAKE_OPTS="$DASH_JAY CTEST_OUTPUT_ON_FAILURE=1 -C $BUILD_DIR"
@@ -46,17 +44,13 @@ CLEAN_OR_OUT=0;
 PKGTYPE="deb"
 MAKETARGET="deb"
 
-# link to LLVM dynamicaly.  Default is to link to llvm dynamically.
-# temporarily set this default to OFF until we resolve Issues
 LINK_LLVM_DYLIB="OFF"
 
-#parse the arguments
-VALID_STR=`getopt -o hcraswlo:p: --long help,clean,release,address_sanitizer,static,wheel,link_llvm_static,outdir:,package: -- "$@"`
+VALID_STR=`getopt -o hcraslo:p: --long help,clean,release,address_sanitizer,static,link_llvm_static,outdir:,package: -- "$@"`
 eval set -- "$VALID_STR"
 
 while true ;
 do
-    #echo "parocessing $1"
     case "$1" in
         (-h | --help)
                 printUsage ; exit 0;;
@@ -69,8 +63,6 @@ do
                 set_address_sanitizer_on ; shift ;;
         (-s | --static)
                 SHARED_LIBS="OFF" ; shift ;;
-        (-w | --wheel)
-                WHEEL_PACKAGE=true ; shift ;;
         (-l | --link_llvm_static)
                 LINK_LLVM_DYLIB="OFF"; shift ;;
         (-o | --outdir)
@@ -113,7 +105,6 @@ build() {
        echo " Building Shared Object "
     fi
 
-# Remove CTEST var once SWDEV-381396 is fixed
     cmake \
         $(rocm_cmake_params) \
         -DBUILD_SHARED_LIBS=$SHARED_LIBS \
@@ -152,7 +143,7 @@ verifyEnvSetup
 
 case $TARGET in
     (clean) clean ;;
-    (build) build; build_wheel "$BUILD_DIR" "$PROJ_NAME" ;;
+    (build) build ;;
     (outdir) print_output_directory ;;
     (*) die "Invalid target $TARGET" ;;
 esac

tools/rocm-build/build_composable_kernel.sh

@@ -2,14 +2,10 @@
 
 set -ex
 
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
-
-# Temporarily disable Address Sanitizer
-ENABLE_ADDRESS_SANITIZER=false
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src composable_kernel
-disable_debug_package_generation
-# Set the GPU_ARCH_LIST to the supported GPUs needed after https://github.com/ROCm/composable_kernel/pull/1536/
+
 GPU_ARCH_LIST="gfx908;gfx90a;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201"
 
 build_miopen_ck() {
@@ -27,17 +23,10 @@ build_miopen_ck() {
         GPU_ARCH_LIST="gfx942"
         ack_and_skip_static
     fi
-    # if ENABLE_GPU_ARCH is set in env by Job parameter ENABLE_GPU_ARCH, then set GPU_ARCH_LIST to that value
-    # This needs to be removed when CK aligns with other component and uses -DAMDGPU_TARGET or _DGPO_TARGET
-    # then we can use set_gpu_arch from compure_helper.sh and get rid of all if clauses
-    if [ -n "$ENABLE_GPU_ARCH" ]; then
-        GPU_ARCH_LIST="$ENABLE_GPU_ARCH"
-    fi
-    # Latest CK requiring Python 3.8 as the minimum.
-    # Point CMake to that explicit location and adjust LD_LIBRARY_PATH.
+
     PYTHON_VERSION_WORKAROUND=''
     echo "DISTRO_ID: ${DISTRO_ID}"
-    if [ "$DISTRO_ID" = "rhel-8.8" ] || [ "$DISTRO_NAME" == "sles" ] || [ "$DISTRO_ID" = "debian-10" ]; then
+    if [ "$DISTRO_ID" = "rhel-8.8" ] || [ "$DISTRO_ID" = "sles-15.5" ] ; then
         EXTRA_PYTHON_PATH=/opt/Python-3.8.13
         PYTHON_VERSION_WORKAROUND="-DCK_USE_ALTERNATIVE_PYTHON=${EXTRA_PYTHON_PATH}/bin/python3.8"
         # For the python interpreter we need to export LD_LIBRARY_PATH.
@@ -53,20 +42,19 @@ build_miopen_ck() {
         "${rocm_math_common_cmake_params[@]}" \
         ${PYTHON_VERSION_WORKAROUND} \
         -DCPACK_GENERATOR="${PKGTYPE^^}" \
-        -DCMAKE_CXX_COMPILER=$(set_build_variables __CLANG++__) \
-        -DCMAKE_C_COMPILER=$(set_build_variables __CLANG__) \
+        -DCMAKE_CXX_COMPILER="${ROCM_PATH}/llvm/bin/clang++" \
+        -DCMAKE_C_COMPILER="${ROCM_PATH}/llvm/bin/clang" \
         ${LAUNCHER_FLAGS} \
         -DGPU_ARCHS="${GPU_ARCH_LIST}" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_FLAGS=" -O3 " \
         "$COMPONENT_SRC"
 
     cmake --build . -- -j${PROC} package
     cmake --build "$BUILD_DIR" -- install
-
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ./*.${PKGTYPE} $PACKAGE_DIR
 }
 
-# Use the function to unset the LDFLAGS and CXXFLAGS
-# specifically set for ASAN
 unset_asan_env_vars() {
     ASAN_CMAKE_PARAMS="false"
     export ADDRESS_SANITIZER="OFF"
@@ -80,6 +68,85 @@ set_address_sanitizer_off() {
     export LDFLAGS=""
 }
 
+build_miopen_ckProf() {
+    ENABLE_ADDRESS_SANITIZER=false
+    echo "Start Building Composable Kernel Profiler"
+    if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
+       set_asan_env_vars
+       set_address_sanitizer_on
+    else
+       unset_asan_env_vars
+       set_address_sanitizer_off
+    fi
+
+    cd $COMPONENT_SRC
+    cd "$BUILD_DIR"
+    rm -rf *
+
+    architectures='gfx10 gfx11 gfx90 gfx94'
+    if [ -n "$GPU_ARCHS" ]; then
+        architectures=$(echo ${GPU_ARCHS} | awk -F';' '{for(i=1;i<=NF;i++) a[substr($i,1,5)]} END{for(i in a) printf i" "}')
+    fi
+
+    for arch in ${architectures}
+        do
+            if [ "${ASAN_CMAKE_PARAMS}" == "true" ] ; then
+                cmake -DBUILD_DEV=OFF \
+                    -DCMAKE_PREFIX_PATH="${ROCM_PATH%-*}/lib/cmake;${ROCM_PATH%-*}/$ASAN_LIBDIR;${ROCM_PATH%-*}/llvm;${ROCM_PATH%-*}" \
+                    -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-'RelWithDebInfo'} \
+                    -DCMAKE_SHARED_LINKER_FLAGS_INIT="-Wl,--enable-new-dtags,--rpath,$ROCM_ASAN_LIB_RPATH" \
+                    -DCMAKE_EXE_LINKER_FLAGS_INIT="-Wl,--enable-new-dtags,--rpath,$ROCM_ASAN_EXE_RPATH" \
+                    -DCMAKE_VERBOSE_MAKEFILE=1 \
+                    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
+                    -DCMAKE_INSTALL_PREFIX="${ROCM_PATH}" \
+                    -DCMAKE_PACKAGING_INSTALL_PREFIX="${ROCM_PATH}" \
+                    -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \
+                    -DROCM_SYMLINK_LIBS=OFF \
+                    -DCPACK_PACKAGING_INSTALL_PREFIX="${ROCM_PATH}" \
+                    -DROCM_DISABLE_LDCONFIG=ON \
+                    -DROCM_PATH="${ROCM_PATH}" \
+                    -DCPACK_GENERATOR="${PKGTYPE^^}" \
+                    -DCMAKE_CXX_COMPILER="${ROCM_PATH}/llvm/bin/clang++" \
+                    -DCMAKE_C_COMPILER="${ROCM_PATH}/llvm/bin/clang" \
+                    ${LAUNCHER_FLAGS} \
+                    -DPROFILER_ONLY=ON \
+                    -DENABLE_ASAN_PACKAGING=true \
+                    -DGPU_ARCH="${arch}" \
+                    "$COMPONENT_SRC"
+            else
+                cmake -DBUILD_DEV=OFF \
+                    -DCMAKE_PREFIX_PATH="${ROCM_PATH%-*}" \
+                    -DCMAKE_BUILD_TYPE=Release \
+                    -DCMAKE_SHARED_LINKER_FLAGS_INIT='-Wl,--enable-new-dtags,--rpath,$ORIGIN' \
+                    -DCMAKE_EXE_LINKER_FLAGS_INIT='-Wl,--enable-new-dtags,--rpath,$ORIGIN/../lib' \
+                    -DCMAKE_VERBOSE_MAKEFILE=1 \
+                    -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE \
+                    -DCMAKE_INSTALL_PREFIX="${ROCM_PATH}" \
+                    -DCMAKE_PACKAGING_INSTALL_PREFIX="${ROCM_PATH}" \
+                    -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \
+                    -DROCM_SYMLINK_LIBS=OFF \
+                    -DCPACK_PACKAGING_INSTALL_PREFIX="${ROCM_PATH}" \
+                    -DROCM_DISABLE_LDCONFIG=ON \
+                    -DROCM_PATH="${ROCM_PATH}" \
+                    -DCPACK_GENERATOR="${PKGTYPE^^}" \
+                    -DCMAKE_CXX_COMPILER="${ROCM_PATH}/llvm/bin/clang++" \
+                    -DCMAKE_C_COMPILER="${ROCM_PATH}/llvm/bin/clang" \
+                    ${LAUNCHER_FLAGS} \
+                    -DPROFILER_ONLY=ON \
+                    -DGPU_ARCH="${arch}" \
+                    "$COMPONENT_SRC"
+            fi
+
+            cmake --build . -- -j${PROC} package
+            cp ./*ckprofiler*.${PKGTYPE} $PACKAGE_DIR
+            rm -rf *
+        done
+    rm -rf _CPack_Packages/ && find -name '*.o' -delete
+
+    echo "Finished building Composable Kernel"
+    show_build_cache_stats
+}
+
 clean_miopen_ck() {
     echo "Cleaning MIOpen-CK build directory: ${BUILD_DIR} ${PACKAGE_DIR}"
     rm -rf "$BUILD_DIR" "$PACKAGE_DIR"
@@ -89,7 +156,7 @@ clean_miopen_ck() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_miopen_ck; build_wheel ;;
+    build) build_miopen_ck ;;
     outdir) print_output_directory ;;
     clean) clean_miopen_ck ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_dbgapi.sh

@@ -11,8 +11,6 @@ printUsage() {
     echo "  -r,  --release            Make a release build instead of a debug build"
     echo "       --enable-assertions  Enable assertions"
     echo "  -a,  --address_sanitizer  Enable address sanitizer"
-    echo "  -w,  --wheel              Creates python wheel package of dbgapi. 
-                                      It needs to be used along with -r option"
     echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
             type referred to by pkg_type"
     echo "  -h,  --help               Prints this help"
@@ -27,7 +25,6 @@ printUsage() {
     return 0
 }
 
-## Build environment variables
 API_NAME=rocm-dbgapi
 AMD_DBGAPI_NAME=amd-dbgapi
 MAKEINSTALL_MANIFEST=makeinstall_manifest.txt
@@ -39,24 +36,21 @@ PACKAGE_ROOT=$(getPackageRoot)
 PACKAGE_LIB=$(getLibPath)
 PACKAGE_INCLUDE=$(getIncludePath)
 BUILD_DIR=$(getBuildPath $API_NAME)
-PACKAGE_DEB=$(getPackageRoot)/deb/$PROJ_NAME
-PACKAGE_RPM=$(getPackageRoot)/rpm/$PROJ_NAME
-#PACKAGE_PREFIX=$ROCM_INSTALL_PATH
+PACKAGE_DEB=$(getPackageRoot)/deb/$API_NAME
+PACKAGE_RPM=$(getPackageRoot)/rpm/$API_NAME
 BUILD_TYPE=Debug
-MAKE_OPTS=($DASH_JAY -C "$BUILD_DIR") # Note that DASH_JAY might have a space after the -j
+MAKE_OPTS=($DASH_JAY -C "$BUILD_DIR")
 SHARED_LIBS="ON"
 CLEAN_OR_OUT=0;
 MAKETARGET="deb"
 PKGTYPE="deb"
 DODOCSBUILD=true
 
-#parse the arguments
-VALID_STR=$(getopt -o hcraswo:p:M --long help,clean,release,enable-assertions,static,wheel,address_sanitizer,outdir:,package:skip_man_pages -- "$@")
+VALID_STR=$(getopt -o hcraso:p:M --long help,clean,release,enable-assertions,static,address_sanitizer,outdir:,package:skip_man_pages -- "$@")
 eval set -- "$VALID_STR"
 
 while true ;
 do
-    #echo "parocessing $1"
     case "$1" in
         (-h | --help)
                 printUsage ; exit 0;;
@@ -72,14 +66,12 @@ do
                 set_address_sanitizer_on ;;
         (-s | --static)
                 ack_and_skip_static ;;
-        (-w | --wheel)
-                WHEEL_PACKAGE=true ;;
         (-o | --outdir)
                 TARGET="outdir"; PKGTYPE=$2 ; ((CLEAN_OR_OUT|=2)) ; shift 1 ;;
         (-M | --skip_man_pages) DODOCSBUILD=false;;
         (-p | --package)
                 MAKETARGET="$2" ; shift 1;;
-        --)     shift; break;; # end delimiter
+        --)     shift; break;;
         (*)
                 echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] ">&2 ; exit 20;;
     esac
@@ -112,7 +104,7 @@ build() {
     then
            echo " No $ROCM_DBGAPI_ROOT/CMakeLists.txt file, skipping rocm-dbgapi" >&2
            echo " No $ROCM_DBGAPI_ROOT/CMakeLists.txt file, skipping rocm-dbgapi"
-       exit 0 # THis is not an error
+       exit 0
     fi
     echo "Building $PROJ_NAME"
 
@@ -129,14 +121,11 @@ build() {
     cmake --build "$BUILD_DIR" -- "${MAKE_OPTS[@]}"
     "$DODOCSBUILD" && cmake --build "$BUILD_DIR" -- "${MAKE_OPTS[@]}" doc
     cmake --build "$BUILD_DIR" -- "${MAKE_OPTS[@]}" install
-    #install_manifest.txt is created by make install and make package with same name unless
-    #component packaging is enabled. To avoid overwriting by make package,move the manifest file
-    #to a different name and can be used for build clean up
+
     mv "$BUILD_DIR/install_manifest.txt" "$BUILD_DIR/$MAKEINSTALL_MANIFEST"
     cmake --build "$BUILD_DIR" -- "${MAKE_OPTS[@]}" package
 
     mkdir -p "$PACKAGE_LIB"
-    # handle the library being in more than one place to avoid breaking the build.
     (
         shopt -s nullglob
         cp -R "$BUILD_DIR/lib/${LIB_NAME}"* "$BUILD_DIR/${LIB_NAME}"* "$PACKAGE_LIB"
@@ -162,7 +151,7 @@ verifyEnvSetup
 
 case $TARGET in
     (clean) clean ;;
-    (build) build; build_wheel "$BUILD_DIR" "$PROJ_NAME";;
+    (build) build ;;
     (outdir) print_output_directory ;;
     (*) die "Invalid target $TARGET" ;;
 esac

tools/rocm-build/build_devicelibs.sh

@@ -10,9 +10,7 @@ printUsage() {
     echo "  -c,  --clean              Clean output and delete all intermediate work"
     echo "  -r,  --release            Build a release version of the package"
     echo "  -a,  --address_sanitizer  Enable address sanitizer"
-    echo "  -s,  --static             Build static lib (.a).  build instead of dynamic/shared(.so) "
-    echo "  -w,  --wheel              Creates python wheel package of devicelibs.
-                                      It needs to be used along with -r option"
+    echo "  -s,  --static             Supports static CI by accepting this param & not bailing out. No effect of the param though"
     echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
     type referred to by pkg_type"
     echo "  -h,  --help             Prints this help"
@@ -21,11 +19,10 @@ printUsage() {
 
     return 0
 }
-PROJ_NAME="devicelibs"
 PACKAGE_ROOT="$(getPackageRoot)"
 PACKAGE_BIN="$(getBinPath)"
 PACKAGE_LIB="$(getLibPath)"
-BUILD_PATH="$(getBuildPath $PROJ_NAME)"
+BUILD_PATH="$(getBuildPath devicelibs)"
 INSTALL_PATH="$(getPackageRoot)"
 LIGHTNING_BUILD_PATH="$(getBuildPath lightning)"
 DEB_PATH="$(getDebPath devicelibs)"
@@ -39,13 +36,11 @@ CLEAN_OR_OUT=0;
 PKGTYPE="deb"
 MAKETARGET="deb"
 
-#parse the arguments
-VALID_STR=`getopt -o hcraswo: --long help,clean,release,static,wheel,address_sanitizer,outdir: -- "$@"`
+VALID_STR=`getopt -o hcraso: --long help,clean,release,static,address_sanitizer,outdir: -- "$@"`
 eval set -- "$VALID_STR"
 
 while true ;
 do
-    #echo "parocessing $1"
     case "$1" in
         (-h | --help)
                 printUsage ; exit 0;;
@@ -58,8 +53,6 @@ do
                 ack_and_ignore_asan ; shift ;;
         (-s | --static)
                 SHARED_LIBS="OFF" ; shift ;;
-        (-w | --wheel)
-                WHEEL_PACKAGE=true ; shift ;;
         (-o | --outdir)
                 TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
         --)     shift; break;; # end delimiter
@@ -78,9 +71,7 @@ fi
 
 
 clean_devicelibs() {
-    # Delete cmake output directory
     rm -rf "$BUILD_PATH"
-    # Delete the *.bc files from the PACKAGE_LIB directory
     rm -f $PACKAGE_LIB/hc*.bc
     rm -f $PACKAGE_LIB/irif*.bc
     rm -f $PACKAGE_LIB/ockl*.bc
@@ -89,7 +80,6 @@ clean_devicelibs() {
     rm -f $PACKAGE_LIB/opencl*.bc
     rm -f $PACKAGE_LIB/openmp*.bc
     rm -rf $PACKAGE_ROOT/amdgcn
-    # Delete any packages generated
     rm -rf "$DEB_PATH"
     rm -rf "$RPM_PATH"
 }
@@ -106,7 +96,6 @@ build_devicelibs() {
     if [ ! -e Makefile ]; then
         cmake $(rocm_cmake_params) \
               $(rocm_common_cmake_params) \
-              ${GEN_NINJA} \
               -DBUILD_SHARED_LIBS=$SHARED_LIBS \
               -DROCM_DEVICE_LIBS_BITCODE_INSTALL_LOC_NEW="$bitcodeInstallLoc/amdgcn" \
               -DROCM_DEVICE_LIBS_BITCODE_INSTALL_LOC_OLD="amdgcn" \
@@ -144,7 +133,7 @@ print_output_directory() {
 }
 case $TARGET in
     (clean) clean_devicelibs ;;
-    (build) build_devicelibs; package_devicelibs; build_wheel "$BUILD_PATH" "$PROJ_NAME" ;;
+    (build) build_devicelibs; package_devicelibs ;;
     (outdir) print_output_directory ;;
     (*) die "Invalid target $TARGET" ;;
 esac

tools/rocm-build/build_half.sh

@@ -1,31 +1,22 @@
 #!/bin/bash
 
 set -ex
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src half
 
 build_half() {
     echo "Start build"
 
-    if [ "${ENABLE_STATIC_BUILDS}" == "true" ]; then
-        ack_and_skip_static
-    fi
-
     if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
          set_asan_env_vars
          set_address_sanitizer_on
-         # ASAN packaging is not required for HALF, since its header only package
-         # Setting the asan_cmake_params to false will disable ASAN packaging
          ASAN_CMAKE_PARAMS="false"
     fi
     mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
 
     cmake \
         -DCMAKE_INSTALL_PREFIX="$ROCM_PATH" \
-        -DCPACK_PACKAGING_INSTALL_PREFIX=${ROCM_PATH}\
-        -DCPACK_SET_DESTDIR="OFF" \
-        -DCPACK_RPM_PACKAGE_RELOCATABLE="ON" \
         -DBUILD_FILE_REORG_BACKWARD_COMPATIBILITY=OFF \
         "$COMPONENT_SRC"
 
@@ -34,7 +25,7 @@ build_half() {
     cmake --build "$BUILD_DIR" -- install
 
     rm -rf _CPack_Packages/ && find -name '*.o' -delete
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
 
     show_build_cache_stats
 }
@@ -48,7 +39,7 @@ clean_half() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_half; build_wheel ;;
+    build) build_half ;;
     outdir) print_output_directory ;;
     clean) clean_half ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_hip_on_rocclr.sh

@@ -10,8 +10,6 @@ printUsage() {
     echo "  -r,  --release              Make a release build instead of a debug build"
     echo "  -a,  --address_sanitizer    Enable address sanitizer"
     echo "  -s,  --static               Build static lib (.a).  build instead of dynamic/shared(.so) "
-    echo "  -w,  --wheel                Creates python wheel package of hip-on-rocclr.
-                                        It needs to be used along with -r option"
     echo "  -o,  --outdir <pkg_type>    Print path of output directory containing packages of type referred to by pkg_type"
     echo "  -t,  --offload-arch=<arch>  Specify arch for catch tests ex: --offload-arch=gfx1030 --offload-arch=gfx1100"
     echo "  -p,  --package <type>       Specify packaging format"
@@ -27,6 +25,7 @@ printUsage() {
 source "$(dirname "${BASH_SOURCE}")/compute_utils.sh"
 MAKEOPTS="$DASH_JAY"
 PROJ_NAME="hip-on-rocclr"
+
 BUILD_PATH="$(getBuildPath $PROJ_NAME)"
 
 TARGET="build"
@@ -54,10 +53,9 @@ MAKETARGET="deb"
 PKGTYPE="deb"
 OFFLOAD_ARCH=()
 
-DEFAULT_OFFLOAD_ARCH=(gfx900 gfx906 gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1031 gfx1033 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 gfx1103 gfx1150 gfx1151 gfx1200 gfx1201)
+DEFAULT_OFFLOAD_ARCH=(gfx900 gfx906 gfx908 gfx90a gfx940 gfx941 gfx942 gfx1030 gfx1031 gfx1033 gfx1034 gfx1035 gfx1100 gfx1101 gfx1102 gfx1200 gfx1201)
 
-#parse the arguments
-VALID_STR=`getopt -o hcraswt:o: --long help,clean,release,address_sanitizer,static,wheel,offload-arch=:,outdir: -- "$@"`
+VALID_STR=`getopt -o hcrast:o: --long help,clean,release,address_sanitizer,static,offload-arch=:,outdir: -- "$@"`
 eval set -- "$VALID_STR"
 
 while true ;
@@ -74,13 +72,11 @@ do
                 set_address_sanitizer_on ; shift ;;
         (-s | --static)
                 SHARED_LIBS="OFF" ; shift ;;
-        (-w | --wheel)
-                WHEEL_PACKAGE=true ; shift ;;
         (-t | --offload-arch=)
                 OFFLOAD_ARCH+=( "$2" ); ((CLEAN_OR_OUT|=2)); shift 2 ;;
         (-o | --outdir)
                 TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 2 ;;
-        --)     shift; break;; # end delimiter
+        --)     shift; break;;
 
         (*)
                 echo " This should never come but just incase : UNEXPECTED ERROR Parm : [$1] ">&2 ; exit 20;;
@@ -102,10 +98,7 @@ if [ $RET_CONFLICT -ge 30 ]; then
    exit $RET_CONFLICT
 fi
 
-
-
 clean_hip_on_rocclr() {
-    # Delete cmake output directory
     rm -rf "$BUILD_PATH"
     rm -rf "$PACKAGE_DEB"
     rm -rf "$PACKAGE_RPM"
@@ -113,23 +106,17 @@ clean_hip_on_rocclr() {
 }
 
 build_hip_on_rocclr() {
-    # TODO This if condition is a temporary workaround so that mainline builds dont error out
-    # until build migrated from hipamd to clr repo
     if [  -e "$CLR_ROOT/CMakeLists.txt" ]; then
-        # We are in a branch that has migrated to clr repo
         _HIP_CMAKELIST_DIR="$CLR_ROOT"
         _HIP_CMAKELIST_OPT="-DCLR_BUILD_HIP=ON -DCLR_BUILD_OCL=OFF"
         if [ -e "$HIPOTHER_ROOT/hipnv" ]; then
-            # We are in a branch that has hipnv headers migrated
             _HIP_CMAKELIST_OPT="$_HIP_CMAKELIST_OPT -DHIPNV_DIR=$HIPOTHER_ROOT/hipnv"
         fi
     elif [ ! -e "$HIPAMD_ROOT/CMakeLists.txt" ]; then
-        # We seem to have hit a branch in which both the old and the new repo don't exist
         echo "No $HIPAMD_ROOT/CMakeLists.txt file, skipping hip on rocclr" >&2
         echo "No $HIPAMD_ROOT/CMakeLists.txt file, skipping hip on rocclr"
-        exit 0 # This is not an error
+        exit 0
     else
-        # We are in a branch that has not yet migrated to clr repo yet
         _HIP_CMAKELIST_DIR="$HIPAMD_ROOT"
         _HIP_CMAKELIST_OPT=""
     fi
@@ -138,7 +125,6 @@ build_hip_on_rocclr() {
     mkdir -p "$BUILD_PATH"
     pushd "$BUILD_PATH"
 
-    # FIXME: Remove -DROCclr_DIR/LIBROCclr_STATIC_DIR
     if [ ! -e Makefile ]; then
         echo "Building HIP-On-ROCclr CMake environment"
         print_lib_type $SHARED_LIBS
@@ -179,13 +165,8 @@ build_catch_tests() {
    rm -rf "$CATCH_BUILD_DIR"
    mkdir -p "$CATCH_BUILD_DIR"
    pushd "$CATCH_BUILD_DIR"
-   # use the newly built hip as HIP for catch
    export HIP_PATH="$ROCM_INSTALL_PATH"
    export ROCM_PATH="$ROCM_INSTALL_PATH"
-   # Note: The rocm_common_cmake_params will provide CMAKE_EXE_LINKER_FLAGS_INIT
-   # for binaries located in /opt/rocm/bin
-   # hip-catch binaries are located in each test folder under /opt/rocm/share/hip/catch_test/
-   # Append the EXE LINKER flags with ROCm library path
    cmake \
          -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
          -DBUILD_SHARED_LIBS=$SHARED_LIBS \
@@ -196,7 +177,6 @@ build_catch_tests() {
          $(rocm_common_cmake_params) \
          -DCPACK_RPM_DEBUGINFO_PACKAGE=FALSE \
          -DCPACK_DEBIAN_DEBUGINFO_PACKAGE=FALSE \
-         -DCMAKE_EXE_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,$ROCM_EXE_RPATH:$ROCM_INSTALL_PATH/lib:/opt/rocm/lib \
          -DCPACK_INSTALL_PREFIX="$ROCM_INSTALL_PATH" \
          "$CATCH_SRC"
 
@@ -210,7 +190,6 @@ build_catch_tests() {
 }
 
 package_samples() {
-   # TODO: To be removed once the issue related to ASAN builds are fixed
    if [ "$ASAN_CMAKE_PARAMS" == "true" ] ; then
       echo "Disable the packaging of HIP samples" >&2
       return
@@ -219,17 +198,13 @@ package_samples() {
    if [ ! -e "$SAMPLES_SRC/CMakeLists.txt" ]; then
       echo "HIP samples source not found at: $SAMPLES_SRC" >&2
       echo "Using samples package from hip project: $BUILD_PATH" >&2
-      # TODO: change to return failure after hip-tests samples change is available in mainline
       return
    fi
-   # package samples
+
    rm -rf "$SAMPLES_BUILD_DIR"
    mkdir -p "$SAMPLES_BUILD_DIR"
    pushd "$SAMPLES_BUILD_DIR"
-   # The cmake path is different for asan and non-asan builds.
-   # Fetch after getting build type. Default will be non-asan build
    local CMAKE_PATH="$(getCmakePath)"
-   # use the newly built hip as HIP for samples
    export HIP_PATH="$ROCM_INSTALL_PATH"
    export ROCM_PATH="$ROCM_INSTALL_PATH"
    cmake \
@@ -316,24 +291,10 @@ print_output_directory() {
 }
 
 case $TARGET in
-    (clean)
-        clean_hip_on_rocclr
-        clean_hip_tests
-        ;;
-    (build)
-        build_hip_on_rocclr
-        build_catch_tests
-        package_hip_on_rocclr
-        package_samples
-        build_wheel "$BUILD_PATH" "$PROJ_NAME"
-        copy_hip_tests
-        ;;
-    (outdir)
-        print_output_directory
-        ;;
-    (*)
-        die "Invalid target $TARGET"
-        ;;
+    (clean) clean_hip_on_rocclr; clean_hip_tests ;;
+    (build) build_hip_on_rocclr; build_catch_tests; package_hip_on_rocclr; package_samples; copy_hip_tests;;
+   (outdir) print_output_directory ;;
+        (*) die "Invalid target $TARGET" ;;
 esac
 
 echo "Operation complete"

tools/rocm-build/build_hipblas-common.sh

@@ -2,19 +2,16 @@
 
 set -ex
 
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src hipBLAS-common
 
 build_hipblas-common() {
     echo "Start build"
 
-    CXX=$(set_build_variables __C_++__)
     cd $COMPONENT_SRC
     mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
 
-    echo "C compiler: $CC"
-    echo "CXX compiler: $CXX"
     init_rocm_common_cmake_params
     cmake \
         "${rocm_math_common_cmake_params[@]}" \
@@ -23,7 +20,8 @@ build_hipblas-common() {
     cmake --build "$BUILD_DIR" -- package
 
     rm -rf _CPack_Packages/ && find -name '*.o' -delete
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
+
     show_build_cache_stats
 }
 
@@ -36,7 +34,7 @@ clean_hipblas-common() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_hipblas-common; build_wheel ;;
+    build) build_hipblas-common ;;
     outdir) print_output_directory ;;
     clean) clean_hipblas-common ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_hipblas.sh

@@ -2,32 +2,28 @@
 
 set -ex
 
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src hipBLAS
 
 build_hipblas() {
     echo "Start build"
 
-    CXX=$(set_build_variables __G_++__)
+    CXX="g++"
     CXX_FLAG=
     if [ "${ENABLE_STATIC_BUILDS}" == "true" ]; then
-        CXX=$(set_build_variables __AMD_CLANG_++__)
-        CXX_FLAG=$(set_build_variables __CMAKE_CXX_PARAMS__)
+        CXX="amdclang++"
+        CXX_FLAG="-DCMAKE_CXX_COMPILER=${ROCM_PATH}/llvm/bin/clang++"
     fi
 
     CLIENTS_SAMPLES="ON"
     if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
        set_asan_env_vars
        set_address_sanitizer_on
-       # fixme: remove CLIENTS_SAMPLES=OFF once SWDEV-417076 is fixed
        CLIENTS_SAMPLES="OFF"
     fi
 
     SHARED_LIBS="ON"
-    if [ "${ENABLE_STATIC_BUILDS}" == "true" ]; then
-        SHARED_LIBS="OFF"
-    fi
 
     echo "C compiler: $CC"
     echo "CXX compiler: $CXX"
@@ -43,10 +39,10 @@ build_hipblas() {
     init_rocm_common_cmake_params
     cmake \
         ${LAUNCHER_FLAGS} \
-	    "${rocm_math_common_cmake_params[@]}" \
+        "${rocm_math_common_cmake_params[@]}" \
         -DUSE_CUDA=OFF \
         -DBUILD_SHARED_LIBS=$SHARED_LIBS \
-	    -DBUILD_CLIENTS_TESTS=ON \
+        -DBUILD_CLIENTS_TESTS=ON \
         -DBUILD_CLIENTS_BENCHMARKS=ON \
         -DBUILD_CLIENTS_SAMPLES="${CLIENTS_SAMPLES}" \
         -DBUILD_ADDRESS_SANITIZER="${ADDRESS_SANITIZER}" \
@@ -58,7 +54,7 @@ build_hipblas() {
     cmake --build "$BUILD_DIR" -- package
 
     rm -rf _CPack_Packages/ && find -name '*.o' -delete
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
 
     show_build_cache_stats
 }
@@ -72,7 +68,7 @@ clean_hipblas() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_hipblas; build_wheel ;;
+    build) build_hipblas ;;
     outdir) print_output_directory ;;
     clean) clean_hipblas ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_hipblaslt.sh

@@ -1,20 +1,10 @@
 #!/bin/bash
 
 set -ex
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src hipBLASLt
 
-#not enabling the debug files by defalut
-disable_debug_package_generation
-# if ENABLE_GPU_ARCH is set in env by Job parameter ENABLE_GPU_ARCH, then set GFX_ARCH to that value
-if [ -n "$ENABLE_GPU_ARCH" ]; then
-    set_gpu_arch "$ENABLE_GPU_ARCH"
-else
-    # gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942
-    set_gpu_arch "all"
-fi
-
 build_hipblaslt() {
     echo "Start build"
 
@@ -30,31 +20,31 @@ build_hipblaslt() {
     cd $COMPONENT_SRC
     mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
 
-    # hipblaslt requiring Python 3.12.
-    # Point CMake to that explicit location and adjust LD_LIBRARY_PATH.
-    if [ "$DISTRO_ID" = "rhel-8.8" ] || [ "$DISTRO_NAME" == "sles" ] || \
-        [ "$DISTRO_ID" = "rhel-9.1" ] || [ "$DISTRO_ID" = "almalinux-8.10" ] || \
-        [ "$DISTRO_ID" = "debian-10" ]; then
-        EXTRA_PYTHON_PATH=/opt/Python-3.12.7
-        EXTRA_CMAKE_OPTIONS="-DPython_ROOT=/opt/Python-3.12.7"
-        export LD_LIBRARY_PATH=${EXTRA_PYTHON_PATH}/lib
+    if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
+       rebuild_lapack
+    fi
+
+    if [ -n "$GPU_ARCHS" ]; then
+        GPU_TARGETS="$GPU_ARCHS"
+    else
+        # gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942
+        GPU_TARGETS=all
     fi
 
     init_rocm_common_cmake_params
-    CXX=$(set_build_variables __CXX__)\
+    CXX=$(set_build_variables CXX)\
     cmake \
+        -DAMDGPU_TARGETS=${GPU_TARGETS} \
         ${LAUNCHER_FLAGS} \
-         "${rocm_math_common_cmake_params[@]}" \
+        "${rocm_math_common_cmake_params[@]}" \
         -DTensile_LOGIC= \
         -DTensile_CODE_OBJECT_VERSION=default \
-        -DTensile_CPU_THREADS=$((PROC / 4)) \
+        -DTensile_CPU_THREADS= \
         -DTensile_LIBRARY_FORMAT=msgpack \
         -DBUILD_CLIENTS_SAMPLES=ON \
         -DBUILD_CLIENTS_TESTS=ON \
-        -DLINK_BLIS=ON \
         -DBUILD_CLIENTS_BENCHMARKS=ON \
         -DBUILD_ADDRESS_SANITIZER="${ADDRESS_SANITIZER}" \
-        ${EXTRA_CMAKE_OPTIONS} \
         "$COMPONENT_SRC"
 
     cmake --build "$BUILD_DIR" -- -j${PROC}
@@ -62,7 +52,8 @@ build_hipblaslt() {
     cmake --build "$BUILD_DIR" -- package
 
     rm -rf _CPack_Packages/ && find -name '*.o' -delete
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
+
     show_build_cache_stats
 }
 
@@ -75,7 +66,7 @@ clean_hipblaslt() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_hipblaslt; build_wheel ;;
+    build) build_hipblaslt ;;
     outdir) print_output_directory ;;
     clean) clean_hipblaslt ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_hipcc.sh

@@ -9,8 +9,6 @@ printUsage() {
     echo "Options:"
     echo "  -a,  --address_sanitizer  Enable address sanitizer"
     echo "  -c,  --clean              Clean output and delete all intermediate work"
-    echo "  -w,  --wheel              Creates python wheel package of hipcc. 
-                                      It needs to be used along with -r option"
     echo "  -o,  --outdir <pkg_type>  Print path of output directory containing packages of
                             type referred to by pkg_type"
     echo "  -r,  --release            Makes a release build"
@@ -23,7 +21,6 @@ printUsage() {
 }
 
 
-## Build environment variables
 API_NAME=hipcc
 PROJ_NAME=$API_NAME
 
@@ -32,11 +29,10 @@ MAKEOPTS="$DASH_JAY"
 BUILD_TYPE="Debug"
 SHARED_LIBS="ON"
 BUILD_DIR=$(getBuildPath $API_NAME)
-PACKAGE_DEB=$(getPackageRoot)/deb/$PROJ_NAME
-PACKAGE_RPM=$(getPackageRoot)/rpm/$PROJ_NAME
+PACKAGE_DEB=$(getPackageRoot)/deb/$API_NAME
+PACKAGE_RPM=$(getPackageRoot)/rpm/$API_NAME
 PACKAGE_SRC="$(getSrcPath)"
 
-#parse the arguments
 VALID_STR=`getopt -o hcraswo:p: --long help,clean,release,address_sanitizer,static,outdir,wheel:,package: -- "$@"`
 eval set -- "$VALID_STR"
 
@@ -49,15 +45,13 @@ do
             TARGET="clean" ;;
         (-o  | --outdir)
             TARGET="outdir"; PKGTYPE=$2 ; OUT_DIR_SPECIFIED=1 ; ((CLEAN_OR_OUT|=2)) ; shift 1 ;;
-        (-w  | --wheel)
-            WHEEL_PACKAGE=true ;;
         (-r  | --release)
             BUILD_TYPE="RelWithDebInfo" ;;
         (-s | --static)
             SHARED_LIBS="OFF" ;;
         (-h  | --help)
             printUsage ; exit 0 ;;
-        --)     shift; break;; # end delimiter
+        --)     shift; break;;
         (*)
             echo "Invalid option [$1]" >&2; printUsage; exit 1 ;;
     esac
@@ -97,7 +91,7 @@ build() {
         $(rocm_cmake_params) \
         $(rocm_common_cmake_params) \
         -DHIPCC_BACKWARD_COMPATIBILITY=OFF \
-        -DCMAKE_INSTALL_PREFIX="$ROCM_PATH" \
+        -DCMAKE_INSTALL_PREFIX="$OUT_DIR" \
         $HIPCC_ROOT
     popd
 
@@ -124,20 +118,10 @@ print_output_directory() {
 }
 
 case $TARGET in
-    (clean)
-        clean
-        ;;
-    (build)
-        build
-        build_wheel "$BUILD_DIR" "$PROJ_NAME"
-        copy_hipcc_sources
-        ;;
-    (outdir)
-        print_output_directory
-        ;;
-    (*)
-        die "Invalid target $TARGET"
-        ;;
+    (clean) clean ;;
+    (build) build ; copy_hipcc_sources ;;
+    (outdir) print_output_directory ;;
+    (*) die "Invalid target $TARGET" ;;
 esac
 
 echo "Operation complete"

tools/rocm-build/build_hipcub.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src hipCUB
 
@@ -17,21 +17,26 @@ build_hipcub() {
     if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
          set_asan_env_vars
          set_address_sanitizer_on
-         # ASAN packaging is not required for HIPCUB, since its header only package
-         # Setting the asan_cmake_params to false will disable ASAN packaging
          ASAN_CMAKE_PARAMS="false"
     fi
 
     mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
     init_rocm_common_cmake_params
 
-    CXX=$(set_build_variables __CXX__)\
+    if [ -n "$GPU_ARCHS" ]; then
+        GPU_TARGETS="$GPU_ARCHS"
+    else
+        GPU_TARGETS="gfx908:xnack-;gfx90a:xnack-;gfx90a:xnack+;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201"
+    fi
+
+    CXX=$(set_build_variables CXX)\
     cmake \
         ${LAUNCHER_FLAGS} \
-	    "${rocm_math_common_cmake_params[@]}" \
+        "${rocm_math_common_cmake_params[@]}" \
         -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip;${ROCM_PATH}/hip/cmake" \
         -Drocprim_DIR="${ROCM_PATH}/rocprim"  \
         -DBUILD_TEST=ON \
+        -DAMDGPU_TARGETS=${GPU_TARGETS} \
         "$COMPONENT_SRC"
 
     cmake --build "$BUILD_DIR" -- -j${PROC}
@@ -39,7 +44,7 @@ build_hipcub() {
     cmake --build "$BUILD_DIR" -- package
 
     rm -rf _CPack_Packages/ && find -name '*.o' -delete
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
 
     show_build_cache_stats
 }
@@ -53,7 +58,7 @@ clean_hipcub() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_hipcub; build_wheel ;;
+    build) build_hipcub ;;
     outdir) print_output_directory ;;
     clean) clean_hipcub ;;
     *) die "Invalid target $TARGET" ;;

tools/rocm-build/build_hipfft.sh

@@ -2,17 +2,13 @@
 
 set -ex
 
-source "$(dirname "${BASH_SOURCE[0]}")/compute_utils.sh"
+source "$(dirname "${BASH_SOURCE[0]}")/compute_helper.sh"
 
 set_component_src hipFFT
 
 build_hipfft() {
     echo "Start build"
 
-    if [ "${ENABLE_STATIC_BUILDS}" == "true" ]; then
-        ack_and_skip_static
-    fi
-
     if [ "${ENABLE_ADDRESS_SANITIZER}" == "true" ]; then
        set_asan_env_vars
        set_address_sanitizer_on
@@ -22,10 +18,17 @@ build_hipfft() {
     mkdir -p "$BUILD_DIR" && cd "$BUILD_DIR"
     init_rocm_common_cmake_params
 
+    if [ -n "$GPU_ARCHS" ]; then
+        GPU_TARGETS="$GPU_ARCHS"
+    else
+        GPU_TARGETS="gfx908;gfx90a;gfx940;gfx941;gfx942;gfx1030;gfx1100;gfx1101;gfx1102;gfx1200;gfx1201"
+    fi
+
     cmake \
-        "$(set_build_variables __CMAKE_CXX_PARAMS__)" \
+        -DCMAKE_CXX_COMPILER=$(set_build_variables CXX) \
         ${LAUNCHER_FLAGS} \
-	    "${rocm_math_common_cmake_params[@]}" \
+        "${rocm_math_common_cmake_params[@]}" \
+        -DAMDGPU_TARGETS=${GPU_TARGETS} \
         -DCMAKE_MODULE_PATH="${ROCM_PATH}/lib/cmake/hip" \
         -DCMAKE_SKIP_BUILD_RPATH=TRUE \
         -DBUILD_ADDRESS_SANITIZER="${ADDRESS_SANITIZER}" \
@@ -38,7 +41,7 @@ build_hipfft() {
     cmake --build "$BUILD_DIR" -- package
 
     rm -rf _CPack_Packages/ && find -name '*.o' -delete
-    copy_if "${PKGTYPE}" "${CPACKGEN:-"DEB;RPM"}" "${PACKAGE_DIR}" "${BUILD_DIR}"/*."${PKGTYPE}"
+    mkdir -p $PACKAGE_DIR  && cp ${BUILD_DIR}/*.${PKGTYPE} $PACKAGE_DIR
 
     show_build_cache_stats
 }
@@ -52,7 +55,7 @@ clean_hipfft() {
 stage2_command_args "$@"
 
 case $TARGET in
-    build) build_hipfft; build_wheel ;;
+    build) build_hipfft ;;
     outdir) print_output_directory ;;
     clean) clean_hipfft ;;
     *) die "Invalid target $TARGET" ;;