Repository navigation
fix: keep hrx-system at 98d05d94 (our loom-jit needs its AMDGPU runtime-globals API) - #359
Conversation
#353/#357 moved third_party/hrx-system to 4ba76c18eafe (our fork's 1bit/main, which merged AMD's c0b135a778cc). That merge includes AMD's loom commit 32d0c76a "[Loom] Make AMDGPU runtime globals compiler-owned", which removes loomc_amdgpu_runtime_global_flags_t / loomc_amdgpu_emit_options_t. Our ggml/src/ggml-hrx/loom-jit.cpp still uses those symbols, so the pinned pair does not compile: loom-jit.cpp:70:5: error: unknown type name 'loomc_amdgpu_runtime_global_flags_t' loom-jit.cpp:994:5: error: unknown type name 'loomc_amdgpu_emit_options_t' 10 errors generated. GitHub CI builds the pin without HRX, so it cannot catch this. 98d05d94 is our fork's previous revision and exports the API (loom/binding/c/include/ loomc/target/amdgpu/emit.h). Compiling loom-jit.cpp against it succeeds. This restores the constraint already recorded in OWNER-ACTIONS.md: hrx-system stays at 98d05d94 until our loom-jit path is ported to the compiler-owned API.
PR Reviewer Guide 🔍Here are some key observations to aid the review process:
|
#361 (c4d9a9b) is titled "Bump HRX: llama.cpp 02f2880c9f42 + hrx-system 4ba76c18eafe (AMD's tested pair)" but its diff changes only third_party/hrx-system. The llama.cpp gitlink stayed at e44c9d01a4d5, whose ggml/src/ggml-hrx/loom-jit.cpp still uses loomc_amdgpu_runtime_global_flags_t, loomc_amdgpu_emit_options_t and LOOMC_AMDGPU_RUNTIME_GLOBAL_*, which 4ba76c18eafe removed. The pinned pair therefore does not compile: loom-jit.cpp:70:5: error: unknown type name 'loomc_amdgpu_runtime_global_flags_t' loom-jit.cpp:553:1: error: unknown type name 'loomc_amdgpu_runtime_global_flags_t' ... 10 errors, all in loom-jit.cpp GitHub CI builds the pin without HRX (ONEBIT_HRX defaults OFF), so it cannot catch this class of break; a from-scratch HRX build on strixhalo is what surfaced it. Restore third_party/hrx-system to 98d05d94a9f9, the revision #359 pinned and which exports the API our loom-jit path needs. llama.cpp is unchanged. Co-authored-by: bong-water-water-bong <bong-water-water-bong@users.noreply.github.com>
…e new revision dropped (#365) AMD removes public LoomC symbols without notice: loom 32d0c76a (in hrx-system 4ba76c18) dropped loomc_amdgpu_runtime_global_flags_t and loomc_amdgpu_emit_options_t, which our ggml/src/ggml-hrx/loom-jit.cpp uses. CI here builds without HRX, so #353, #357 and #361 merged a submodule pair that does not compile with ONEBIT_HRX=ON, and #359 and #363 pinned hrx-system back by hand (KNOWN-ISSUES.md). The bump now checks, at the header level, that every loomc_* / LOOMC_* identifier used under ggml/src/ggml-hrx at the new llama.cpp revision is still declared under loom/binding/c/include at the new hrx-system revision. If one is missing, the PR moves llama.cpp only, keeps hrx-system where it is, and says so in its body and in a workflow warning. When neither submodule moves, no PR is opened (#361 moved one gitlink only). Co-authored-by: bong-water-water-bong <bong-water-water-bong@1bit.gg> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Current
maindoes not compile with HRX. #353/#357 movedthird_party/hrx-systemto4ba76c18eafe(our fork's1bit/main, which merged AMD'sc0b135a778cc). That merge carries AMD's loom commit32d0c76a"[Loom] Make AMDGPU runtime globals compiler-owned", which deletesloomc_amdgpu_runtime_global_flags_tandloomc_amdgpu_emit_options_tfromloom/binding/c/include/loomc/target/amdgpu/emit.h.Our
ggml/src/ggml-hrx/loom-jit.cppstill uses them, so the pinned pair fails:GitHub-hosted CI builds the pin without HRX, so it cannot catch this (see bump-hrx.yml); a from-scratch HRX build on strixhalo is what surfaced it.
Fix: restore
third_party/hrx-systemto98d05d94a9f9e405683f8aeafc037f5ace0abe4a(our fork's previous revision, which exports the API atloom/binding/c/include/loomc/target/amdgpu/emit.h:37). Verified: recompilingloom-jit.cppagainst98d05d94succeeds (rc=0). This is the constraint already recorded inOWNER-ACTIONS.md§"engine#336": "leaves hrx-system at 98d05d94 — AMD's hrx-system does not export loomc_amdgpu_runtime_global_flags_t, which our loom-jit path needs."Pin rollback on purpose.
llama.cppis unchanged ate44c9d01a4d5.Follow-up (forward direction): port
loom-jit.cppto the compiler-owned API and move hrx-system forward again — tracked separately so the release pin can build now.