Macos ios build support (#151)

* Added x86 macro protection to avx code

Signed-off-by: s.watsa <[email protected]>

* Added UNIVERSAL definition to include both neon and avx codes for universal builds

Signed-off-by: s.watsa <[email protected]>

* Added toolchain file for ios arm64 build

Signed-off-by: s.watsa <[email protected]>

* Added toolchain for macos universal builds (both x86 and arm64)

Signed-off-by: s.watsa <[email protected]>

---------

Signed-off-by: s.watsa <[email protected]>
Co-authored-by: s.watsa <[email protected]>

Author: sidwat

CMakeLists.txt

@@ -88,6 +88,14 @@ else()
   set(ARM "TRUE")
 endif()
 
+# To build for universal architectures provide in command line: -DUNIVERSAL=TRUE
+if(NOT UNIVERSAL)
+  set(UNIVERSAL "FALSE")
+else()
+  add_definitions(-DUNIVERSAL=1)
+  set(UNIVERSAL "TRUE")
+endif()
+
 ########################################
 # Compilation flags
 ########################################

ios_arm64_toolchain.cmake

@@ -0,0 +1,30 @@
+# Basic system configuration
+set(CMAKE_SYSTEM_NAME Darwin)  # Darwin is the core of macOS/iOS
+set(CMAKE_SYSTEM_PROCESSOR arm64)  # Target ARM64 architecture
+set(CMAKE_OSX_ARCHITECTURES arm64)  # Build only for arm64 (no x86_64)
+set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)  # Minimum iOS version support
+
+# Compiler configuration
+set(CMAKE_C_COMPILER "/usr/bin/clang")  # Path to Apple's clang for C
+set(CMAKE_CXX_COMPILER "/usr/bin/clang++")  # Path to Apple's clang++ for C++
+
+# SDK configuration
+set(CMAKE_OSX_SYSROOT iphoneos)  # Use iOS SDK (automatically found by Xcode)
+
+# Cross-compilation search behavior
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)  # Don't search for programs in sysroot
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)  # Only search for libraries in sysroot
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)  # Only search for includes in sysroot
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)  # Only search for packages in sysroot
+
+# Compiler flags
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch arm64 -fembed-bitcode -isysroot ${CMAKE_OSX_SYSROOT}")
+# -arch arm64: Target ARM64 architecture
+# -fembed-bitcode: Include bitcode for App Store submission
+# -isysroot: Specify iOS SDK path
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch arm64 -fembed-bitcode -isysroot ${CMAKE_OSX_SYSROOT}")
+# Same flags for C++ compilation
+
+# Mark as iOS build
+set(IOS TRUE)  # Can be used in CMakeLists.txt for iOS-specific logic

macos_universal_toolchain.cmake

@@ -0,0 +1,22 @@
+set(CMAKE_SYSTEM_NAME Darwin)
+set(CMAKE_SYSTEM_PROCESSOR universal)
+
+set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build architectures for macOS")
+
+# Standard compiler settings for macOS
+set(CMAKE_C_COMPILER "/usr/bin/clang")
+set(CMAKE_CXX_COMPILER "/usr/bin/clang++")
+
+# Find programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+# Disable codesigning for command-line tools to simplify builds
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED "NO")
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "")
+
+message(STATUS "Using macOS Universal Toolchain for OAPV.")
+message(STATUS "Target architectures: ${CMAKE_OSX_ARCHITECTURES}")
+message(STATUS "UNIVERSAL build option enabled: ${UNIVERSAL}")

src/CMakeLists.txt

@@ -37,6 +37,8 @@ endif()
 
 if(ARM)
   set(SOURCE_FILES ${LIB_API_SRC} ${LIB_INC} ${LIB_BASE_SRC} ${LIB_BASE_INC} ${LIB_NEON_SRC} ${LIB_NEON_INC})
+elseif(UNIVERSAL)
+  set(SOURCE_FILES ${LIB_API_SRC} ${LIB_INC} ${LIB_BASE_SRC} ${LIB_BASE_INC} ${LIB_SSE_SRC} ${LIB_SSE_INC} ${LIB_AVX_SRC} ${LIB_AVX_INC} ${LIB_NEON_SRC} ${LIB_NEON_INC})
 elseif(X86)
   set(SOURCE_FILES ${LIB_API_SRC} ${LIB_INC} ${LIB_BASE_SRC} ${LIB_BASE_INC} ${LIB_SSE_SRC} ${LIB_SSE_INC} ${LIB_AVX_SRC} ${LIB_AVX_INC})
 else()
@@ -106,7 +108,7 @@ if(MSVC)
 elseif(UNIX OR MINGW)
   if (ARM)
     set_property(SOURCE ${NEON} APPEND PROPERTY COMPILE_FLAGS "-flax-vector-conversions")
-  elseif (X86)
+elseif (X86 OR UNIVERSAL)
     set_property(SOURCE ${SSE} APPEND PROPERTY COMPILE_FLAGS "-msse4.1")
     set_property(SOURCE ${AVX} APPEND PROPERTY COMPILE_FLAGS " -mavx2")
   endif()

src/avx/oapv_sad_avx.h

@@ -33,9 +33,9 @@
 #define _OAPV_SAD_AVX_H_
 
 #include "oapv_def.h"
+#if X86_SSE
 #include <immintrin.h>
 
-#if X86_SSE
 extern const oapv_fn_sad_t oapv_tbl_fn_sad_16b_avx[2];
 extern const oapv_fn_ssd_t oapv_tbl_fn_ssd_16b_avx[2];
 extern const oapv_fn_diff_t oapv_tbl_fn_diff_16b_avx[2];

src/avx/oapv_tq_avx.c

@@ -32,6 +32,7 @@
 #include "oapv_def.h"
 #include "oapv_tq_avx.h"
 
+#if X86_SSE
 #ifndef _mm256_set_m128i
 #define _mm256_set_m128i(/* __m128i */ hi, /* __m128i */ lo) \
     _mm256_insertf128_si256(_mm256_castsi128_si256(lo), (hi), 0x1)
@@ -560,4 +561,5 @@ const oapv_fn_itx_adj_t oapv_tbl_fn_itx_adj_avx[2] =
 {
     oapv_adjust_itrans_avx,
         NULL,
-};
+};
+#endif /* X86_SSE */