Introduce basic ARM64 build support for apple silicon with libraries updated and rebuilt with universal support

Author: Rye

autobuild.xml

@@ -34,7 +34,7 @@ add_compile_definitions(BOOST_BIND_GLOBAL_PLACEHOLDERS)
 
 # Force enable SSE2 instructions in GLM per the manual
 # https://github.com/g-truc/glm/blob/master/manual.md#section2_10
-add_compile_definitions(GLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 GLM_FORCE_SSE2=1 GLM_ENABLE_EXPERIMENTAL=1)
+add_compile_definitions(GLM_FORCE_DEFAULT_ALIGNED_GENTYPES=1 GLM_ENABLE_EXPERIMENTAL=1)
 
 # Configure crash reporting
 set(RELEASE_CRASH_REPORTING OFF CACHE BOOL "Enable use of crash reporting in release builds")
@@ -197,13 +197,19 @@ if (LINUX)
 endif (LINUX)
 
 if (DARWIN)
+  # Use rpath loading on macos
+  set(CMAKE_MACOSX_RPATH TRUE)
+
   # Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default
   set(CLANG_DISABLE_FATAL_WARNINGS OFF)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
 
   # Ensure debug symbols are always generated
   add_compile_options(-g --debug) # --debug is a clang synonym for -g that bypasses cmake behaviors
+
+  # Silence GL deprecation warnings
+  add_compile_definitions(GL_SILENCE_DEPRECATION=1)
 endif(DARWIN)
 
 if(LINUX OR DARWIN)

indra/cmake/00-Common.cmake

@@ -9,28 +9,15 @@ use_system_binary( apr apr-util )
 use_prebuilt_binary(apr_suite)
 
 if (WINDOWS)
-  if (LLCOMMON_LINK_SHARED)
-    set(APR_selector "lib")
-  else (LLCOMMON_LINK_SHARED)
-    set(APR_selector "")
-  endif (LLCOMMON_LINK_SHARED)
   target_link_libraries( ll::apr INTERFACE
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}apr-1.lib
-          ${ARCH_PREBUILT_DIRS_RELEASE}/${APR_selector}aprutil-1.lib
+          ${ARCH_PREBUILT_DIRS_RELEASE}/apr-1.lib
+          ${ARCH_PREBUILT_DIRS_RELEASE}/aprutil-1.lib
           )
   target_compile_definitions( ll::apr INTERFACE APR_DECLARE_STATIC=1 APU_DECLARE_STATIC=1 API_DECLARE_STATIC=1)
 elseif (DARWIN)
-  if (LLCOMMON_LINK_SHARED)
-    set(APR_selector     "0.dylib")
-    set(APRUTIL_selector "0.dylib")
-  else (LLCOMMON_LINK_SHARED)
-    set(APR_selector     "a")
-    set(APRUTIL_selector "a")
-  endif (LLCOMMON_LINK_SHARED)
-
   target_link_libraries( ll::apr INTERFACE
-          ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.${APR_selector}
-          ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.${APR_selector}
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.a
+          ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.a
           iconv
           )
 else()

indra/cmake/APR.cmake

@@ -66,6 +66,7 @@ set(cmake_SOURCE_FILES
         Prebuilt.cmake
         Python.cmake
         SDL2.cmake
+        SSE2NEON.cmake
         TemplateCheck.cmake
         ThreeJS.cmake
         TinyEXR.cmake

indra/cmake/CMakeLists.txt

@@ -57,11 +57,6 @@ if(WINDOWS)
         SDL2.dll
         )
 
-    if(LLCOMMON_LINK_SHARED)
-        set(release_files ${release_files} libapr-1.dll)
-        set(release_files ${release_files} libaprutil-1.dll)
-    endif()
-
     # Filenames are different for 32/64 bit BugSplat file and we don't
     # have any control over them so need to branch.
     if (USE_BUGSPLAT)
@@ -173,15 +168,6 @@ elseif(DARWIN)
         libSDL2.dylib
        )
 
-    if(LLCOMMON_LINK_SHARED)
-        set(release_files ${release_files}
-            libapr-1.0.dylib
-            libapr-1.dylib
-            libaprutil-1.0.dylib
-            libaprutil-1.dylib
-            )
-    endif()
-
     if (TARGET ll::openal)
       list(APPEND release_files libalut.dylib libopenal.dylib)
     endif ()
