Skip to content

Commit

Permalink
Merging From Github
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit 7ab6644fd04db189801f6cee70a09bb621070b60
Author: Ammar ELWazir <[email protected]>
Date:   Sat Jul 15 00:47:30 2023 -0500

    Gerrit amd staging (#49)

    * removing README from tests diretory

    Change-Id: Id1162dbbe911e24f02d1bf42dafc93a9a934f71f

    * Fixing navi v1 test hang

    Change-Id: I7416170c126a2d3ec564ed27111f1befc3778b4a

    - Added all gpu targets in build script.
    - Changed memory order to relaxed seem to work for navi hang
    - need to set power state for consistent results

    Change-Id: I7416170c126a2d3ec564ed27111f1befc3778b4a

    * Pull from Github

    Squashed commit of the following:

    commit ac49fdd92a72e9c99394253a02da413a6c2e3b3a
    Merge: a07946a 03a0855
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 11:36:24 2023 -0500

        Merge pull request #2 from ROCm-Developer-Tools/gerrit-amd-staging

        Pull from gerrit

    commit 03a085588cffe863e8f466de67be1cfb205b675a
    Merge: e88cad2 a07946a
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 10:57:30 2023 -0500

        Merge branch 'amd-staging' into gerrit-amd-staging

    commit a07946a5cd4c670c83c27ad1a076a9d4567ce6d7
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 15:46:04 2023 +0000

        Enabling Cached Builds

    commit 525e494a7f13941077a8fd4ad6840904db4d27d4
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 04:53:54 2023 +0000

        Updating missed GPU Targets

    commit 42c75862f628c9bee7cfb7dc04dff2619430efbc
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 04:43:02 2023 +0000

        Adding V1 Testing

    commit 9d72fd4aee85e4b0c12e717060d2730fa5b73be1
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:34:31 2023 +0000

        Fixing Artifacts directory path

    commit f4000cc558b3b2e4676f7994f7ce8c8e6f94518e
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:27:26 2023 +0000

        Fixing CMake for test build job

    commit 2ce8115d4c33948c3c8f957f545a95a04e1d6cd2
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:16:18 2023 +0000

        Fixing Ubuntu CMake for ubuntu test build

    commit 6d0ed439191be900748d0c025157f9d689a73ec7
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 01:28:41 2023 +0000

        Removing Navi21

    commit e349a7642e5ae5eb03ab9fcd0a0f74f09f78cab5
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 01:14:14 2023 +0000

        Removing Navi21

    commit fefd02fe68d2a4bca7ec2e381960ad004ee9fc5b
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:42:48 2023 +0000

        Fixing CMake Job

    commit 2ea46abf7bf92643efa8c549fa70346ffbd79d65
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:35:13 2023 +0000

        Fixing CMake Job

    commit d99d681ed1999c5fcf291dc678b11a77205fb0f3
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:32:13 2023 +0000

        Fixing Pull Latest Dockers and CMake Jobs

    commit dfc4498072d13b4a1df3a63047d34c682c3d9a29
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 23:54:21 2023 +0000

        Fixing CMake job

    commit 919efe04de707f7c702031be15c3e2c5f8442cbb
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 23:52:13 2023 +0000

        Adding Pull Last dockers job

    commit be1b1256e8b0e05308e8f7e7e69bee3acca55281
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:25:40 2023 -0500

        Update cmake.yml

    commit 212299fa4355ae6ec18f9aaacbb79c51ea6c6f97
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:23:35 2023 -0500

        Update cmake.yml

    commit 7c2c1327086a61466cc6cac39f70865c051a8bc7
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:18:53 2023 -0500

        Update cmake.yml

    commit 191b5ce007e612e814c1d7a3afb4ad398f3852e1
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:03:22 2023 -0500

        Update cmake.yml

    commit 8824113d95f3e13c7ce4d0af8e0d9d8f522a6c4a
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:28:09 2023 +0000

        Fixing Pull from Gerrit job name

        Change-Id: I9e7ed9a27a13ca49d62c93bdadb30f0057e4d385

    commit cc3d5e4b02ffb439e8cc2b3efa53527c376f9982
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:21:43 2023 +0000

        Adding Staging sync job

        Change-Id: I0551f43878b0678ce4b3e74e27d62357cf95ad95

    commit b9be2eee71380a2e6dd34d520e92d0c4209277a0
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 15:57:11 2023 +0000

        Fixing build.sh

        Change-Id: Ia987b0244f0875370d5fe69907b3f5e9cea914de

    commit 9eee33a95a1abd656a7ac5ca10a9f245e9825431
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:39:46 2023 -0500

        Update cmake.yml

    commit 7093b85a78497140e8b52632ca2a002bdaeacd62
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:33:29 2023 -0500

        Update cmake.yml

    commit f54697172c72a67740f9fdfa0c217b6ea6931576
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:01:26 2023 -0500

        Update cmake.yml

    commit 1b6620e16f8940386b0f4f04e69e2410d21c0e26
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 20:21:02 2023 -0500

        Update cmake.yml

    commit a94bec740c6b42c4b79c87bca20fa87b99bf060d
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:46:35 2023 -0500

        Update cmake.yml

    commit 85d6b29d4375a69d575c18ece8542c50f2ddfcc3
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:34:39 2023 -0500

        Update cmake.yml

    commit 8c004887cf1435f1a6214c3d2455299a8a27bd4c
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:31:17 2023 -0500

        Update cmake.yml

    commit a14a9168e17d9348a53c6e9c9a47ba1edb4c4509
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:25:46 2023 -0500

        Update cmake.yml

    commit 000f2f40b84e6a2f7d4becdbf5aed01436ca4c83
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:08:18 2023 -0500

        Update cmake.yml

    commit a28a53d56731cad848fa9133d1c4dbaa8fc7afa7
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:03:39 2023 -0500

        Update cmake.yml

    commit a6a2db01027f0b01fdfbb5997ddb772c7f51b649
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 18:21:53 2023 -0500

        Update cmake.yml

    commit 118ef2a88b2d44e3207c31c343da3e5e5ec6f176
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 17:55:57 2023 -0500

        Update cmake.yml

    commit 03c4c232396440cd0be6d2dd7baf4ceea1c2589d
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 17:48:49 2023 -0500

        Create cmake.yml

    Change-Id: I2223efd600dcd8a4f695e61491b94b7f12ae2c5b

    * SWDEV-409195: Added instructions for ATT help.

    Change-Id: Ie76518dd54c3de82abfbd64b5e8c44a43edc8a09

    * Pull from Github

    Squashed commit of the following:

    commit f029195705a15700380c6f832ba5d15d46fd6de7
    Author: Jonathan R. Madsen <[email protected]>
    Date:   Thu Jul 13 14:38:56 2023 -0500

        Formatting workflows for source (clang-format) and cmake (cmake-format) (#4)

        * Add .cmake-format.yaml file

        * Add formatting workflow

        * provide base input for creating PR

        * Update scheme for extracting branch name

        - disable running formatting on push to amd-staging branch

        * patch .cmake-format.yaml for find_package signature

        - apparently cmake-format doesn't format the full signature of find_package

        * run formatting (clang-format v11) (#7)

        Co-authored-by: jrmadsen <[email protected]>

        * run cmake formatting (cmake-format) (#6)

        Co-authored-by: jrmadsen <[email protected]>

        ---------

        Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

    commit bc4d135fdd8a1a9e51235f18a5d575fd2b3735e6
    Author: Ammar ELWazir <[email protected]>
    Date:   Thu Jul 13 12:55:17 2023 -0500

        Removing Build cache for potential issues with auto-generated header files (#5)

        Change-Id: I9e2319f4335e2f88585ffa6fac2bd88a1c952e6e

    commit ce86dea6a311d44d880fa684eb78f3329295e2a4
    Author: Jonathan R. Madsen <[email protected]>
    Date:   Thu Jul 13 11:08:58 2023 -0500

        Fix decltype(<hsa-function>) function pointer usage (#3)

        - the following is done in several places:
            decltype(hsa_memory_allocate)* hsa_memory_allocate
        - above can cause compiler errors
        - replace decltype(<hsa-function>) with decltype(::<hsa-function>)
          - this ensures that the type within the decltype is recognized as the global scope HSA function, not the variable
        - in many places, the variable has a "_fn" suffix to prevent this issue but added '::' anyway for consistency

    commit ac49fdd92a72e9c99394253a02da413a6c2e3b3a
    Merge: a07946a 03a0855
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 11:36:24 2023 -0500

        Merge pull request #2 from ROCm-Developer-Tools/gerrit-amd-staging

        Pull from gerrit

    commit 03a085588cffe863e8f466de67be1cfb205b675a
    Merge: e88cad2 a07946a
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 10:57:30 2023 -0500

        Merge branch 'amd-staging' into gerrit-amd-staging

    commit a07946a5cd4c670c83c27ad1a076a9d4567ce6d7
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 15:46:04 2023 +0000

        Enabling Cached Builds

    commit 525e494a7f13941077a8fd4ad6840904db4d27d4
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 04:53:54 2023 +0000

        Updating missed GPU Targets

    commit 42c75862f628c9bee7cfb7dc04dff2619430efbc
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 04:43:02 2023 +0000

        Adding V1 Testing

    commit 9d72fd4aee85e4b0c12e717060d2730fa5b73be1
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:34:31 2023 +0000

        Fixing Artifacts directory path

    commit f4000cc558b3b2e4676f7994f7ce8c8e6f94518e
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:27:26 2023 +0000

        Fixing CMake for test build job

    commit 2ce8115d4c33948c3c8f957f545a95a04e1d6cd2
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:16:18 2023 +0000

        Fixing Ubuntu CMake for ubuntu test build

    commit 6d0ed439191be900748d0c025157f9d689a73ec7
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 01:28:41 2023 +0000

        Removing Navi21

    commit e349a7642e5ae5eb03ab9fcd0a0f74f09f78cab5
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 01:14:14 2023 +0000

        Removing Navi21

    commit fefd02fe68d2a4bca7ec2e381960ad004ee9fc5b
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:42:48 2023 +0000

        Fixing CMake Job

    commit 2ea46abf7bf92643efa8c549fa70346ffbd79d65
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:35:13 2023 +0000

        Fixing CMake Job

    commit d99d681ed1999c5fcf291dc678b11a77205fb0f3
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:32:13 2023 +0000

        Fixing Pull Latest Dockers and CMake Jobs

    commit dfc4498072d13b4a1df3a63047d34c682c3d9a29
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 23:54:21 2023 +0000

        Fixing CMake job

    commit 919efe04de707f7c702031be15c3e2c5f8442cbb
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 23:52:13 2023 +0000

        Adding Pull Last dockers job

    commit be1b1256e8b0e05308e8f7e7e69bee3acca55281
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:25:40 2023 -0500

        Update cmake.yml

    commit 212299fa4355ae6ec18f9aaacbb79c51ea6c6f97
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:23:35 2023 -0500

        Update cmake.yml

    commit 7c2c1327086a61466cc6cac39f70865c051a8bc7
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:18:53 2023 -0500

        Update cmake.yml

    commit 191b5ce007e612e814c1d7a3afb4ad398f3852e1
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:03:22 2023 -0500

        Update cmake.yml

    commit 8824113d95f3e13c7ce4d0af8e0d9d8f522a6c4a
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:28:09 2023 +0000

        Fixing Pull from Gerrit job name

        Change-Id: I9e7ed9a27a13ca49d62c93bdadb30f0057e4d385

    commit cc3d5e4b02ffb439e8cc2b3efa53527c376f9982
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:21:43 2023 +0000

        Adding Staging sync job

        Change-Id: I0551f43878b0678ce4b3e74e27d62357cf95ad95

    commit b9be2eee71380a2e6dd34d520e92d0c4209277a0
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 15:57:11 2023 +0000

        Fixing build.sh

        Change-Id: Ia987b0244f0875370d5fe69907b3f5e9cea914de

    commit 9eee33a95a1abd656a7ac5ca10a9f245e9825431
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:39:46 2023 -0500

        Update cmake.yml

    commit 7093b85a78497140e8b52632ca2a002bdaeacd62
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:33:29 2023 -0500

        Update cmake.yml

    commit f54697172c72a67740f9fdfa0c217b6ea6931576
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:01:26 2023 -0500

        Update cmake.yml

    commit 1b6620e16f8940386b0f4f04e69e2410d21c0e26
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 20:21:02 2023 -0500

        Update cmake.yml

    commit a94bec740c6b42c4b79c87bca20fa87b99bf060d
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:46:35 2023 -0500

        Update cmake.yml

    commit 85d6b29d4375a69d575c18ece8542c50f2ddfcc3
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:34:39 2023 -0500

        Update cmake.yml

    commit 8c004887cf1435f1a6214c3d2455299a8a27bd4c
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:31:17 2023 -0500

        Update cmake.yml

    commit a14a9168e17d9348a53c6e9c9a47ba1edb4c4509
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:25:46 2023 -0500

        Update cmake.yml

    commit 000f2f40b84e6a2f7d4becdbf5aed01436ca4c83
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:08:18 2023 -0500

        Update cmake.yml

    commit a28a53d56731cad848fa9133d1c4dbaa8fc7afa7
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:03:39 2023 -0500

        Update cmake.yml

    commit a6a2db01027f0b01fdfbb5997ddb772c7f51b649
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 18:21:53 2023 -0500

        Update cmake.yml

    commit 118ef2a88b2d44e3207c31c343da3e5e5ec6f176
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 17:55:57 2023 -0500

        Update cmake.yml

    commit 03c4c232396440cd0be6d2dd7baf4ceea1c2589d
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 17:48:49 2023 -0500

        Create cmake.yml

    Change-Id: I77992f15694e77cbae49c56f9ff02f4f9079235d

    * Added error handling to att iterate_data. Fix for genasm.

    Change-Id: Ia86e629e74c6e00b98155355beabf69681a88875

    * SWDEV-409575 - Append additional RPATH to libraries and binaries installed in /opt/rocm-ver/lib/rocprofiler

    Append the rpath $ORIGIN/.. to component specific libraries
    Binaries installed in /opt/rocm-ver/lib/rocprofiler had been appended with $ORIGIN/..
    Binaries installed in /opt/rocm-ver/libexec/rocprofiler had been appended with $ORIGIN/../../lib
    Used TARGET form for installation of rocprof-ctrl and librocprof-tool in runtime component

    Change-Id: I53b7a283c6a8ddea97d4889db6010832389894bb

    * run cmake formatting (cmake-format) (#50)

    Co-authored-by: ammarwa <[email protected]>

    * run formatting (clang-format v11) (#51)

    Co-authored-by: ammarwa <[email protected]>

    * Update CMakeLists.txt

    Co-authored-by: Jonathan R. Madsen <[email protected]>

    ---------

    Co-authored-by: gobhardw <[email protected]>
    Co-authored-by: Giovanni  LB <[email protected]>
    Co-authored-by: Ranjith Ramakrishnan <[email protected]>
    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: ammarwa <[email protected]>
    Co-authored-by: Jonathan R. Madsen <[email protected]>

commit 3476ef7afe4e7af0a282b42da4b06ec8b0b9301a
Author: Jonathan R. Madsen <[email protected]>
Date:   Fri Jul 14 19:11:41 2023 -0500

    Workflow simplification and cancellation (#48)

    * Update formatting workflow

    - ignore changes to pull_*.yml workflows

    * Update pull_from_gerrit.yml workflow

    - allow manual trigger (workflow dispatch)
    - concurrent cancellation

    * Update pull_latest_dockers.yml workflow

    - simply workflow significantly by using matrix
    - allow manual trigger (workflow dispatch)
    - concurrent cancellation
    - run when pushed

    * Update CMake workflow

    - ignore changes to pull_*.yml workflows
    - concurrent cancellation

commit f053319a4873b3d0d5d6a5074238c0371e0c9f60
Author: Ammar ELWazir <[email protected]>
Date:   Thu Jul 13 20:27:40 2023 -0500

    Update and rename pull.yml to pull_from_gerrit.yml (#44)

commit 90b423ebfaf35cc14d6c3b07c617e2346140853f
Author: Ammar ELWazir <[email protected]>
Date:   Thu Jul 13 19:40:45 2023 -0500

    Update pull_latest_dockers.yml

commit 93acde8ed69766fb6d3482a1be8238f322b1db75
Author: Ammar ELWazir <[email protected]>
Date:   Thu Jul 13 19:38:29 2023 -0500

    Update pull_latest_dockers.yml

commit 0092267a800ef1571bdb423272a8f2a2b8a641e6
Author: Ammar ELWazir <[email protected]>
Date:   Thu Jul 13 19:29:47 2023 -0500

    Gerrit amd staging (#9)

    * removing README from tests diretory

    Change-Id: Id1162dbbe911e24f02d1bf42dafc93a9a934f71f

    * Fixing navi v1 test hang

    Change-Id: I7416170c126a2d3ec564ed27111f1befc3778b4a

    - Added all gpu targets in build script.
    - Changed memory order to relaxed seem to work for navi hang
    - need to set power state for consistent results

    Change-Id: I7416170c126a2d3ec564ed27111f1befc3778b4a

    * Pull from Github

    Squashed commit of the following:

    commit ac49fdd92a72e9c99394253a02da413a6c2e3b3a
    Merge: a07946a 03a0855
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 11:36:24 2023 -0500

        Merge pull request #2 from ROCm-Developer-Tools/gerrit-amd-staging

        Pull from gerrit

    commit 03a085588cffe863e8f466de67be1cfb205b675a
    Merge: e88cad2 a07946a
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 10:57:30 2023 -0500

        Merge branch 'amd-staging' into gerrit-amd-staging

    commit a07946a5cd4c670c83c27ad1a076a9d4567ce6d7
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 15:46:04 2023 +0000

        Enabling Cached Builds

    commit 525e494a7f13941077a8fd4ad6840904db4d27d4
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 04:53:54 2023 +0000

        Updating missed GPU Targets

    commit 42c75862f628c9bee7cfb7dc04dff2619430efbc
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 04:43:02 2023 +0000

        Adding V1 Testing

    commit 9d72fd4aee85e4b0c12e717060d2730fa5b73be1
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:34:31 2023 +0000

        Fixing Artifacts directory path

    commit f4000cc558b3b2e4676f7994f7ce8c8e6f94518e
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:27:26 2023 +0000

        Fixing CMake for test build job

    commit 2ce8115d4c33948c3c8f957f545a95a04e1d6cd2
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 03:16:18 2023 +0000

        Fixing Ubuntu CMake for ubuntu test build

    commit 6d0ed439191be900748d0c025157f9d689a73ec7
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 01:28:41 2023 +0000

        Removing Navi21

    commit e349a7642e5ae5eb03ab9fcd0a0f74f09f78cab5
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 01:14:14 2023 +0000

        Removing Navi21

    commit fefd02fe68d2a4bca7ec2e381960ad004ee9fc5b
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:42:48 2023 +0000

        Fixing CMake Job

    commit 2ea46abf7bf92643efa8c549fa70346ffbd79d65
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:35:13 2023 +0000

        Fixing CMake Job

    commit d99d681ed1999c5fcf291dc678b11a77205fb0f3
    Author: Ammar ELWazir <[email protected]>
    Date:   Wed Jul 12 00:32:13 2023 +0000

        Fixing Pull Latest Dockers and CMake Jobs

    commit dfc4498072d13b4a1df3a63047d34c682c3d9a29
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 23:54:21 2023 +0000

        Fixing CMake job

    commit 919efe04de707f7c702031be15c3e2c5f8442cbb
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 23:52:13 2023 +0000

        Adding Pull Last dockers job

    commit be1b1256e8b0e05308e8f7e7e69bee3acca55281
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:25:40 2023 -0500

        Update cmake.yml

    commit 212299fa4355ae6ec18f9aaacbb79c51ea6c6f97
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:23:35 2023 -0500

        Update cmake.yml

    commit 7c2c1327086a61466cc6cac39f70865c051a8bc7
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 18:18:53 2023 -0500

        Update cmake.yml

    commit 191b5ce007e612e814c1d7a3afb4ad398f3852e1
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:03:22 2023 -0500

        Update cmake.yml

    commit 8824113d95f3e13c7ce4d0af8e0d9d8f522a6c4a
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:28:09 2023 +0000

        Fixing Pull from Gerrit job name

        Change-Id: I9e7ed9a27a13ca49d62c93bdadb30f0057e4d385

    commit cc3d5e4b02ffb439e8cc2b3efa53527c376f9982
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 16:21:43 2023 +0000

        Adding Staging sync job

        Change-Id: I0551f43878b0678ce4b3e74e27d62357cf95ad95

    commit b9be2eee71380a2e6dd34d520e92d0c4209277a0
    Author: Ammar ELWazir <[email protected]>
    Date:   Tue Jul 11 15:57:11 2023 +0000

        Fixing build.sh

        Change-Id: Ia987b0244f0875370d5fe69907b3f5e9cea914de

    commit 9eee33a95a1abd656a7ac5ca10a9f245e9825431
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:39:46 2023 -0500

        Update cmake.yml

    commit 7093b85a78497140e8b52632ca2a002bdaeacd62
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:33:29 2023 -0500

        Update cmake.yml

    commit f54697172c72a67740f9fdfa0c217b6ea6931576
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 21:01:26 2023 -0500

        Update cmake.yml

    commit 1b6620e16f8940386b0f4f04e69e2410d21c0e26
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 20:21:02 2023 -0500

        Update cmake.yml

    commit a94bec740c6b42c4b79c87bca20fa87b99bf060d
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:46:35 2023 -0500

        Update cmake.yml

    commit 85d6b29d4375a69d575c18ece8542c50f2ddfcc3
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:34:39 2023 -0500

        Update cmake.yml

    commit 8c004887cf1435f1a6214c3d2455299a8a27bd4c
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:31:17 2023 -0500

        Update cmake.yml

    commit a14a9168e17d9348a53c6e9c9a47ba1edb4c4509
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:25:46 2023 -0500

        Update cmake.yml

    commit 000f2f40b84e6a2f7d4becdbf5aed01436ca4c83
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:08:18 2023 -0500

        Update cmake.yml

    commit a28a53d56731cad848fa9133d1c4dbaa8fc7afa7
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 19:03:39 2023 -0500

        Update cmake.yml

    commit a6a2db01027f0b01fdfbb5997ddb772c7f51b649
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 18:21:53 2023 -0500

        Update cmake.yml

    commit 118ef2a88b2d44e3207c31c343da3e5e5ec6f176
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 17:55:57 2023 -0500

        Update cmake.yml

    commit 03c4c232396440cd0be6d2dd7baf4ceea1c2589d
    Author: Ammar ELWazir <[email protected]>
    Date:   Mon Jul 10 17:48:49 2023 -0500

        Create cmake.yml

    Change-Id: I2223efd600dcd8a4f695e61491b94b7f12ae2c5b

    * run formatting (clang-format v11) (#10)

    Co-authored-by: ammarwa <[email protected]>

    ---------

    Co-authored-by: gobhardw <[email protected]>
    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: ammarwa <[email protected]>

commit f029195705a15700380c6f832ba5d15d46fd6de7
Author: Jonathan R. Madsen <[email protected]>
Date:   Thu Jul 13 14:38:56 2023 -0500

    Formatting workflows for source (clang-format) and cmake (cmake-format) (#4)

    * Add .cmake-format.yaml file

    * Add formatting workflow

    * provide base input for creating PR

    * Update scheme for extracting branch name

    - disable running formatting on push to amd-staging branch

    * patch .cmake-format.yaml for find_package signature

    - apparently cmake-format doesn't format the full signature of find_package

    * run formatting (clang-format v11) (#7)

    Co-authored-by: jrmadsen <[email protected]>

    * run cmake formatting (cmake-format) (#6)

    Co-authored-by: jrmadsen <[email protected]>

    ---------

    Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

commit bc4d135fdd8a1a9e51235f18a5d575fd2b3735e6
Author: Ammar ELWazir <[email protected]>
Date:   Thu Jul 13 12:55:17 2023 -0500

    Removing Build cache for potential issues with auto-generated header files (#5)

    Change-Id: I9e2319f4335e2f88585ffa6fac2bd88a1c952e6e

commit ce86dea6a311d44d880fa684eb78f3329295e2a4
Author: Jonathan R. Madsen <[email protected]>
Date:   Thu Jul 13 11:08:58 2023 -0500

    Fix decltype(<hsa-function>) function pointer usage (#3)

    - the following is done in several places:
        decltype(hsa_memory_allocate)* hsa_memory_allocate
    - above can cause compiler errors
    - replace decltype(<hsa-function>) with decltype(::<hsa-function>)
      - this ensures that the type within the decltype is recognized as the global scope HSA function, not the variable
    - in many places, the variable has a "_fn" suffix to prevent this issue but added '::' anyway for consistency

commit ac49fdd92a72e9c99394253a02da413a6c2e3b3a
Merge: a07946a 03a0855
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 11:36:24 2023 -0500

    Merge pull request #2 from ROCm-Developer-Tools/gerrit-amd-staging

    Pull from gerrit

commit 03a085588cffe863e8f466de67be1cfb205b675a
Merge: e88cad2 a07946a
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 10:57:30 2023 -0500

    Merge branch 'amd-staging' into gerrit-amd-staging

commit a07946a5cd4c670c83c27ad1a076a9d4567ce6d7
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 15:46:04 2023 +0000

    Enabling Cached Builds

commit 525e494a7f13941077a8fd4ad6840904db4d27d4
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 04:53:54 2023 +0000

    Updating missed GPU Targets

commit 42c75862f628c9bee7cfb7dc04dff2619430efbc
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 04:43:02 2023 +0000

    Adding V1 Testing

commit 9d72fd4aee85e4b0c12e717060d2730fa5b73be1
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 03:34:31 2023 +0000

    Fixing Artifacts directory path

commit f4000cc558b3b2e4676f7994f7ce8c8e6f94518e
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 03:27:26 2023 +0000

    Fixing CMake for test build job

commit 2ce8115d4c33948c3c8f957f545a95a04e1d6cd2
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 03:16:18 2023 +0000

    Fixing Ubuntu CMake for ubuntu test build

commit 6d0ed439191be900748d0c025157f9d689a73ec7
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 01:28:41 2023 +0000

    Removing Navi21

commit e349a7642e5ae5eb03ab9fcd0a0f74f09f78cab5
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 01:14:14 2023 +0000

    Removing Navi21

commit fefd02fe68d2a4bca7ec2e381960ad004ee9fc5b
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 00:42:48 2023 +0000

    Fixing CMake Job

commit 2ea46abf7bf92643efa8c549fa70346ffbd79d65
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 00:35:13 2023 +0000

    Fixing CMake Job

commit d99d681ed1999c5fcf291dc678b11a77205fb0f3
Author: Ammar ELWazir <[email protected]>
Date:   Wed Jul 12 00:32:13 2023 +0000

    Fixing Pull Latest Dockers and CMake Jobs

commit dfc4498072d13b4a1df3a63047d34c682c3d9a29
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 23:54:21 2023 +0000

    Fixing CMake job

commit 919efe04de707f7c702031be15c3e2c5f8442cbb
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 23:52:13 2023 +0000

    Adding Pull Last dockers job

commit be1b1256e8b0e05308e8f7e7e69bee3acca55281
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 18:25:40 2023 -0500

    Update cmake.yml

commit 212299fa4355ae6ec18f9aaacbb79c51ea6c6f97
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 18:23:35 2023 -0500

    Update cmake.yml

commit 7c2c1327086a61466cc6cac39f70865c051a8bc7
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 18:18:53 2023 -0500

    Update cmake.yml

commit 191b5ce007e612e814c1d7a3afb4ad398f3852e1
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 16:03:22 2023 -0500

    Update cmake.yml

commit 8824113d95f3e13c7ce4d0af8e0d9d8f522a6c4a
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 16:28:09 2023 +0000

    Fixing Pull from Gerrit job name

    Change-Id: I9e7ed9a27a13ca49d62c93bdadb30f0057e4d385

commit cc3d5e4b02ffb439e8cc2b3efa53527c376f9982
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 16:21:43 2023 +0000

    Adding Staging sync job

    Change-Id: I0551f43878b0678ce4b3e74e27d62357cf95ad95

commit b9be2eee71380a2e6dd34d520e92d0c4209277a0
Author: Ammar ELWazir <[email protected]>
Date:   Tue Jul 11 15:57:11 2023 +0000

    Fixing build.sh

    Change-Id: Ia987b0244f0875370d5fe69907b3f5e9cea914de

commit 9eee33a95a1abd656a7ac5ca10a9f245e9825431
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 21:39:46 2023 -0500

    Update cmake.yml

commit 7093b85a78497140e8b52632ca2a002bdaeacd62
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 21:33:29 2023 -0500

    Update cmake.yml

commit f54697172c72a67740f9fdfa0c217b6ea6931576
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 21:01:26 2023 -0500

    Update cmake.yml

commit 1b6620e16f8940386b0f4f04e69e2410d21c0e26
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 20:21:02 2023 -0500

    Update cmake.yml

commit a94bec740c6b42c4b79c87bca20fa87b99bf060d
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 19:46:35 2023 -0500

    Update cmake.yml

commit 85d6b29d4375a69d575c18ece8542c50f2ddfcc3
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 19:34:39 2023 -0500

    Update cmake.yml

commit 8c004887cf1435f1a6214c3d2455299a8a27bd4c
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 19:31:17 2023 -0500

    Update cmake.yml

commit a14a9168e17d9348a53c6e9c9a47ba1edb4c4509
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 19:25:46 2023 -0500

    Update cmake.yml

commit 000f2f40b84e6a2f7d4becdbf5aed01436ca4c83
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 19:08:18 2023 -0500

    Update cmake.yml

commit a28a53d56731cad848fa9133d1c4dbaa8fc7afa7
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 19:03:39 2023 -0500

    Update cmake.yml

commit a6a2db01027f0b01fdfbb5997ddb772c7f51b649
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 18:21:53 2023 -0500

    Update cmake.yml

commit 118ef2a88b2d44e3207c31c343da3e5e5ec6f176
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 17:55:57 2023 -0500

    Update cmake.yml

commit 03c4c232396440cd0be6d2dd7baf4ceea1c2589d
Author: Ammar ELWazir <[email protected]>
Date:   Mon Jul 10 17:48:49 2023 -0500

    Create cmake.yml

Change-Id: I994a9fa743d47de3640d2bf7ae9ea3e01ea44f6a
  • Loading branch information
ammarwa committed Jul 15, 2023
1 parent 5e4ac01 commit a7e5509
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 143 deletions.
8 changes: 8 additions & 0 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/pull_from_gerrit.yml
Original file line number Diff line number Diff line change
@@ -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://[email protected]: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
149 changes: 25 additions & 124 deletions .github/workflows/pull_latest_dockers.yml

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
15 changes: 7 additions & 8 deletions src/core/hsa/queues/queue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<rocprofiler_record_se_att_data_t*>(
Expand Down Expand Up @@ -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<hsa_ven_amd_aqlprofile_parameter_name_t>(int(ROCPROFILER_ATT_PERFCOUNTER)),
event.counter_id | (event.counter_id ? (0xF << 24) : 0)
});
att_params.push_back(
{static_cast<hsa_ven_amd_aqlprofile_parameter_name_t>(int(ROCPROFILER_ATT_PERFCOUNTER)),
event.counter_id | (event.counter_id ? (0xF << 24) : 0)});
num_att_counters += 1;
}

Expand Down
6 changes: 3 additions & 3 deletions src/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 2 additions & 4 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/ctrl/test_hsa.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down

0 comments on commit a7e5509

Please sign in to comment.