Skip to content

Commit df05a18

Browse files
authored
Merge branch 'develop' into import/develop/ROCm_amdsmi/pr-156
2 parents 841eb04 + 3ee3930 commit df05a18

File tree

190 files changed

+45117
-44514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

190 files changed

+45117
-44514
lines changed

.github/workflows/therock-ci-linux.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
repository: "ROCm/TheRock"
4040
path: "TheRock"
41-
ref: 6fab5d65a552483bcfa1f6ccaaabf699c8188c1e # 2025-11-06 commit
41+
ref: eb8f187ff47eb6af9cd5aaa0b8d9a04b06b12796 # 2025-11-15 commit
4242

4343
- name: Install python deps
4444
run: |
@@ -66,7 +66,6 @@ jobs:
6666
run: |
6767
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
6868
# rm ./TheRock/patches/amd-mainline/rocm-systems/*.patch
69-
rm ./TheRock/patches/amd-mainline/rocm-systems/0008-Find-bundled-libelf.patch
7069
./TheRock/build_tools/fetch_sources.py --jobs 12 --no-include-rocm-systems --no-include-rocm-libraries --no-include-ml-frameworks
7170
7271
@@ -110,7 +109,7 @@ jobs:
110109
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
111110
with:
112111
aws-region: us-east-2
113-
role-to-assume: arn:aws:iam::692859939525:role/therock-artifacts-external
112+
role-to-assume: arn:aws:iam::692859939525:role/therock-ci-external
114113

115114
- name: Post Build Upload
116115
if: always()

.github/workflows/therock-ci-windows.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
with:
4040
repository: "ROCm/TheRock"
4141
path: "TheRock"
42-
ref: 6fab5d65a552483bcfa1f6ccaaabf699c8188c1e # 2025-11-06 commit
42+
ref: eb8f187ff47eb6af9cd5aaa0b8d9a04b06b12796 # 2025-11-15 commit
4343

4444
- name: Set up Python
4545
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
@@ -54,7 +54,6 @@ jobs:
5454
run: |
5555
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
5656
# rm ./TheRock/patches/amd-mainline/rocm-systems/*.patch
57-
rm ./TheRock/patches/amd-mainline/rocm-systems/0008-Find-bundled-libelf.patch
5857
git -c user.name="therockbot" -c "[email protected]" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch
5958
6059
- name: Install requirements
@@ -72,10 +71,6 @@ jobs:
7271
with:
7372
version: '3.62.0'
7473

75-
- uses: iterative/setup-dvc@4bdfd2b0f6f1ad7e08afadb03b1a895c352a5239 # v2.0.0
76-
with:
77-
version: '3.62.0'
78-
7974
# After other installs, so MSVC get priority in the PATH.
8075
- name: Configure MSVC
8176
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
@@ -138,7 +133,7 @@ jobs:
138133
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
139134
with:
140135
aws-region: us-east-2
141-
role-to-assume: arn:aws:iam::692859939525:role/therock-artifacts-external
136+
role-to-assume: arn:aws:iam::692859939525:role/therock-ci-external
142137
special-characters-workaround: true
143138

144139
- name: Post Build Upload

.github/workflows/therock-test-packages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9393
with:
9494
repository: "ROCm/TheRock"
95-
ref: 6fab5d65a552483bcfa1f6ccaaabf699c8188c1e # 2025-11-06 commit
95+
ref: eb8f187ff47eb6af9cd5aaa0b8d9a04b06b12796 # 2025-11-15 commit
9696

9797
- name: Run setup test environment workflow
9898
uses: './.github/actions/setup_test_environment'

projects/amdsmi/tests/amd_smi_test/functional/gpu_partition_metrics_read.cc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,43 @@ void TestGpuPartitionMetricsRead::Run(void) {
8383
std::cout << "\n\n";
8484
std::cout << "\t**GPU PARTITION METRICS: Using static struct (Backwards Compatibility):\n";
8585
}
86+
87+
// Test if xcp_metrics causes kernel crash
88+
pid_t test_pid = fork();
89+
if (test_pid == 0) {
90+
// Child: try reading xcp_metrics
91+
amdsmi_gpu_metrics_t test_smu = {};
92+
amdsmi_get_gpu_partition_metrics_info(processor_handles_[i], &test_smu);
93+
_exit(0);
94+
}
95+
if (test_pid < 0) {
96+
FAIL() << "Fork failed";
97+
}
98+
99+
// Parent: wait for child (3 second timeout: 30 iterations × 100ms)
100+
constexpr int MAX_WAIT_RETRIES = 30;
101+
constexpr int WAIT_INTERVAL_US = 100000; // 100ms in microseconds
102+
int status;
103+
bool child_exited = false;
104+
for (int retry = 0; retry < MAX_WAIT_RETRIES; retry++) {
105+
if (waitpid(test_pid, &status, WNOHANG) > 0) {
106+
child_exited = true;
107+
if (WIFSIGNALED(status)) {
108+
// Child process terminated by signal - fail the test
109+
FAIL() << "FAILED: Child process terminated by signal (signal " << WTERMSIG(status) << ")";
110+
}
111+
break;
112+
}
113+
usleep(WAIT_INTERVAL_US);
114+
}
115+
116+
// Handle timeout - child still running after 3 seconds
117+
if (!child_exited) {
118+
kill(test_pid, SIGKILL);
119+
waitpid(test_pid, &status, 0); // Clean up zombie process
120+
FAIL() << "FAILED: Timeout waiting for child process (hung for 3+ seconds)";
121+
}
122+
86123
amdsmi_gpu_metrics_t smu = {};
87124
err = amdsmi_get_gpu_partition_metrics_info(processor_handles_[i], &smu);
88125
const char *status_string;

projects/aqlprofile/src/core/tests/aql_profile_v2_tests.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//Copyright © Advanced Micro Devices, Inc., or its affiliates.
2+
//SPDX-License-Identifier: MIT
3+
14
#include <gtest/gtest.h>
25
#include <gmock/gmock.h>
36
#include <cstring>

projects/aqlprofile/src/core/tests/logger_tests.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//Copyright © Advanced Micro Devices, Inc., or its affiliates.
2+
//SPDX-License-Identifier: MIT
3+
14
#include <gtest/gtest.h>
25
#include <gmock/gmock.h>
36
#include <fstream>

projects/aqlprofile/src/core/tests/pm4_factory_tests.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//Copyright © Advanced Micro Devices, Inc., or its affiliates.
2+
//SPDX-License-Identifier: MIT
3+
14
#include <gtest/gtest.h>
25
#include "core/pm4_factory.h"
36

projects/aqlprofile/src/pm4/tests/gfx9_cmd_builder_tests.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//Copyright © Advanced Micro Devices, Inc., or its affiliates.
2+
//SPDX-License-Identifier: MIT
3+
14
#include <gtest/gtest.h>
25
#include <memory>
36
#include <vector>

projects/aqlprofile/src/pm4/tests/pmc_builder_tests.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//Copyright © Advanced Micro Devices, Inc., or its affiliates.
2+
//SPDX-License-Identifier: MIT
3+
14
#include <gtest/gtest.h>
25
#include <cstdint>
36
#include <vector>

projects/aqlprofile/src/pm4/tests/spm_builder_test.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
//Copyright © Advanced Micro Devices, Inc., or its affiliates.
2+
//SPDX-License-Identifier: MIT
3+
14
#include <gtest/gtest.h>
25
#include <gmock/gmock.h>
36
#include <cstring>

0 commit comments

Comments
 (0)