@@ -215,20 +201,6 @@ elseif(LINUX)
         libSDL2-2.0.so.0
         )
 
-     if( USE_AUTOBUILD_3P )
-         list( APPEND release_files
-                 libapr-1.so.0
-                 libaprutil-1.so.0
-                 )
-
-        if(LLCOMMON_LINK_SHARED)
-            set(release_files ${release_files}
-                libapr-1.so.0
-                libaprutil-1.so.0
-                )
-        endif()
-     endif()
-
 else(WINDOWS)
     message(STATUS "WARNING: unrecognized platform for staging 3rd party libs, skipping...")
     set(vivox_lib_dir "${CMAKE_SOURCE_DIR}/newview/vivox-runtime/i686-linux")

indra/cmake/Copy3rdPartyLibs.cmake

@@ -99,6 +99,13 @@ MACRO(LL_ADD_PROJECT_UNIT_TESTS project sources)
     target_include_directories (PROJECT_${project}_TEST_${name} PRIVATE ${LIBS_OPEN_DIR}/test )
 
     set_target_properties(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
+    if (DARWIN)
+      set_target_properties(PROJECT_${project}_TEST_${name}
+          PROPERTIES
+          BUILD_WITH_INSTALL_RPATH 1
+          INSTALL_RPATH "@executable_path/Resources"
+          )
+    endif(DARWIN)
 
     #
     # Per-codefile additional / external project dep and lib dep property extraction
@@ -229,8 +236,11 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     # test binaries always need to be signed for local development
     set_target_properties(INTEGRATION_TEST_${testname}
             PROPERTIES
-            XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-")
-  endif ()
+            XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "-"
+            BUILD_WITH_INSTALL_RPATH 1
+            INSTALL_RPATH "@executable_path/Resources"
+            )
+  endif(DARWIN)
 
   # Add link deps to the executable
   if(TEST_DEBUG)

indra/cmake/LLAddBuildTest.cmake

@@ -0,0 +1,12 @@
+# -*- cmake -*-
+
+include(Prebuilt)
+
+add_library(ll::sse2neon INTERFACE IMPORTED)
+
+if (DARWIN)
+    use_system_binary(sse2neon)
+    use_prebuilt_binary(sse2neon)
+
+    target_include_directories( ll::sse2neon SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include/sse2neon)
+endif()

indra/cmake/SSE2NEON.cmake

@@ -145,30 +145,26 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}")
   message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET = '${CMAKE_OSX_DEPLOYMENT_TARGET}'")
 
-  string(REGEX MATCH "-stdlib=([^ ]+)" scratch "$ENV{LL_BUILD}")
-  set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "${CMAKE_MATCH_1}")
-  message(STATUS "CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY = '${CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY}'")
-
   string(REGEX MATCH "-O([^ ]*)" scratch "$ENV{LL_BUILD}")
   set(CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL "${CMAKE_MATCH_1}")
   message(STATUS "CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL = '${CMAKE_XCODE_ATTRIBUTE_GCC_OPTIMIZATION_LEVEL}'")
 
   # allow disabling this check by setting LL_SKIP_REQUIRE_SYSROOT either ON as cmake cache var or non-empty as environment var
