Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion .github/workflows/public.continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,42 @@ jobs:
cmake -D BUILD_TBB_FROM_SOURCE=ON -D EMBREE_EXTRA_OPTIONS="-DBUILD_TESTING=ON -DEMBREE_TUTORIALS=ON -DEMBREE_ISPC_SUPPORT=ON -DEMBREE_TESTING_INTENSITY=3" ../superbuild
cmake --build .
cd embree/build
ctest
ctest

windows-11-arm:
runs-on: windows-11-arm
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Build and Run
shell: pwsh
run: |
$opts = "-DBUILD_TESTING=ON"
$opts += " -DEMBREE_TUTORIALS=ON"
$opts += " -DEMBREE_ISPC_SUPPORT=OFF"
$opts += " -DEMBREE_TASKING_SYSTEM=INTERNAL"
$opts += " -DEMBREE_TESTING_INTENSITY=2"

cmake -B build -G "Visual Studio 17 2022" -A ARM64 $opts.Split(" ") .
cmake --build build --config Release
ctest --test-dir build -C Release --output-on-failure

windows-11:
runs-on: windows-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- name: Build and Run
shell: pwsh
run: |
$opts = "-DBUILD_TESTING=ON"
$opts += " -DEMBREE_TUTORIALS=ON"
$opts += " -DEMBREE_ISPC_SUPPORT=OFF"
$opts += " -DEMBREE_TASKING_SYSTEM=INTERNAL"
$opts += " -DEMBREE_TESTING_INTENSITY=2"

cmake -B build -G "Visual Studio 17 2022" $opts.Split(" ") .
cmake --build build --config Release
ctest --test-dir build -C Release --output-on-failure
4 changes: 4 additions & 0 deletions common/simd/arm/sse2neon.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@
#define _sse2neon_likely(x) __builtin_expect(!!(x), 1)
#define _sse2neon_unlikely(x) __builtin_expect(!!(x), 0)
#else /* non-GNU / non-clang compilers */
#if defined(_MSC_VER)
#pragma message("Macro name collisions may happen with unsupported compiler.")
#else
#warning "Macro name collisions may happen with unsupported compiler."
#endif
#ifndef FORCE_INLINE
#define FORCE_INLINE static inline
#endif
Expand Down
2 changes: 1 addition & 1 deletion common/sys/intrinsics.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <intrin.h>
#endif

#if defined(__ARM_NEON)
#if defined(__ARM_NEON) || defined(__aarch64__)
#include "../simd/arm/emulation.h"
#else
#include <immintrin.h>
Expand Down
5 changes: 5 additions & 0 deletions common/sys/platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@
#define __X86_ASM__
#endif

/* normalize ARM64 platform macro */
#if defined(_M_ARM64) || defined(_M_ARM64EC)
#define __aarch64__
#endif

/* detect 64 bit platform */
#if defined(__X86_64__) || defined(__aarch64__)
#define __64BIT__
Expand Down
2 changes: 1 addition & 1 deletion superbuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

## Global settings ##

cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.5)

set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
Expand Down
Loading