This is an archive of the discontinued LLVM Phabricator instance.

Differential D14642

[tsan] Don't require full paths to be present on stack traces
ClosedPublic

Authored by kubamracek on Nov 13 2015, 2:23 AM.

Details

Reviewers
kcc
glider
dvyukov
samsonov
Commits
rG770dac438218: [tsan] Don't require full paths to be present on stack traces
rCRT253075: [tsan] Don't require full paths to be present on stack traces
rL253075: [tsan] Don't require full paths to be present on stack traces
Summary

The OS X symbolizers (namely AtosSymbolizer) don't return full file paths, only file names. This patch modifies mutexset*.cc tests not to require a path to be present in the symbol on the stack trace.

Diff Detail

Event Timeline

kubamracek updated this revision to Diff 40124.Nov 13 2015, 2:23 AM
kubamracek retitled this revision from to [tsan] Don't require full paths to be present on stack traces.
kubamracek updated this object.
kubamracek added reviewers: dvyukov, samsonov, glider, kcc.
kubamracek added subscribers: llvm-commits, zaks.anna, ismailp.
dvyukov accepted this revision.Nov 13 2015, 9:22 AM
dvyukov edited edge metadata.
This revision is now accepted and ready to land.Nov 13 2015, 9:22 AM
Closed by commit rL253075: [tsan] Don't require full paths to be present on stack traces (authored by kuba.brecka). · Explain WhyNov 13 2015, 12:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
tsan/
2 lines
2 lines
4 lines
4 lines
4 lines
6 lines
2 lines

Diff 40124

test/tsan/mutexset1.cc

Show All 20 Lines
int main() { int main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T1 // CHECK: Write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]]):
// CHECK: Previous write of size 4 at {{.*}} by thread T2: // CHECK: Previous write of size 4 at {{.*}} by thread T2:
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset1.cc:[[@LINE+1]] // CHECK: #1 main {{.*}}mutexset1.cc:[[@LINE+1]]
pthread_mutex_init(&mtx, 0); pthread_mutex_init(&mtx, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(&mtx); pthread_mutex_destroy(&mtx);
} }

test/tsan/mutexset2.cc

Show All 20 Lines
int main() { int main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T2: // CHECK: Write of size 4 at {{.*}} by thread T2:
// CHECK: Previous write of size 4 at {{.*}} by thread T1 // CHECK: Previous write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset2.cc:[[@LINE+1]] // CHECK: #1 main {{.*}}mutexset2.cc:[[@LINE+1]]
pthread_mutex_init(&mtx, 0); pthread_mutex_init(&mtx, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(&mtx); pthread_mutex_destroy(&mtx);
} }

test/tsan/mutexset3.cc

Show All 23 Lines
int main() { int main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T1 // CHECK: Write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]):
// CHECK: Previous write of size 4 at {{.*}} by thread T2: // CHECK: Previous write of size 4 at {{.*}} by thread T2:
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset3.cc:[[@LINE+4]] // CHECK: #1 main {{.*}}mutexset3.cc:[[@LINE+4]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at: // CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset3.cc:[[@LINE+2]] // CHECK: #1 main {{.*}}mutexset3.cc:[[@LINE+2]]
pthread_mutex_init(&mtx1, 0); pthread_mutex_init(&mtx1, 0);
pthread_mutex_init(&mtx2, 0); pthread_mutex_init(&mtx2, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(&mtx1); pthread_mutex_destroy(&mtx1);
pthread_mutex_destroy(&mtx2); pthread_mutex_destroy(&mtx2);
} }

test/tsan/mutexset4.cc

Show All 23 Lines
int main() { int main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T2: // CHECK: Write of size 4 at {{.*}} by thread T2:
// CHECK: Previous write of size 4 at {{.*}} by thread T1 // CHECK: Previous write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]], write [[M2:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset4.cc:[[@LINE+4]] // CHECK: #1 main {{.*}}mutexset4.cc:[[@LINE+4]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at: // CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset4.cc:[[@LINE+2]] // CHECK: #1 main {{.*}}mutexset4.cc:[[@LINE+2]]
pthread_mutex_init(&mtx1, 0); pthread_mutex_init(&mtx1, 0);
pthread_mutex_init(&mtx2, 0); pthread_mutex_init(&mtx2, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(&mtx1); pthread_mutex_destroy(&mtx1);
pthread_mutex_destroy(&mtx2); pthread_mutex_destroy(&mtx2);
} }

