Merge branch 'ARM-software:main' into sparse

Author: aestriplex

.clang-tidy

@@ -2,7 +2,6 @@
 Checks:          'clang-diagnostic-*,*,-llvm-include-order,clang-analyzer-*,-abseil-*,-fuchsia-*,-bugprone-*,-hicpp-*,-cppcoreguidelines-pro-bounds-pointer-arithmetic,-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-cppcoreguidelines-pro-bounds-constant-array-index,-cert-err58-cpp,-cppcoreguidelines-pro-type-reinterpret-cast,-google-runtime-references,-google-build-using-namespace,-readability-redundant-member-init,-readability-redundant-declaration,-readability-else-after-return,-performance-type-promotion-in-math-fn,-cert-err60-cpp,-cppcoreguidelines-narrowing-conversions,-readability-magic-numbers,-cppcoreguidelines-avoid-magic-numbers,-readability-named-parameter,-readability-implicit-bool-conversion,-readability-uppercase-literal-suffix,-clang-analyzer-optin.cplusplus.VirtualCall,-cppcoreguidelines-macro-usage'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
 CheckOptions:
   - key:             cert-dcl16-c.IgnoreMacros
     value:           '1'

.git-blame-ignore-revs

@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Arm Limited.
+# Copyright (c) 2023, 2025-2026 Arm Limited.
 #
 # SPDX-License-Identifier: MIT
 #
@@ -26,3 +26,6 @@
 
 # COMPMID-6576: Apply clang-format on repository
 afd38f0c617d6f89b2b4532c6c44f116617e2b6f
+
+# style: Apply clang-format for tests
+de306a3335172ddbb4796a317e86c2abc7c4d5b2

.gitignore

@@ -31,8 +31,6 @@ CMakeUserPresets.json
 *cscope*
 
 # Text files
-*.txt
-!CMakeLists.txt
 *.xml
 *.embed
 *.diff

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-# Copyright (c) 2023-2025 Arm Limited.
+# Copyright (c) 2023-2026 Arm Limited.
 #
 # SPDX-License-Identifier: MIT
 #
@@ -31,6 +31,8 @@ exclude: |
         src/core/NEON/kernels/convolution/.*|
         src/core/NEON/kernels/arm_gemm/.*|
         src/core/NEON/kernels/arm_conv/.*|
+        src/cpu/kernels/assembly/arm_gemm/.*|
+        src/cpu/kernels/assembly/arm_common/.*|
         third_party/.*|
         LICENSES/.*
     )$
@@ -88,23 +90,27 @@ repos:
         name: Fix header guards in ACL
         stages: [pre-commit]
         language: python
-        entry: python ./scripts/check_header_guards.py --extensions=h,hh,hpp,inl --comment_style=double_slash --prefix=ACL --exclude=src/core/NEON/kernels/convolution/,src/core/NEON/kernels/arm_gemm/,src/core/NEON/kernels/arm_conv/,include/,third_party/ --add_extension
+        entry: python ./scripts/check_header_guards.py --extensions=h,hh,hpp,inl --comment_style=double_slash --prefix=ACL --exclude=src/core/NEON/kernels/convolution/,src/core/NEON/kernels/arm_gemm/,src/core/NEON/kernels/arm_conv/,include/,third_party/,src/cpu/kernels/assembly/arm_gemm,src/cpu/kernels/assembly/arm_common --add_extension
         pass_filenames: true
       - id: pre-push-check
         name: Commit Message Check
         language: python
         always_run: true
         entry: bash -c "pip install -q commitizen && git log -1 --pretty=%s | cz check"
         stages: [pre-push]
+      - id: check-signoff
+        name: Check Signed-off-by
+        entry: >
+          bash -c 'git log -1 --pretty=%B |
+          grep -qiE "^Signed-off-by: .+ <.+@.+>$"'
+        always_run: true
+        language: system
+        stages: [pre-push]
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v14.0.6
     hooks:
       - id: clang-format
         files: .*\.(cpp|h|hpp|hh|cc|inl|c)$
-        exclude: |
-            (?x)^(
-              tests/.*
-            )$
         stages: [pre-commit]
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
@@ -121,7 +127,7 @@ repos:
         args: ['--maxkb=100']
         stages: [pre-commit]
   - repo: https://github.com/fsfe/reuse-tool
-    rev: v4.0.3
+    rev: v6.2.0
     hooks:
       - id: reuse
         stages: [ pre-commit ]

Android.bp

@@ -1,5 +1,5 @@
 //
-// Copyright © 2020-2025 Arm Ltd. All rights reserved.
+// Copyright © 2020-2026 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
 
