<div dir="ltr"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 7, 2015 at 2:00 PM, Jonathan Roelofs <span dir="ltr"><<a href="mailto:jonathan@codesourcery.com" target="_blank">jonathan@codesourcery.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class=""><div class="h5"><br>
<br>
On 12/7/15 2:54 PM, Alexey Samsonov via llvm-commits wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Author: samsonov<br>
Date: Mon Dec 7 15:53:59 2015<br>
New Revision: 254955<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=254955&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=254955&view=rev</a><br>
Log:<br>
[TSan] Port check_memcpy.sh script to a regular lit test.<br>
<br>
Check that TSan runtime doesn't contain compiler-inserted calls<br>
to memset/memmove functions.<br>
<br>
In future, we may consider moving this test to test/sanitizer_common,<br>
as we don't want to have compiler-inserted memcpy/memmove calls in<br>
any sanitizer runtime.<br>
<br>
Added:<br>
compiler-rt/trunk/test/tsan/Linux/check_memcpy.cc<br>
compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh (with props)<br>
Removed:<br>
compiler-rt/trunk/lib/tsan/check_memcpy.sh<br>
Modified:<br>
compiler-rt/trunk/lib/tsan/Makefile.old<br>
<br>
Modified: compiler-rt/trunk/lib/tsan/Makefile.old<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/Makefile.old?rev=254955&r1=254954&r2=254955&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/Makefile.old?rev=254955&r1=254954&r2=254955&view=diff</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/Makefile.old (original)<br>
+++ compiler-rt/trunk/lib/tsan/Makefile.old Mon Dec 7 15:53:59 2015<br>
@@ -71,14 +71,12 @@ presubmit:<br>
# Release build with clang.<br>
$(MAKE) -f Makefile.old clean<br>
$(MAKE) -f Makefile.old run DEBUG=0 -j 16 CC=$(CLANG) CXX=$(CLANG)++<br>
- ./check_memcpy.sh<br>
# Debug build with gcc<br>
$(MAKE) -f Makefile.old clean<br>
$(MAKE) -f Makefile.old run DEBUG=1 -j 16 CC=gcc CXX=g++<br>
# Release build with gcc<br>
$(MAKE) -f Makefile.old clean<br>
$(MAKE) -f Makefile.old run DEBUG=0 -j 16 CC=gcc CXX=g++<br>
- ./check_memcpy.sh<br>
# Sanity check for Go runtime<br>
(cd go && ./buildgo.sh)<br>
# Check cmake build<br>
<br>
Removed: compiler-rt/trunk/lib/tsan/check_memcpy.sh<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/check_memcpy.sh?rev=254954&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/check_memcpy.sh?rev=254954&view=auto</a><br>
==============================================================================<br>
--- compiler-rt/trunk/lib/tsan/check_memcpy.sh (original)<br>
+++ compiler-rt/trunk/lib/tsan/check_memcpy.sh (removed)<br>
@@ -1,31 +0,0 @@<br>
-#!/bin/bash<br>
-<br>
-# Ensure that tsan runtime does not contain compiler-emitted memcpy and memset calls.<br>
-<br>
-set -eu<br>
-<br>
-ROOTDIR=$(dirname $0)<br>
-TEST_DIR=$ROOTDIR/../../test/tsan<br>
-<br>
-: ${CXX:=clang++}<br>
-CFLAGS="-fsanitize=thread -fPIE -O1 -g"<br>
-LDFLAGS="-pie -lpthread -ldl -lrt -lm -Wl,--whole-archive $ROOTDIR/rtl/libtsan.a -Wl,--no-whole-archive"<br>
-<br>
-SRC=$TEST_DIR/simple_race.cc<br>
-OBJ=$SRC.o<br>
-EXE=$SRC.exe<br>
-$CXX $SRC $CFLAGS -c -o $OBJ<br>
-$CXX $OBJ $LDFLAGS -o $EXE<br>
-<br>
-NCALL=$(objdump -d $EXE | egrep "callq .*<__interceptor_mem(cpy|set)>" | wc -l)<br>
-if [ "$NCALL" != "0" ]; then<br>
- echo FAIL: found $NCALL memcpy/memset calls<br>
- exit 1<br>
-fi<br>
-<br>
-# tail calls<br>
-NCALL=$(objdump -d $EXE | egrep "jmpq .*<__interceptor_mem(cpy|set)>" | wc -l)<br>
-if [ "$NCALL" != "0" ]; then<br>
- echo FAIL: found $NCALL memcpy/memset calls<br>
- exit 1<br>
-fi<br>
<br>
Added: compiler-rt/trunk/test/tsan/Linux/check_memcpy.cc<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Linux/check_memcpy.cc?rev=254955&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Linux/check_memcpy.cc?rev=254955&view=auto</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/Linux/check_memcpy.cc (added)<br>
+++ compiler-rt/trunk/test/tsan/Linux/check_memcpy.cc Mon Dec 7 15:53:59 2015<br>
@@ -0,0 +1,11 @@<br>
+// Test that verifies TSan runtime doesn't contain compiler-emitted<br>
+// memcpy/memmove calls. It builds the binary with TSan and passes it to<br>
+// check_memcpy.sh script.<br>
+<br>
+// RUN: %clangxx_tsan -O1 %s -o %t<br>
+// RUN: %S/check_memcpy.sh %t<br>
+<br>
+int main() {<br>
+ return 0;<br>
+}<br>
+<br>
<br>
Added: compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh?rev=254955&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh?rev=254955&view=auto</a><br>
==============================================================================<br>
--- compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh (added)<br>
+++ compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh Mon Dec 7 15:53:59 2015<br>
@@ -0,0 +1,26 @@<br>
+#!/bin/bash<br>
+<br>
+# Script that ensures that TSan runtime does not contain compiler-emitted<br>
+# memcpy and memset calls.<br>
</blockquote>
<br></div></div>
Why is this a script at all? ISTM it should be done as FileCheck CHECK-NOT's in check_memcpy.cc...</blockquote><div><br></div><div>Right, I've killed it in r254959. Thanks!</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><div class=""><div class="h5"><br>
<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
+<br>
+set -eu<br>
+<br>
+if [[ "$#" != 1 ]]; then<br>
+ echo "Usage: $0 /path/to/binary/built/with/tsan"<br>
+ exit 1<br>
+fi<br>
+<br>
+EXE=$1<br>
+<br>
+NCALL=$(objdump -d $EXE | egrep "callq .*<__interceptor_mem(cpy|set)>" | wc -l)<br>
+if [ "$NCALL" != "0" ]; then<br>
+ echo FAIL: found $NCALL memcpy/memset calls<br>
+ exit 1<br>
+fi<br>
+<br>
+# tail calls<br>
+NCALL=$(objdump -d $EXE | egrep "jmpq .*<__interceptor_mem(cpy|set)>" | wc -l)<br>
+if [ "$NCALL" != "0" ]; then<br>
+ echo FAIL: found $NCALL memcpy/memset calls<br>
+ exit 1<br>
+fi<br>
<br>
Propchange: compiler-rt/trunk/test/tsan/Linux/check_memcpy.sh<br>
------------------------------------------------------------------------------<br>
svn:executable = *<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>
<br>
</blockquote>
<br></div></div><span class=""><font color="#888888">
-- <br>
Jon Roelofs<br>
<a href="mailto:jonathan@codesourcery.com" target="_blank">jonathan@codesourcery.com</a><br>
CodeSourcery / Mentor Embedded<br>
</font></span></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></div>