Merge staging-next into staging

This commit is contained in:
nixpkgs-ci[bot]
2026-09-25 11:44:42 +00:00
committed by GitHub
2 changed files with 21 additions and 0 deletions

View File

@@ -0,0 +1,17 @@
diff --git a/cmake/developer_package/compile_flags/functions.cmake b/cmake/developer_package/compile_flags/functions.cmake
index baff79893fe0..a2ca8fa764c1 100644
--- a/cmake/developer_package/compile_flags/functions.cmake
+++ b/cmake/developer_package/compile_flags/functions.cmake
@@ -290,7 +290,11 @@ macro(ov_arm_sve_optimization_flags flags)
# (svld1/svmla_f32/...) and are unaffected. Both GCC and Clang auto-vectorize to SVE here,
# but the knob is compiler-specific (Android/MSVC/IntelLLVM handled above).
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- list(APPEND ${flags} --param=aarch64-autovec-preference=1)
+ if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 16)
+ list(APPEND ${flags} --param=aarch64-autovec-preference=asimd-only)
+ else()
+ list(APPEND ${flags} --param=aarch64-autovec-preference=1)
+ endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|AppleClang)$")
list(APPEND ${flags} -mllvm -scalable-vectorization=off)
endif()

View File

@@ -92,6 +92,10 @@ stdenv.mkDerivation (finalAttrs: {
patches = [
# https://aur.archlinux.org/cgit/aur.git/tree/010-openvino-change-install-paths.patch?h=openvino
./cmake-install-paths.patch
# Fix aarch64 build on GCC 16
# Upstream PR: https://github.com/openvinotoolkit/openvino/pull/38268/changes
./gcc-16-fix.patch
];
# Fix arm computelib ar/ranlib toolchain paths for LTO awareness