fix(hip): Wave64 warp shuffle type mismatch#43
Merged
Conversation
Owner
|
Thank you! |
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.
Overview
This PR fixes a compiler type mismatch on AMD ROCm/HIP systems when building for Wave64 architectures (GCN, CDNA, or RDNA targets compiled in Wave64 mode).
It appends the missing
ULL(unsigned long long) suffix to two hardcoded warp sync masks infwht.cuandmma.cuh, converting0xFFFFFFFFto0xFFFFFFFFULL. This matches the establishedggml-cudaconvention used throughout the rest of the repository and prevents compilation failures due to strict 64-bit mask type matching on Wave64 targets.Additional information
This change brings these two outliers in line with standard conventions already used everywhere else in the codebase (such as in
argmax.cu,common.cuh, and other sections ofmma.cuh), which already use0xFFFFFFFFULLuniversally.It is fully backward-compatible with 32-bit NVIDIA CUDA and AMD Wave32 compilers, which implicitly downcast the literal safely.
Requirements