Skip to content

update fbthrift version to include new optimizations and avoid build errors #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ahmadelyoussef wants to merge 1 commit into from
Closed

update fbthrift version to include new optimizations and avoid build errors #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/wdl_bench/0001-folly.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ index 44ba37edd..6ba5a69f1 100644
@@ -566,8 +566,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)
Expand Down Expand Up @@ -45,7 +45,7 @@ index 44ba37edd..6ba5a69f1 100644
+
+ 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)
Expand All @@ -72,7 +72,7 @@ index 44ba37edd..6ba5a69f1 100644
+ BENCHMARK lt_hash_benchmark SOURCES LtHashBenchmark.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
Expand All @@ -91,11 +91,11 @@ 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>
4 changes: 2 additions & 2 deletions packages/wdl_bench/install_wdl_bench.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ declare -A REPOS=(

declare -A TAGS=(
['folly']='v2025.05.12.00'
['fbthrift']='v2025.05.12.00'
['fbthrift']='v2025.08.18.00'
['lzbench']='d138844ea56b36ff1c1c43b259c866069deb64ad'
['openssl']='openssl-3.3.1'
)
Expand Down Expand Up @@ -112,7 +112,7 @@ build_fbthrift()

sudo ./build/fbcode_builder/getdeps.py install-system-deps --recursive fbthrift

python3 ./build/fbcode_builder/getdeps.py --allow-system-packages build fbthrift --scratch-path "${WDL_BUILD}"
python3 ./build/fbcode_builder/getdeps.py --allow-system-packages build fbthrift --scratch-path "${WDL_BUILD}" --extra-cmake-defines='{"enable_tests": "1"}'

popd || exit
}
Expand Down