[tsan] Filter OS X architectures for unit testing

[kubamracek]

Summary

The TSan unit test build currently fails if we're also building the iOS parts of compiler-rt, because TSAN_SUPPORTED_ARCH contains ARM64. For unit tests, we need to filter this only to host architecture(s).

[glider]

lib/tsan/tests/CMakeLists.txt

38 ↗

(On Diff #40015)

I'm not familiar with CMake infrastructure enough but I think darwin_filter_host_archs isn't the right way to say "remove ARM64 from the list".
Can we just explicitly set TSAN_TEST_ARCH to x86_64 on Darwin?

[kubamracek]

lib/tsan/tests/CMakeLists.txt

38 ↗

(On Diff #40015)

darwin_filter_host_archs is already used for this purpose in asan/tests/ and sanitizer_common/tests/. It's actually doing a little more work, namely keeping both x86_64 and x86_64h in case your system is a Haswell+ machine.

But I'm actually completely fine with just doing set(TSAN_TEST_ARCH x86_64) here, if you still want me to.

[glider]

lib/tsan/tests/CMakeLists.txt

38 ↗

(On Diff #40015)

Sorry, I cannot comment on whether we want x86_64h or not.
Does that mean that we'll be running the tests twice on the Haswell+ machines?
I think it's good to be consistent with the rest of compiler-rt, but I don't understand why this is done there in the first place.
If you know this is needed, I'm fine with keeping darwin_filter_host_archs

[kubamracek]

lib/tsan/tests/CMakeLists.txt

38 ↗

(On Diff #40015)

Yes, this is consistent with the rest of compiler-rt. We're already running both lit tests and unit tests of ASan and sanitizer-common for x86_64 and x86_64h, if your system is post-Haswell. That's because we also *build* two slices into the ASan dylib...

$ lipo -info ./lib/clang/3.8.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib 
Architectures in the fat file: ./lib/clang/3.8.0/lib/darwin/libclang_rt.asan_osx_dynamic.dylib are: i386 x86_64 x86_64h

...so we want to test them both.

[glider]

I see, thank you for explaining!
The change looks good to me.

compiler-rt/trunk/lib/tsan/tests/CMakeLists.txt

macro(tsan_compile obj_list source arch)
   endif()
   clang_compile(${output_obj} ${source}
           CFLAGS ${TSAN_UNITTEST_CFLAGS} ${TARGET_CFLAGS}
           DEPS ${COMPILE_DEPS})
   list(APPEND ${obj_list} ${output_obj})
 endmacro()
 
 macro(add_tsan_unittest testname)
+  set(TSAN_TEST_ARCH ${TSAN_SUPPORTED_ARCH})
+  if(APPLE)
+    darwin_filter_host_archs(TSAN_SUPPORTED_ARCH TSAN_TEST_ARCH)
+  endif()
   if(UNIX)
-    foreach(arch ${TSAN_SUPPORTED_ARCH})
+    foreach(arch ${TSAN_TEST_ARCH})
       cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN})
       set(TEST_OBJECTS)
       foreach(SOURCE ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE})
         tsan_compile(TEST_OBJECTS ${SOURCE} ${arch} ${TEST_HEADERS})
       endforeach()
       get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
       set(TEST_DEPS ${TEST_OBJECTS})
       if(NOT COMPILER_RT_STANDALONE_BUILD)