summaryrefslogtreecommitdiffstats
path: root/libcxx/benchmarks/algorithms.bench.cpp
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2019-08-21 00:14:48 +0000
committerEric Fiselier <eric@efcs.ca>2019-08-21 00:14:48 +0000
commita6edef35639bb6314b7d69cf874a87aa5bbb89bb (patch)
tree0cde6efeecf7a9c131ba6d557d742858e9a87527 /libcxx/benchmarks/algorithms.bench.cpp
parentcc89063bff0f73ec7049a1dcb5d4688ae6806941 (diff)
downloadbcm5719-llvm-a6edef35639bb6314b7d69cf874a87aa5bbb89bb.tar.gz
bcm5719-llvm-a6edef35639bb6314b7d69cf874a87aa5bbb89bb.zip
Attempt to fix MSAN failures in benchmarks
llvm-svn: 369482
Diffstat (limited to 'libcxx/benchmarks/algorithms.bench.cpp')
-rw-r--r--libcxx/benchmarks/algorithms.bench.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/libcxx/benchmarks/algorithms.bench.cpp b/libcxx/benchmarks/algorithms.bench.cpp
index eee8a4da2ab..f5f0a02a9a2 100644
--- a/libcxx/benchmarks/algorithms.bench.cpp
+++ b/libcxx/benchmarks/algorithms.bench.cpp
@@ -256,7 +256,13 @@ int main(int argc, char** argv) {
return 1;
const std::vector<size_t> Quantities = {1 << 0, 1 << 2, 1 << 4, 1 << 6,
- 1 << 8, 1 << 10, 1 << 14, 1 << 18};
+ 1 << 8, 1 << 10, 1 << 14,
+ // Running each benchmark in parallel consumes too much memory with MSAN
+ // and can lead to the test process being killed.
+#if !TEST_HAS_FEATURE(memory_sanitizer)
+ 1 << 18
+#endif
+ };
makeCartesianProductBenchmark<Sort, AllValueTypes, AllOrders>(Quantities);
makeCartesianProductBenchmark<StableSort, AllValueTypes, AllOrders>(
Quantities);
OpenPOWER on IntegriCloud