From patchwork Fri Oct 30 08:31:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 538203 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 0D0E8140E3E for ; Fri, 30 Oct 2015 19:32:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=sA7VDlJ6; 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=irVTFe4IZU0SyWWR+4oClZM0P+fQt eKhp3ad3JzDJOHyhF58EazHz+8MlOUchpwrf+sWKURuh4DHv+0Ws93dQIH094hdA R0GKVTbCIHDPD/HrDdrLbjeLaO32dflQb8Sndun5r13xx7e0+RyMOytkZ3jI/WJ8 lX6hfOdQtDA+fQ= 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=IYDibnlLdeUszv1uozMy0xGhUQY=; b=sA7 VDlJ6X3xDnwxWETf9f18SF2804HKrDxaAizVaB3KV6/Szp6y957Lqnyslo9wwxM8 ZaxTgDF+fdNaLnI22ajxdzOuXawWWVnANyWEzmWTYZf8EnE8kHvQxnEysyxQjluE yQLULHim359ZvHEkl16UoZU0sKYOl+cOVphgulzQ= Received: (qmail 33240 invoked by alias); 30 Oct 2015 08:32:05 -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 33227 invoked by uid 89); 30 Oct 2015 08:32:04 -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, 30 Oct 2015 08:32:03 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-03.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zs56N-0007je-W1 from Thomas_Schwinge@mentor.com for gcc-patches@gcc.gnu.org; Fri, 30 Oct 2015 01:32:00 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-03.mgc.mentorg.com (137.202.0.108) with Microsoft SMTP Server id 14.3.224.2; Fri, 30 Oct 2015 08:31:58 +0000 From: Thomas Schwinge To: Nathan Sidwell , GCC Patches Subject: Re: [gomp4] acc_on_device In-Reply-To: <56327E51.1090507@acm.org> References: <56327E51.1090507@acm.org> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Fri, 30 Oct 2015 09:31:52 +0100 Message-ID: <87d1vw4v0n.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Thu, 29 Oct 2015 13:15:13 -0700, Nathan Sidwell wrote: > I've committed this to gomp4 branch. It resolves a problem with > builtin_acc_on_device and C++. > The test cases in the gcc testsuite were hiding the problem by providing part of > openacc.h in the test directory, and this had diverged from the openacc.h we > actually have. I deleted those tests and inserted one in the libgomp testsuite, > which correctly picks up the openacc.h of the tool under test, (rather than one > in system includes). The idea had been to test the compiler handling of the acc_on_device builtin in the compiler testsuite, but yes, having to duplicate parts of openacc.h was ugly. > --- libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c (revision 0) > +++ libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c (working copy) In r229568 committed to gomp-4_0-branch as obvious: commit e2c1427d60ffcc9183fbd5a0996dfe98c7219dc5 Author: tschwinge Date: Fri Oct 30 08:29:54 2015 +0000 De-duplicate testsuite file libgomp/ * testsuite/libgomp.oacc-c-c++-common/acc-on-device.c: De-duplicate file. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@229568 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgomp/ChangeLog.gomp | 5 +++++ libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) Grüße Thomas diff --git libgomp/ChangeLog.gomp libgomp/ChangeLog.gomp index ddbcdee..89f57ef 100644 --- libgomp/ChangeLog.gomp +++ libgomp/ChangeLog.gomp @@ -1,3 +1,8 @@ +2015-10-30 Thomas Schwinge + + * testsuite/libgomp.oacc-c-c++-common/acc-on-device.c: + De-duplicate file. + 2015-10-29 Nathan Sidwell * openacc.h (enum acc_device_t): Ensure layout compatibility. diff --git libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c index 0f73aeb..c1eed0e 100644 --- libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c +++ libgomp/testsuite/libgomp.oacc-c-c++-common/acc-on-device.c @@ -1,15 +1,3 @@ -/* { dg-do compile } */ -/* { dg-additional-options "-O2" } */ - -#include - -int Foo (acc_device_t x) -{ - return acc_on_device (x); -} - -/* { dg-final { scan-assembler-not "acc_on_device" } } */ -/* { dg-do compile } */ /* { dg-additional-options "-O2" } */ #include