Skip to content

Commit 5a6466a

Browse files
ywang103-amdywang103-amd
committed
Merge branch 'develop' into users/ywang103-amd/pc_sampling_unit_tests
2 parents 235fa71 + 97d9f35 commit 5a6466a

37 files changed

+503
-157
lines changed

‎.github/repos-config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"url": "ROCm/aqlprofile",
66
"branch": "amd-staging",
77
"category": "projects",
8-
"auto_subtree_pull": true,
9-
"auto_subtree_push": false
8+
"auto_subtree_pull": false,
9+
"auto_subtree_push": true
1010
},
1111
{
1212
"name": "rdc",
@@ -69,8 +69,8 @@
6969
"url": "ROCm/rocprofiler-sdk",
7070
"branch": "amd-staging",
7171
"category": "projects",
72-
"auto_subtree_pull": true,
73-
"auto_subtree_push": false
72+
"auto_subtree_pull": false,
73+
"auto_subtree_push": true
7474
},
7575
{
7676
"name": "rocprofiler-systems",

‎.github/workflows/aqlprofile-codeql.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: "AqlProfile CodeQL Advanced"
22

33
on:
44
push:
5+
branches:
6+
- develop
57
paths:
68
- 'projects/aqlprofile/**'
79
pull_request:
@@ -44,7 +46,7 @@ jobs:
4446
build-mode: none
4547
- language: actions
4648
build-mode: none
47-
49+
4850
steps:
4951
- name: Install OS requirements
5052
timeout-minutes: 10
@@ -55,14 +57,14 @@ jobs:
5557
sudo apt-add-repository ppa:git-core/ppa
5658
sudo apt-get update
5759
sudo apt install -y git
58-
60+
5961
- name: Checkout repository
6062
uses: actions/checkout@v4
6163
with:
6264
sparse-checkout: |
6365
projects/aqlprofile
6466
.github/workflows/aqlprofile-code-ql.yml
65-
67+
6668
- name: Configure Git Safe Directory
6769
shell: bash
6870
run: |

‎.github/workflows/aqlprofile-continuous_integration.yml‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: AqlProfile Continuous Integration
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
- develop
68
paths:
79
- 'projects/aqlprofile/**'
810
- '!projects/aqlprofile/*.md'
@@ -43,12 +45,11 @@ jobs:
4345
strategy:
4446
fail-fast: false
4547
matrix:
46-
runner: ['navi4', 'navi3', 'mi300']
48+
runner: ['navi4', 'navi3', 'mi3xx']
4749
os: ['ubuntu-22.04']
4850
build-type: ['RelWithDebInfo']
4951

50-
runs-on: rocprofiler-${{ matrix.runner == 'mi300' && 'ubuntu-22' || matrix.runner }}
51-
if: github.event.pull_request.head.repo.full_name == 'AMD-ROCm-Internal/aqlprofile'
52+
runs-on: rocprofiler-${{ matrix.runner }}
5253

5354
permissions:
5455
contents: read
@@ -57,19 +58,17 @@ jobs:
5758
# define this for containers
5859
env:
5960
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
60-
CORE_EXT_RUNNER: mi300a
6161

6262
steps:
6363
- uses: actions/checkout@v4
6464
with:
6565
sparse-checkout: projects/aqlprofile
66-
66+
set-safe-directory: true
6767

6868
- name: Install requirements
6969
timeout-minutes: 10
7070
shell: bash
7171
run: |
72-
cd projects/aqlprofile
7372
git config --global --add safe.directory '*'
7473
apt-get update
7574
apt-get install -y build-essential cmake g++-11 g++-12 python3-pip libgtest-dev libgmock-dev
@@ -79,7 +78,6 @@ jobs:
7978
- name: List Files
8079
shell: bash
8180
run: |
82-
cd projects/aqlprofile
8381
echo "PATH: ${PATH}"
8482
echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
8583
which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
@@ -91,24 +89,22 @@ jobs:
9189
- name: Configure, Build, and Test
9290
timeout-minutes: 30
9391
shell: bash
94-
working-directory: projects/aqlprofile
9592
run:
96-
LD_LIBRARY_PATH=$(pwd)/build:$LD_LIBRARY_PATH ctest --output-on-failure -V -DCTEST_SOURCE_DIRECTORY="$(pwd)"
93+
LD_LIBRARY_PATH=$(pwd)/build:$LD_LIBRARY_PATH /usr/bin/ctest --output-on-failure -VV -DCTEST_SOURCE_DIRECTORY="$(pwd)"
9794
-DCTEST_BINARY_DIRECTORY="$(pwd)/build" -DAQLPROFILE_BUILD_NUM_JOBS="16" -DCTEST_SITE="${RUNNER_HOSTNAME}"
9895
-DCTEST_BUILD_NAME=PR_${{ github.ref_name }}_${{ github.repository }}-${{ matrix.os }}-${{ matrix.runner }}-core
9996
-DCMAKE_CTEST_ARGUMENTS=""
10097
-DAQLPROFILE_BUILD_TESTS=ON
10198
-DAQLPROFILE_EXTRA_CONFIGURE_ARGS=""
102-
-S ./dashboard.cmake
99+
-S $(pwd)/projects/aqlprofile/dashboard.cmake
103100

104101
core-rpm:
105-
if: github.ref != 'refs/heads/amd-npi' && github.event.pull_request.head.repo.full_name == 'AMD-ROCm-Internal/aqlprofile'
106102
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
107103
strategy:
108104
fail-fast: false
109105
matrix:
110106
runner: ['mi300']
111-
os: ['rhel', 'sles']
107+
os: ['rhel-8', 'sles-15']
112108
build-type: ['RelWithDebInfo']
113109
ci-flags: ['--linter clang-tidy']
114110

@@ -121,24 +117,21 @@ jobs:
121117
# define this for containers
122118
env:
123119
GIT_DISCOVERY_ACROSS_FILESYSTEM: 1
124-
CORE_EXT_RUNNER: mi300
125120

126121
steps:
127122
- uses: actions/checkout@v4
128123
with:
129124
sparse-checkout: projects/aqlprofile
125+
set-safe-directory: true
130126

131127
- name: Install requirements
132128
timeout-minutes: 10
133129
shell: bash
134-
run: |
135-
cd projects/aqlprofile
136-
git config --global --add safe.directory '*'
130+
run: git config --global --add safe.directory '*'
137131

138132
- name: List Files
139133
shell: bash
140134
run: |
141-
cd projects/aqlprofile
142135
echo "PATH: ${PATH}"
143136
echo "LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
144137
which-realpath() { echo -e "\n$1 resolves to $(realpath $(which $1))"; echo "$($(which $1) --version &> /dev/stdout | head -n 1)"; }
@@ -150,12 +143,11 @@ jobs:
150143
- name: Configure, Build, and Test
151144
timeout-minutes: 30
152145
shell: bash
153-
working-directory: projects/aqlprofile
154146
run:
155-
LD_LIBRARY_PATH=$(pwd)/build:$LD_LIBRARY_PATH ctest --output-on-failure -V -DCTEST_SOURCE_DIRECTORY="$(pwd)"
147+
LD_LIBRARY_PATH=$(pwd)/build:$LD_LIBRARY_PATH ctest --output-on-failure -VV -DCTEST_SOURCE_DIRECTORY="$(pwd)"
156148
-DCTEST_BINARY_DIRECTORY="$(pwd)/build" -DAQLPROFILE_BUILD_NUM_JOBS="16" -DCTEST_SITE="${RUNNER_HOSTNAME}"
157149
-DCTEST_BUILD_NAME=PR_${{ github.ref_name }}_${{ github.repository }}-${{ matrix.os }}-${{ matrix.runner }}-core
158150
-DCMAKE_CTEST_ARGUMENTS=""
159151
-DAQLPROFILE_BUILD_TESTS=ON
160152
-DAQLPROFILE_EXTRA_CONFIGURE_ARGS=""
161-
-S ./dashboard.cmake
153+
-S $(pwd)/projects/aqlprofile/dashboard.cmake

‎.github/workflows/rocprofiler-register-continuous-integration.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: rocprofiler-register Continuous Integration
22

33
on:
44
push:
5+
branches:
6+
- develop
57
paths:
68
- 'projects/rocprofiler-register/**'
79
- '!projects/rocprofiler-register/*.md'
@@ -45,7 +47,7 @@ jobs:
4547
# ci-args: '--memcheck UndefinedBehaviorSanitizer'
4648
# ci-tag: '-undefined-behavior-sanitizer'
4749

48-
runs-on: rocprofiler-ubuntu-22
50+
runs-on: rocprofiler-mi3xx
4951

5052
env:
5153
BUILD_TYPE: RelWithDebInfo

‎.github/workflows/rocprofiler-sdk-code_coverage.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ permissions:
77
on:
88
workflow_dispatch:
99
push:
10+
branches:
11+
- develop
1012
paths:
1113
- 'projects/rocprofiler-sdk/**'
1214
- '!projects/rocprofiler-sdk/CODEOWNERS'
@@ -61,7 +63,7 @@ jobs:
6163
os: ['ubuntu-22.04']
6264
build-type: ['Release']
6365

64-
runs-on: rocprofiler-ubuntu-22
66+
runs-on: rocprofiler-mi3xx
6567

6668
# define this for container
6769
env:
@@ -138,8 +140,9 @@ jobs:
138140
- name: Configure, Build, and Test (Total Code Coverage)
139141
timeout-minutes: 30
140142
shell: bash
143+
working-directory: projects/rocprofiler-sdk
141144
run:
142-
python3 projects/rocprofiler-sdk/source/scripts/run-ci.py -B build
145+
python3 ./source/scripts/run-ci.py -B build
143146
--name ${{ github.repository }}-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.runner }}-codecov
144147
--build-jobs 16
145148
--site ${RUNNER_HOSTNAME}
@@ -157,9 +160,10 @@ jobs:
157160
- name: Configure, Build, and Test (Tests Code Coverage)
158161
timeout-minutes: 30
159162
shell: bash
163+
working-directory: projects/rocprofiler-sdk
160164
run:
161165
find build -type f | egrep '\.gcda$' | xargs rm &&
162-
python3 projects/rocprofiler-sdk/source/scripts/run-ci.py -B build
166+
python3 ./source/scripts/run-ci.py -B build
163167
--name ${{ github.repository }}-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.runner }}-codecov-tests
164168
--build-jobs 16
165169
--site ${RUNNER_HOSTNAME}
@@ -176,10 +180,11 @@ jobs:
176180

