Tread TSan LLVM flags to driver: unit tests.

[alekseyshl]

Summary

Unit tests for the new clang flags.

[kubamracek]

test/tsan/atomic_free.cc

1–11

Why not just use a pipe instead of writing to %t.out? If you're doing this only to maintain 80-column width, then you can split a line using a backslash:

// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t 2>&1 \
// RUN:   | FileCheck %s

Anyway, I think RUN commands are allowed to be longer that 80 columns (but others probably disagree), there's a lot of tests already doing that.

[alekseyshl]

• Use pipe instead of a temp file as FileCheck input.

[alekseyshl]

Comments addressed.

[alekseyshl]

• Flags renamed.

[seurer]

This revision causes failures on power for both BE and LE:

FAIL: ThreadSanitizer-powerpc64le :: simple_stack.c (237 of 339)

• TEST 'ThreadSanitizer-powerpc64le :: simple_stack.c' FAILED ****

Script:

/home/seurer/llvm/build/llvm-test2/./bin/clang -fsanitize=thread -Wall -m64 -gline-tables-only -O1 /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c -o /home/seurer/llvm/build/llvm-test2/projects/compiler-rt/test/tsan/POWERPC64LEConfig/Output/simple_stack.c.tmp && /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/deflake.bash /home/seurer/llvm/build/llvm-test2/projects/compiler-rt/test/tsan/POWERPC64LEConfig/Output/simple_stack.c.tmp 2>&1 | FileCheck /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c
/home/seurer/llvm/build/llvm-test2/./bin/clang --driver-mode=g++ -fsanitize=thread -Wall -m64 -gline-tables-only -std=c++11 -O1 /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c -o /home/seurer/llvm/build/llvm-test2/projects/compiler-rt/test/tsan/POWERPC64LEConfig/Output/simple_stack.c.tmp -fno-sanitize-thread-func-entry-exit && /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/deflake.bash /home/seurer/llvm/build/llvm-test2/projects/compiler-rt/test/tsan/POWERPC64LEConfig/Output/simple_stack.c.tmp 2>&1 | FileCheck --check-prefix=CHECK-FUNC-ENTRY-EXIT-OFF /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c

/home/seurer/llvm/build/llvm-test2/./bin/clang --driver-mode=g++ -fsanitize=thread -Wall -m64 -gline-tables-only -std=c++11 -O1 /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c -o /home/seurer/llvm/build/llvm-test2/projects/compiler-rt/test/tsan/POWERPC64LEConfig/Output/simple_stack.c.tmp -mllvm -tsan-instrument-func-entry-exit=0 && /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/deflake.bash /home/seurer/llvm/build/llvm-test2/projects/compiler-rt/test/tsan/POWERPC64LEConfig/Output/simple_stack.c.tmp 2>&1 | FileCheck --check-prefix=CHECK-FUNC-ENTRY-EXIT-OFF /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c

Exit Code: 1

Command Output (stderr):

clang-4.0: warning: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated [-Wdeprecated]
/home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c:84:36: error: expected string not found in input
// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT: #1 main{{.*}} {{.*}}simple_stack.c:42{{(:3)?}} ({{.*}})

^

<stdin>:13:2: note: scanning from here
#1 StartThread(unsigned long*, void* (*)(void*)) /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c:36:3 (simple_stack.c.tmp+0x0000100e79c8)
^
<stdin>:19:90: note: possible intended match here
SUMMARY: ThreadSanitizer: data race /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c:6:10 in foo1()

         ^

---

[seurer]

In the new sets of tests the output being looked for is wrong.

Actual output:

Thread T1 (tid=131029, running) created by main thread at:
  #0 pthread_create /home/seurer/llvm/llvm-test2/projects/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc:902 (simple_stack.test2+0x00001005a3f0)
  #1 StartThread(unsigned long*, void* (*)(void*)) /home/seurer/llvm/llvm-test2/projects/compiler-rt/test/tsan/simple_stack.c:36 (simple_stack.test2+0x0000100e79c8)

What is being looked for:
CHECK-FUNC-ENTRY-EXIT-OFF: Thread T1 (tid={{.*}}, running) created by main thread at:
CHECK-FUNC-ENTRY-EXIT-OFF-NEXT: #0 pthread_create {{.*}} ({{.*}})
// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT: #1 main{{.*}} {{.*}}simple_stack.c:42{{(:3)?}} ({{.*}})

