[compiler-rt] r204854 - Add function to get the number of DFSan labels allocated.

[Peter Collingbourne]

Author: pcc
Date: Wed Mar 26 16:09:53 2014
New Revision: 204854

URL: http://llvm.org/viewvc/llvm-project?rev=204854&view=rev
Log:
Add function to get the number of DFSan labels allocated.

Expose the number of DFSan labels allocated by adding function dfsan_get_label_count().

Patch by Sam Kerner!

Differential Revision: http://llvm-reviews.chandlerc.com/D3109

Added:
    compiler-rt/trunk/test/dfsan/label_count.c
Modified:
    compiler-rt/trunk/include/sanitizer/dfsan_interface.h
    compiler-rt/trunk/lib/dfsan/dfsan.cc
    compiler-rt/trunk/lib/dfsan/done_abilist.txt

Modified: compiler-rt/trunk/include/sanitizer/dfsan_interface.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/include/sanitizer/dfsan_interface.h?rev=204854&r1=204853&r2=204854&view=diff
==============================================================================
--- compiler-rt/trunk/include/sanitizer/dfsan_interface.h (original)
+++ compiler-rt/trunk/include/sanitizer/dfsan_interface.h Wed Mar 26 16:09:53 2014
@@ -74,6 +74,9 @@ int dfsan_has_label(dfsan_label label, d
 /// that label, else returns 0.
 dfsan_label dfsan_has_label_with_desc(dfsan_label label, const char *desc);
 
+/// Returns the number of labels allocated.
+size_t dfsan_get_label_count(void);
+
 #ifdef __cplusplus
 }  // extern "C"
 

Modified: compiler-rt/trunk/lib/dfsan/dfsan.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/dfsan/dfsan.cc?rev=204854&r1=204853&r2=204854&view=diff
==============================================================================
--- compiler-rt/trunk/lib/dfsan/dfsan.cc (original)
+++ compiler-rt/trunk/lib/dfsan/dfsan.cc Wed Mar 26 16:09:53 2014
@@ -230,6 +230,14 @@ dfsan_has_label_with_desc(dfsan_label la
   }
 }
 
+extern "C" SANITIZER_INTERFACE_ATTRIBUTE uptr
+dfsan_get_label_count(void) {
+  dfsan_label max_label_allocated =
+      atomic_load(&__dfsan_last_label, memory_order_relaxed);
+
+  return static_cast<uptr>(max_label_allocated);
+}
+
 static void InitializeFlags(Flags &f, const char *env) {
   f.warn_unimplemented = true;
   f.warn_nonzero_labels = false;

Modified: compiler-rt/trunk/lib/dfsan/done_abilist.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/dfsan/done_abilist.txt?rev=204854&r1=204853&r2=204854&view=diff
==============================================================================
--- compiler-rt/trunk/lib/dfsan/done_abilist.txt (original)
+++ compiler-rt/trunk/lib/dfsan/done_abilist.txt Wed Mar 26 16:09:53 2014
@@ -16,6 +16,8 @@ fun:dfsan_get_label=uninstrumented
 fun:dfsan_get_label=custom
 fun:dfsan_read_label=uninstrumented
 fun:dfsan_read_label=discard
+fun:dfsan_get_label_count=uninstrumented
+fun:dfsan_get_label_count=discard
 fun:dfsan_get_label_info=uninstrumented
 fun:dfsan_get_label_info=discard
 fun:dfsan_has_label=uninstrumented

Added: compiler-rt/trunk/test/dfsan/label_count.c
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/dfsan/label_count.c?rev=204854&view=auto
==============================================================================
--- compiler-rt/trunk/test/dfsan/label_count.c (added)
+++ compiler-rt/trunk/test/dfsan/label_count.c Wed Mar 26 16:09:53 2014
@@ -0,0 +1,75 @@
+// RUN: %clang_dfsan -DLIB -m64 -c %s -o %t.lib.o && \
+// RUN: %clang_dfsan       -m64 -c %s -o %t.o && \
+// RUN: %clang_dfsan -m64 %t.lib.o %t.o -o %t.bin && \
+// RUN: %t.bin
+
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 -DLIB -c %s -o %t.lib.o && \
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 -c %s -o %t.o && \
+// RUN: %clang_dfsan -mllvm -dfsan-args-abi -m64 %t.o %t.lib.o -o %t.bin && \
+// RUN: %t.bin
+
+#include <sanitizer/dfsan_interface.h>
+#include <assert.h>
+
+#ifdef LIB
+// Compiling this file with and without LIB defined allows this file to be
+// built as two separate translation units.  This ensures that the code
+// can not be optimized in a way that removes behavior we wish to test.  For
+// example, computing a value should cause labels to be allocated only if
+// the computation is actually done.  Putting the computation here prevents
+// the compiler from optimizing away the computation (and labeling) that
+// tests wish to verify.
+
+int add_in_separate_translation_unit(int a, int b) {
+  return a + b;
+}
+
+int multiply_in_separate_translation_unit(int a, int b) {
+  return a * b;
+}
+
+#else
+
+int add_in_separate_translation_unit(int i, int j);
+int multiply_in_separate_translation_unit(int i, int j);
+
+int main(void) {
+  size_t label_count;
+
+  // No labels allocated yet.
+  label_count = dfsan_get_label_count();
+  assert(0 == label_count);
+
+  int i = 1;
+  dfsan_label i_label = dfsan_create_label("i", 0);
+  dfsan_set_label(i_label, &i, sizeof(i));
+
+  // One label allocated for i.
+  label_count = dfsan_get_label_count();
+  assert(1u == label_count);
+
+  int j = 2;
+  dfsan_label j_label = dfsan_create_label("j", 0);
+  dfsan_set_label(j_label, &j, sizeof(j));
+
+  // Check that a new label was allocated for j.
+  label_count = dfsan_get_label_count();
+  assert(2u == label_count);
+
+  // Create a value that combines i and j.
+  int i_plus_j = add_in_separate_translation_unit(i, j);
+
+  // Check that a label was created for the union of i and j.
+  label_count = dfsan_get_label_count();
+  assert(3u == label_count);
+
+  // Combine i and j in a different way.  Check that the existing label is
+  // reused, and a new label is not created.
+  int j_times_i = multiply_in_separate_translation_unit(j, i);
+  label_count = dfsan_get_label_count();
+  assert(3u == label_count);
+  assert(dfsan_get_label(i_plus_j) == dfsan_get_label(j_times_i));
+
+  return 0;
+}
+#endif  // #ifdef LIB