From patchwork Mon Oct 16 08:49:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 826193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-464241-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="MgC9h5BB"; dkim-atps=neutral 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 3yFsTY32Qnz9sNr for ; Mon, 16 Oct 2017 19:50:09 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=PGaAVceeJeBhkuf9TUzbNxSCg/LHTy/fBo28JZ8YzGGloQA+fo dB290KqXfspzQaA/YTiymy3QEEOOEqS9Kuqy5xSByzSyBjUOvMmJCDFXzj+DTP5k mBUSzIw2LzWWmaMQiRh3+bu2B2Fgnc7JpJeqnc7L1J82S8MaaXP2XxlHs= 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:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=tJ2KZwjEflyQxjtnrjCnTiYkJ8Y=; b=MgC9h5BBCiLJFppkeHIH ofD+s9A2YBUPFQtnnr7kJD7rkYFIYJyQjg6TjzD6Eo5PvASwNTnu12SaIdMWA/FE wQNvEmGqsJb1C2mcnlP86ppaPAN4jpDzbLy6NAeWKHZE9VwXdcYd8cmspYaKrfM7 1P5vahlvo9l/Bh6/vckeI3U= Received: (qmail 44354 invoked by alias); 16 Oct 2017 08:49:59 -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 44181 invoked by uid 89); 16 Oct 2017 08:49:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=vries 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; Mon, 16 Oct 2017 08:49:56 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1e415t-0003oB-9q from Tom_deVries@mentor.com ; Mon, 16 Oct 2017 01:49:53 -0700 Received: from [127.0.0.1] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1263.5; Mon, 16 Oct 2017 09:49:48 +0100 To: Jakub Jelinek CC: Thomas Schwinge , GCC Patches From: Tom de Vries Subject: [openacc, testsuite, committed] Enable libgomp.oacc-*/declare-*.{c, f90} for non-nvidia devices Message-ID: <0cdee5b1-2251-f34b-d1c0-12f2145fdb0e@mentor.com> Date: Mon, 16 Oct 2017 10:49:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) Hi, this patch enables some openacc test-cases for non-nvidia devices. Committed. Thanks, - Tom Enable libgomp.oacc-*/declare-*.{c,f90} for non-nvidia devices 2017-10-16 Tom de Vries * testsuite/libgomp.oacc-c-c++-common/declare-1.c: Don't require openacc_nvidia_accel_selected. * testsuite/libgomp.oacc-c-c++-common/declare-2.c: Same. * testsuite/libgomp.oacc-c-c++-common/declare-4.c: Same. * testsuite/libgomp.oacc-fortran/declare-2.f90: Same. * testsuite/libgomp.oacc-fortran/declare-4.f90: Same * testsuite/libgomp.oacc-fortran/declare-5.f90: Same. * testsuite/libgomp.oacc-c-c++-common/declare-5.c: Don't require openacc_nvidia_accel_selected. Skip for shared memory device. * testsuite/libgomp.oacc-fortran/declare-1.f90: Same. * testsuite/libgomp.oacc-fortran/declare-3.f90: Same. --- libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c | 2 -- libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c | 2 -- libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c | 2 -- libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c | 2 +- libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 | 2 +- libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 | 2 -- libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 | 2 +- libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 | 2 -- libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 | 2 -- 9 files changed, 3 insertions(+), 15 deletions(-) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c index c63a68d..bc7261742 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-1.c @@ -1,5 +1,3 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ - #include #include #include diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c index 2078a33..d212458 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-2.c @@ -1,5 +1,3 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ - #include #define N 16 diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c index 36bf0eb..ca48e80 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-4.c @@ -1,5 +1,3 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ - #include #include diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c index 38c5de0..229e96c 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/declare-5.c @@ -1,4 +1,4 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ +/* { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } */ #include diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 index 2d4b707..ca8831e 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-1.f90 @@ -1,4 +1,4 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } +! { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } ! Tests to exercise the declare directive along with ! the clauses: copy diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 index 2aa7907..aeea10a 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-2.f90 @@ -1,5 +1,3 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } - module globalvars implicit none integer a diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 index 3a6b420..88b9aff 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-3.f90 @@ -1,4 +1,4 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } +! { dg-skip-if "" { *-*-* } { "-DACC_MEM_SHARED=1" } } module globalvars implicit none diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 index 226264e..252c4ff 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-4.f90 @@ -1,5 +1,3 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } - module vars implicit none real b diff --git a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 index bcd9c9c..e91f26b 100644 --- a/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 +++ b/libgomp/testsuite/libgomp.oacc-fortran/declare-5.f90 @@ -1,5 +1,3 @@ -! { dg-do run { target openacc_nvidia_accel_selected } } - module vars implicit none real b