aboutsummaryrefslogtreecommitdiff
path: root/lib/libcxx/src/pstl/libdispatch.cpp
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2024-04-26 15:33:29 -0700
committerAndrew Kelley <andrew@ziglang.org>2024-05-08 19:37:29 -0700
commit06ee65af9ed6aa5ee4d1d7f4fab9d7acecf66e76 (patch)
tree1316711b92a43dd5c599e425b8693fa8e1e0c0b7 /lib/libcxx/src/pstl/libdispatch.cpp
parentbc6ebc6f2597fda1f98842c6f545751fef2a5334 (diff)
downloadzig-06ee65af9ed6aa5ee4d1d7f4fab9d7acecf66e76.tar.gz
zig-06ee65af9ed6aa5ee4d1d7f4fab9d7acecf66e76.zip
libcxx: update to LLVM 18
release/18.x branch, commit 78b99c73ee4b96fe9ce0e294d4632326afb2db42 This adds the flag `-D_LIBCPP_HARDENING_MODE` which is determined based on the Zig optimization mode. This commit also fixes libunwind, libcxx, and libcxxabi to properly report sub compilation errors.
Diffstat (limited to 'lib/libcxx/src/pstl/libdispatch.cpp')
-rw-r--r--lib/libcxx/src/pstl/libdispatch.cpp47
1 files changed, 5 insertions, 42 deletions
diff --git a/lib/libcxx/src/pstl/libdispatch.cpp b/lib/libcxx/src/pstl/libdispatch.cpp
index b3a9559d08..52d4afbcce 100644
--- a/lib/libcxx/src/pstl/libdispatch.cpp
+++ b/lib/libcxx/src/pstl/libdispatch.cpp
@@ -10,59 +10,22 @@
#include <__algorithm/pstl_backends/cpu_backends/libdispatch.h>
#include <__config>
#include <dispatch/dispatch.h>
-#include <thread>
_LIBCPP_BEGIN_NAMESPACE_STD
namespace __par_backend::inline __libdispatch {
-
void __dispatch_apply(size_t chunk_count, void* context, void (*func)(void* context, size_t chunk)) noexcept {
::dispatch_apply_f(chunk_count, DISPATCH_APPLY_AUTO, context, func);
}
-__chunk_partitions __partition_chunks(ptrdiff_t element_count) {
- if (element_count == 0) {
- return __chunk_partitions{1, 0, 0};
- } else if (element_count == 1) {
- return __chunk_partitions{1, 0, 1};
- }
-
+__chunk_partitions __partition_chunks(ptrdiff_t element_count) noexcept {
__chunk_partitions partitions;
- partitions.__chunk_count_ = [&] {
- ptrdiff_t cores = std::max(1u, thread::hardware_concurrency());
-
- auto medium = [&](ptrdiff_t n) { return cores + ((n - cores) / cores); };
-
- // This is an approximation of `log(1.01, sqrt(n))` which seemes to be reasonable for `n` larger than 500 and tops
- // at 800 tasks for n ~ 8 million
- auto large = [](ptrdiff_t n) { return static_cast<ptrdiff_t>(100.499 * std::log(std::sqrt(n))); };
-
- if (element_count < cores)
- return element_count;
- else if (element_count < 500)
- return medium(element_count);
- else
- return std::min(medium(element_count), large(element_count)); // provide a "smooth" transition
- }();
+ partitions.__chunk_count_ = std::max<ptrdiff_t>(1, element_count / 256);
partitions.__chunk_size_ = element_count / partitions.__chunk_count_;
- partitions.__first_chunk_size_ = partitions.__chunk_size_;
-
- const ptrdiff_t leftover_item_count = element_count - (partitions.__chunk_count_ * partitions.__chunk_size_);
-
- if (leftover_item_count == 0)
- return partitions;
-
- if (leftover_item_count == partitions.__chunk_size_) {
- partitions.__chunk_count_ += 1;
- return partitions;
- }
-
- const ptrdiff_t n_extra_items_per_chunk = leftover_item_count / partitions.__chunk_count_;
- const ptrdiff_t n_final_leftover_items = leftover_item_count - (n_extra_items_per_chunk * partitions.__chunk_count_);
-
- partitions.__chunk_size_ += n_extra_items_per_chunk;
- partitions.__first_chunk_size_ = partitions.__chunk_size_ + n_final_leftover_items;
+ partitions.__first_chunk_size_ = element_count - (partitions.__chunk_count_ - 1) * partitions.__chunk_size_;
+ if (partitions.__chunk_count_ == 0 && element_count > 0)
+ partitions.__chunk_count_ = 1;
return partitions;
}