Note the actual output has "StartThread" as the #1 function while "main" is being looked for.

This is true for the test for Thread T2 as well.

[alekseyshl]

I'll look into that (meanwhile D26629 should make this test pass).

Apparently, on other platforms it look like this (from my local run on x86):

Thread T1 (tid=113512, running) created by main thread at:
  #0 pthread_create /usr/local/google/home/alekseys/llvm-dev/llvm/projects/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc:902 (simple_stack.c.tmp+0x00000043ea75)
  #1 main /usr/local/google/home/alekseys/llvm-dev/llvm/projects/compiler-rt/test/tsan/simple_stack.c:42 (simple_stack.c.tmp+0x00000049d75b)

test/tsan/atomic_free.cc

-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
+
+// Also check that atomics instrumentation can be configured by either driver or
+// legacy flags:
+
+// RUN: %clangxx_tsan -O1 %s -o %t -fno-sanitize-thread-atomics && not %deflake %run %t 2>&1 \
+// RUN:   | FileCheck --allow-empty --check-prefix=CHECK-NO-ATOMICS %s
+// RUN: %clangxx_tsan -O1 %s -o %t -mllvm -tsan-instrument-atomics=0 && not %deflake %run %t 2>&1 \
+// RUN:   | FileCheck --allow-empty --check-prefix=CHECK-NO-ATOMICS %s <%t.out
+
 #include "test.h"
 
 void *Thread(void *a) {
   __atomic_fetch_add((int*)a, 1, __ATOMIC_SEQ_CST);
   barrier_wait(&barrier);
   return 0;
 }
 
 int main() {
   barrier_init(&barrier, 2);
   int *a = new int(0);
   pthread_t t;
   pthread_create(&t, 0, Thread, a);
   barrier_wait(&barrier);
   delete a;
   pthread_join(t, 0);
 }
 
 // CHECK: WARNING: ThreadSanitizer: data race
+
+// CHECK-NO-ATOMICS-NOT: WARNING: ThreadSanitizer: data race

test/tsan/global_race.cc

-// RUN: %clangxx_tsan -O1 %s -o %T/global_race.cc.exe && %deflake %run %T/global_race.cc.exe | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %T/global_race.cc.exe && %deflake %run %T/global_race.cc.exe 2>&1 \
+// RUN:   | FileCheck %s
+
+// Also check that memory access instrumentation can be configured by either
+// driver or legacy flags:
+
+// RUN: %clangxx_tsan -O1 %s -o %T/global_race.cc.exe -fno-sanitize-thread-memory-access && not %deflake %run %T/global_race.cc.exe 2>&1 \
+// RUN:   | FileCheck --allow-empty --check-prefix=CHECK-MEMORY-ACCESS-OFF %s
+// RUN: %clangxx_tsan -O1 %s -o %T/global_race.cc.exe -mllvm -tsan-instrument-memory-accesses=0 && not %deflake %run %T/global_race.cc.exe 2>&1 \
+// RUN:   | FileCheck --allow-empty --check-prefix=CHECK-MEMORY-ACCESS-OFF %s
+
 #include "test.h"
 
 int GlobalData[10];
 
 void *Thread(void *a) {
   barrier_wait(&barrier);
   GlobalData[2] = 42;
   return 0;
 }
 
 int main() {
   barrier_init(&barrier, 2);
   print_address("addr=", 1, GlobalData);
   pthread_t t;
   pthread_create(&t, 0, Thread, 0);
   GlobalData[2] = 43;
   barrier_wait(&barrier);
   pthread_join(t, 0);
 }
 
 // CHECK: addr=[[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
 // CHECK: Location is global 'GlobalData' {{(of size 40 )?}}at [[ADDR]] (global_race.cc.exe+0x{{[0-9,a-f]+}})
 
+// CHECK-MEMORY-ACCESS-OFF-NOT: WARNING: ThreadSanitizer: data race

test/tsan/simple_stack.c

-// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
 #include "test.h"
 
 int Global;
 
 void __attribute__((noinline)) foo1() {
   Global = 42;
 }
 
int main() {
   pthread_t t[2];
   StartThread(&t[0], Thread1);
   StartThread(&t[1], Thread2);
   pthread_join(t[0], NULL);
   pthread_join(t[1], NULL);
   return 0;
 }
 
+// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
+
+// Also check that functions instrumentation can be configured by either driver
+// or legacy flags:
+
+// RUN: %clangxx_tsan -O1 %s -o %t -fno-sanitize-thread-func-entry-exit && %deflake %run %t 2>&1 \
+// RUN:   | FileCheck --check-prefix=CHECK-FUNC-ENTRY-EXIT-OFF %s
+// RUN: %clangxx_tsan -O1 %s -o %t -mllvm -tsan-instrument-func-entry-exit=0 && %deflake %run %t 2>&1 \
+// RUN:   | FileCheck --check-prefix=CHECK-FUNC-ENTRY-EXIT-OFF %s
+
 // CHECK:      WARNING: ThreadSanitizer: data race
 // CHECK-NEXT:   Write of size 4 at {{.*}} by thread T1:
-// CHECK-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack.c:7{{(:10)?}} ({{.*}})
-// CHECK-NEXT:     #1 bar1{{.*}} {{.*}}simple_stack.c:12{{(:3)?}} ({{.*}})
-// CHECK-NEXT:     #2 Thread1{{.*}} {{.*}}simple_stack.c:26{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack.c:6{{(:10)?}} ({{.*}})
+// CHECK-NEXT:     #1 bar1{{.*}} {{.*}}simple_stack.c:11{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #2 Thread1{{.*}} {{.*}}simple_stack.c:25{{(:3)?}} ({{.*}})
 // CHECK:        Previous read of size 4 at {{.*}} by thread T2:
-// CHECK-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack.c:16{{(:20)?}} ({{.*}})
-// CHECK-NEXT:     #1 bar2{{.*}} {{.*}}simple_stack.c:21{{(:3)?}} ({{.*}})
-// CHECK-NEXT:     #2 Thread2{{.*}} {{.*}}simple_stack.c:31{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack.c:15{{(:20)?}} ({{.*}})
+// CHECK-NEXT:     #1 bar2{{.*}} {{.*}}simple_stack.c:20{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #2 Thread2{{.*}} {{.*}}simple_stack.c:30{{(:3)?}} ({{.*}})
 // CHECK:        Thread T1 (tid={{.*}}, running) created by main thread at:
 // CHECK-NEXT:     #0 pthread_create {{.*}} ({{.*}})
-// CHECK-NEXT:     #1 StartThread{{.*}} {{.*}}simple_stack.c:37{{(:3)?}} ({{.*}})
-// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack.c:43{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #1 StartThread{{.*}} {{.*}}simple_stack.c:36{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack.c:42{{(:3)?}} ({{.*}})
 // CHECK:        Thread T2 ({{.*}}) created by main thread at:
 // CHECK-NEXT:     #0 pthread_create {{.*}} ({{.*}})
-// CHECK-NEXT:     #1 StartThread{{.*}} {{.*}}simple_stack.c:37{{(:3)?}} ({{.*}})
-// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack.c:44{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #1 StartThread{{.*}} {{.*}}simple_stack.c:36{{(:3)?}} ({{.*}})
+// CHECK-NEXT:     #2 main{{.*}} {{.*}}simple_stack.c:43{{(:3)?}} ({{.*}})
+
+// CHECK-FUNC-ENTRY-EXIT-OFF:      WARNING: ThreadSanitizer: data race
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:   Write of size 4 at {{.*}} by thread T1:
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:     #0 foo1{{.*}} {{.*}}simple_stack.c:6{{(:10)?}} ({{.*}})
+// CHECK-FUNC-ENTRY-EXIT-OFF:        Previous read of size 4 at {{.*}} by thread T2:
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:     #0 foo2{{.*}} {{.*}}simple_stack.c:15{{(:20)?}} ({{.*}})
+// CHECK-FUNC-ENTRY-EXIT-OFF:        Thread T1 (tid={{.*}}, running) created by main thread at:
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:     #0 pthread_create {{.*}} ({{.*}})
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:     #1 main{{.*}} {{.*}}simple_stack.c:42{{(:3)?}} ({{.*}})
+// CHECK-FUNC-ENTRY-EXIT-OFF:        Thread T2 ({{.*}}) created by main thread at:
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:     #0 pthread_create {{.*}} ({{.*}})
+// CHECK-FUNC-ENTRY-EXIT-OFF-NEXT:     #1 main{{.*}} {{.*}}simple_stack.c:43{{(:3)?}} ({{.*}})