Testing upstream Embree4 + WinArm

.github/workflows/continuous.yaml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-15-intel, macos-15]
-        config: [RelwithDebInfo, Debug]
+        config: [RelWithDebInfo, Debug]
         compiler: [gcc, apple, llvm]
         sanitizer: ["Address", "Thread"] # TODO: Add Memory+Undefined Sanitizer
         exclude:
@@ -182,11 +182,12 @@ jobs:
   ####################
 
   Windows:
-    name: windows-2025 (${{ matrix.config }})
-    runs-on: windows-2025
+    name: ${{ matrix.os }} (${{ matrix.config }})
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
+        os: [windows-2025, windows-11-arm]
         config: [Release, Debug]
     steps:
       - name: Show disk space
@@ -205,48 +206,51 @@ jobs:
       - name: Install Ninja
         uses: seanmiddleditch/gha-setup-ninja@master
 
-      - name: Set env variable for sccache
-        run: |
-          echo "appdata=$env:LOCALAPPDATA" >> ${env:GITHUB_ENV}
-
       - name: Get number of CPU cores
         uses: SimenB/github-actions-cpu-cores@v1
         id: cpu-cores
 
-      - name: Cache build
-        id: cache-build
-        uses: actions/cache@v3
-        with:
-          path: ${{ env.appdata }}\Mozilla\sccache
-          key: ${{ runner.os }}-${{ matrix.config }}-cache
+      - name: Configure sccache
+        run: echo "SCCACHE_GHA_ENABLED=true" >> ${env:GITHUB_ENV}
 
       - name: Prepare sccache
+        uses: mozilla-actions/sccache-action@v0.0.9
+
+      - name: Set x64 vars
+        if: matrix.os == 'windows-2025'
+        run: |
+            echo "BUILD_DIR=D:/build" >> ${env:GITHUB_ENV}
+            echo "ARCH=x64" >> ${env:GITHUB_ENV}
+
+      - name: Set arm64 vars
+        if: matrix.os == 'windows-11-arm'
         run: |
-          iwr -useb 'https://raw.githubusercontent.com/scoopinstaller/install/master/install.ps1' -outfile 'install.ps1'
-          .\install.ps1 -RunAsAdmin
-          scoop install sccache --global
-          # Scoop modifies the PATH so we make it available for the next steps of the job
-          echo "${env:PATH}" >> ${env:GITHUB_PATH}
-
-        # We run configure + build in the same step, since they both need to call VsDevCmd
-        # Also, cmd uses ^ to break commands into multiple lines (in powershell this is `)
-      - name: Configure and build
-        shell: cmd
+            echo "BUILD_DIR=C:/build" >> ${env:GITHUB_ENV}
+            echo "ARCH=arm64" >> ${env:GITHUB_ENV}
+
+      - name: Setup MSVC Developer Command Prompt
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: ${{ env.ARCH }}
+
+        # Cmd uses ^ to break commands into multiple lines, powershell uses `
+      - name: Configure
         run: |
-          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=x64
           cmake --version
