]> git.djapps.eu Git - pkg/ggml/sources/llama.cpp/commitdiff
ggml : fix conv2d_dw SVE path (ggml/1380)
authorGeorgi Gerganov <redacted>
Tue, 4 Nov 2025 18:40:52 +0000 (20:40 +0200)
committerGeorgi Gerganov <redacted>
Wed, 5 Nov 2025 08:41:51 +0000 (10:41 +0200)
* Fix test-conv2d-dw failure on ARM SVE by using runtime vector length

The ggml_compute_forward_conv_2d_dw_cwhn function was using a hardcoded GGML_F32_EPR (8) for SIMD vectorization, but on ARM SVE the actual vector length varies by hardware. This caused incorrect computation when processing CWHN layout tensors on ARM machines.

Fix by using svcntw() to get the runtime SVE vector length instead of the compile-time constant.

Co-authored-by: ggerganov <redacted>
* ci : reduce sam score threshold

* ci : update bbox checks for sam test

---------

Co-authored-by: copilot-swe-agent[bot] <redacted>
Co-authored-by: ggerganov <redacted>
ggml/src/ggml-cpu/ops.cpp

index 7e3436fec1a80a08a347e05a4efb1c502b382ad8..8235f6959439184d72d9ed0ec84d7183bad583ca 100644 (file)
@@ -7084,7 +7084,11 @@ static void ggml_compute_forward_conv_2d_dw_cwhn(
     const int64_t row_end = MIN(row_start + rows_per_thread, rows_total);
 
 #ifdef GGML_SIMD
-    const int64_t pkg_size = GGML_F32_EPR;
+    #if defined(__ARM_FEATURE_SVE)
+        const int64_t pkg_size = svcntw();
+    #else
+        const int64_t pkg_size = GGML_F32_EPR;
+    #endif
     const int64_t pkg_count = c / pkg_size;
     const int64_t c_pkg_end = pkg_count * pkg_size;
 #else