Repository navigation
Commit 882f456
committed
Fix the merge regression that broke every compile job
My 2026-08-11 merge of origin/master kept BOTH sides of the simd.rs
re-export block, which introduced a duplicate `bf16_tile_gemm_16x16`
name: once unaliased from `hpc::bf16_tile_gemm` (this branch's W1a
re-export) and once from `simd_ops` (master's canonical polyfill
export). The collision is a hard compile error, which is why clippy,
tests, native-backend, tier4-avx512, wasm-simd, neon-qemu and
hpc-stream-parallel all went red at once on 921bd7a.
Resolution: drop this branch's unaliased re-export and keep master's
deliberate two-name split — `bf16_tile_gemm_16x16` (the pure polyfill
kernel, from simd_ops) and `bf16_tile_gemm_16x16_amx` (the
tile-dispatching wrapper, from hpc). Master's arrangement already
satisfies the W1a "reach it via ndarray::simd::*" intent that this
branch's export was written for, so nothing is lost. No tile-GEMM
function is added or removed by this branch — `int8_tile_gemm_16x16`
(used by the geostrophic example) has been on master since 58200fb,
and no 16x32 tile GEMM exists in the crate; the only 16x32 symbols are
SIMD register types (I16x32/U16x32) in simd_nightly, which are lane
widths, not tile kernels. 16x16 is AMX's native TDPBUSD accumulator
geometry, not a choice.
Also in this commit:
- Restore the newline my merge script ate between the `_amx` re-export
and the CPU-generation comment (this was the `format/stable` failure).
- Correct the arch_prctl wording in AMX_GOTCHAS Gotcha 15: 158 is the
x86_64 SYS_arch_prctl syscall NUMBER, not an operation argument, so
both diagnostics now read
`syscall(SYS_arch_prctl /* 158 */, ARCH_{REQ,GET}_XCOMP_PERM, ...)`.
Raised by CodeRabbit on #275 and correct on the merits.
Gates, run locally on the merged tree: `cargo fmt --check` clean,
`cargo check --lib --features std` clean, `cargo clippy --lib --features
std` no errors, and `cargo run --example geostrophic_stencil` green with
all 4 pre-registered bars PASS on the scalar-fallback path.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CcpLeEC3XK8Eye53GKBVvi1 parent 921bd7a commit 882f456
2 files changed
Lines changed: 11 additions & 9 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
281 | 281 | | |
282 | 282 | | |
283 | 283 | | |
284 | | - | |
| 284 | + | |
| 285 | + | |
285 | 286 | | |
286 | | - | |
| 287 | + | |
| 288 | + | |
287 | 289 | | |
288 | 290 | | |
289 | 291 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
645 | 645 | | |
646 | 646 | | |
647 | 647 | | |
648 | | - | |
649 | | - | |
650 | | - | |
651 | | - | |
652 | | - | |
653 | | - | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
654 | 653 | | |
655 | 654 | | |
656 | 655 | | |
| |||
682 | 681 | | |
683 | 682 | | |
684 | 683 | | |
685 | | - | |
| 684 | + | |
| 685 | + | |
686 | 686 | | |
687 | 687 | | |
688 | 688 | | |
| |||
0 commit comments