From 846de99fbd2024dd8c0626408c8f3e3211b4cf0d Mon Sep 17 00:00:00 2001 From: "Mohit K. Bhakkad" Date: Fri, 20 Feb 2015 09:32:45 +0000 Subject: [PATCH] [TSan][MIPS64] Fix few more test cases for MIPS64 Patch by Sagar Thakur Reviewers: dvyukov, samsonov, kcc. Subscribers: dsanders, mohit.bhakkad, Anand.Takale, llvm-commits. Differential Revision: http://reviews.llvm.org/D7290 llvm-svn: 230002 --- compiler-rt/lib/tsan/rtl/tsan_interceptors.cc | 6 +++--- compiler-rt/test/tsan/global_race.cc | 6 +++--- compiler-rt/test/tsan/global_race2.cc | 6 +++--- compiler-rt/test/tsan/global_race3.cc | 6 +++--- compiler-rt/test/tsan/map32bit.cc | 3 +++ compiler-rt/test/tsan/mmap_large.cc | 4 ++++ compiler-rt/test/tsan/test.h | 9 +++++++++ 7 files changed, 28 insertions(+), 12 deletions(-) diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc index 9fc5f2b84e29..de469ce645bf 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc @@ -1926,9 +1926,9 @@ static void CallUserSignalHandler(ThreadState *thr, bool sync, bool acquire, // signal; and it looks too fragile to intercept all ways to reraise a signal. if (flags()->report_bugs && !sync && sig != SIGTERM && errno != 99) { VarSizeStackTrace stack; - // Add 1 to pc because return address is expected, - // OutputReport() will undo this. - ObtainCurrentStack(thr, pc + 1, &stack); + // StackTrace::GetNestInstructionPc(pc) is used because return address is + // expected, OutputReport() will undo this. + ObtainCurrentStack(thr, StackTrace::GetNextInstructionPc(pc), &stack); ThreadRegistryLock l(ctx->thread_registry); ScopedReport rep(ReportTypeErrnoInSignal); if (!IsFiredSuppression(ctx, rep, stack)) { diff --git a/compiler-rt/test/tsan/global_race.cc b/compiler-rt/test/tsan/global_race.cc index d70bee4a556b..3128ec411749 100644 --- a/compiler-rt/test/tsan/global_race.cc +++ b/compiler-rt/test/tsan/global_race.cc @@ -11,9 +11,9 @@ void *Thread(void *a) { int main() { barrier_init(&barrier, 2); - // On FreeBSD, the %p conversion specifier works as 0x%x and thus does not - // match to the format used in the diagnotic message. - fprintf(stderr, "addr=0x%012lx\n", (unsigned long) GlobalData); + fprintf(stderr, "addr="); + print_address(GlobalData); + fprintf(stderr, "\n"); pthread_t t; pthread_create(&t, 0, Thread, 0); GlobalData[2] = 43; diff --git a/compiler-rt/test/tsan/global_race2.cc b/compiler-rt/test/tsan/global_race2.cc index 6631008d85a5..4ab2842e7eef 100644 --- a/compiler-rt/test/tsan/global_race2.cc +++ b/compiler-rt/test/tsan/global_race2.cc @@ -11,9 +11,9 @@ void *Thread(void *a) { int main() { barrier_init(&barrier, 2); - // On FreeBSD, the %p conversion specifier works as 0x%x and thus does not - // match to the format used in the diagnotic message. - fprintf(stderr, "addr2=0x%012lx\n", (unsigned long) &x); + fprintf(stderr, "addr2="); + print_address(&x); + fprintf(stderr, "\n"); pthread_t t; pthread_create(&t, 0, Thread, 0); x = 0; diff --git a/compiler-rt/test/tsan/global_race3.cc b/compiler-rt/test/tsan/global_race3.cc index e7e9a7fef028..1531d7830f78 100644 --- a/compiler-rt/test/tsan/global_race3.cc +++ b/compiler-rt/test/tsan/global_race3.cc @@ -16,9 +16,9 @@ void *Thread(void *a) { int main() { barrier_init(&barrier, 2); - // On FreeBSD, the %p conversion specifier works as 0x%x and thus does not - // match to the format used in the diagnotic message. - fprintf(stderr, "addr3=0x%012lx\n", (unsigned long) XXX::YYY::ZZZ); + fprintf(stderr, "addr3="); + print_address(XXX::YYY::ZZZ); + fprintf(stderr, "\n"); pthread_t t; pthread_create(&t, 0, Thread, 0); XXX::YYY::ZZZ[0] = 0; diff --git a/compiler-rt/test/tsan/map32bit.cc b/compiler-rt/test/tsan/map32bit.cc index 9dae6880e7fe..d9a04655ddca 100644 --- a/compiler-rt/test/tsan/map32bit.cc +++ b/compiler-rt/test/tsan/map32bit.cc @@ -7,6 +7,9 @@ // Test for issue: // https://code.google.com/p/thread-sanitizer/issues/detail?id=5 +// MAP_32BIT flag for mmap is supported only for x86_64. +// XFAIL: mips64 + void *Thread(void *ptr) { *(int*)ptr = 42; barrier_wait(&barrier); diff --git a/compiler-rt/test/tsan/mmap_large.cc b/compiler-rt/test/tsan/mmap_large.cc index e715ea666231..4ae4c0863501 100644 --- a/compiler-rt/test/tsan/mmap_large.cc +++ b/compiler-rt/test/tsan/mmap_large.cc @@ -5,7 +5,11 @@ #include int main() { +#ifdef __x86_64__ const size_t kLog2Size = 39; +#elif defined(__mips64) + const size_t kLog2Size = 32; +#endif const uintptr_t kLocation = 0x40ULL << kLog2Size; void *p = mmap( reinterpret_cast(kLocation), diff --git a/compiler-rt/test/tsan/test.h b/compiler-rt/test/tsan/test.h index 4496e56cda87..bb861b07745e 100644 --- a/compiler-rt/test/tsan/test.h +++ b/compiler-rt/test/tsan/test.h @@ -29,3 +29,12 @@ void barrier_init(pthread_barrier_t *barrier, unsigned count) { // Default instance of the barrier, but a test can declare more manually. pthread_barrier_t barrier; +void print_address(void *address) { +// On FreeBSD, the %p conversion specifier works as 0x%x and thus does not match +// to the format used in the diagnotic message. +#ifdef __x86_64__ + fprintf(stderr, "0x%012lx", (unsigned long) address); +#elif defined(__mips64) + fprintf(stderr, "0x%010lx", (unsigned long) address); +#endif +}