diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a8c8581dbb..584e994035 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -3,8 +3,16 @@ name: CMake on: push: branches: [ "amd-staging" ] + paths-ignore: + - '.github/workflows/pull_*.yml' pull_request: branches: [ "amd-staging" ] + paths-ignore: + - '.github/workflows/pull_*.yml' + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true env: # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index 73d6b3c5f3..fbed48e095 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -5,6 +5,8 @@ run-name: formatting on: pull_request: branches: [ amd-staging ] + paths-ignore: + - '.github/workflows/pull_*.yml' concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/pull_from_gerrit.yml b/.github/workflows/pull_from_gerrit.yml new file mode 100644 index 0000000000..0b2d003655 --- /dev/null +++ b/.github/workflows/pull_from_gerrit.yml @@ -0,0 +1,26 @@ +name: "Pull from Gerrit" + +on: + # allow triggering manually + workflow_dispatch: + schedule: + - cron: "0 */23 * * *" + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +jobs: + pull: + runs-on: navi32 + steps: + - name: Pull from Gerrit to gerrit-amd-staging branch + run: | + cd ${{github.workspace}} + git config --global --add safe.directory ${{github.workspace}} + git remote add gerrit ssh://aelwazir@gerrit-git.amd.com:29418/compute/ec/rocprofiler + git fetch --all + git checkout gerrit/amd-staging + git checkout -b gerrit-amd-staging + git push origin gerrit-amd-staging + git checkout amd-staging diff --git a/.github/workflows/pull_latest_dockers.yml b/.github/workflows/pull_latest_dockers.yml index 6944ecb0e0..5540a70ff7 100644 --- a/.github/workflows/pull_latest_dockers.yml +++ b/.github/workflows/pull_latest_dockers.yml @@ -1,137 +1,38 @@ name: Get Latest Dockers on: + # allow triggering manually + workflow_dispatch: + # run when updated + push: + branches: '*' + paths: + - '.github/workflows/pull_latest_dockers.yml' + # run when updated schedule: - - cron: "* */23 * * *" + - cron: "0 */23 * * *" + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: - getting_latest_docker_mi200: - runs-on: mi200 + update-runner-mainline: + + strategy: + fail-fast: false + matrix: + runner: ['mi200', 'mi100', 'vega20', 'navi32'] + os: ['ubuntu-22.04', 'ubuntu-20.04', 'sles', 'rhel-9.x', 'rhel-8.x'] + + runs-on: ${{ matrix.runner }} steps: - - uses: actions/checkout@v3 - - name: pull_the_latest_images + - name: pull-image run: | - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 + docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-${{ matrix.os }}-stg1 - - name: tag_the_latest_docker + - name: tag-image run: | - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 localhost:5000/mainline-sles-stg1:latest - docker push localhost:5000/mainline-sles-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 localhost:5000/mainline-rhel-9.x-stg1:latest - docker push localhost:5000/mainline-rhel-9.x-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 localhost:5000/mainline-rhel-8.x-stg1:latest - docker push localhost:5000/mainline-rhel-8.x-stg1:latest - - getting_latest_docker_mi100: - runs-on: mi100 - - steps: - - uses: actions/checkout@v3 - - name: pull_the_latest_images - run: | - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 - - - name: tag_the_latest_docker - run: | - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 localhost:5000/mainline-sles-stg1:latest - docker push localhost:5000/mainline-sles-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 localhost:5000/mainline-rhel-9.x-stg1:latest - docker push localhost:5000/mainline-rhel-9.x-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 localhost:5000/mainline-rhel-8.x-stg1:latest - docker push localhost:5000/mainline-rhel-8.x-stg1:latest - - getting_latest_docker_vega20: - runs-on: vega20 - - steps: - - uses: actions/checkout@v3 - - name: pull_the_latest_images - run: | - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 - - - name: tag_the_latest_docker - run: | - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 localhost:5000/mainline-sles-stg1:latest - docker push localhost:5000/mainline-sles-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 localhost:5000/mainline-rhel-9.x-stg1:latest - docker push localhost:5000/mainline-rhel-9.x-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 localhost:5000/mainline-rhel-8.x-stg1:latest - docker push localhost:5000/mainline-rhel-8.x-stg1:latest - - - getting_latest_docker_navi32: - runs-on: navi32 - - steps: - - uses: actions/checkout@v3 - - name: pull_the_latest_images - run: | - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 - docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 - - - name: tag_the_latest_docker - run: | - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-22.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker push localhost:5000/mainline-ubuntu-20.04-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 localhost:5000/mainline-sles-stg1:latest - docker push localhost:5000/mainline-sles-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 localhost:5000/mainline-rhel-9.x-stg1:latest - docker push localhost:5000/mainline-rhel-9.x-stg1:latest - docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 localhost:5000/mainline-rhel-8.x-stg1:latest - docker push localhost:5000/mainline-rhel-8.x-stg1:latest - - # getting_latest_docker_navi21: - # runs-on: navi21 - - # steps: - # - uses: actions/checkout@v3 - # - name: pull_the_latest_images - # run: | - # docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 - # docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 - # docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 - # docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 - # docker pull compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 - - # - name: tag_the_latest_docker - # run: | - # docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-22.04-stg1 localhost:5000/mainline-ubuntu-22.04-stg1:latest - # docker push localhost:5000/mainline-ubuntu-22.04-stg1:latest - # docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-ubuntu-20.04-stg1 localhost:5000/mainline-ubuntu-20.04-stg1:latest - # docker push localhost:5000/mainline-ubuntu-20.04-stg1:latest - # docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-sles-stg1 localhost:5000/mainline-sles-stg1:latest - # docker push localhost:5000/mainline-sles-stg1:latest - # docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-9.x-stg1 localhost:5000/mainline-rhel-9.x-stg1:latest - # docker push localhost:5000/mainline-rhel-9.x-stg1:latest - # docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-rhel-8.x-stg1 localhost:5000/mainline-rhel-8.x-stg1:latest - # docker push localhost:5000/mainline-rhel-8.x-stg1:latest + docker tag compute-artifactory.amd.com:5000/rocm-plus-docker/compute-rocm-dkms-no-npi-hipclang:$(wget -qO- "http://rocm-ci.amd.com/job/compute-rocm-dkms-no-npi-hipclang/lastSuccessfulBuild/buildNumber")-${{ matrix.os }}-stg1 localhost:5000/mainline-${{ matrix.os }}-stg1:latest + docker push localhost:5000/mainline-${{ matrix.os }}-stg1:latest diff --git a/CMakeLists.txt b/CMakeLists.txt index 3201ea0368..c8f5da723e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,9 +84,8 @@ set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(LIB_DIR "${ROOT_DIR}/src") set(TEST_DIR "${ROOT_DIR}/test") -# To set additional RUNPATH in libraries -# installed in /opt/rocm-ver/lib/roctracer -set(ROCM_APPEND_PRIVLIB_RPATH "$ORIGIN/..") +# To set additional RUNPATH in libraries installed in /opt/rocm-ver/lib/roctracer +set(ROCM_APPEND_PRIVLIB_RPATH "\$ORIGIN/..") find_package( amd_comgr REQUIRED CONFIG @@ -237,6 +236,24 @@ install( DESTINATION ${CMAKE_INSTALL_LIBDIR}/${ROCPROFILER_NAME} COMPONENT runtime) +# librocprof-tool.so +install( + FILES ${PROJECT_BINARY_DIR}/test/librocprof-tool.so + DESTINATION ${CMAKE_INSTALL_LIBDIR}/${ROCPROFILER_NAME} + COMPONENT runtime) + +install( + FILES ${PROJECT_BINARY_DIR}/test/librocprof-tool.so + DESTINATION ${CMAKE_INSTALL_LIBDIR}/${ROCPROFILER_NAME} + COMPONENT asan) + +install( + FILES ${PROJECT_BINARY_DIR}/test/rocprof-ctrl + DESTINATION ${CMAKE_INSTALL_LIBDIR}/${ROCPROFILER_NAME} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ + WORLD_EXECUTE + COMPONENT runtime) + # File reorg backward compatibility for non ASAN packaging if(NOT ENABLE_ASAN_PACKAGING) # File reorg Backward compatibility diff --git a/src/core/hsa/queues/queue.cpp b/src/core/hsa/queues/queue.cpp index 10d4f3da0e..c173dcab16 100644 --- a/src/core/hsa/queues/queue.cpp +++ b/src/core/hsa/queues/queue.cpp @@ -348,14 +348,14 @@ void AddAttRecord(rocprofiler_record_att_tracer_t* record, hsa_agent_t gpu_agent att_pending_signal_t& pending) { Agent::AgentInfo agent_info = hsa_support::GetAgentInfo(gpu_agent.handle); att_trace_callback_data_t data; - hsa_status_t status = hsa_ven_amd_aqlprofile_iterate_data(pending.profile, attTraceDataCallback, &data); + hsa_status_t status = + hsa_ven_amd_aqlprofile_iterate_data(pending.profile, attTraceDataCallback, &data); if ((status & HSA_STATUS_ERROR_OUT_OF_RESOURCES) == HSA_STATUS_ERROR_OUT_OF_RESOURCES) rocprofiler::warning("Warning: ATT buffer full!\n"); if ((status & HSA_STATUS_ERROR_EXCEPTION) == HSA_STATUS_ERROR_EXCEPTION) rocprofiler::warning("Warning: ATT received a UTC memory error!\n"); - if (status == HSA_STATUS_ERROR) - fatal("Thread Trace Error!"); + if (status == HSA_STATUS_ERROR) fatal("Thread Trace Error!"); // Allocate memory for shader_engine_data record->shader_engine_data = static_cast( @@ -758,12 +758,11 @@ hsa_ven_amd_aqlprofile_profile_t* ProcessATTParams(Packet::packet_t& start_packe base->GetCounters(counters); hsa_ven_amd_aqlprofile_event_t event = counters[0]->event; if (event.block_name != HSA_VEN_AMD_AQLPROFILE_BLOCK_NAME_SQ) - rocprofiler::fatal("Only events from the SQ block can be selected for ATT.\n"); + rocprofiler::fatal("Only events from the SQ block can be selected for ATT.\n"); - att_params.push_back({ - static_cast(int(ROCPROFILER_ATT_PERFCOUNTER)), - event.counter_id | (event.counter_id ? (0xF << 24) : 0) - }); + att_params.push_back( + {static_cast(int(ROCPROFILER_ATT_PERFCOUNTER)), + event.counter_id | (event.counter_id ? (0xF << 24) : 0)}); num_att_counters += 1; } diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index ceb3a43bc0..92f952604d 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -70,9 +70,9 @@ add_subdirectory(rocsys) add_subdirectory(rocprofv2) add_executable(ctrl ctrl.cpp) -set_target_properties(ctrl PROPERTIES RUNTIME_OUTPUT_DIRECTORY - ${CMAKE_BINARY_DIR}/libexec/rocprofiler - INSTALL_RPATH "$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") +set_target_properties( + ctrl PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/rocprofiler + INSTALL_RPATH "$ORIGIN/../../${CMAKE_INSTALL_LIBDIR}") target_link_options( rocprofiler_tool PRIVATE -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap -Wl,--no-undefined) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8f0094e957..8473a4215c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -178,8 +178,7 @@ install( # Building ctrl test executable add_executable(${EXE_NAME} ${CTRL_SRC} ${UTIL_SRC} ${KERN_SRC}) -set_target_properties( ${EXE_NAME} PROPERTIES - INSTALL_RPATH "${ROCM_APPEND_PRIVLIB_RPATH}") +set_target_properties(${EXE_NAME} PROPERTIES INSTALL_RPATH "${ROCM_APPEND_PRIVLIB_RPATH}") target_include_directories(${EXE_NAME} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${PROJECT_SOURCE_DIR}/include) target_link_libraries(${EXE_NAME} hsa-runtime64::hsa-runtime64 hsakmt::hsakmt @@ -201,8 +200,7 @@ install( set(TEST_LIB "rocprof-tool") set(TEST_LIB_SRC ${TEST_DIR}/tool/tool.cpp ${UTIL_SRC}) add_library(${TEST_LIB} SHARED ${TEST_LIB_SRC}) -set_target_properties( ${TEST_LIB} PROPERTIES - INSTALL_RPATH "${ROCM_APPEND_PRIVLIB_RPATH}") +set_target_properties(${TEST_LIB} PROPERTIES INSTALL_RPATH "${ROCM_APPEND_PRIVLIB_RPATH}") target_include_directories(${TEST_LIB} PRIVATE ${TEST_DIR} ${ROOT_DIR} ${PROJECT_SOURCE_DIR}/include) target_link_libraries(${TEST_LIB} ${ROCPROFILER_TARGET} hsa-runtime64::hsa-runtime64 diff --git a/test/ctrl/test_hsa.cpp b/test/ctrl/test_hsa.cpp index 97feb3b097..6383f20aef 100644 --- a/test/ctrl/test_hsa.cpp +++ b/test/ctrl/test_hsa.cpp @@ -226,7 +226,7 @@ bool TestHsa::Run() { // Wait on the dispatch signal until the kernel is finished. // Update wait condition to HSA_WAIT_STATE_ACTIVE for Polling if (hsa_signal_wait_relaxed(hsa_signal_, HSA_SIGNAL_CONDITION_LT, 1, UINT64_MAX, - HSA_WAIT_STATE_BLOCKED) != 0) { + HSA_WAIT_STATE_BLOCKED) != 0) { TEST_ASSERT("signal_wait failed"); }