From patchwork Fri Sep 18 12:44:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 519276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DC5CF1401F0 for ; Fri, 18 Sep 2015 22:45:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=Rp8D1aVc; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; q=dns; s=default; b=LWWU/02m+6+XvwmLnwP3cjq60Vwvp jPxBKuZ7R2ZVB9d1DL4iKHWFfXeLBAH0AL3vt58r6f+HTcGLrSj4BZ+bKWGlx1Su lwGQurrQC0Euq2UigIqPxH4wTI45YEGq83HWGYeME5O4A8ida+YFR+lGv0zOsuKH N2RBOt6lL5KgpM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:subject:in-reply-to:references:date:message-id:mime-version :content-type; s=default; bh=AxNYD9juENABw1X66gCBekxM2H4=; b=Rp8 D1aVcVUw+pKglVDDaIjuiVmF7Jo8VGL9UJPdRCwB6GrFCsFzGxyN7yhOWJNLBCA/ XSwa9PPCYSAGxPho5sdXXY6+WZxW+mdSz5ScXzpxQSIc2AwVFl8AuVdX7TEHcR/+ piF9tyVf2jaotCXRBz9psqd4HbqD71wGaXG6mxXI= Received: (qmail 21374 invoked by alias); 18 Sep 2015 12:45:16 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 21354 invoked by uid 89); 18 Sep 2015 12:45:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 18 Sep 2015 12:45:14 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zcv2M-000288-Q8 from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Fri, 18 Sep 2015 05:45:11 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Fri, 18 Sep 2015 13:45:09 +0100 From: Thomas Schwinge To: Nathan Sidwell , GCC Patches Subject: Re: [gomp] more ptx builtins In-Reply-To: <55BA7EA9.1020303@acm.org> References: <55BA7EA9.1020303@acm.org> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Fri, 18 Sep 2015 14:44:59 +0200 Message-ID: <87oagz28xg.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 30 Jul 2015 15:44:41 -0400, Nathan Sidwell wrote: > I've committed this to gomp4. It adds spinlock builtins [...] These two test cases actually got committed to gomp-4_0-branch in the later/unrelated r226508. In gomp-4_0-branch r227904, I now fixed these as follows: commit 5ab915af300d470df125fcf2445f56b601fbd80b Author: tschwinge Date: Fri Sep 18 12:43:37 2015 +0000 Fix DejaGnu directives in nvptx spinlock tests gcc/testsuite/ * gcc.target/nvptx/spinlock-1.c: Fix DejaGnu directives. * gcc.target/nvptx/spinlock-2.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@227904 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog.gomp | 5 +++++ gcc/testsuite/gcc.target/nvptx/spinlock-1.c | 4 ++-- gcc/testsuite/gcc.target/nvptx/spinlock-2.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) Grüße, Thomas diff --git gcc/testsuite/ChangeLog.gomp gcc/testsuite/ChangeLog.gomp index 1135e84..b14167e 100644 --- gcc/testsuite/ChangeLog.gomp +++ gcc/testsuite/ChangeLog.gomp @@ -1,3 +1,8 @@ +2015-09-18 Thomas Schwinge + + * gcc.target/nvptx/spinlock-1.c: Fix DejaGnu directives. + * gcc.target/nvptx/spinlock-2.c: Likewise. + 2015-09-11 Cesar Philippidis * c-c++-common/goacc/parallel-reduction.c: Enclose the parallel diff --git gcc/testsuite/gcc.target/nvptx/spinlock-1.c gcc/testsuite/gcc.target/nvptx/spinlock-1.c index 0b458c6..b464ad9 100644 --- gcc/testsuite/gcc.target/nvptx/spinlock-1.c +++ gcc/testsuite/gcc.target/nvptx/spinlock-1.c @@ -7,5 +7,5 @@ void Foo () /* { dg-final { scan-assembler-times ".atom.global.cas.b32" 2 } } */ -/* { dg-final { scan-assember ".global .u32 __global_lock;" } } */ -/* { dg-final { scan-assember-not ".shared .u32 __shared_lock;" } } */ +/* { dg-final { scan-assembler ".global .u32 __global_lock;" } } */ +/* { dg-final { scan-assembler-not ".shared .u32 __shared_lock;" } } */ diff --git gcc/testsuite/gcc.target/nvptx/spinlock-2.c gcc/testsuite/gcc.target/nvptx/spinlock-2.c index a327179..9a51d3f 100644 --- gcc/testsuite/gcc.target/nvptx/spinlock-2.c +++ gcc/testsuite/gcc.target/nvptx/spinlock-2.c @@ -6,5 +6,5 @@ void Foo () } /* { dg-final { scan-assembler-times ".atom.shared.cas.b32" 2 } } */ -/* { dg-final { scan-assember ".shared .u32 __shared_lock;" } } */ -/* { dg-final { scan-assember-not ".shared .u32 __shared_lock;" } } */ +/* { dg-final { scan-assembler ".shared .u32 __shared_lock;" } } */ +/* { dg-final { scan-assembler-not ".global .u32 __global_lock;" } } */