Commit: 798b989e7dae86013412af9a478b1959adf986d7
Author: Brecht Van Lommel
Date: Wed Jan 5 21:19:47 2022 +0100
Branches: blender-v2.83-release
https://developer.blender.org/rB798b989e7dae86013412af9a478b1959adf986d7
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 6dcc7f7b3dd..911b94275c6 100644
--- a/intern/cycles/test/CMakeLists.txt
+++ b/intern/cycles/test/CMakeLists.txt
@@ -108,7 +108,12 @@ CYCLES_TEST(util_path
"cycles_util;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
CYCLES_TEST(util_string
"cycles_util;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
CYCLES_TEST(util_task
"cycles_util;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES};bf_intern_numaapi")
CYCLES_TEST(util_time
"cycles_util;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
-set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS
"${CYCLES_AVX_KERNEL_FLAGS}")
-CYCLES_TEST(util_avxf_avx
"cycles_util;bf_intern_numaapi;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
-set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS
"${CYCLES_AVX2_KERNEL_FLAGS}")
-CYCLES_TEST(util_avxf_avx2
"cycles_util;bf_intern_numaapi;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
+
+# 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)
+ set_source_files_properties(util_avxf_avx_test.cpp PROPERTIES COMPILE_FLAGS
"${CYCLES_AVX_KERNEL_FLAGS}")
+ CYCLES_TEST(util_avxf_avx
"cycles_util;bf_intern_numaapi;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
+ set_source_files_properties(util_avxf_avx2_test.cpp PROPERTIES COMPILE_FLAGS
"${CYCLES_AVX2_KERNEL_FLAGS}")
+ CYCLES_TEST(util_avxf_avx2
"cycles_util;bf_intern_numaapi;${OPENIMAGEIO_LIBRARIES};${BOOST_LIBRARIES}")
+endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