-          cmake -G Ninja ^
-            -DCMAKE_BUILD_TYPE=${{ matrix.config }} ^
-            -DLAGRANGE_JENKINS=ON ^
-            -DLAGRANGE_ALL=ON ^
-            -DLAGRANGE_POLYSCOPE_MOCK_BACKEND=ON ^
-            -B "D:/build" ^
+          cmake -G Ninja `
+            -DCMAKE_BUILD_TYPE=${{ matrix.config }} `
+            -DLAGRANGE_JENKINS=ON `
+            -DLAGRANGE_MODULE_RAYCASTING=ON `
+            -B ${{ env.BUILD_DIR }} `
             -S .
-          cmake --build "D:/build" -j ${{ steps.cpu-cores.outputs.count }}
+
+      - name: Build
+        run: |
+          cmake --build ${{ env.BUILD_DIR }} -j ${{ steps.cpu-cores.outputs.count }}
 
       - name: Show disk space
         if: always()
         run: Get-PSDrive
 
       - name: Tests
-        run: cd "D:/build"; ctest --verbose -j ${{ steps.cpu-cores.outputs.count }}
+        run: cd ${{ env.BUILD_DIR }}; ctest --verbose -j ${{ steps.cpu-cores.outputs.count }}

cmake/lagrange/lagrange_find_package.cmake

@@ -43,6 +43,19 @@ function(lagrange_find_package name)
         elseif(${name} STREQUAL algcmake)
             find_package(${name} ${ARGN})
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
+        elseif(${name} STREQUAL embree)
+            if(${ARGC} LESS 2)
+                message(FATAL_ERROR "lagrange_find_package(embree ...) requires at least 1 argument for the version number, ${ARGC} given")
+            endif()
+            if(${ARGV1} EQUAL 3)
+                # Defer to vcpkg port
+                find_package(${name} ${ARGN})
+            elseif(${ARGV1} EQUAL 4)
+                # Use internal embree4.cmake recipe
+                include(embree4)
+            else()
+                message(FATAL_ERROR "Unsupported embree version number: ${ARGV1}")
+            endif()
         else()
             find_package(${name} ${ARGN})
         endif()
@@ -67,6 +80,19 @@ function(lagrange_find_package name)
                 ${algcmake_SOURCE_DIR}/modules
             )
             set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} PARENT_SCOPE)
+        elseif(${name} STREQUAL embree)
+            if(${ARGC} LESS 2)
+                message(FATAL_ERROR "lagrange_find_package(embree ...) requires at least 1 argument for the version number, ${ARGC} given")
+            endif()
+            if(${ARGV1} EQUAL 3)
+                # Redirect to embree3.cmake
+                include(embree3)
+            elseif(${ARGV1} EQUAL 4)
+                # Redirect to embree4.cmake
+                include(embree4)
+            else()
+                message(FATAL_ERROR "Unsupported embree version number: ${ARGV1}")
+            endif()
         else()
             include(${name})
         endif()

cmake/recipes/external/Boost.cmake

@@ -79,12 +79,15 @@ option(BOOST_IOSTREAMS_ENABLE_BZIP2 "Boost.Iostreams: Enable BZip2 support" OFF)
 option(BOOST_IOSTREAMS_ENABLE_LZMA "Boost.Iostreams: Enable LZMA support" OFF)
 option(BOOST_IOSTREAMS_ENABLE_ZSTD "Boost.Iostreams: Enable Zstd support" OFF)
 
-set(BOOST_PATCHES "")
+set(BOOST_PATCHES)
 if(EMSCRIPTEN)
     # Wasm doesn't have rounding mode control yet, so we trick Boost::interval into thinking it has.
     # https://github.com/WebAssembly/rounding-mode-control
     # https://github.com/boostorg/interval/issues/44
-    set(BOOST_PATCHES PATCHES Boost.wasm.patch)
+    list(APPEND BOOST_PATCHES Boost.wasm.patch)
+endif()
+if(WIN32)
+    list(APPEND BOOST_PATCHES Boost.winarm.patch)
 endif()
 
 # Modern CMake target support was added in Boost 1.82.0
@@ -95,7 +98,7 @@ CPMAddPackage(
     URL https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.xz
     URL_HASH SHA256=2e64e5d79a738d0fa6fb546c6e5c2bd28f88d268a2a080546f74e5ff98f29d0e
     EXCLUDE_FROM_ALL ON
-    ${BOOST_PATCHES}
+    PATCHES ${BOOST_PATCHES}
 )
 
 # Due to MKL, we may require the release runtime (/MD) even when compiling in Debug mode.

cmake/recipes/external/Boost.winarm.patch

@@ -0,0 +1,132 @@
+Submodule libs/context contains modified content
+diff --git i/libs/context/CMakeLists.txt w/libs/context/CMakeLists.txt
+index dca5349..bd064b1 100644
+--- i/libs/context/CMakeLists.txt
++++ w/libs/context/CMakeLists.txt
+@@ -12,7 +12,7 @@ list(APPEND CMAKE_MODULE_PATH ${boost_context_SOURCE_DIR}/cmake)
+
+ ## Binary format
+
+-if(WIN32)
++if(WIN32 OR CYGWIN)
+   set(_default_binfmt pe)
+ elseif(APPLE)
+   set(_default_binfmt mach-o)
+@@ -31,7 +31,7 @@ math(EXPR _bits "${CMAKE_SIZEOF_VOID_P}*8")
+
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "^[Aa][Rr][Mm]" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+   set(_default_abi aapcs)
+-elseif(WIN32)
++elseif(WIN32 OR CYGWIN)
+   set(_default_abi ms)
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+   if(_bits EQUAL 32)
+@@ -60,6 +60,8 @@ elseif(_bits EQUAL 32)
+     set(_default_arch arm)
+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+     set(_default_arch mips32)
++  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc32)")
++    set(_default_arch ppc32)
+   else()
+     set(_default_arch i386)
+   endif()
+@@ -69,6 +71,8 @@ else()
+     set(_default_arch arm64)
+   elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+     set(_default_arch mips64)
++  elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc64)")
++    set(_default_arch ppc64)
+   else()
+     set(_default_arch x86_64)
+   endif()
+@@ -89,18 +93,22 @@ if(MSVC)
+   else()
+     set(_default_asm masm)
+   endif()
++elseif(BOOST_CONTEXT_ARCHITECTURE STREQUAL arm64 AND MINGW)
++  set(_default_asm armclang)
+ else()
+   set(_default_asm gas)
+ endif()
+
+-set(BOOST_CONTEXT_ASSEMBLER "${_default_asm}" CACHE STRING "Boost.Context assembler (masm, gas, armasm)")
+-set_property(CACHE BOOST_CONTEXT_ASSEMBLER PROPERTY STRINGS masm gas armasm)
++set(BOOST_CONTEXT_ASSEMBLER "${_default_asm}" CACHE STRING "Boost.Context assembler (masm, gas, armasm, armclang)")
++set_property(CACHE BOOST_CONTEXT_ASSEMBLER PROPERTY STRINGS masm gas armasm armclang)
+
+ unset(_default_asm)
+
+ ## Assembler source suffix
+
+-if(BOOST_CONTEXT_BINARY_FORMAT STREQUAL pe)
++if(BOOST_CONTEXT_ASSEMBLER STREQUAL armclang)
++  set(_default_ext .S)
++elseif(BOOST_CONTEXT_BINARY_FORMAT STREQUAL pe)
+   set(_default_ext .asm)
+ elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL gas)
+   set(_default_ext .S)
+@@ -133,18 +141,22 @@ message(STATUS "Boost.Context: "
+   "implementation ${BOOST_CONTEXT_IMPLEMENTATION}")
+
+ # Enable the right assembler
+-
++set(ASM_LANGUAGE)
+ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
+-  if(BOOST_CONTEXT_ASSEMBLER STREQUAL gas)
++  if(BOOST_CONTEXT_ASSEMBLER STREQUAL gas OR BOOST_CONTEXT_ASSEMBLER STREQUAL armclang)
+     if(CMAKE_CXX_PLATFORM_ID MATCHES "Cygwin")
+-      enable_language(ASM-ATT)
++      set(ASM_LANGUAGE ASM-ATT)
+     else()
+-      enable_language(ASM)
++      set(ASM_LANGUAGE ASM)
+     endif()
+   elseif(BOOST_CONTEXT_ASSEMBLER STREQUAL armasm)
+-    enable_language(ASM_ARMASM)
++    if(MSVC)
++      set(ASM_LANGUAGE ASM_MARMASM)
++    else()
++      set(ASM_LANGUAGE ASM_ARMASM)
++    endif()
+   else()
+-    enable_language(ASM_MASM)
++    set(ASM_LANGUAGE ASM_MASM)
+   endif()
+ endif()
+
+@@ -170,13 +182,29 @@ if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
+
+   set(IMPL_SOURCES ${ASM_SOURCES})
+
+-  if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm AND BOOST_CONTEXT_ARCHITECTURE STREQUAL i386)
+-      set_source_files_properties(${ASM_SOURCES} PROPERTIES COMPILE_FLAGS "/safeseh")
+-  endif()
++  if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm)
+
+-  if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+-    set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
+-  endif()
++    set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/nologo")
++
++    if(MSVC AND NOT(MSVC_VERSION LESS 1936) AND NOT(CMAKE_CXX_SIMULATE_VERSION))
++      set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/quiet")
++    endif()
++
++    if(BOOST_CONTEXT_ARCHITECTURE STREQUAL i386)
++      set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "/safeseh")
++    endif()
++
++  # armasm doesn't support most of these options
++  elseif(NOT BOOST_CONTEXT_ASSEMBLER STREQUAL armasm) # masm
++    if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
++      set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp")
++    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
++      set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-Wno-unused-command-line-argument")
++    endif()
++  endif() # masm
++
++  enable_language(${ASM_LANGUAGE})
++  set_source_files_properties(${ASM_SOURCES} PROPERTIES LANGUAGE ${ASM_LANGUAGE})
+ else()
+   set(IMPL_SOURCES
+     src/continuation.cpp

cmake/recipes/external/embree.cmake → cmake/recipes/external/embree3.cmake

@@ -89,8 +89,10 @@ function(embree_import_target)
     lagrange_find_package(TBB CONFIG REQUIRED)
     ignore_package(TBB)
     get_target_property(TBB_INCLUDE_DIRS TBB::tbb INTERFACE_INCLUDE_DIRECTORIES)
-    add_library(TBB INTERFACE)
-    target_link_libraries(TBB INTERFACE TBB::tbb)
+    if(NOT TARGET TBB)
+        add_library(TBB INTERFACE)
+        target_link_libraries(TBB INTERFACE TBB::tbb)
+    endif()
     set(TBB_LIBRARIES TBB)
 
     # Ready to include embree's atrocious CMake
@@ -105,7 +107,7 @@ function(embree_import_target)
             # Patch for emscripten compatibility. Fix available upstream in Embree 4+.
             # https://github.com/RenderKit/embree/pull/365
             # https://github.com/RenderKit/embree/issues/486
-            embree.patch
+            embree3.patch
     )
 
     unignore_package(TBB)