Skip to content

opencl: fix image limit for q4_k dense bin kernels, q4_0 bcast and rms_norm - #30310

Merged
max-krasnyansky merged 3 commits into
ggml-org:masterfrom
qualcomm:lh/q4-k-image-limit-fix
Oct 11, 2026
Merged

max-krasnyansky merged 3 commits into
ggml-org:masterfrom
qualcomm:lh/q4-k-image-limit-fix

Conversation

@lhez

@lhez lhez commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

Overview

The dense bin kernels (q4_0, q4_k and q6_k) use image to receive weights. When the weight exceeds image dimension limit, it will crash. This PR refines the conditions for using these kernels so large weights fallback to builtin kernels. The bin kernels require ne2 and ne3 be 1 and use a difference weight layout -- this currently breaks broadcast for Q4_0, which does not handle this layout. This is also fixed. This part is extracted from #30178.

This PR also fixes test-backend-ops crash in test-backend-ops when ne00 is smaller than subgroup size.

Additional information

Requirements

  • I have read and agree with the contributing guidelines
  • AI usage disclosure: Yes, Codex reviewed the original PR, I told it which part to extract, then I reviewed and refactored.

@github-actions github-actions Bot added ggml changes relating to the ggml tensor library for machine learning OpenCL Issues specific to the OpenCL backend labels Oct 10, 2026
@lhez
lhez marked this pull request as ready for review October 11, 2026 07:03
@lhez
lhez requested a review from a team as a code owner October 11, 2026 07:03
@lhez

lhez commented Oct 11, 2026

Copy link
Copy Markdown
Contributor Author

@max-krasnyansky please review and ack when you get a chance

@lhez lhez added the merge ready A maintainer can use this label to indicate that they consider the changes final and ready to merge. label Oct 11, 2026
@max-krasnyansky
max-krasnyansky merged commit c83f305 into ggml-org:master Oct 11, 2026
20 checks passed
@BrewTestBot BrewTestBot mentioned this pull request Oct 15, 2026
1 task done
wanghqc added a commit to qualcomm/llama.cpp that referenced this pull request Oct 22, 2026
ggml-opencl keeps this branch's implementation where upstream added its own
version of the same feature: cooperative-K dp4a GEMM (ggml-org#30741, = cok), the
act_vload4 dp4a GEMMs (ggml-org#30753, = alds4), the narrow l4_lm / q1_0 nsg1 variants
(ggml-org#30850), the FA rework (ggml-org#30266), the expert-sort buf+offset (ggml-org#30418, kept the
aligned-copy path) and the PREC_F32 MUL_MAT_ID decline (ggml-org#30365, covered by the
src1 precision floor). The gemm_coopk_* kernels are not carried.

Taken from upstream: IM2COL_3D (ggml-org#30895), get_rows i32 and cpy i32<->f32
(ggml-org#30756), CLAMP on non-contiguous views (ggml-org#30186), the A6X fixes (ggml-org#30176: a623
detection, constant-fold workaround, no cpy pack kernel), rms_norm full
subgroup (ggml-org#30310), the rope build fix (ggml-org#30893), the mxfp4 flat GEMV row bound,
the extra q5_0/q5_1/q5_K GEMV tail clamps (ggml-org#30421) and query_valid after the
softcap in the q4_0/q8_0 FA prefill (ggml-org#30546). The q4_0 q1_vec FA decode now
applies the softcap on the dp4a path too.

Speculative decoding keeps this branch's llama_batch path: LiliCorr drafters
(ggml-org#30506) are refused at load. The server keeps the tree verify and gives the
logprobs of ggml-org#27196 the batch row each accepted token was sampled from. The two
GDN n_tokens > K tests are dropped with upstream's relaxed contract.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ggml changes relating to the ggml tensor library for machine learning merge ready A maintainer can use this label to indicate that they consider the changes final and ready to merge. OpenCL Issues specific to the OpenCL backend

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants