Skip to content

Commit b37bd57

Browse files
agunasheNikhil-Nunna
authored andcommitted
versioned comgr dll causes error in opencl apps (#3974)
versioned comgr dll causes error in runtime setting kComgrVersioned opencl=false hip=true ## Technical Details versioned comgr dll causes error in runtime setting kComgrVersioned opencl=false hip=true ## JIRA ID https://amd-hub.atlassian.net/browse/ROCM-20077 ## Test Plan hip-tests and opencl tests need to pass <!-- Explain any relevant testing done to verify this PR. --> ## Test Result hip-tests and opencl tests need to pass Rock CI verifies hip-tests/hip apps ocltst and clinfo were verified locally since Rock does not have Opencl testing yet. Used the artifacts from this PR and run https://github.com/ROCm/rocm-systems/actions/runs/23009594300 python build_tools/install_rocm_from_artifacts.py --run-id 23009594300 --amdgpu-family gfx94X-dcgpu --tests --run-github-repo ROCm/rocm-systems <!-- Briefly summarize test outcomes. --> ## Submission Checklist - [x] Look over the contributing guidelines at https://github.com/ROCm/ROCm/blob/develop/CONTRIBUTING.md#pull-requests.
1 parent 5142267 commit b37bd57

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ jobs:
6969
- name: Patch rocm-systems
7070
run: |
7171
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
72-
# rm ./TheRock/patches/amd-mainline/rocm-systems/*.patch
73-
git -c user.name="therockbot" -c "user.email=therockbot@amd.com" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch
72+
rm ./TheRock/patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch
7473
7574
- name: Configure Projects
7675
env:

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ jobs:
5353
- name: Patch rocm-systems
5454
run: |
5555
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
56-
# rm ./TheRock/patches/amd-mainline/rocm-systems/*.patch
57-
git -c user.name="therockbot" -c "user.email=therockbot@amd.com" am --whitespace=nowarn ./TheRock/patches/amd-mainline/rocm-systems/*.patch
56+
rm ./TheRock/patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch
5857
5958
- name: Install requirements
6059
run: |

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ jobs:
6565
run: |
6666
./TheRock/build_tools/fetch_sources.py --jobs 12 --no-include-rocm-systems
6767
68+
- name: Patch rocm-systems
69+
run: |
70+
# Remove patches here if they cannot be applied cleanly, and they have not been deleted from TheRock repo
71+
rm ./TheRock/patches/amd-mainline/rocm-systems/0003-Use-is_versioned-true-consistently-in-both-Comgr-Loa.patch
72+
6873
- name: Configure Projects
6974
env:
7075
amdgpu_families: ${{ env.AMDGPU_FAMILIES }}

projects/clr/rocclr/device/device.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -807,8 +807,8 @@ Device::~Device() {
807807
}
808808

809809
bool Device::ValidateComgr() {
810-
// Check if Lightning compiler was requested
811-
constexpr bool kComgrVersioned = false;
810+
// use versioned comgr for HIP, unversioned for Opencl
811+
const bool kComgrVersioned = amd::IS_HIP;
812812
std::call_once(amd::Comgr::initialized, amd::Comgr::LoadLib, kComgrVersioned);
813813
return amd::Comgr::IsReady();
814814
}

0 commit comments

Comments
 (0)