summaryrefslogtreecommitdiff
path: root/libcxx/benchmarks
diff options
context:
space:
mode:
authorLouis Dionne <ldionne.2@gmail.com>2022-06-30 11:57:52 -0400
committerLouis Dionne <ldionne.2@gmail.com>2022-07-19 10:50:20 -0400
commit8711fcae276a59345506f585a29db8e2b07f8d21 (patch)
treed973a4e0fb66904c3476dcd66bcce0f606bae5e0 /libcxx/benchmarks
parent7300a651f5f3b43f9fa3a2d9927322b0e061fcb2 (diff)
downloadllvm-8711fcae276a59345506f585a29db8e2b07f8d21.tar.gz
[libc++] Treat incomplete features just like other experimental features
In particular remove the ability to expel incomplete features from the library at configure-time, since this can now be done through the _LIBCPP_ENABLE_EXPERIMENTAL macro. Also, never provide symbols related to incomplete features inside the dylib, instead provide them in c++experimental.a (this changes the symbols list, but not for any configuration that should have shipped). Differential Revision: https://reviews.llvm.org/D128928
Diffstat (limited to 'libcxx/benchmarks')
-rw-r--r--libcxx/benchmarks/CMakeLists.txt26
1 files changed, 9 insertions, 17 deletions
diff --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index 9bb45cdabd67..b9034ecbf086 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -123,10 +123,7 @@ function(add_benchmark_test name source_file)
else()
target_link_libraries(${libcxx_target} PRIVATE cxx_static)
endif()
- if (TARGET cxx_experimental)
- target_link_libraries(${libcxx_target} PRIVATE cxx_experimental)
- endif()
- target_link_libraries(${libcxx_target} PRIVATE -lbenchmark)
+ target_link_libraries(${libcxx_target} PRIVATE cxx_experimental benchmark)
if (LLVM_USE_SANITIZER)
target_link_libraries(${libcxx_target} PRIVATE -ldl)
endif()
@@ -160,6 +157,7 @@ endfunction()
# Register Benchmark tests
#==============================================================================
set(BENCHMARK_TESTS
+ algorithms.partition_point.bench.cpp
algorithms/lower_bound.bench.cpp
algorithms/make_heap.bench.cpp
algorithms/make_heap_then_sort_heap.bench.cpp
@@ -176,13 +174,19 @@ set(BENCHMARK_TESTS
algorithms/sort.bench.cpp
algorithms/sort_heap.bench.cpp
algorithms/stable_sort.bench.cpp
- algorithms.partition_point.bench.cpp
allocation.bench.cpp
deque.bench.cpp
filesystem.bench.cpp
+ format_to_n.bench.cpp
+ format_to.bench.cpp
+ format.bench.cpp
+ formatted_size.bench.cpp
+ formatter_float.bench.cpp
+ formatter_int.bench.cpp
function.bench.cpp
map.bench.cpp
ordered_set.bench.cpp
+ std_format_spec_string_unicode.bench.cpp
string.bench.cpp
stringstream.bench.cpp
to_chars.bench.cpp
@@ -194,18 +198,6 @@ set(BENCHMARK_TESTS
vector_operations.bench.cpp
)
-if (LIBCXX_ENABLE_INCOMPLETE_FEATURES)
- set(BENCHMARK_TESTS
- ${BENCHMARK_TESTS}
- format_to_n.bench.cpp
- format_to.bench.cpp
- format.bench.cpp
- formatted_size.bench.cpp
- formatter_float.bench.cpp
- formatter_int.bench.cpp
- std_format_spec_string_unicode.bench.cpp)
-endif()
-
foreach(test_path ${BENCHMARK_TESTS})
get_filename_component(test_file "${test_path}" NAME)
string(REPLACE ".bench.cpp" "" test_name "${test_file}")