-  set(LL_SKIP_REQUIRE_SYSROOT OFF CACHE BOOL "Skip requirement to set toolchain sysroot ahead of time. Not skipped by default for consistency, but skipping can be useful for selecting alternative xcode versions side by side")
-  if("$ENV{LL_SKIP_REQUIRE_SYSROOT}" STREQUAL "" AND NOT ${LL_SKIP_REQUIRE_SYSROOT})
-    string(REGEX MATCHALL "[^ ]+" LL_BUILD_LIST "$ENV{LL_BUILD}")
-    list(FIND LL_BUILD_LIST "-iwithsysroot" sysroot_idx)
-    if ("${sysroot_idx}" LESS 0)
-      message(FATAL_ERROR "Environment variable LL_BUILD must contain '-iwithsysroot'")
-    endif ()
-    math(EXPR sysroot_idx "${sysroot_idx} + 1")
-    list(GET LL_BUILD_LIST "${sysroot_idx}" CMAKE_OSX_SYSROOT)
-  endif()
-  message(STATUS "CMAKE_OSX_SYSROOT = '${CMAKE_OSX_SYSROOT}'")
+  # set(LL_SKIP_REQUIRE_SYSROOT OFF CACHE BOOL "Skip requirement to set toolchain sysroot ahead of time. Not skipped by default for consistency, but skipping can be useful for selecting alternative xcode versions side by side")
+  # if("$ENV{LL_SKIP_REQUIRE_SYSROOT}" STREQUAL "" AND NOT ${LL_SKIP_REQUIRE_SYSROOT})
+  #   string(REGEX MATCHALL "[^ ]+" LL_BUILD_LIST "$ENV{LL_BUILD}")
+  #   list(FIND LL_BUILD_LIST "-iwithsysroot" sysroot_idx)
+  #   if ("${sysroot_idx}" LESS 0)
+  #     message(FATAL_ERROR "Environment variable LL_BUILD must contain '-iwithsysroot'")
+  #   endif ()
+  #   math(EXPR sysroot_idx "${sysroot_idx} + 1")
+  #   list(GET LL_BUILD_LIST "${sysroot_idx}" CMAKE_OSX_SYSROOT)
+  # endif()
+  # message(STATUS "CMAKE_OSX_SYSROOT = '${CMAKE_OSX_SYSROOT}'")
 
   # Force debug symbol generation under xcode generator
   set(CMAKE_XCODE_ATTRIBUTE_GCC_GENERATE_DEBUGGING_SYMBOLS YES)
-  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf-with-dsym)
+  set(CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT dwarf)
   message(STATUS "CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT = '${CMAKE_XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT}'")
 
   # Strip dead code
@@ -193,9 +189,16 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(CMAKE_XCODE_ATTRIBUTE_LD_WARN_DUPLICATE_LIBRARIES NO)
   set(CMAKE_XCODE_ATTRIBUTE_DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING YES)
   set(CMAKE_XCODE_ATTRIBUTE_GCC_WARN_64_TO_32_BIT_CONVERSION NO)
-  set(CMAKE_OSX_ARCHITECTURES "${ARCH}")
-  string(REPLACE "i686"  "i386"   CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
-  string(REPLACE "AMD64" "x86_64" CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES}")
+
+  option(BUILD_UNIVERSAL "Build macOS universal binaries" ON)
+  option(BUILD_ARM64 "Build for arm64 on macos" ON)
+  if(BUILD_UNIVERSAL)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+  elseif(BUILD_ARM64)
+    set(CMAKE_OSX_ARCHITECTURES "arm64")
+  else()
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
+  endif()
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 # Default deploy grid

indra/cmake/Variables.cmake

@@ -11,7 +11,7 @@ include(LLSharedLibs)
 include(Copy3rdPartyLibs)
 include(ZLIBNG)
 include(Tracy)
-
+include(SSE2NEON)
 
 set(llcommon_SOURCE_FILES
     apply.cpp
@@ -75,7 +75,7 @@ set(llcommon_SOURCE_FILES
     llprocess.cpp
     llprocessor.cpp
     llprocinfo.cpp
-    llptrto.cpp 
+    llptrto.cpp
     llqueuedthread.cpp
     llrand.cpp
     llrefcount.cpp
@@ -116,7 +116,7 @@ set(llcommon_SOURCE_FILES
     workqueue.cpp
     StackWalker.cpp
     )
-    
+
 set(llcommon_HEADER_FILES
     CMakeLists.txt
 
@@ -272,7 +272,7 @@ set(llcommon_HEADER_FILES
     workqueue.h
     StackWalker.h
     )
-    
+
 if (DARWIN)
   list(APPEND llcommon_HEADER_FILES llsys_objc.h)
   list(APPEND llcommon_SOURCE_FILES llsys_objc.mm)
@@ -294,6 +294,7 @@ target_link_libraries(
         ll::boost
         ll::oslibraries
         ll::tracy
+        ll::sse2neon
     )
 
 target_include_directories(llcommon INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})

indra/llcommon/CMakeLists.txt

@@ -64,7 +64,7 @@ bool        BlockTimer::sLog             = false;
 std::string BlockTimer::sLogName         = "";
 bool        BlockTimer::sMetricLog       = false;
 
-#if LL_LINUX
+#if LL_LINUX || LL_DARWIN
 U64         BlockTimer::sClockResolution = 1000000000; // Nanosecond resolution
 #else
 U64         BlockTimer::sClockResolution = 1000000; // Microsecond resolution