Merge remote-tracking branch 'upstream/feat/win-compilation' into zephyr

Author: amrbashir

CMakeLists.txt

@@ -45,7 +45,7 @@ message(STATUS "PROJECT_ROOT_DIR = ${PROJECT_ROOT_DIR}")
 include(${PROJECT_ROOT_DIR}/cmake/bazel.cmake)
 include(${PROJECT_ROOT_DIR}/cmake/option.cmake)
 
-if(NOT ANDROID AND AUTO_DETECT_ARCH AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|i686|i386|x64")
+if (NOT ANDROID AND AUTO_DETECT_ARCH AND HOST_ARCH MATCHES "^(x86|x64)$")
   setup_compiler_march_for_x86(MATH_MARCH_FLAG_SSE MATH_MARCH_FLAG_AVX2 MATH_MARCH_FLAG_AVX512 MATH_MARCH_FLAG_AVX512FP16)
   message(STATUS "best compiler march, sse: " ${MATH_MARCH_FLAG_SSE} ", avx2: " ${MATH_MARCH_FLAG_AVX2} ", avx512: " ${MATH_MARCH_FLAG_AVX512} ", avx512fp16: " ${MATH_MARCH_FLAG_AVX512FP16})
 endif()

src/ailego/CMakeLists.txt

@@ -19,12 +19,9 @@ if(UNIX AND NOT APPLE)
 endif()
 
 if(NOT ANDROID AND AUTO_DETECT_ARCH)
-    message(WARNING "before setup_compiler_march_for_x86")
-    message(WARNING "before  CMAKE_SYSTEM_PROCESSOR - ${CMAKE_SYSTEM_PROCESSOR}")
-    message(WARNING "before  HOST_ARCH - ${HOST_ARCH}")
     if(HOST_ARCH MATCHES "^(x86|x64)$")
         setup_compiler_march_for_x86(MATH_MARCH_FLAG_SSE MATH_MARCH_FLAG_AVX2 MATH_MARCH_FLAG_AVX512 MATH_MARCH_FLAG_AVX512FP16)
-        message(STATUS "best compiler march, sse: " ${MATH_MARCH_FLAG_SSE} ", avx2: " ${MATH_MARCH_FLAG_AVX2} ", avx512: " ${MATH_MARCH_FLAG_AVX512} ", avx512fp16: " ${MATH_MARCH_FLAG_AVX512FP16})
+        message(STATUS "best compiler march - sse: " ${MATH_MARCH_FLAG_SSE} ", avx2: " ${MATH_MARCH_FLAG_AVX2} ", avx512: " ${MATH_MARCH_FLAG_AVX512} ", avx512fp16: " ${MATH_MARCH_FLAG_AVX512FP16})
 
         file(GLOB_RECURSE MATH_FILES_SSE
             ${CMAKE_CURRENT_SOURCE_DIR}/math/*_sse.cc
@@ -93,7 +90,7 @@ if(NOT ANDROID AND AUTO_DETECT_ARCH)
             COMPILE_FLAGS "${MATH_MARCH_FLAG_AVX512FP16}"
         )
     endforeach()
-    elseif(HOST_ARCH MATCHES "^(x86|x64)$")
+    elseif (HOST_ARCH MATCHES "^(arm|arm64)$")
         if(MSVC)
             return()
         endif()

src/turbo/CMakeLists.txt

@@ -2,9 +2,9 @@ include(${PROJECT_ROOT_DIR}/cmake/bazel.cmake)
 include(${PROJECT_ROOT_DIR}/cmake/option.cmake)
 
 if(NOT ANDROID AND AUTO_DETECT_ARCH)
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|i686|i386|x64")
+    if (HOST_ARCH MATCHES "^(x86|x64)$")
         setup_compiler_march_for_x86(TURBO_MARCH_FLAG_SSE TURBO_MARCH_FLAG_AVX2 TURBO_MARCH_FLAG_AVX512 TURBO_MARCH_FLAG_AVX512FP16)
-    elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64|ARM64")
+    elseif (HOST_ARCH MATCHES "^(arm|arm64)$")
         # ARM64 architecture - no special march flags needed for now
         # NEON implementations can be added here if needed
         message(STATUS "turbo: ARM64 detected, skipping x86-specific optimizations")
@@ -18,7 +18,7 @@ file(GLOB_RECURSE ALL_SRCS *.cc *.c *.h)
 # same directory that adds the sources to a target (i.e. here, not in a
 # subdirectory).
 if(NOT ANDROID AND AUTO_DETECT_ARCH)
-    if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|i686|i386|x64")
+    if (HOST_ARCH MATCHES "^(x86|x64)$")
         file(GLOB_RECURSE AVX512_VNNI_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/avx512_vnni/*.cc)
         set_source_files_properties(
             ${AVX512_VNNI_SRCS}