This is hell slow on Mac 10.6 x64:
AddressSanitizerInterface.GetOwnershipStressTest (3250302 ms)
On Sat, Mar 10, 2012 at 5:30 AM, Kostya Serebryany <kcc at google.com> wrote:
> Author: kcc
> Date: Fri Mar 9 19:30:01 2012
> New Revision: 152467
>
> URL: http://llvm.org/viewvc/llvm-project?rev=152467&view=rev
> Log:
> [asan] use O(log(N)) algorithm instead of O(N) in __asan_get_ownership
>
> Modified:
> compiler-rt/trunk/lib/asan/asan_allocator.cc
> compiler-rt/trunk/lib/asan/asan_internal.h
> compiler-rt/trunk/lib/asan/asan_posix.cc
> compiler-rt/trunk/lib/asan/asan_win.cc
> compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc
>
> Modified: compiler-rt/trunk/lib/asan/asan_allocator.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.cc?rev=152467&r1=152466&r2=152467&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/asan_allocator.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_allocator.cc Fri Mar 9 19:30:01 2012
> @@ -362,9 +362,6 @@
> return FindChunkByAddr(addr);
> }
>
> - // TODO(glider): AllocationSize() may become very slow if the size of
> - // page_groups_ grows. This can be fixed by increasing kMinMmapSize,
> - // but a better solution is to speed up the search somehow.
> size_t AllocationSize(uintptr_t ptr) {
> if (!ptr) return 0;
> ScopedLock lock(&mu_);
> @@ -413,12 +410,32 @@
>
> private:
> PageGroup *FindPageGroupUnlocked(uintptr_t addr) {
> - for (int i = 0; i < n_page_groups_; i++) {
> - PageGroup *g = page_groups_[i];
> - if (g->InRange(addr)) {
> - return g;
> + int n = n_page_groups_;
> + // If the page groups are not sorted yet, sort them.
> + if (n_sorterd_page_groups < n) {
> + SortArray((uintptr_t*)page_groups_, n);
> + n_sorterd_page_groups = n;
> + }
> + // Binray search over the page groups.
> + int beg = 0, end = n;
> + while (beg < end) {
> + int med = (beg + end) / 2;
> + uintptr_t g = (uintptr_t)page_groups_[med];
> + if (addr > g) {
> + // 'g' points to the end of the group, so 'addr'
> + // may not belong to page_groups_[med] or any previous group.
> + beg = med + 1;
> + } else {
> + // 'addr' may belong to page_groups_[med] or a previous group.
> + end = med;
> }
> }
> + if (beg >= n)
> + return NULL;
> + PageGroup *g = page_groups_[beg];
> + CHECK(g);
> + if (g->InRange(addr))
> + return g;
> return NULL;
> }
>
> @@ -546,6 +563,7 @@
>
> PageGroup *page_groups_[kMaxAvailableRam / kMinMmapSize];
> int n_page_groups_; // atomic
> + int n_sorterd_page_groups;
> };
>
> static MallocInfo malloc_info(LINKER_INITIALIZED);
>
> Modified: compiler-rt/trunk/lib/asan/asan_internal.h
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=152467&r1=152466&r2=152467&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/asan_internal.h (original)
> +++ compiler-rt/trunk/lib/asan/asan_internal.h Fri Mar 9 19:30:01 2012
> @@ -205,6 +205,8 @@
> template<class T> T Min(T a, T b) { return a < b ? a : b; }
> template<class T> T Max(T a, T b) { return a > b ? a : b; }
>
> +void SortArray(uintptr_t *array, size_t size);
> +
> // asan_poisoning.cc
> // Poisons the shadow memory for "size" bytes starting from "addr".
> void PoisonShadow(uintptr_t addr, size_t size, uint8_t value);
>
> Modified: compiler-rt/trunk/lib/asan/asan_posix.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_posix.cc?rev=152467&r1=152466&r2=152467&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/asan_posix.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_posix.cc Fri Mar 9 19:30:01 2012
> @@ -30,6 +30,10 @@
> #include <sys/atomics.h>
> #endif
>
> +// Should not add dependency on libstdc++,
> +// since most of the stuff here is inlinable.
> +#include <algorithm>
> +
> namespace __asan {
>
> static void MaybeInstallSigaction(int signum,
> @@ -112,6 +116,10 @@
> #endif
> }
>
> +void SortArray(uintptr_t *array, size_t size) {
> + std::sort(array, array + size);
> +}
> +
> // ---------------------- TSD ---------------- {{{1
>
> static pthread_key_t tsd_key;
>
> Modified: compiler-rt/trunk/lib/asan/asan_win.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_win.cc?rev=152467&r1=152466&r2=152467&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/asan_win.cc (original)
> +++ compiler-rt/trunk/lib/asan/asan_win.cc Fri Mar 9 19:30:01 2012
> @@ -26,6 +26,10 @@
> #include "asan_procmaps.h"
> #include "asan_thread.h"
>
> +// Should not add dependency on libstdc++,
> +// since most of the stuff here is inlinable.
> +#include <algorithm>
> +
> namespace __asan {
>
> // ---------------------- Memory management ---------------- {{{1
> @@ -267,6 +271,10 @@
> return atexit(function);
> }
>
> +void SortArray(uintptr_t *array, size_t size) {
> + std::sort(array, array + size);
> +}
> +
> } // namespace __asan
>
> #endif // _WIN32
>
> Modified: compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc?rev=152467&r1=152466&r2=152467&view=diff
> ==============================================================================
> --- compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc (original)
> +++ compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc Fri Mar 9 19:30:01 2012
> @@ -363,12 +363,23 @@
> __asan_set_error_report_callback(NULL);
> }
>
> -TEST(AddressSanitizerInterface, DISABLED_GetOwnershipStressTest) {
> - std::vector<void *> v;
> - for (size_t i = 0; i < 3000; i++)
> - v.push_back(malloc(i * 1000));
> - for (size_t i = 0; i < 1000000; i++)
> - __asan_get_ownership(&v);
> - for (size_t i = 0, n = v.size(); i < n; i++)
> - free(v[i]);
> +TEST(AddressSanitizerInterface, GetOwnershipStressTest) {
> + std::vector<char *> pointers;
> + std::vector<size_t> sizes;
> + const size_t kNumMallocs =
> + (__WORDSIZE <= 32 || ASAN_LOW_MEMORY) ? 1 << 10 : 1 << 14;
> + for (size_t i = 0; i < kNumMallocs; i++) {
> + size_t size = i * 100 + 1;
> + pointers.push_back((char*)malloc(size));
> + sizes.push_back(size);
> + }
> + for (size_t i = 0; i < 4000000; i++) {
> + EXPECT_FALSE(__asan_get_ownership(&pointers));
> + EXPECT_FALSE(__asan_get_ownership((void*)0x1234));
> + size_t idx = i % kNumMallocs;
> + EXPECT_TRUE(__asan_get_ownership(pointers[idx]));
> + EXPECT_EQ(sizes[idx], __asan_get_allocated_size(pointers[idx]));
> + }
> + for (size_t i = 0, n = pointers.size(); i < n; i++)
> + free(pointers[i]);
> }
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
--
Alexander Potapenko
Software Engineer
Google Moscow