From patchwork Tue Nov 14 09:23:35 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: 837757 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-466707-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="fYgWx+qk"; 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 3ybhsF2pxWz9s9Y for ; Tue, 14 Nov 2017 20:24:01 +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=N5c/agNHvtVw6NAXHcAIToP1Yd8qKLczWjp9KZi9gFUvG0imK1 yAdLaCW66j+786oRvPqLotJZ3FmjApZ8z5KnmU6SE8THI0V95nOoS69GIoYh7APo K0vBPDIGhkniUzgg7RrblVwxdoL77MPuZLSznrUOVvasziYajjzss+f7I= 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=w8h8xSEHvFaH5g9DPuTC+cKxeZg=; b=fYgWx+qk89BGuDrlskzg Eyy0UQ3nXIFyzlgJnHgNLnFB/ZRmezd0xfahpoM2P+vPQlhNc0bf2NFq5rHfpev+ M0zEUiXLKXUZs7f3YzTkIQ/4lATWzATbDckmLAVveN7oSs05akZ16+RLU7kzKOOs 6PiwOnWDOVZAu3fzMlrEFEA= Received: (qmail 110825 invoked by alias); 14 Nov 2017 09:23:50 -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 110813 invoked by uid 89); 14 Nov 2017 09:23:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=non-nvidia, asyncwait-1.c, asyncwait1c, UD:asyncwait-1.c 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; Tue, 14 Nov 2017 09:23:45 +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 1eEXRX-0001Pr-Hm from Tom_deVries@mentor.com ; Tue, 14 Nov 2017 01:23:43 -0800 Received: from [172.30.72.87] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Tue, 14 Nov 2017 09:23:39 +0000 To: Jakub Jelinek CC: GCC Patches , Thomas Schwinge From: Tom de Vries Subject: [libgomp, testsuite, committed] Allow asyncwait-1.c to run for non-nvidia devices Message-ID: <81b46cb1-a6e4-4d6c-647f-58fb64a9d1d4@mentor.com> Date: Tue, 14 Nov 2017 10:23:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.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 allows openacc test-case asyncwait-1.c to run for non-nvidia devices. Committed as obvious. Thanks, - Tom Allow asyncwait-1.c to run for non-nvidia devices 2017-11-14 Tom de Vries * testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c: Allow to run for non-nvidia devices. --- .../testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c index d478ce2..e780845 100644 --- a/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/asyncwait-1.c @@ -1,9 +1,11 @@ -/* { dg-do run { target openacc_nvidia_accel_selected } } */ -/* { dg-additional-options "-lcuda" } */ +/* { dg-do run } */ +/* { dg-additional-options "-lcuda" { target openacc_nvidia_accel_selected } } */ #include #include +#if defined ACC_DEVICE_TYPE_nvidia #include "cuda.h" +#endif #include #include @@ -11,14 +13,18 @@ int main (int argc, char **argv) { +#if defined ACC_DEVICE_TYPE_nvidia CUresult r; CUstream stream1; +#endif int N = 128; //1024 * 1024; float *a, *b, *c, *d, *e; int i; int nbytes; +#if defined ACC_DEVICE_TYPE_nvidia acc_init (acc_device_nvidia); +#endif nbytes = N * sizeof (float); @@ -210,6 +216,7 @@ main (int argc, char **argv) } +#if defined ACC_DEVICE_TYPE_nvidia r = cuStreamCreate (&stream1, CU_STREAM_NON_BLOCKING); if (r != CUDA_SUCCESS) { @@ -218,6 +225,7 @@ main (int argc, char **argv) } acc_set_cuda_stream (1, stream1); +#endif for (i = 0; i < N; i++) { @@ -642,6 +650,7 @@ main (int argc, char **argv) } +#if defined ACC_DEVICE_TYPE_nvidia r = cuStreamCreate (&stream1, CU_STREAM_NON_BLOCKING); if (r != CUDA_SUCCESS) { @@ -650,6 +659,7 @@ main (int argc, char **argv) } acc_set_cuda_stream (1, stream1); +#endif for (i = 0; i < N; i++) { @@ -892,7 +902,9 @@ main (int argc, char **argv) abort (); } +#if defined ACC_DEVICE_TYPE_nvidia acc_shutdown (acc_device_nvidia); +#endif return 0; }