test/tsan/mutexset5.cc

Show All 24 Linesint main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T1 // CHECK: Write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]]):
// CHECK: Previous write of size 4 at {{.*}} by thread T2 // CHECK: Previous write of size 4 at {{.*}} by thread T2
// CHECK: (mutexes: write [[M2:M[0-9]+]]): // CHECK: (mutexes: write [[M2:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset5.cc:[[@LINE+4]] // CHECK: #1 main {{.*}}mutexset5.cc:[[@LINE+4]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at: // CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset5.cc:[[@LINE+5]] // CHECK: #1 main {{.*}}mutexset5.cc:[[@LINE+5]]
pthread_mutex_init(&mtx1, 0); pthread_mutex_init(&mtx1, 0);
pthread_mutex_init(&mtx2, 0); pthread_mutex_init(&mtx2, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(&mtx1); pthread_mutex_destroy(&mtx1);
pthread_mutex_destroy(&mtx2); pthread_mutex_destroy(&mtx2);
} }

test/tsan/mutexset6.cc

Show All 28 Lines
int main() { int main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T1 // CHECK: Write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]]):
// CHECK: Previous write of size 4 at {{.*}} by thread T2 // CHECK: Previous write of size 4 at {{.*}} by thread T2
// CHECK: (mutexes: write [[M2:M[0-9]+]], read [[M3:M[0-9]+]]): // CHECK: (mutexes: write [[M2:M[0-9]+]], read [[M3:M[0-9]+]]):
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+5]] // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+5]]
// CHECK: Mutex [[M2]] (0x{{.*}}) created at: // CHECK: Mutex [[M2]] (0x{{.*}}) created at:
// CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+4]] // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+4]]
// CHECK: Mutex [[M3]] (0x{{.*}}) created at: // CHECK: Mutex [[M3]] (0x{{.*}}) created at:
// CHECK: #1 main {{.*}}/mutexset6.cc:[[@LINE+3]] // CHECK: #1 main {{.*}}mutexset6.cc:[[@LINE+3]]
pthread_mutex_init(&mtx1, 0); pthread_mutex_init(&mtx1, 0);
pthread_spin_init(&mtx2, 0); pthread_spin_init(&mtx2, 0);
pthread_rwlock_init(&mtx3, 0); pthread_rwlock_init(&mtx3, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(&mtx1); pthread_mutex_destroy(&mtx1);
pthread_spin_destroy(&mtx2); pthread_spin_destroy(&mtx2);
pthread_rwlock_destroy(&mtx3); pthread_rwlock_destroy(&mtx3);
} }

test/tsan/mutexset8.cc

Show All 20 Lines
int main() { int main() {
barrier_init(&barrier, 2); barrier_init(&barrier, 2);
// CHECK: WARNING: ThreadSanitizer: data race // CHECK: WARNING: ThreadSanitizer: data race
// CHECK: Write of size 4 at {{.*}} by thread T1 // CHECK: Write of size 4 at {{.*}} by thread T1
// CHECK: (mutexes: write [[M1:M[0-9]+]]): // CHECK: (mutexes: write [[M1:M[0-9]+]]):
// CHECK: Previous write of size 4 at {{.*}} by thread T2: // CHECK: Previous write of size 4 at {{.*}} by thread T2:
// CHECK: Mutex [[M1]] (0x{{.*}}) created at: // CHECK: Mutex [[M1]] (0x{{.*}}) created at:
// CHECK: #0 pthread_mutex_init // CHECK: #0 pthread_mutex_init
// CHECK: #1 main {{.*}}/mutexset8.cc // CHECK: #1 main {{.*}}mutexset8.cc
mtx = new pthread_mutex_t; mtx = new pthread_mutex_t;
pthread_mutex_init(mtx, 0); pthread_mutex_init(mtx, 0);
pthread_t t[2]; pthread_t t[2];
pthread_create(&t[0], NULL, Thread1, NULL); pthread_create(&t[0], NULL, Thread1, NULL);
pthread_create(&t[1], NULL, Thread2, NULL); pthread_create(&t[1], NULL, Thread2, NULL);
pthread_join(t[0], NULL); pthread_join(t[0], NULL);
pthread_join(t[1], NULL); pthread_join(t[1], NULL);
pthread_mutex_destroy(mtx); pthread_mutex_destroy(mtx);
delete mtx; delete mtx;
} }