@@ -345,7 +345,6 @@ cc_library_static {
         "src/core/NEON/kernels/arm_gemm/mergeresults-fp16.cpp",
         "src/core/NEON/kernels/arm_gemm/mergeresults-sve.cpp",
         "src/core/NEON/kernels/arm_gemm/mergeresults.cpp",
-        "src/core/NEON/kernels/arm_gemm/misc-sve.cpp",
         "src/core/NEON/kernels/arm_gemm/misc.cpp",
         "src/core/NEON/kernels/arm_gemm/quantized-fp16.cpp",
         "src/core/NEON/kernels/arm_gemm/quantized.cpp",
@@ -463,6 +462,7 @@ cc_library_static {
         "src/cpu/kernels/CpuScatterKernel.cpp",
         "src/cpu/kernels/CpuSoftmaxKernel.cpp",
         "src/cpu/kernels/CpuSubKernel.cpp",
+        "src/cpu/kernels/CpuTopKVKernel.cpp",
         "src/cpu/kernels/CpuTransposeKernel.cpp",
         "src/cpu/kernels/CpuWeightsReshapeKernel.cpp",
         "src/cpu/kernels/CpuWinogradConv2dKernel.cpp",
@@ -612,6 +612,11 @@ cc_library_static {
         "src/cpu/kernels/sub/neon/qasymm8.cpp",
         "src/cpu/kernels/sub/neon/qasymm8_signed.cpp",
         "src/cpu/kernels/sub/neon/qsymm16.cpp",
+        "src/cpu/kernels/topkv/generic/neon/fp16.cpp",
+        "src/cpu/kernels/topkv/generic/neon/fp32.cpp",
+        "src/cpu/kernels/topkv/generic/neon/integer.cpp",
+        "src/cpu/kernels/topkv/generic/neon/qasymm8.cpp",
+        "src/cpu/kernels/topkv/generic/neon/qasymm8_signed.cpp",
         "src/cpu/operators/CpuActivation.cpp",
         "src/cpu/operators/CpuAdd.cpp",
         "src/cpu/operators/CpuAddMulAdd.cpp",
@@ -650,6 +655,7 @@ cc_library_static {
         "src/cpu/operators/CpuScatter.cpp",
         "src/cpu/operators/CpuSoftmax.cpp",
         "src/cpu/operators/CpuSub.cpp",
+        "src/cpu/operators/CpuTopKV.cpp",
         "src/cpu/operators/CpuTranspose.cpp",
         "src/cpu/operators/CpuWinogradConv2d.cpp",
         "src/cpu/operators/internal/CpuGemmAssemblyDispatch.cpp",
@@ -979,6 +985,7 @@ cc_library_static {
         "src/runtime/NEON/functions/NEStackLayer.cpp",
         "src/runtime/NEON/functions/NEStridedSlice.cpp",
         "src/runtime/NEON/functions/NETile.cpp",
+        "src/runtime/NEON/functions/NETopKV.cpp",
         "src/runtime/NEON/functions/NETranspose.cpp",
         "src/runtime/NEON/functions/NEUnstack.cpp",
         "src/runtime/NEON/functions/NEWinogradConvolutionLayer.cpp",
@@ -1286,7 +1293,6 @@ cc_library_static {
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_u8u32_dot_6x16/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_hybrid_u8u32_mmla_6x16/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_bf16fp32_dot_8x12/generic.cpp",
-                "src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_bf16fp32_dot_8x12/x1.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_bf16fp32_mmla_8x12/a510.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_bf16fp32_mmla_8x12/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_interleaved_s8s32_mmla_8x12/a510.cpp",
@@ -1300,7 +1306,6 @@ cc_library_static {
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x12/x1.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_sgemm_8x6/generic.cpp",
-                "src/core/NEON/kernels/arm_gemm/kernels/a64_sgemv_pretransposed/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_fp32_mla_6x4/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_fp32_mla_8x4/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_s8s32_dot_6x4/a55.cpp",
@@ -1312,15 +1317,14 @@ cc_library_static {
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_8x4/a55.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/a64_smallK_hybrid_u8u32_dot_8x4/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_bf16fp32_dot_16VL/generic.cpp",
-                "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_fp16_mla_16VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_fp16fp32fp16_dot_16VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_fp32_mla_16VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_fp32bf16fp32_dot_16VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_s8qa_dot_16VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_gemv_u8qa_dot_16VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_bf16fp32_mopa_1VLx4VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_bf16fp32_mopa_2VLx2VL/generic.cpp",
-                "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_bf16fp32_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_bf16fp32_mopa_4VLx1VL_lhs2VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_fp16fp32_mopa_1VLx4VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_fp16fp32_mopa_2VLx2VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_fp16fp32_mopa_4VLx1VL/generic.cpp",
@@ -1342,6 +1346,37 @@ cc_library_static {
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_u8q_mopa_1VLx4VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_u8q_mopa_2VLx2VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sme2_interleaved_nomerge_u8q_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_bf16fp32_dot_8VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_fp16_mla_8VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_fp16fp32fp16_mla_8VL_rhs2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_fp32_mla_8VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_fp32bf16fp32_dot_8VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_s8qa_dot_8VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_gemv_u8qa_dot_8VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_bf16fp32_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_bf16fp32_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_bf16fp32_mopa_4VLx1VL_lhs2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp16fp32_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp16fp32_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp16fp32_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp16fp32fp16_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp16fp32fp16_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp16fp32fp16_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp32_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp32_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_fp32_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8q_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8q_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8q_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8qfp32_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8qfp32_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8qfp32_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8s32_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8s32_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_s8s32_mopa_4VLx1VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_u8q_mopa_1VLx4VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_u8q_mopa_2VLx2VL/generic.cpp",
+                "src/core/NEON/kernels/arm_gemm/kernels/sme_interleaved_nomerge_u8q_mopa_4VLx1VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sve_ffhybrid_bf16fp32_mmla_6x4VL/generic.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sve_ffhybrid_fp16_mla_6x4VL/a64fx.cpp",
                 "src/core/NEON/kernels/arm_gemm/kernels/sve_ffhybrid_fp16_mla_6x4VL/generic.cpp",

BUILD.bazel

@@ -424,8 +424,7 @@ cc_library(
         "//support",
         "//utils",
         "@@kleidiai//:common",
-        "@@kleidiai//kai/ukernels/matmul:clamp_f32_f32_f32p",
-        "@@kleidiai//kai/ukernels/matmul:rhs_pack_kxn_f32pbiasf32_f32_f32_neon",
+        "@@kleidiai//kai/ukernels/matmul:matmul",
         "//:arm_compute_sve",
         "//:arm_compute_sve2"
     ],