Repository navigation
feat(build): add THEROCK_COMGR_DLL_NAME to override comgr DLL name - #6971
Merged
Merged
Conversation
Add a top-level THEROCK_COMGR_DLL_NAME option that, when set, forwards -DCOMGR_DLL_NAME to both the amd-comgr subproject (comgr build output name) and the hip-clr subproject (CLR's dynamic load of comgr). Empty keeps each component's default (amd_comgr). Both sides already read a COMGR_DLL_NAME cache var but the superbuild never forwarded it, so they always fell back to amd_comgr. Driving both from one option keeps the built name and the loaded name in sync. The effect is Windows-only (both uses are WIN32-guarded); harmless elsewhere. Enables shipping an OpenCL-flavoured comgr (amd_comgr_opencl.dll) that sits side-by-side with the HIP SDK's comgr.
✅ All Checks Passed — Ready for Review
📖 Need help? See the Policy FAQ for details on every check and how to fix failures. |
|
🎉 All checks passed! This PR is ready for review. |
lamb-j
commented
Jul 29, 2026
chinmaydd
approved these changes
Jul 29, 2026
1 task
lamb-j
added a commit
that referenced
this pull request
Sep 9, 2026
`THEROCK_COMGR_DLL_NAME` (#6971) forwards `-DCOMGR_DLL_NAME` to `amd-comgr` and `hip-clr`, but not `ocl-clr`. Since `ocl-clr` is a separate configure of clr and compiles its own rocclr, it kept the default `amd_comgr.dll` while comgr was built under the overridden name — so the OpenCL runtime loads a DLL that is never produced. That is the mismatch the option exists to prevent. - Hoist the `_clr_comgr_dll_name_cmake_args` block to file scope; it sat inside the `THEROCK_ENABLE_HIP_RUNTIME` guard, so an OpenCL-only build never saw it. - Pass it to `ocl-clr` as well. Windows-only in effect, inert when the option is empty. ISSUE ID: #6970
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a top-level
THEROCK_COMGR_DLL_NAMEoption that forwards-DCOMGR_DLL_NAME=<value>to both theamd-comgrbuild (comgr's output name) andhip-clr(the name CLR loads), keeping the two in sync. Empty default = today's behavior (amd_comgr); effect is Windows-only.Lets a build ship an OpenCL-flavoured comgr (
amd_comgr_opencl.dll) side-by-side with the ROCm on Window's comgr, for the WindowscomputeOpenCL driver rework.ISSUE ID: #6970