From 169c9a0d497e2ede0dd7714d53d7345e5bb32dee Mon Sep 17 00:00:00 2001 From: David Galiffi Date: Fri, 18 Apr 2025 09:32:26 -0400 Subject: [PATCH] Add rocm-6.4 to workflows (#165) * Add rocm-6.4 to workflows * Update containers.yml * Update cpack.yml * Update cpack.yml * Disable OpenMP Target Examples on GitHub Runners * Fix build warnings. Switch statements with unhandled enums. * Enable testing on 6.3 and 6.4 * Ubuntu 24 workflow. Build both ROCm 6.3 and 6.4 Signed-off-by: David Galiffi --------- Signed-off-by: David Galiffi --- .github/workflows/containers.yml | 19 ++ .github/workflows/cpack.yml | 18 ++ .github/workflows/formatting.yml | 2 +- .github/workflows/opensuse.yml | 2 +- .github/workflows/redhat.yml | 4 +- .github/workflows/ubuntu-focal.yml | 4 +- .github/workflows/ubuntu-jammy.yml | 233 ++++++++++++++---- .github/workflows/ubuntu-noble.yml | 4 +- .../rocprof-sys/library/rocprofiler-sdk.cpp | 18 +- 9 files changed, 241 insertions(+), 63 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 58164ac067..5b9b1588dd 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -98,6 +98,9 @@ jobs: - os-distro: "ubuntu" os-version: "22.04" rocm-version: "6.3" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "6.4" # ubuntu 24.04 - os-distro: "ubuntu" os-version: "24.04" @@ -105,6 +108,9 @@ jobs: - os-distro: "ubuntu" os-version: "24.04" rocm-version: "6.3" + - os-distro: "ubuntu" + os-version: "24.04" + rocm-version: "6.4" # opensuse 15.5 - os-distro: "opensuse" os-version: "15.5" @@ -119,12 +125,19 @@ jobs: - os-distro: "opensuse" os-version: "15.6" rocm-version: "6.3" + - os-distro: "opensuse" + os-version: "15.6" + rocm-version: "6.4" + # RHEL 8.10 - os-distro: "rhel" os-version: "8.10" rocm-version: "0.0" - os-distro: "rhel" os-version: "8.10" rocm-version: "6.3" + - os-distro: "rhel" + os-version: "8.10" + rocm-version: "6.4" # RHEL 9.4 - os-distro: "rhel" os-version: "9.4" @@ -132,6 +145,9 @@ jobs: - os-distro: "rhel" os-version: "9.4" rocm-version: "6.3" + - os-distro: "rhel" + os-version: "9.4" + rocm-version: "6.4" # RHEL 9.5 - os-distro: "rhel" os-version: "9.5" @@ -139,6 +155,9 @@ jobs: - os-distro: "rhel" os-version: "9.5" rocm-version: "6.3" + - os-distro: "rhel" + os-version: "9.5" + rocm-version: "6.4" steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/cpack.yml b/.github/workflows/cpack.yml index b8acd2602f..8caab6a979 100644 --- a/.github/workflows/cpack.yml +++ b/.github/workflows/cpack.yml @@ -47,6 +47,9 @@ jobs: - os-distro: "ubuntu" os-version: "22.04" rocm-version: "6.3" + - os-distro: "ubuntu" + os-version: "22.04" + rocm-version: "6.4" # ubuntu 24.04 - os-distro: "ubuntu" os-version: "24.04" @@ -54,6 +57,9 @@ jobs: - os-distro: "ubuntu" os-version: "24.04" rocm-version: "6.3" + - os-distro: "ubuntu" + os-version: "24.04" + rocm-version: "6.4" # opensuse 15.5 - os-distro: "opensuse" os-version: "15.5" @@ -68,6 +74,9 @@ jobs: - os-distro: "opensuse" os-version: "15.6" rocm-version: "6.3" + - os-distro: "opensuse" + os-version: "15.6" + rocm-version: "6.4" # RHEL 8.10 - os-distro: "rhel" os-version: "8.10" @@ -75,6 +84,9 @@ jobs: - os-distro: "rhel" os-version: "8.10" rocm-version: "6.3" + - os-distro: "rhel" + os-version: "8.10" + rocm-version: "6.4" # RHEL 9.4 - os-distro: "rhel" os-version: "9.4" @@ -82,6 +94,9 @@ jobs: - os-distro: "rhel" os-version: "9.4" rocm-version: "6.3" + - os-distro: "rhel" + os-version: "9.4" + rocm-version: "6.4" # RHEL 9.5 - os-distro: "rhel" os-version: "9.5" @@ -89,6 +104,9 @@ jobs: - os-distro: "rhel" os-version: "9.5" rocm-version: "6.3" + - os-distro: "rhel" + os-version: "9.5" + rocm-version: "6.4" steps: - name: Free Disk Space diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 58ac079801..610615d2de 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -17,7 +17,7 @@ jobs: call-workflow-passing-data: name: Documentation uses: ROCm/rocm-docs-core/.github/workflows/linting.yml@develop - + python: runs-on: ubuntu-22.04 strategy: diff --git a/.github/workflows/opensuse.yml b/.github/workflows/opensuse.yml index 9170e3d126..a4bf30d4d1 100644 --- a/.github/workflows/opensuse.yml +++ b/.github/workflows/opensuse.yml @@ -104,7 +104,7 @@ jobs: -DROCPROFSYS_PYTHON_ENVS="py3.6;py3.7;py3.8;py3.9;py3.10;py3.11" -DROCPROFSYS_CI_MPI_RUN_AS_ROOT=ON -DROCPROFSYS_MAX_THREADS=64 - -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;videodecode;jpegdecode" + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;openmp-target;videodecode;jpegdecode" -DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }} -- -LE "transpose|rccl|videodecode|jpegdecode|network" diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index 4f446c1ee9..fc6e0aec12 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -49,7 +49,7 @@ jobs: matrix: compiler: ['g++'] os-release: [ '8.10', '9.3', '9.4' ] - rocm-version: [ '0.0', '6.3' ] + rocm-version: [ '0.0', '6.3', '6.4' ] build-type: ['Release'] steps: @@ -120,7 +120,7 @@ jobs: -DROCPROFSYS_INSTALL_PERFETTO_TOOLS=OFF -DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs -DROCPROFSYS_PYTHON_ENVS="py3.6;py3.7;py3.8;py3.9;py3.10;py3.11" - -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl" + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;openmp-target" -DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }} -- -LE "transpose|rccl|videodecode|jpegdecode|network" diff --git a/.github/workflows/ubuntu-focal.yml b/.github/workflows/ubuntu-focal.yml index 8bd8ea8402..e0e60452c0 100644 --- a/.github/workflows/ubuntu-focal.yml +++ b/.github/workflows/ubuntu-focal.yml @@ -159,7 +159,7 @@ jobs: -DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs -DROCPROFSYS_PYTHON_ENVS="py3.6;py3.7;py3.8;py3.9;py3.10;py3.11" -DROCPROFSYS_MAX_THREADS=64 - -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;videodecode;jpegdecode" + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;videodecode;jpegdecode;openmp-target" -DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }} -DMPI_HEADERS_ALLOW_MPICH=OFF -- @@ -465,7 +465,7 @@ jobs: -DROCPROFSYS_USE_ROCM=OFF -DROCPROFSYS_USE_RCCL=OFF -DROCPROFSYS_MAX_THREADS=64 - -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;videodecode;jpegdecode" + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;videodecode;jpegdecode;openmp-target" -DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }} -- -LE "transpose|rccl|videodecode|jpegdecode|network" diff --git a/.github/workflows/ubuntu-jammy.yml b/.github/workflows/ubuntu-jammy.yml index a0365fb534..a9fbed9c88 100644 --- a/.github/workflows/ubuntu-jammy.yml +++ b/.github/workflows/ubuntu-jammy.yml @@ -48,36 +48,17 @@ jobs: fail-fast: false matrix: compiler: ['g++-11', 'g++-12'] - hip: ['OFF'] + rocm: ['OFF'] mpi: ['OFF'] ompt: ['OFF'] papi: ['OFF'] python: ['ON'] - lto: ['OFF'] strip: ['OFF'] hidden: ['ON', 'OFF'] build-type: ['Release'] mpi-headers: ['ON', 'OFF'] - static-libgcc: ['OFF'] - static-libstdcxx: ['OFF'] build-dyninst: ['OFF'] rocm-version: ['0.0'] - include: - - compiler: 'g++' - hip: 'ON' - mpi: 'OFF' - ompt: 'OFF' - papi: 'OFF' - python: 'ON' - lto: 'OFF' - strip: 'OFF' - hidden: 'ON' - build-type: 'Release' - mpi-headers: 'OFF' - static-libgcc: 'OFF' - static-libstdcxx: 'OFF' - build-dyninst: 'OFF' - rocm-version: '6.3' env: OMPI_ALLOW_RUN_AS_ROOT: 1 @@ -106,30 +87,6 @@ jobs: python3 -m pip install 'cmake==3.21' && for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done - - name: Install ROCm Packages - timeout-minutes: 25 - if: ${{ matrix.rocm-version != '0.0' }} - uses: nick-fields/retry@v3 - with: - retry_wait_seconds: 30 - timeout_minutes: 25 - max_attempts: 5 - shell: bash - command: | - ROCM_VERSION=${{ matrix.rocm-version }} - ROCM_MAJOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $1}') - ROCM_MINOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $2}') - ROCM_VERSN=$(( (${ROCM_MAJOR}*10000)+(${ROCM_MINOR}*100) )) - echo "ROCM_MAJOR=${ROCM_MAJOR} ROCM_MINOR=${ROCM_MINOR} ROCM_VERSN=${ROCM_VERSN}" - wget -q https://repo.radeon.com/amdgpu-install/${{ matrix.rocm-version }}/ubuntu/jammy/amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb - apt-get install -y ./amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb - apt-get update - apt-get install -y rocm-dev rocdecode-dev libavformat-dev libavcodec-dev - echo "/opt/rocm/bin" >> $GITHUB_PATH - echo "ROCM_PATH=/opt/rocm" >> $GITHUB_ENV - echo "LD_LIBRARY_PATH=/opt/rocm/lib:${LD_LIBRARY_PATH}" >> $GITHUB_ENV - /opt/rocm/bin/hipcc -O3 -c ./examples/transpose/transpose.cpp -o /tmp/transpose.o - - name: Test Environment Modules timeout-minutes: 15 shell: bash @@ -151,18 +108,14 @@ jobs: cmake --version && TAG="" && append-tagname() { if [ "${1}" == "ON" ]; then TAG="${TAG}-${2}"; fi; } && - append-tagname ${{ matrix.hip }} rocm-${{ matrix.rocm-version }} && append-tagname ${{ matrix.mpi }} mpi && append-tagname ${{ matrix.ompt }} ompt && append-tagname ${{ matrix.papi }} papi && append-tagname ${{ matrix.python }} python && append-tagname ${{ matrix.mpi-headers }} mpip && append-tagname ${{ matrix.build-dyninst }} internal-dyninst && - append-tagname ${{ matrix.lto }} lto && append-tagname ${{ matrix.strip }} strip && append-tagname ${{ matrix.hidden }} hidden-viz && - append-tagname ${{ matrix.static-libgcc }} libgcc && - append-tagname ${{ matrix.static-libstdcxx }} libstdcxx && python3 ./scripts/run-ci.py -B build --name ${{ github.repository_owner }}-${{ github.ref_name }}-ubuntu-jammy-${{ matrix.compiler }}${TAG} --build-jobs 2 @@ -174,21 +127,18 @@ jobs: -DCMAKE_INSTALL_PREFIX=/opt/rocprofiler-systems-dev -DROCPROFSYS_BUILD_TESTING=ON -DROCPROFSYS_USE_MPI=${{ matrix.mpi }} - -DROCPROFSYS_USE_ROCM=${{ matrix.hip }} + -DROCPROFSYS_USE_ROCM=${{ matrix.rocm }} -DROCPROFSYS_USE_OMPT=${{ matrix.ompt }} -DROCPROFSYS_USE_PAPI=${{ matrix.papi }} -DROCPROFSYS_USE_PYTHON=${{ matrix.python }} -DROCPROFSYS_USE_MPI_HEADERS=${{ matrix.mpi-headers }} - -DROCPROFSYS_BUILD_LTO=${{ matrix.lto }} -DROCPROFSYS_BUILD_DYNINST=${{ matrix.build-dyninst }} -DROCPROFSYS_BUILD_HIDDEN_VISIBILITY=${{ matrix.hidden }} - -DROCPROFSYS_BUILD_STATIC_LIBGCC=${{ matrix.static-libgcc }} - -DROCPROFSYS_BUILD_STATIC_LIBSTDCXX=${{ matrix.static-libstdcxx }} -DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs -DROCPROFSYS_PYTHON_ENVS="py3.7;py3.8;py3.9;py3.10;py3.11" -DROCPROFSYS_STRIP_LIBRARIES=${{ matrix.strip }} -DROCPROFSYS_MAX_THREADS=64 - -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl" + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;openmp-target" -DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }} -DUSE_CLANG_OMP=OFF -- @@ -242,3 +192,180 @@ jobs: build/rocprofsys-tests-config/*.cfg build/rocprofsys-tests-output/**/*.txt build/rocprofsys-tests-output/**/*-instr*.json + + ubuntu-jammy-external-rocm: + runs-on: ubuntu-latest + container: + image: dgaliffiamd/rocprofiler-systems:ci-base-ubuntu-22.04 + strategy: + fail-fast: false + matrix: + compiler: ['g++'] + rocm: ['ON'] + mpi: ['OFF'] + ompt: ['OFF'] + papi: ['OFF'] + python: ['ON'] + strip: ['OFF'] + hidden: ['ON'] + build-type: ['Release'] + mpi-headers: ['OFF'] + build-dyninst: ['OFF'] + rocm-version: ['6.3', '6.4'] + + env: + OMPI_ALLOW_RUN_AS_ROOT: 1 + OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1 + ROCPROFSYS_CI: 'ON' + + steps: + - uses: actions/checkout@v4 + + - name: Install Packages + timeout-minutes: 25 + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 30 + timeout_minutes: 25 + max_attempts: 5 + command: | + apt-get update && + apt-get install -y software-properties-common && + apt-get upgrade -y && + apt-get install -y autoconf bison build-essential clang environment-modules \ + gettext libfabric-dev libiberty-dev libomp-dev libopenmpi-dev libtool m4 \ + openmpi-bin python3-pip texinfo ${{ matrix.compiler }} && + python3 -m pip install --upgrade pip && + python3 -m pip install --upgrade numpy perfetto dataclasses && + python3 -m pip install 'cmake==3.21' && + for i in 6 7 8 9 10 11; do /opt/conda/envs/py3.${i}/bin/python -m pip install --upgrade numpy perfetto dataclasses; done + + - name: Install ROCm Packages + timeout-minutes: 25 + uses: nick-fields/retry@v3 + with: + retry_wait_seconds: 30 + timeout_minutes: 25 + max_attempts: 5 + shell: bash + command: | + ROCM_VERSION=${{ matrix.rocm-version }} + ROCM_MAJOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $1}') + ROCM_MINOR=$(echo ${ROCM_VERSION} | sed 's/\./ /g' | awk '{print $2}') + ROCM_VERSN=$(( (${ROCM_MAJOR}*10000)+(${ROCM_MINOR}*100) )) + echo "ROCM_MAJOR=${ROCM_MAJOR} ROCM_MINOR=${ROCM_MINOR} ROCM_VERSN=${ROCM_VERSN}" + wget -q https://repo.radeon.com/amdgpu-install/${{ matrix.rocm-version }}/ubuntu/jammy/amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb + apt-get install -y ./amdgpu-install_${ROCM_MAJOR}.${ROCM_MINOR}.${ROCM_VERSN}-1_all.deb + apt-get update + apt-get install -y rocm-dev rocdecode-dev libavformat-dev libavcodec-dev + echo "/opt/rocm/bin" >> $GITHUB_PATH + echo "ROCM_PATH=/opt/rocm" >> $GITHUB_ENV + echo "LD_LIBRARY_PATH=/opt/rocm/lib:${LD_LIBRARY_PATH}" >> $GITHUB_ENV + /opt/rocm/bin/hipcc -O3 -c ./examples/transpose/transpose.cpp -o /tmp/transpose.o + + - name: Test Environment Modules + timeout-minutes: 15 + shell: bash + run: | + set -v + source /usr/share/modules/init/$(basename ${SHELL}) + module avail + + - name: Configure Env + run: | + echo "CC=$(echo '${{ matrix.compiler }}' | sed 's/+/c/g')" >> $GITHUB_ENV + echo "CXX=${{ matrix.compiler }}" >> $GITHUB_ENV + + - name: Configure, Build, and Test + timeout-minutes: 115 + shell: bash + run: + git config --global --add safe.directory ${PWD} && + cmake --version && + TAG="" && + append-tagname() { if [ "${1}" == "ON" ]; then TAG="${TAG}-${2}"; fi; } && + append-tagname ${{ matrix.rocm }} rocm-${{ matrix.rocm-version }} && + append-tagname ${{ matrix.mpi }} mpi && + append-tagname ${{ matrix.ompt }} ompt && + append-tagname ${{ matrix.papi }} papi && + append-tagname ${{ matrix.python }} python && + append-tagname ${{ matrix.mpi-headers }} mpip && + append-tagname ${{ matrix.build-dyninst }} internal-dyninst && + append-tagname ${{ matrix.strip }} strip && + append-tagname ${{ matrix.hidden }} hidden-viz && + python3 ./scripts/run-ci.py -B build + --name ${{ github.repository_owner }}-${{ github.ref_name }}-ubuntu-jammy-${{ matrix.compiler }}${TAG} + --build-jobs 2 + --site GitHub + -- + -DCMAKE_C_COMPILER=$(echo '${{ matrix.compiler }}' | sed 's/+/c/g') + -DCMAKE_CXX_COMPILER=${{ matrix.compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} + -DCMAKE_INSTALL_PREFIX=/opt/rocprofiler-systems-dev + -DROCPROFSYS_BUILD_TESTING=ON + -DROCPROFSYS_USE_MPI=${{ matrix.mpi }} + -DROCPROFSYS_USE_ROCM=${{ matrix.rocm }} + -DROCPROFSYS_USE_OMPT=${{ matrix.ompt }} + -DROCPROFSYS_USE_PAPI=${{ matrix.papi }} + -DROCPROFSYS_USE_PYTHON=${{ matrix.python }} + -DROCPROFSYS_USE_MPI_HEADERS=${{ matrix.mpi-headers }} + -DROCPROFSYS_BUILD_DYNINST=${{ matrix.build-dyninst }} + -DROCPROFSYS_BUILD_HIDDEN_VISIBILITY=${{ matrix.hidden }} + -DROCPROFSYS_PYTHON_PREFIX=/opt/conda/envs + -DROCPROFSYS_PYTHON_ENVS="py3.7;py3.8;py3.9;py3.10;py3.11" + -DROCPROFSYS_STRIP_LIBRARIES=${{ matrix.strip }} + -DROCPROFSYS_MAX_THREADS=64 + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;openmp-target" + -DROCPROFSYS_BUILD_NUMBER=${{ github.run_attempt }} + -DUSE_CLANG_OMP=OFF + -- + -LE "transpose|rccl|videodecode|jpegdecode|network" + + - name: Install + timeout-minutes: 10 + run: + cmake --build build --target install --parallel 2 + + - name: CPack and Install + run: | + cd build + cpack -G STGZ + mkdir -p /opt/rocprofiler-systems + ./rocprofiler-systems-*.sh --prefix=/opt/rocprofiler-systems --exclude-subdir --skip-license + + - name: Test Install with Modulefile + timeout-minutes: 15 + shell: bash + run: | + set -v + source /usr/share/modules/init/$(basename ${SHELL}) + module use /opt/rocprofiler-systems/share/modulefiles + module avail + module load rocprofiler-systems + ./scripts/test-install.sh --test-rocprof-sys-{instrument,avail,sample,python,rewrite,runtime}=1 + + - name: Test User API + timeout-minutes: 10 + run: | + set -v + ./scripts/test-find-package.sh --install-dir /opt/rocprofiler-systems + + - name: CTest Artifacts + if: failure() + continue-on-error: True + uses: actions/upload-artifact@v4 + with: + name: ctest-${{ github.job }}-${{ strategy.job-index }}-log + path: | + build/*.log + + - name: Data Artifacts + if: failure() + continue-on-error: True + uses: actions/upload-artifact@v4 + with: + name: data-${{ github.job }}-${{ strategy.job-index }}-files + path: | + build/rocprofsys-tests-config/*.cfg + build/rocprofsys-tests-output/**/*.txt + build/rocprofsys-tests-output/**/*-instr*.json \ No newline at end of file diff --git a/.github/workflows/ubuntu-noble.yml b/.github/workflows/ubuntu-noble.yml index d404b550f6..9c33d93da4 100644 --- a/.github/workflows/ubuntu-noble.yml +++ b/.github/workflows/ubuntu-noble.yml @@ -51,7 +51,7 @@ jobs: build-type: ['Release', 'Debug'] strip: ['OFF'] build-dyninst: ['OFF'] - rocm-version: ['0.0', '6.3'] + rocm-version: ['0.0','6.3','6.4'] env: ROCPROFSYS_CI: 'ON' @@ -102,7 +102,7 @@ jobs: -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} \ -DCMAKE_INSTALL_PREFIX=/opt/rocprofiler-systems \ -DROCPROFSYS_BUILD_TESTING=ON \ - -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl" \ + -DROCPROFSYS_DISABLE_EXAMPLES="transpose;rccl;openmp-target" \ -DROCPROFSYS_USE_ROCM=${USE_ROCM} \ -DRCOPROFSYS_USE_PYTHON=ON \ -DROCPROFSYS_STRIP_LIBRARIES=${{ matrix.strip }} \ diff --git a/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp b/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp index 0ea3b12d6b..78f0f29bd1 100644 --- a/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp +++ b/source/lib/rocprof-sys/library/rocprofiler-sdk.cpp @@ -508,13 +508,15 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, user_data, ts); break; } -#if(ROCPROFILER_VERSION >= 700) +#if(ROCPROFILER_VERSION >= 600) case ROCPROFILER_CALLBACK_TRACING_ROCDECODE_API: { tool_tracing_callback_start(category::rocm_rocdecode_api{}, record, user_data, ts); break; } +#endif +#if(ROCPROFILER_VERSION >= 700) case ROCPROFILER_CALLBACK_TRACING_ROCJPEG_API: { tool_tracing_callback_start(category::rocm_rocjpeg_api{}, record, @@ -531,6 +533,11 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, case ROCPROFILER_CALLBACK_TRACING_KERNEL_DISPATCH: case ROCPROFILER_CALLBACK_TRACING_MEMORY_COPY: case ROCPROFILER_CALLBACK_TRACING_RCCL_API: +#if(ROCPROFILER_VERSION >= 600) + case ROCPROFILER_CALLBACK_TRACING_OMPT: + case ROCPROFILER_CALLBACK_TRACING_MEMORY_ALLOCATION: + case ROCPROFILER_CALLBACK_TRACING_RUNTIME_INITIALIZATION: +#endif { ROCPROFSYS_CI_ABORT(true, "unhandled callback record kind: %i\n", record.kind); @@ -592,13 +599,15 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, ts, _bt_data); break; } -#if(ROCPROFILER_VERSION >= 700) +#if(ROCPROFILER_VERSION >= 600) case ROCPROFILER_CALLBACK_TRACING_ROCDECODE_API: { tool_tracing_callback_stop(category::rocm_rocdecode_api{}, record, user_data, ts, _bt_data); break; } +#endif +#if(ROCPROFILER_VERSION >= 700) case ROCPROFILER_CALLBACK_TRACING_ROCJPEG_API: { tool_tracing_callback_stop(category::rocm_rocjpeg_api{}, record, @@ -615,6 +624,11 @@ tool_tracing_callback(rocprofiler_callback_tracing_record_t record, case ROCPROFILER_CALLBACK_TRACING_KERNEL_DISPATCH: case ROCPROFILER_CALLBACK_TRACING_MEMORY_COPY: case ROCPROFILER_CALLBACK_TRACING_RCCL_API: +#if(ROCPROFILER_VERSION >= 600) + case ROCPROFILER_CALLBACK_TRACING_OMPT: + case ROCPROFILER_CALLBACK_TRACING_MEMORY_ALLOCATION: + case ROCPROFILER_CALLBACK_TRACING_RUNTIME_INITIALIZATION: +#endif { ROCPROFSYS_CI_ABORT(true, "unhandled callback record kind: %i\n", record.kind);