- cubecl-cpp (HANZO PATCH, wmma_intrinsics_compiler.rs): compute intra-wave lane-half as (threadIdx.x % 32) / 16 instead of threadIdx.x / 16 in WmmaLoad (Accumulator) and WmmaStore, matching WMMA_LANE_DEF (threadIdx.x % 16) so 1D multi-wave blocks (Block::new_1d(128)) do not write out of bounds for waves 1..3. Documented in vendor/cubecl-cpp/HANZO_PATCHES.md. - ternary.rs (matmul_pq2_0_gguf, matmul_ptq1_0_gguf): parameterize by comptime plane size (32 on Metal/CUDA/ROCm/NVIDIA Vulkan, plane_size_max=64 on AMD Vulkan) and launch Block::new_1d(4 * plane) so RDNA 3.5 Vulkan wave64 subgroups maintain uniformity on cooperative matrix ops. plane == 32 is comptime-elided so committed Metal MSL artifacts stay byte-identical. Verified across all four backends (PQ2_0 + PTQ1_0, matvec + GEMM): - Metal (dbc M4 Max): kernel-gen --check 0 drift; PQ2 54/54 + 6/6; PTQ1 54/54 + 6/6 - CUDA (dgx GB10, CUDA 13.0): PQ2 54/54 + 6/6; PTQ1 54/54 + 6/6 - ROCm (evo Radeon 8060S, ROCm 7.1): PQ2 54/54 + 6/6; PTQ1 54/54 + 6/6 - Vulkan NVIDIA (dgx GB10, plane=32..32): PQ2 54/54 + 6/6; PTQ1 54/54 + 6/6 - Vulkan AMD (evo Radeon 8060S, plane=32..64): PQ2 GEMM 6/6; PTQ1 GEMM 6/6
3.5 KiB
Hanzo patches to cubecl-cpp 0.10.0
Vendored from crates.io cubecl-cpp 0.10.0 and wired in by [patch.crates-io] in
hanzo-kernel/Cargo.toml. diff -r ~/.cargo/registry/src/*/cubecl-cpp-0.10.0 vendor/cubecl-cpp
shows only the hunks marked HANZO PATCH (plus this file). Delete the vendor directory and the
patch entry once upstream ships the fix in a release we can take.
bitcast-of-literal (src/shared/instruction.rs, Instruction::Bitcast)
Bug. A bitcast whose input is a literal (Variable::Constant) is emitted as
const float l_71 = reinterpret_cast<thread float const&>(uint(947912704));, a reference cast of
an rvalue. MSL rejects it ("reinterpret_cast from rvalue to reference type"). The source is
f32::reinterpret(113u32 << 23) after constant folding, in hanzo_kernel::quant::f16lo_to_f32.
Any DSL kernel calling it failed to build on Metal (wgpu reported only "Failed to generate the
backend-specific code"; xcrun metal -c names the line).
Fix. Bind the literal to a named local first:
const uint l_71_bits = uint(947912704); const float l_71 = reinterpret_cast<thread float const&>(l_71_bits);
Non-constant inputs are emitted exactly as before.
Regression gate. hanzo_kernel::ternary::f16_decode_probe decodes 4096 f16 patterns
(zeros, both subnormal ends, normals, max, infinities) and compares with half bit-for-bit.
pq2-check --backend <b> runs it first on each backend, through that backend's real compiler:
| backend | compiler path | result (2026-11-18) |
|---|---|---|
| metal (dbc M4 Max) | cubecl-cpp MSL, patched branch | 0 / 4096 differ |
| cuda (dgx GB10) | cubecl-cpp CUDA, same shared emitter | 0 / 4096 differ |
| vulkan (dgx GB10) | cubecl-spirv, not affected | (SPIR-V, unaffected) |
Upstream status. As of tracel-ai/cubecl main at 68fff47 (2026-11-18), the crate has been
restructured. Its Metal ReinterpretCastOp (crates/cubecl-cpp/src/metal/unary.rs) still emits
reinterpret_cast<const thread {ty}&>(input) for non-pointer inputs, so the bug is probably not
fixed there, unless the new IR always gives constants a name before this point. That still needs
checking against a 0.11 build.
Issue to file upstream (not filed yet; needs owner approval to post):
MSL: bitcast of a constant emits a reference cast of an rvalue
f32::reinterpret(C)whereCis a compile-time constant lowers on Metal toreinterpret_cast<thread float const&>(uint(C)), which the Metal compiler rejects ("reinterpret_cast from rvalue to reference type"). Repro: a#[cube]fn returningf32::reinterpret(113u32 << 23), launched on wgpu. Suggested fix: emitas_type<T>(x)for MSL scalar/vector bitcasts (valid for rvalues), or bind constant inputs to a named local.
hip-wmma-multiwave-lane (src/hip/mma/wmma_intrinsics_compiler.rs, WmmaLoad/WmmaStore)
Bug. RDNA 3/3.5 WMMA accumulator load and store helpers compute the intra-wave lane-half as
threadIdx.x / uint(16) while WMMA_LANE_DEF computes wmmaLane = uint(threadIdx.x % 16). When a
kernel launches a 1D multi-wave block (e.g., Block::new_1d(128) with 4 wave32s along x), waves
1..3 get threadIdx.x / 16 in {2..7} instead of {0, 1}, writing past the 16-row tile and
leaving early rows uninitialized.
Fix. Use (threadIdx.x % uint(32)) / uint(16) in WmmaLoad (FragmentIdent::Accumulator) and
WmmaStore, matching WMMA_LANE_DEF.
Regression gate. pq2-check --backend rocm --all and --all --ptq1 on evo (AMD Radeon 8060S,
ROCm 7.1, runtime=hip, plane_size=32..32).