177181
- name: Configure, Build, and Test (Samples Code Coverage)
178182
timeout-minutes: 30
183+
working-directory: projects/rocprofiler-sdk
179184
shell: bash
180185
run:
181186
find build -type f | egrep '\.gcda$' | xargs rm &&
182-
python3 projects/rocprofiler-sdk/source/scripts/run-ci.py -B build
187+
python3 ./source/scripts/run-ci.py -B build
183188
--name ${{ github.repository }}-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.runner }}-codecov-samples
184189
--build-jobs 16
185190
--site ${RUNNER_HOSTNAME}
@@ -200,15 +205,15 @@ jobs:
200205
with:
201206
key: ${{ github.sha }}-codecov
202207
path: |
203-
.codecov/*.xml
208+
projects/rocprofiler-sdk/.codecov/*.xml
204209
205210
- id: generatereport
206211
name: Generate Code Coverage Comment
207212
if: github.event_name == 'pull_request'
208213
timeout-minutes: 5
214+
working-directory: projects/rocprofiler-sdk
209215
shell: bash
210216
run: |
211-
cd projects/rocprofiler-sdk
212217
echo "PWD: ${PWD}"
213218
ls -la
214219
@@ -219,7 +224,7 @@ jobs:
219224
which -a git
220225
git --version
221226
222-
./source/scripts/upload-image-to-github.py --bot --token ${{ secrets.TOKEN }} --files .codecov/{all,tests,samples}.png --output-dir .codecov --name pr-${{ github.event.pull_request.number }}
227+
./source/scripts/upload-image-to-github.py --bot --token ${{ secrets.ROCPROFILER_TOKEN }} --files .codecov/{all,tests,samples}.png --output-dir .codecov --name pr-${{ github.event.pull_request.number }}
223228
224229
echo -e "\n${PWD}:"
225230
ls -la .
@@ -261,7 +266,7 @@ jobs:
261266
${{ steps.generatereport.outputs.CODECOVERAGE_REPORT }}
262267
</details>
263268
with:
264-
github-token: ${{ secrets.TOKEN }}
269+
github-token: ${{ secrets.ROCPROFILER_TOKEN }}
265270
script: |
266271
const commentIdentifier = '<!-- code-coverage-comment-identifier -->'; // Used to identify codecov comment
267272
const commentBody = process.env.COMMENT_BODY;
@@ -302,7 +307,7 @@ jobs:
302307
with:
303308
name: code-coverage-details
304309
path: |
305-
${{github.workspace}}/.codecov/*
310+
${{github.workspace}}/projects/rocprofiler-sdk/.codecov/*
306311
307312
- name: Verify Test Labels
308313
timeout-minutes: 5

‎.github/workflows/rocprofiler-sdk-codeql.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- '!projects/rocprofiler-sdk/*.md'
1111

1212
push:
13+
branches:
14+
- develop
1315
paths:
1416
- 'projects/rocprofiler-sdk/**'
1517
- '!projects/rocprofiler-sdk/CODEOWNERS'

‎.github/workflows/rocprofiler-sdk-continuous_integration.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: rocprofiler-sdk Continuous Integration
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
- develop
68
paths:
79
- 'projects/rocprofiler-sdk/**'
810
- '!projects/rocprofiler-sdk/*.md'
@@ -57,7 +59,7 @@ jobs:
5759
os: ['ubuntu-22.04']
5860
build-type: ['RelWithDebInfo']
5961

60-
runs-on: rocprofiler-${{ matrix.runner == 'mi3xx' && 'ubuntu-22' || matrix.runner }}
62+
runs-on: rocprofiler-${{ matrix.runner }}
6163

6264
# define this for containers
6365
env:
@@ -198,7 +200,7 @@ jobs:
198200
fail-fast: false
199201
matrix:
200202
runner: ['mi300']
201-
os: ['rhel', 'sles']
203+
os: ['rhel-8', 'sles-15']
202204
build-type: ['RelWithDebInfo']
203205
ci-flags: ['']
204206

@@ -254,7 +256,7 @@ jobs:
254256
shell: bash
255257
working-directory: projects/rocprofiler-sdk
256258
run:
257-
if [ "${OS_TYPE}" == "rhel" ]; then source scl_source enable gcc-toolset-11; fi;
259+
if [ "${OS_TYPE}" == "rhel-8" ]; then source scl_source enable gcc-toolset-11; fi;
258260
/usr/bin/python3 ./source/scripts/run-ci.py -B build
259261
--name ${{ github.repository }}-${{ github.ref_name }}-${{ matrix.os }}-${{ matrix.runner }}-core
260262
--build-jobs 16
@@ -282,7 +284,7 @@ jobs:
282284
build-type: ['RelWithDebInfo']
283285

284286
if: ${{ contains(github.event_name, 'pull_request') }}
285-
runs-on: rocprofiler-${{ matrix.runner == 'mi3xx' && 'ubuntu-22' || matrix.runner }}
287+
runs-on: rocprofiler-${{ matrix.runner }}
286288

287289
# define this for containers
288290
env:
@@ -301,7 +303,7 @@ jobs:
301303
timeout-minutes: 10
302304
shell: bash
303305
working-directory: projects/rocprofiler-sdk
304-
run:
306+
run: |
305307
git config --global --add safe.directory '*'
306308
apt-get update
307309
apt-get install -y build-essential cmake python3-pip libasan8 libtsan2 software-properties-common clang-15 libdw-dev libsqlite3-dev
@@ -326,8 +328,7 @@ jobs:
326328
if: ${{ contains(matrix.runner, 'mi200') || contains(matrix.runner, 'mi300a') }}
327329
shell: bash
328330
working-directory: projects/rocprofiler-sdk
329-
run:
330-
echo 'ROCPROFILER_PC_SAMPLING_BETA_ENABLED=1' >> $GITHUB_ENV
331+
run: echo 'ROCPROFILER_PC_SAMPLING_BETA_ENABLED=1' >> $GITHUB_ENV
331332

332333
- name: Configure, Build, and Test
333334
timeout-minutes: 45

‎.github/workflows/rocprofiler-sdk-docs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: rocprofiler-sdk Documentation
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
- develop
68
paths:
79
- 'projects/rocprofiler-sdk/*.md'
810
- 'projects/rocprofiler-sdk/VERSION'

‎.github/workflows/rocprofiler-sdk-python.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: rocprofiler-sdk Python Linting
33
on:
44
workflow_dispatch:
55
push:
6+
branches:
7+
- develop
68
paths:
79
- 'projects/rocprofiler-sdk/**'
810
pull_request:

‎.github/workflows/rocprofiler-sdk-rocm_release_compatibility.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ permissions:
66
on:
77
workflow_dispatch:
88
push:
9+
branches:
10+
- develop
911
paths:
1012
- 'projects/rocprofiler-sdk/**'
1113
- '!projects/rocprofiler-sdk/CODEOWNERS'

0 commit comments

Comments
 (0)