From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95469 invoked by alias); 27 Apr 2017 14:11:40 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 95449 invoked by uid 89); 27 Apr 2017 14:11:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.2 spammy=scanned X-Spam-User: qpsmtpd, 3 recipients X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 27 Apr 2017 14:11:38 +0000 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 86B3CAD53; Thu, 27 Apr 2017 14:11:38 +0000 (UTC) Subject: Re: [PATCH] Fix test-case on ppc64le (PR testsuite/79455). To: Bernd Edlinger , Jakub Jelinek References: <0fca1de5-0203-f14a-d59e-e70664ce57ec@suse.cz> <20170424151939.GP1809@tucnak> <7df50141-5b92-d6f3-c993-86cdec053f58@suse.cz> Cc: GCC Patches , Segher Boessenkool , "wschmidt@gcc.gnu.org" , "kelvin@gcc.gnu.org" From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Message-ID: <4d5afb02-a96e-b405-9e24-5928c551680c@suse.cz> Date: Thu, 27 Apr 2017 14:43:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------6661CE2C9664A0A556A738EB" X-IsSubscribed: yes X-SW-Source: 2017-04/txt/msg01404.txt.bz2 This is a multi-part message in MIME format. --------------6661CE2C9664A0A556A738EB Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 434 On 04/26/2017 03:38 PM, Bernd Edlinger wrote: > I think however, that only one extra call frame can ever > be seen, because the stack frames are only created by instrumentation > at instrumented function begin and end statements. > > So probably the test expectations could be more strict than in the > proposed patch. Hi. I'm sending more restricted version of patch that works both on x86_64 and ppcl64. Ready for trunk? Martin --------------6661CE2C9664A0A556A738EB Content-Type: text/x-patch; name="0001-Fix-test-case-on-ppc64le-PR-testsuite-79455.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-test-case-on-ppc64le-PR-testsuite-79455.patch" Content-length: 1656 >From 76af8598879977fdf7c924f5576c04b8d9260013 Mon Sep 17 00:00:00 2001 From: marxin Date: Mon, 24 Apr 2017 14:59:18 +0200 Subject: [PATCH] Fix test-case on ppc64le (PR testsuite/79455). gcc/testsuite/ChangeLog: 2017-04-24 Martin Liska * c-c++-common/tsan/race_on_mutex.c: Make the scanned pattern more generic. --- gcc/testsuite/c-c++-common/tsan/race_on_mutex.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/c-c++-common/tsan/race_on_mutex.c b/gcc/testsuite/c-c++-common/tsan/race_on_mutex.c index ae30d053c92..def1d47de7b 100644 --- a/gcc/testsuite/c-c++-common/tsan/race_on_mutex.c +++ b/gcc/testsuite/c-c++-common/tsan/race_on_mutex.c @@ -37,9 +37,10 @@ int main() { } /* { dg-output "WARNING: ThreadSanitizer: data race.*(\n|\r\n|\r)" } */ -/* { dg-output " Atomic read of size 1 at .* by thread T2:(\n|\r\n|\r)" } */ +/* { dg-output " Atomic read of size \[0-9]\+ at .* by thread T2:(\n|\r\n|\r)" } */ /* { dg-output " #0 pthread_mutex_lock.*" } */ /* { dg-output " #1 Thread2.* .*(race_on_mutex.c:22|\\?{2}:0) (.*)" } */ -/* { dg-output " Previous write of size 1 at .* by thread T1:(\n|\r\n|\r)" } */ -/* { dg-output " #0 pthread_mutex_init .* (.)*" } */ -/* { dg-output " #1 Thread1.* .*(race_on_mutex.c:12|\\?{2}:0) .*" } */ +/* { dg-output " Previous write of size \[0-9]\+ at .* by thread T1:(\n|\r\n|\r)" } */ +/* { dg-output "( #0 \[^\n\r\]*(\n|\r\n|\r))?" } */ +/* { dg-output " #\[01\] (__)?pthread_mutex_init \[^\n\r\]* (.)*" } */ +/* { dg-output " #\[12\] Thread1.* .*(race_on_mutex.c:12|\\?{2}:0) .*" } */ -- 2.12.2 --------------6661CE2C9664A0A556A738EB--