<br><br><div class="gmail_quote">On Fri, Mar 16, 2012 at 10:13 AM, Alexander Potapenko <span dir="ltr"><<a href="mailto:glider@google.com">glider@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This is hell slow on Mac 10.6 x64:<br></blockquote><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">AddressSanitizerInterface.GetOwnershipStressTest (3250302 ms)<br></blockquote>
<div><br></div><div>@*#^%$</div><div>Any idea why? Could you please collect a profile (or remind me how to do this with shark)?</div><div><br></div><div>--kcc </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

<div class="im HOEnZb"><br>
On Sat, Mar 10, 2012 at 5:30 AM, Kostya Serebryany <<a href="mailto:kcc@google.com">kcc@google.com</a>> wrote:<br>
</div><div class="HOEnZb"><div class="h5">> Author: kcc<br>
> Date: Fri Mar  9 19:30:01 2012<br>
> New Revision: 152467<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=152467&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=152467&view=rev</a><br>
> Log:<br>
> [asan] use O(log(N)) algorithm instead of O(N) in __asan_get_ownership<br>
><br>
> Modified:<br>
>    compiler-rt/trunk/lib/asan/asan_allocator.cc<br>
>    compiler-rt/trunk/lib/asan/asan_internal.h<br>
>    compiler-rt/trunk/lib/asan/asan_posix.cc<br>
>    compiler-rt/trunk/lib/asan/asan_win.cc<br>
>    compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_allocator.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.cc?rev=152467&r1=152466&r2=152467&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_allocator.cc?rev=152467&r1=152466&r2=152467&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_allocator.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_allocator.cc Fri Mar  9 19:30:01 2012<br>
> @@ -362,9 +362,6 @@<br>
>     return FindChunkByAddr(addr);<br>
>   }<br>
><br>
> -  // TODO(glider): AllocationSize() may become very slow if the size of<br>
> -  // page_groups_ grows. This can be fixed by increasing kMinMmapSize,<br>
> -  // but a better solution is to speed up the search somehow.<br>
>   size_t AllocationSize(uintptr_t ptr) {<br>
>     if (!ptr) return 0;<br>
>     ScopedLock lock(&mu_);<br>
> @@ -413,12 +410,32 @@<br>
><br>
>  private:<br>
>   PageGroup *FindPageGroupUnlocked(uintptr_t addr) {<br>
> -    for (int i = 0; i < n_page_groups_; i++) {<br>
> -      PageGroup *g = page_groups_[i];<br>
> -      if (g->InRange(addr)) {<br>
> -        return g;<br>
> +    int n = n_page_groups_;<br>
> +    // If the page groups are not sorted yet, sort them.<br>
> +    if (n_sorterd_page_groups < n) {<br>
> +      SortArray((uintptr_t*)page_groups_, n);<br>
> +      n_sorterd_page_groups = n;<br>
> +    }<br>
> +    // Binray search over the page groups.<br>
> +    int beg = 0, end = n;<br>
> +    while (beg < end) {<br>
> +      int med = (beg + end) / 2;<br>
> +      uintptr_t g = (uintptr_t)page_groups_[med];<br>
> +      if (addr > g) {<br>
> +        // 'g' points to the end of the group, so 'addr'<br>
> +        // may not belong to page_groups_[med] or any previous group.<br>
> +        beg = med + 1;<br>
> +      } else {<br>
> +        // 'addr' may belong to page_groups_[med] or a previous group.<br>
> +        end = med;<br>
>       }<br>
>     }<br>
> +    if (beg >= n)<br>
> +      return NULL;<br>
> +    PageGroup *g = page_groups_[beg];<br>
> +    CHECK(g);<br>
> +    if (g->InRange(addr))<br>
> +      return g;<br>
>     return NULL;<br>
>   }<br>
><br>
> @@ -546,6 +563,7 @@<br>
><br>
>   PageGroup *page_groups_[kMaxAvailableRam / kMinMmapSize];<br>
>   int n_page_groups_;  // atomic<br>
> +  int n_sorterd_page_groups;<br>
>  };<br>
><br>
>  static MallocInfo malloc_info(LINKER_INITIALIZED);<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_internal.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=152467&r1=152466&r2=152467&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=152467&r1=152466&r2=152467&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_internal.h (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_internal.h Fri Mar  9 19:30:01 2012<br>
> @@ -205,6 +205,8 @@<br>
>  template<class T> T Min(T a, T b) { return a < b ? a : b; }<br>
>  template<class T> T Max(T a, T b) { return a > b ? a : b; }<br>
><br>
> +void SortArray(uintptr_t *array, size_t size);<br>
> +<br>
>  // asan_poisoning.cc<br>
>  // Poisons the shadow memory for "size" bytes starting from "addr".<br>
>  void PoisonShadow(uintptr_t addr, size_t size, uint8_t value);<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_posix.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_posix.cc?rev=152467&r1=152466&r2=152467&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_posix.cc?rev=152467&r1=152466&r2=152467&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_posix.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_posix.cc Fri Mar  9 19:30:01 2012<br>
> @@ -30,6 +30,10 @@<br>
>  #include <sys/atomics.h><br>
>  #endif<br>
><br>
> +// Should not add dependency on libstdc++,<br>
> +// since most of the stuff here is inlinable.<br>
> +#include <algorithm><br>
> +<br>
>  namespace __asan {<br>
><br>
>  static void MaybeInstallSigaction(int signum,<br>
> @@ -112,6 +116,10 @@<br>
>  #endif<br>
>  }<br>
><br>
> +void SortArray(uintptr_t *array, size_t size) {<br>
> +  std::sort(array, array + size);<br>
> +}<br>
> +<br>
>  // ---------------------- TSD ---------------- {{{1<br>
><br>
>  static pthread_key_t tsd_key;<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_win.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_win.cc?rev=152467&r1=152466&r2=152467&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_win.cc?rev=152467&r1=152466&r2=152467&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_win.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_win.cc Fri Mar  9 19:30:01 2012<br>
> @@ -26,6 +26,10 @@<br>
>  #include "asan_procmaps.h"<br>
>  #include "asan_thread.h"<br>
><br>
> +// Should not add dependency on libstdc++,<br>
> +// since most of the stuff here is inlinable.<br>
> +#include <algorithm><br>
> +<br>
>  namespace __asan {<br>
><br>
>  // ---------------------- Memory management ---------------- {{{1<br>
> @@ -267,6 +271,10 @@<br>
>   return atexit(function);<br>
>  }<br>
><br>
> +void SortArray(uintptr_t *array, size_t size) {<br>
> +  std::sort(array, array + size);<br>
> +}<br>
> +<br>
>  }  // namespace __asan<br>
><br>
>  #endif  // _WIN32<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc?rev=152467&r1=152466&r2=152467&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc?rev=152467&r1=152466&r2=152467&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/tests/asan_interface_test.cc Fri Mar  9 19:30:01 2012<br>
> @@ -363,12 +363,23 @@<br>
>   __asan_set_error_report_callback(NULL);<br>
>  }<br>
><br>
> -TEST(AddressSanitizerInterface, DISABLED_GetOwnershipStressTest) {<br>
> -  std::vector<void *> v;<br>
> -  for (size_t i = 0; i < 3000; i++)<br>
> -    v.push_back(malloc(i * 1000));<br>
> -  for (size_t i = 0; i < 1000000; i++)<br>
> -    __asan_get_ownership(&v);<br>
> -  for (size_t i = 0, n = v.size(); i < n; i++)<br>
> -    free(v[i]);<br>
> +TEST(AddressSanitizerInterface, GetOwnershipStressTest) {<br>
> +  std::vector<char *> pointers;<br>
> +  std::vector<size_t> sizes;<br>
> +  const size_t kNumMallocs =<br>
> +      (__WORDSIZE <= 32 || ASAN_LOW_MEMORY) ? 1 << 10 : 1 << 14;<br>
> +  for (size_t i = 0; i < kNumMallocs; i++) {<br>
> +    size_t size = i * 100 + 1;<br>
> +    pointers.push_back((char*)malloc(size));<br>
> +    sizes.push_back(size);<br>
> +  }<br>
> +  for (size_t i = 0; i < 4000000; i++) {<br>
> +    EXPECT_FALSE(__asan_get_ownership(&pointers));<br>
> +    EXPECT_FALSE(__asan_get_ownership((void*)0x1234));<br>
> +    size_t idx = i % kNumMallocs;<br>
> +    EXPECT_TRUE(__asan_get_ownership(pointers[idx]));<br>
> +    EXPECT_EQ(sizes[idx], __asan_get_allocated_size(pointers[idx]));<br>
> +  }<br>
> +  for (size_t i = 0, n = pointers.size(); i < n; i++)<br>
> +    free(pointers[i]);<br>
>  }<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
<br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Alexander Potapenko<br>
Software Engineer<br>
Google Moscow<br>
</font></span></blockquote></div><br>