diff options
author | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2021-05-10 11:59:45 -0700 |
---|---|---|
committer | Christopher Ferris <cferris@google.com> | 2021-05-12 14:35:10 -0700 |
commit | 6583baa3f259137a11d48eef7e7c88799bc8af82 (patch) | |
tree | 6adf2c969f3f544947f40a18067cddd520e183ef | |
parent | 4c8907821948a91d8e1fd3c419f3251ed102ee7c (diff) | |
download | scudo-6583baa3f259137a11d48eef7e7c88799bc8af82.tar.gz |
[scudo] [GWP-ASan] Add GWP-ASan variant of scudo benchmarks.
GWP-ASan is the "production" variant as compiled by compiler-rt, and it's useful to be able to benchmark changes in GWP-ASan or Scudo's GWP-ASan hooks across versions. GWP-ASan is sampled, and sampled allocations are much slower, but given the amount of allocations that happen under test here - we actually get a reasonable representation of GWP-ASan's negligent performance impact between runs.
Reviewed By: cryptoad
Differential Revision: https://reviews.llvm.org/D101865
GitOrigin-RevId: 8936608e6f4dbd2a80acde660849cd87ef5c9d26
Change-Id: I99c8aff8f71fe5523b9d6f5a9a805d5a1827e2b9
-rw-r--r-- | standalone/benchmarks/malloc_benchmark.cpp | 14 | ||||
-rw-r--r-- | standalone/combined.h | 4 |
2 files changed, 13 insertions, 5 deletions
diff --git a/standalone/benchmarks/malloc_benchmark.cpp b/standalone/benchmarks/malloc_benchmark.cpp index ce48dc02f7a..661fff45a8d 100644 --- a/standalone/benchmarks/malloc_benchmark.cpp +++ b/standalone/benchmarks/malloc_benchmark.cpp @@ -13,15 +13,22 @@ #include "benchmark/benchmark.h" #include <memory> +#include <vector> + +void *CurrentAllocator; +template <typename Config> void PostInitCallback() { + reinterpret_cast<scudo::Allocator<Config> *>(CurrentAllocator)->initGwpAsan(); +} template <typename Config> static void BM_malloc_free(benchmark::State &State) { - using AllocatorT = scudo::Allocator<Config>; + using AllocatorT = scudo::Allocator<Config, PostInitCallback<Config>>; auto Deleter = [](AllocatorT *A) { A->unmapTestOnly(); delete A; }; std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT, Deleter); + CurrentAllocator = Allocator.get(); Allocator->reset(); const size_t NBytes = State.range(0); @@ -55,18 +62,19 @@ BENCHMARK_TEMPLATE(BM_malloc_free, scudo::FuchsiaConfig) template <typename Config> static void BM_malloc_free_loop(benchmark::State &State) { - using AllocatorT = scudo::Allocator<Config>; + using AllocatorT = scudo::Allocator<Config, PostInitCallback<Config>>; auto Deleter = [](AllocatorT *A) { A->unmapTestOnly(); delete A; }; std::unique_ptr<AllocatorT, decltype(Deleter)> Allocator(new AllocatorT, Deleter); + CurrentAllocator = Allocator.get(); Allocator->reset(); const size_t NumIters = State.range(0); size_t PageSize = scudo::getPageSizeCached(); - void *Ptrs[NumIters]; + std::vector<void *> Ptrs(NumIters); for (auto _ : State) { size_t SizeLog2 = 0; diff --git a/standalone/combined.h b/standalone/combined.h index 146408a26bf..03a85ec3310 100644 --- a/standalone/combined.h +++ b/standalone/combined.h @@ -51,8 +51,7 @@ public: typedef typename Params::template TSDRegistryT<ThisT> TSDRegistryT; void callPostInitCallback() { - static pthread_once_t OnceControl = PTHREAD_ONCE_INIT; - pthread_once(&OnceControl, PostInitCallback); + pthread_once(&PostInitNonce, PostInitCallback); } struct QuarantineCallback { @@ -952,6 +951,7 @@ private: SecondaryT Secondary; QuarantineT Quarantine; TSDRegistryT TSDRegistry; + pthread_once_t PostInitNonce = PTHREAD_ONCE_INIT; #ifdef GWP_ASAN_HOOKS gwp_asan::GuardedPoolAllocator GuardedAlloc; |