Update WDL to use latest folly

Summary: $title

Differential Revision: D82332329

Author: charles-typ

packages/wdl_bench/0001-folly.patch

@@ -1,54 +1,53 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 44ba37edd..6ba5a69f1 100644
+index ecc11a796..0ffe5abe7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -566,8 +566,8 @@ install(
+@@ -568,6 +568,8 @@ install(
    COMPONENT dev
  )
 
--option(BUILD_TESTS "If enabled, compile the tests." OFF)
--option(BUILD_BENCHMARKS "If enabled, compile the benchmarks." OFF)
 +option(BUILD_TESTS "If enabled, compile the tests." ON)
 +option(BUILD_BENCHMARKS "If enabled, compile the benchmarks." ON)
+ option(BUILD_TESTS "If enabled, compile the tests." OFF)
+ option(BUILD_BENCHMARKS "If enabled, compile the benchmarks." OFF)
  option(BUILD_BROKEN_TESTS "If enabled, compile tests that are known to be broken." OFF)
- option(BUILD_HANGING_TESTS "If enabled, compile tests that are known to hang." OFF)
- option(BUILD_SLOW_TESTS "If enabled, compile tests that take a while to run in debug mode." OFF)
-@@ -692,6 +692,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
-     DIRECTORY container/test/
-       TEST container_access_test SOURCES AccessTest.cpp
-       TEST container_array_test SOURCES ArrayTest.cpp
+@@ -709,7 +711,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+       TEST container_fbvector_test SOURCES FBVectorTest.cpp
+       BENCHMARK container_foreach_benchmark SOURCES ForeachBenchmark.cpp
+       TEST container_foreach_test SOURCES ForeachTest.cpp
+-      BENCHMARK container_hash_maps_bench SOURCES HashMapsBench.cpp
 +      BENCHMARK hash_maps_bench SOURCES HashMapsBench.cpp
-       BENCHMARK container_bit_iterator_bench SOURCES BitIteratorBench.cpp
-       TEST container_bit_iterator_test SOURCES BitIteratorTest.cpp
-       TEST container_enumerate_test SOURCES EnumerateTest.cpp
-@@ -913,6 +914,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+       TEST container_heap_vector_types_test SOURCES heap_vector_types_test.cpp
+       TEST container_map_util_test WINDOWS_DISABLED SOURCES MapUtilTest.cpp
+       TEST container_merge_test SOURCES MergeTest.cpp
+@@ -916,7 +918,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+
      DIRECTORY io/test/
        TEST io_fs_util_test SOURCES FsUtilTest.cpp
-       TEST io_iobuf_test WINDOWS_DISABLED SOURCES IOBufTest.cpp
+-      BENCHMARK io_iobuf_benchmark WINDOWS_DISABLED SOURCES IOBufBenchmark.cpp
 +      BENCHMARK iobuf_benchmark WINDOWS_DISABLED SOURCES IOBufBenchmark.cpp
+       TEST io_iobuf_test WINDOWS_DISABLED SOURCES IOBufTest.cpp
        TEST io_iobuf_cursor_test SOURCES IOBufCursorTest.cpp
        TEST io_iobuf_queue_test SOURCES IOBufQueueTest.cpp
-       TEST io_record_io_test WINDOWS_DISABLED SOURCES RecordIOTest.cpp
-@@ -945,6 +947,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
-       # TODO: Refactor EventHandlerTest to not use eventfd so it can work on Mac OS X.
-       #TEST io_async_event_handler_test WINDOWS_DISABLED SOURCES EventHandlerTest.cpp
-       TEST io_async_async_timeout_test SOURCES AsyncTimeoutTest.cpp
+@@ -957,7 +959,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+         SOURCES DelayedDestructionBaseTest.cpp
+       TEST io_async_destructor_check_test SOURCES DestructorCheckTest.cpp
+       # Fails with gtest macro error
+-      BENCHMARK io_async_event_base_benchmark SOURCES EventBaseBenchmark.cpp
 +      BENCHMARK event_base_benchmark SOURCES EventBaseBenchmark.cpp
-       TEST io_async_async_udp_socket_test APPLE_DISABLED WINDOWS_DISABLED
-         SOURCES AsyncUDPSocketTest.cpp
-       TEST io_async_delayed_destruction_test SOURCES DelayedDestructionTest.cpp
-@@ -1057,6 +1060,10 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+       TEST io_async_event_base_test BROKEN SOURCES EventBaseTest.cpp
+       TEST io_async_event_base_local_test WINDOWS_DISABLED
+         SOURCES EventBaseLocalTest.cpp
+@@ -1063,7 +1065,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+       TEST synchronization_rw_spin_lock_test SOURCES RWSpinLockTest.cpp
        TEST synchronization_semaphore_test WINDOWS_DISABLED
          SOURCES SemaphoreTest.cpp
+-      BENCHMARK synchronization_small_locks_benchmark
++      BENCHMARK small_locks_benchmark
+         SOURCES SmallLocksBenchmark.cpp
        TEST synchronization_small_locks_test SOURCES SmallLocksTest.cpp
-+      BENCHMARK small_locks_benchmark SOURCES SmallLocksBenchmark.cpp
-+
-+    DIRECTORY test/function_benchmark/
-+      BENCHMARK function_benchmark SOURCES main.cpp benchmark_impl.cpp test_functions.cpp
 
-     DIRECTORY synchronization/detail/test/
-       TEST synchronization_detail_hardware_test SOURCES HardwareTest.cpp
-@@ -1139,6 +1146,8 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+@@ -1148,6 +1150,8 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
        TEST locks_test SOURCES SpinLockTest.cpp
        TEST math_test SOURCES MathTest.cpp
        TEST memcpy_test SOURCES MemcpyTest.cpp
@@ -57,45 +56,12 @@ index 44ba37edd..6ba5a69f1 100644
        TEST memory_idler_test SOURCES MemoryIdlerTest.cpp
        TEST memory_test WINDOWS_DISABLED
          SOURCES MemoryTest.cpp
-@@ -1165,6 +1174,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
-         SOURCES ProducerConsumerQueueTest.cpp
-       BENCHMARK range_find_benchmark SOURCES RangeFindBenchmark.cpp
-       TEST random_test SOURCES RandomTest.cpp
-+      BENCHMARK random_benchmark SOURCES RandomBenchmark.cpp
-       TEST range_test SOURCES RangeTest.cpp
-       TEST replaceable_test WINDOWS_DISABLED SOURCES ReplaceableTest.cpp
-       TEST scope_guard_test WINDOWS_DISABLED SOURCES ScopeGuardTest.cpp
-@@ -1227,6 +1237,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+@@ -1240,7 +1244,7 @@ if (BUILD_TESTS OR BUILD_BENCHMARKS)
+     folly_define_tests(
        DIRECTORY crypto/test/
          TEST crypto_blake2xb_test SOURCES Blake2xbTest.cpp
-         TEST crypto_lt_hash_test SOURCES LtHashTest.cpp
+-        BENCHMARK crypto_lt_hash_benchmark SOURCES LtHashBenchmark.cpp
 +        BENCHMARK lt_hash_benchmark SOURCES LtHashBenchmark.cpp
+         TEST crypto_lt_hash_test SOURCES LtHashTest.cpp
      )
    endif()
-
-diff --git a/folly/concurrency/test/ConcurrentHashMapBench.cpp b/folly/concurrency/test/ConcurrentHashMapBench.cpp
-index 770c47ed0..e1e5bf097 100644
---- a/folly/concurrency/test/ConcurrentHashMapBench.cpp
-+++ b/folly/concurrency/test/ConcurrentHashMapBench.cpp
-@@ -214,7 +214,7 @@ void benches() {
-             << std::endl;
-   std::cout << "Test name                         Max time  Avg time  Min time"
-             << std::endl;
--  for (int nthr : {1, 10}) {
-+  for (int nthr : {1, 8, 32, 64}) {
-     std::cout << "========================= " << std::setw(2) << nthr
-               << " threads" << " =========================" << std::endl;
-     bench_ctor_dtor(nthr, 0, "CHM ctor/dtor -- empty          ");
-diff --git a/folly/lang/Hint-inl.h b/folly/lang/Hint-inl.h
-index 2c207a551..bd577ed98 100644
---- a/folly/lang/Hint-inl.h
-+++ b/folly/lang/Hint-inl.h
-@@ -115,7 +115,7 @@ FOLLY_ALWAYS_INLINE void compiler_must_not_elide(T const& t, std::true_type) {
-
- template <typename T>
- FOLLY_ALWAYS_INLINE void compiler_must_not_predict(T& t, std::false_type) {
--  asm volatile("" : "+r"(t));
-+  //asm volatile("" : "+r"(t));
- }
-
- template <typename T>

packages/wdl_bench/install_wdl_bench.sh

@@ -8,7 +8,7 @@ set -Eeuo pipefail
 ##################### BENCHMARK CONFIG #########################
 
 declare -A REPOS=(
-    ['folly']='https://github.com/facebook/folly.git'
+    ['folly']='7bce6fd7626b94e206d9ab66ac1ce34d82a1992c'
     ['fbthrift']='https://github.com/facebook/fbthrift.git'
     ['lzbench']='https://github.com/inikep/lzbench.git'
     ['openssl']='https://github.com/openssl/openssl.git'