<div dir="ltr">Ouch, we still have this horrible Makefile.old !<div>I will fix it</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Nov 17, 2015 at 4:18 PM, Reid Kleckner via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div>Your .S file does not appear to assemble in the autoconf build:</div><div><a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/11763" target="_blank">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/11763</a></div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Nov 16, 2015 at 5:55 AM, Adhemerval Zanella via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: azanella<br>
Date: Mon Nov 16 07:55:19 2015<br>
New Revision: 253205<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=253205&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=253205&view=rev</a><br>
Log:<br>
[compiler-rt] [tsan] Enable intercept setjmp/longjmp for AArch64<br>
<br>
This patch adds assembly routines to enable setjmp/longjmp for aarch64<br>
on linux. It fixes:<br>
<br>
* test/tsan/longjmp2.cc<br>
* test/tsan/longjmp3.cc<br>
* test/tsan/longjmp4.cc<br>
* test/tsan/signal_longjmp.cc<br>
<br>
I also checked with perlbench from specpu2006 (it fails to run<br>
with missing setjmp/longjmp intrumentation).<br>
<br>
Added:<br>
compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S<br>
Modified:<br>
compiler-rt/trunk/lib/sanitizer_common/sanitizer_asm.h<br>
compiler-rt/trunk/lib/tsan/CMakeLists.txt<br>
compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc<br>
compiler-rt/trunk/test/tsan/longjmp.cc<br>
compiler-rt/trunk/test/tsan/longjmp2.cc<br>
compiler-rt/trunk/test/tsan/longjmp3.cc<br>
compiler-rt/trunk/test/tsan/longjmp4.cc<br>
compiler-rt/trunk/test/tsan/signal_longjmp.cc<br>
<br>
Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_asm.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_asm.h?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_asm.h?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_asm.h (original)<br>
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_asm.h Mon Nov 16 07:55:19 2015<br>
@@ -23,8 +23,11 @@<br>
# define CFI_STARTPROC .cfi_startproc<br>
# define CFI_ENDPROC .cfi_endproc<br>
# define CFI_ADJUST_CFA_OFFSET(n) .cfi_adjust_cfa_offset n<br>
+# define CFI_DEF_CFA_OFFSET(n) .cfi_def_cfa_offset n<br>
# define CFI_REL_OFFSET(reg, n) .cfi_rel_offset reg, n<br>
+# define CFI_OFFSET(reg, n) .cfi_offset reg, n<br>
# define CFI_DEF_CFA_REGISTER(reg) .cfi_def_cfa_register reg<br>
+# define CFI_DEF_CFA(reg, n) .cfi_def_cfa reg, n<br>
# define CFI_RESTORE(reg) .cfi_restore reg<br>
<br>
#else // No CFI<br>
@@ -32,8 +35,11 @@<br>
# define CFI_STARTPROC<br>
# define CFI_ENDPROC<br>
# define CFI_ADJUST_CFA_OFFSET(n)<br>
+# define CFI_DEF_CFA_OFFSET(n)<br>
# define CFI_REL_OFFSET(reg, n)<br>
+# define CFI_OFFSET(reg, n)<br>
# define CFI_DEF_CFA_REGISTER(reg)<br>
+# define CFI_DEF_CFA(reg, n)<br>
# define CFI_RESTORE(reg)<br>
#endif<br>
<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/CMakeLists.txt?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/CMakeLists.txt (original)<br>
+++ compiler-rt/trunk/lib/tsan/CMakeLists.txt Mon Nov 16 07:55:19 2015<br>
@@ -121,6 +121,11 @@ else()<br>
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go<br>
COMMENT "Checking TSan Go runtime..."<br>
VERBATIM)<br>
+ elseif(arch STREQUAL "aarch64")<br>
+ set(TSAN_ASM_SOURCES rtl/tsan_rtl_aarch64.S)<br>
+ # Pass ASM file directly to the C++ compiler.<br>
+ set_source_files_properties(${TSAN_ASM_SOURCES} PROPERTIES<br>
+ LANGUAGE C)<br>
else()<br>
set(TSAN_ASM_SOURCES)<br>
endif()<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc (original)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Mon Nov 16 07:55:19 2015<br>
@@ -451,8 +451,12 @@ static void SetJmp(ThreadState *thr, upt<br>
static void LongJmp(ThreadState *thr, uptr *env) {<br>
#if SANITIZER_FREEBSD<br>
uptr mangled_sp = env[2];<br>
-#else<br>
+#elif defined(SANITIZER_LINUX)<br>
+# ifdef __aarch64__<br>
+ uptr mangled_sp = env[13];<br>
+# else<br>
uptr mangled_sp = env[6];<br>
+# endif<br>
#endif // SANITIZER_FREEBSD<br>
// Find the saved buf by mangled_sp.<br>
for (uptr i = 0; i < thr->jmp_bufs.Size(); i++) {<br>
<br>
Added: compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S?rev=253205&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S?rev=253205&view=auto</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S (added)<br>
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_rtl_aarch64.S Mon Nov 16 07:55:19 2015<br>
@@ -0,0 +1,206 @@<br>
+#include "sanitizer_common/sanitizer_asm.h"<br>
+.section .text<br>
+<br>
+.hidden __tsan_setjmp<br>
+.comm _ZN14__interception11real_setjmpE,8,8<br>
+.type setjmp, @function<br>
+setjmp:<br>
+ CFI_STARTPROC<br>
+<br>
+ // save env parameters for function call<br>
+ stp x29, x30, [sp, -32]!<br>
+ CFI_DEF_CFA_OFFSET (32)<br>
+ CFI_OFFSET (29, -32)<br>
+ CFI_OFFSET (30, -24)<br>
+<br>
+ // Adjust the SP for previous frame<br>
+ add x29, sp, 0<br>
+ CFI_DEF_CFA_REGISTER (29)<br>
+<br>
+ // Save jmp_buf<br>
+ str x19, [sp, 16]<br>
+ CFI_OFFSET (19, -16)<br>
+ mov x19, x0<br>
+<br>
+ // SP pointer mangling (see glibc setjmp)<br>
+ adrp x2, :got:__pointer_chk_guard<br>
+ ldr x2, [x2, #:got_lo12:__pointer_chk_guard]<br>
+ add x0, x29, 32<br>
+ ldr x2, [x2]<br>
+ eor x1, x2, x0<br>
+<br>
+ // call tsan interceptor<br>
+ bl __tsan_setjmp<br>
+<br>
+ // restore env parameter<br>
+ mov x0, x19<br>
+ ldr x19, [sp, 16]<br>
+ ldp x29, x30, [sp], 32<br>
+ CFI_RESTORE (30)<br>
+ CFI_RESTORE (19)<br>
+ CFI_DEF_CFA (31, 0)<br>
+<br>
+ // tail jump to libc setjmp<br>
+ adrp x1, :got:_ZN14__interception11real_setjmpE<br>
+ ldr x1, [x1, #:got_lo12:_ZN14__interception11real_setjmpE]<br>
+ ldr x1, [x1]<br>
+ br x1<br>
+<br>
+ CFI_ENDPROC<br>
+.size setjmp, .-setjmp<br>
+<br>
+.comm _ZN14__interception12real__setjmpE,8,8<br>
+.globl _setjmp<br>
+.type _setjmp, @function<br>
+_setjmp:<br>
+ CFI_STARTPROC<br>
+<br>
+ // save env parameters for function call<br>
+ stp x29, x30, [sp, -32]!<br>
+ CFI_DEF_CFA_OFFSET (32)<br>
+ CFI_OFFSET (29, -32)<br>
+ CFI_OFFSET (30, -24)<br>
+<br>
+ // Adjust the SP for previous frame<br>
+ add x29, sp, 0<br>
+ CFI_DEF_CFA_REGISTER (29)<br>
+<br>
+ // Save jmp_buf<br>
+ str x19, [sp, 16]<br>
+ CFI_OFFSET (19, -16)<br>
+ mov x19, x0<br>
+<br>
+ // SP pointer mangling (see glibc setjmp)<br>
+ adrp x2, :got:__pointer_chk_guard<br>
+ ldr x2, [x2, #:got_lo12:__pointer_chk_guard]<br>
+ add x0, x29, 32<br>
+ ldr x2, [x2]<br>
+ eor x1, x2, x0<br>
+<br>
+ // call tsan interceptor<br>
+ bl __tsan_setjmp<br>
+<br>
+ // Restore jmp_buf parameter<br>
+ mov x0, x19<br>
+ ldr x19, [sp, 16]<br>
+ ldp x29, x30, [sp], 32<br>
+ CFI_RESTORE (30)<br>
+ CFI_RESTORE (19)<br>
+ CFI_DEF_CFA (31, 0)<br>
+<br>
+ // tail jump to libc setjmp<br>
+ adrp x1, :got:_ZN14__interception12real__setjmpE<br>
+ ldr x1, [x1, #:got_lo12:_ZN14__interception12real__setjmpE]<br>
+ ldr x1, [x1]<br>
+ br x1<br>
+<br>
+ CFI_ENDPROC<br>
+.size _setjmp, .-_setjmp<br>
+<br>
+.comm _ZN14__interception14real_sigsetjmpE,8,8<br>
+.globl sigsetjmp<br>
+.type sigsetjmp, @function<br>
+sigsetjmp:<br>
+ CFI_STARTPROC<br>
+<br>
+ // save env parameters for function call<br>
+ stp x29, x30, [sp, -32]!<br>
+ CFI_DEF_CFA_OFFSET (32)<br>
+ CFI_OFFSET (29, -32)<br>
+ CFI_OFFSET (30, -24)<br>
+<br>
+ // Adjust the SP for previous frame<br>
+ add x29, sp, 0<br>
+ CFI_DEF_CFA_REGISTER (29)<br>
+<br>
+ // Save jmp_buf and savesigs<br>
+ stp x19, x20, [sp, 16]<br>
+ CFI_OFFSET (19, -16)<br>
+ CFI_OFFSET (20, -8)<br>
+ mov w20, w1<br>
+ mov x19, x0<br>
+<br>
+ // SP pointer mangling (see glibc setjmp)<br>
+ adrp x2, :got:__pointer_chk_guard<br>
+ ldr x2, [x2, #:got_lo12:__pointer_chk_guard]<br>
+ add x0, x29, 32<br>
+ ldr x2, [x2]<br>
+ eor x1, x2, x0<br>
+<br>
+ // call tsan interceptor<br>
+ bl __tsan_setjmp<br>
+<br>
+ // restore env parameter<br>
+ mov w1, w20<br>
+ mov x0, x19<br>
+ ldp x19, x20, [sp, 16]<br>
+ ldp x29, x30, [sp], 32<br>
+ CFI_RESTORE (30)<br>
+ CFI_RESTORE (29)<br>
+ CFI_RESTORE (19)<br>
+ CFI_RESTORE (20)<br>
+ CFI_DEF_CFA (31, 0)<br>
+<br>
+ // tail jump to libc sigsetjmp<br>
+ adrp x2, :got:_ZN14__interception14real_sigsetjmpE<br>
+ ldr x2, [x2, #:got_lo12:_ZN14__interception14real_sigsetjmpE]<br>
+ ldr x2, [x2]<br>
+ br x2<br>
+ CFI_ENDPROC<br>
+.size sigsetjmp, .-sigsetjmp<br>
+<br>
+.comm _ZN14__interception16real___sigsetjmpE,8,8<br>
+.globl __sigsetjmp<br>
+.type __sigsetjmp, @function<br>
+__sigsetjmp:<br>
+ CFI_STARTPROC<br>
+<br>
+ // save env parameters for function call<br>
+ stp x29, x30, [sp, -32]!<br>
+ CFI_DEF_CFA_OFFSET (32)<br>
+ CFI_OFFSET (29, -32)<br>
+ CFI_OFFSET (30, -24)<br>
+<br>
+ // Adjust the SP for previous frame<br>
+ add x29, sp, 0<br>
+ CFI_DEF_CFA_REGISTER (29)<br>
+<br>
+ // Save jmp_buf and savesigs<br>
+ stp x19, x20, [sp, 16]<br>
+ CFI_OFFSET (19, -16)<br>
+ CFI_OFFSET (20, -8)<br>
+ mov w20, w1<br>
+ mov x19, x0<br>
+<br>
+ // SP pointer mangling (see glibc setjmp)<br>
+ adrp x2, :got:__pointer_chk_guard<br>
+ ldr x2, [x2, #:got_lo12:__pointer_chk_guard]<br>
+ add x0, x29, 32<br>
+ ldr x2, [x2]<br>
+ eor x1, x2, x0<br>
+<br>
+ // call tsan interceptor<br>
+ bl __tsan_setjmp<br>
+<br>
+ mov w1, w20<br>
+ mov x0, x19<br>
+ ldp x19, x20, [sp, 16]<br>
+ ldp x29, x30, [sp], 32<br>
+ CFI_RESTORE (30)<br>
+ CFI_RESTORE (29)<br>
+ CFI_RESTORE (19)<br>
+ CFI_RESTORE (20)<br>
+ CFI_DEF_CFA (31, 0)<br>
+<br>
+ // tail jump to libc __sigsetjmp<br>
+ adrp x2, :got:_ZN14__interception16real___sigsetjmpE<br>
+ ldr x2, [x2, #:got_lo12:_ZN14__interception16real___sigsetjmpE]<br>
+ ldr x2, [x2]<br>
+ br x2<br>
+ CFI_ENDPROC<br>
+.size __sigsetjmp, .-__sigsetjmp<br>
+<br>
+#if defined(__linux__)<br>
+/* We do not need executable stack. */<br>
+.section .note.GNU-stack,"",@progbits<br>
+#endif<br>
<br>
Modified: compiler-rt/trunk/test/tsan/longjmp.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp.cc?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp.cc?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/longjmp.cc (original)<br>
+++ compiler-rt/trunk/test/tsan/longjmp.cc Mon Nov 16 07:55:19 2015<br>
@@ -1,8 +1,7 @@<br>
// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s<br>
<br>
-// Longjmp assembly has not been implemented for mips64 or aarch64 yet<br>
+// Longjmp assembly has not been implemented for mips64 yet<br>
// XFAIL: mips64<br>
-// XFAIL: aarch64<br>
<br>
#include <stdio.h><br>
#include <stdlib.h><br>
<br>
Modified: compiler-rt/trunk/test/tsan/longjmp2.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp2.cc?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp2.cc?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/longjmp2.cc (original)<br>
+++ compiler-rt/trunk/test/tsan/longjmp2.cc Mon Nov 16 07:55:19 2015<br>
@@ -1,8 +1,7 @@<br>
// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s<br>
<br>
-// Longjmp assembly has not been implemented for mips64 or aarch64 yet<br>
+// Longjmp assembly has not been implemented for mips64 yet<br>
// XFAIL: mips64<br>
-// XFAIL: aarch64<br>
<br>
#include <stdio.h><br>
#include <stdlib.h><br>
<br>
Modified: compiler-rt/trunk/test/tsan/longjmp3.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp3.cc?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp3.cc?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/longjmp3.cc (original)<br>
+++ compiler-rt/trunk/test/tsan/longjmp3.cc Mon Nov 16 07:55:19 2015<br>
@@ -1,8 +1,7 @@<br>
// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s<br>
<br>
-// Longjmp assembly has not been implemented for mips64 or aarch64 yet<br>
+// Longjmp assembly has not been implemented for mips64 yet<br>
// XFAIL: mips64<br>
-// XFAIL: aarch64<br>
<br>
#include <pthread.h><br>
#include <stdio.h><br>
<br>
Modified: compiler-rt/trunk/test/tsan/longjmp4.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp4.cc?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/longjmp4.cc?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/longjmp4.cc (original)<br>
+++ compiler-rt/trunk/test/tsan/longjmp4.cc Mon Nov 16 07:55:19 2015<br>
@@ -1,8 +1,7 @@<br>
// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s<br>
<br>
-// Longjmp assembly has not been implemented for mips64 or aarch64 yet<br>
+// Longjmp assembly has not been implemented for mips64 yet<br>
// XFAIL: mips64<br>
-// XFAIL: aarch64<br>
<br>
#include <pthread.h><br>
#include <stdio.h><br>
<br>
Modified: compiler-rt/trunk/test/tsan/signal_longjmp.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/signal_longjmp.cc?rev=253205&r1=253204&r2=253205&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/signal_longjmp.cc?rev=253205&r1=253204&r2=253205&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/signal_longjmp.cc (original)<br>
+++ compiler-rt/trunk/test/tsan/signal_longjmp.cc Mon Nov 16 07:55:19 2015<br>
@@ -3,9 +3,8 @@<br>
// Test case for longjumping out of signal handler:<br>
// <a href="https://code.google.com/p/thread-sanitizer/issues/detail?id=75" rel="noreferrer" target="_blank">https://code.google.com/p/thread-sanitizer/issues/detail?id=75</a><br>
<br>
-// Longjmp assembly has not been implemented for mips64 or aarch64 yet<br>
+// Longjmp assembly has not been implemented for mips64 yet<br>
// XFAIL: mips64<br>
-// XFAIL: aarch64<br>
<br>
#include <setjmp.h><br>
#include <signal.h><br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</div></div><br>_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
<br></blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">Alexey Samsonov<br><a href="mailto:vonosmas@gmail.com" target="_blank">vonosmas@gmail.com</a></div></div>
</div>