diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-01-05 23:19:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-01-05 23:22:08 +0300 |
| commit | 2926f10ffe020a010fca3a6b9b735f475a9e2d9f (patch) | |
| tree | cf78d2f0aa5f14f9e9b54f97ea150ec7a375ddc7 /intern | |
| parent | deca1be48077f9f12a2047817616758e0affd3e5 (diff) | |
Fix/workaround macOS Rosetta crash running Cycles AVX tests
Just disable these tests on macOS for now as fixing seems hard, and we want to
be able to cross-compile and test x86_64 on Arm machines on the buildbot.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 51cc47fa704..00ef272a447 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -54,17 +54,21 @@ set(SRC util_transform_test.cpp ) -if(CXX_HAS_AVX) - list(APPEND SRC - util_avxf_avx_test.cpp - ) - set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}") -endif() -if(CXX_HAS_AVX2) - list(APPEND SRC - util_avxf_avx2_test.cpp - ) - set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") +# Disable AVX tests on macOS. Rosetta has problems running them, and other +# platforms should be enough to verify AVX operations are implemented correctly. +if(NOT APPLE) + if(CXX_HAS_AVX) + list(APPEND SRC + util_avxf_avx_test.cpp + ) + set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX_KERNEL_FLAGS}") + endif() + if(CXX_HAS_AVX2) + list(APPEND SRC + util_avxf_avx2_test.cpp + ) + set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS "${CYCLES_AVX2_KERNEL_FLAGS}") + endif() endif() if(WITH_GTESTS) |