Commit: a5b4373f9506322d6c149fe72ef262df017577bf
Author: Brecht Van Lommel
Date: Wed Jan 5 21:19:47 2022 +0100
Branches: master
https://developer.blender.org/rBa5b4373f9506322d6c149fe72ef262df017577bf
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.
===================================================================
M intern/cycles/test/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/test/CMakeLists.txt
b/intern/cycles/test/CMakeLists.txt
index 86a830b2b65..634daab5dc1 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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
