From patchwork Fri Mar 18 12:37:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 599444 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 3qRPs236X8z9s9j for ; Fri, 18 Mar 2016 23:38: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=MOaSLyWU; 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=W8JfVRSrHAr8yryL O6XiVvocRdU71MAwWATO9+TCacep8EK9lnr3Qnhi+sTLMOVRBWb1OxrB73Jw4oqO 4ZPxnPyFHmhduViAf+FBwY517rgk2cuNsif+2o60Nb0dg34BN/OD8VDUNXdc/FEx bvYgnqk1Ac2qnSo4EOC1jDYXKLc= 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:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=k/jvsSrwqYLcFjN6id1UNq TAm5o=; b=MOaSLyWU2c7xWn8x7wNl5pV1qcUocjFmYo5H2MrZ/yfvnKfGn1eTY7 cVExirn5OpQc3UWygLjrfCkHTrzy7X4kqtoNQAj/m+kVZe9fVlPqHqsxSO9Dzv0M gWRf1Iy3R3O9v8ts/ANwuOiJuhQVTl0zk6Hb250UIIHC3d/+DAuV8= Received: (qmail 47575 invoked by alias); 18 Mar 2016 12:38:03 -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 45586 invoked by uid 89); 18 Mar 2016 12:38:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=omitted, cited, 465, FAILED X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 18 Mar 2016 12:38:00 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49138) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1agtfC-00047L-6H for gcc-patches@gnu.org; Fri, 18 Mar 2016 08:37:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agtf8-0001sP-B9 for gcc-patches@gnu.org; Fri, 18 Mar 2016 08:37:57 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:36162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agtf8-0001s8-2F for gcc-patches@gnu.org; Fri, 18 Mar 2016 08:37:54 -0400 Received: from svr-orw-fem-02x.mgc.mentorg.com ([147.34.96.206] helo=SVR-ORW-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1agtf6-0005Ta-0w from Thomas_Schwinge@mentor.com ; Fri, 18 Mar 2016 05:37:52 -0700 Received: from tftp-cs (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.3.224.2; Fri, 18 Mar 2016 05:37:51 -0700 Received: by tftp-cs (Postfix, from userid 49978) id 15CA5C1D41; Fri, 18 Mar 2016 05:37:51 -0700 (PDT) From: Thomas Schwinge To: Tom de Vries , "gcc-patches@gnu.org" CC: Jakub Jelinek , Richard Biener Subject: Scan for parallelization of the oacc kernels test-cases in gfortran.dg/goacc (was: [PATCH, 15/16] Add libgomp.oacc-c-c++-common/kernels-*.c) In-Reply-To: <56DFEA28.2060303@mentor.com> References: <5640BD31.2060602@mentor.com> <5640FDB6.70903@mentor.com> <56DFEA28.2060303@mentor.com> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Fri, 18 Mar 2016 13:37:43 +0100 Message-ID: <87oaacrmg8.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi! On Wed, 9 Mar 2016 10:17:28 +0100, Tom de Vries wrote: > [Should have cited > > instead of the C/C++ tests] > Retested on current trunk. > > Committed, minus the kernels-parallel-loop-data-enter-exit.f95 test. Is there a reason why you omitted the following tree scanning tests (as done for C/C++, and also present for Fortran on gomp-4_0-branch)? (Note that I had to XFAIL gfortran.dg/goacc/kernels-loop-n.f95.) OK to commit? commit f0294eeb30ef285c3930b975ccbc1b6d7052cc03 Author: Thomas Schwinge Date: Fri Mar 18 12:52:37 2016 +0100 Scan for parallelization of the oacc kernels test-cases in gfortran.dg/goacc gcc/testsuite/ * gfortran.dg/goacc/kernels-loop-2.f95: Scan for parallelization. * gfortran.dg/goacc/kernels-loop-data-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data-enter-exit.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data-update.f95: Likewise. * gfortran.dg/goacc/kernels-loop-data.f95: Likewise. * gfortran.dg/goacc/kernels-loop.f95: Likewise. * gfortran.dg/goacc/kernels-loop-n.f95: Likewise, XFAILed. --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 | 1 + gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 | 2 ++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 | 7 +++++++ gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 | 2 ++ 8 files changed, 20 insertions(+) Grüße Thomas diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 index 5cc2e8b..865f7a6 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-2.f95 @@ -40,3 +40,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 index d1bfc70..c9f3a62 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-2.f95 @@ -47,3 +47,4 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 index feac7b2..3361607 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit-2.f95 @@ -46,3 +46,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 index 632983f..5ba56fb 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-enter-exit.f95 @@ -44,3 +44,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 index 41b0d96..a622a96 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data-update.f95 @@ -43,3 +43,5 @@ end program main ! Check that the loop has been split off into a function. ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 2 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 index 3de2057..4ec2ac3 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-data.f95 @@ -44,3 +44,5 @@ end program main ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.1 " 1 "optimized" } } ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.2 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 3 "parloops1" } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 index 21e2e86..90439ca 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop-n.f95 @@ -36,3 +36,10 @@ end module test ! Check that the loop has been split off into a function. ! { dg-final { scan-tree-dump-times "(?n);; Function __test_MOD_foo._omp_fn.0 " 1 "optimized" } } + +! TODO, *.parloops1: +! SUCCESS: may be parallelized +! Stmt *_9 = 0; +! conflicts with entry/exit stmt: _7 = *_6; +! entry/exit not ok: FAILED +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 1 "parloops1" { xfail *-*-* } } } diff --git gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 index f7e14b4..ae2cac6 100644 --- gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 +++ gcc/testsuite/gfortran.dg/goacc/kernels-loop.f95 @@ -34,3 +34,5 @@ end program main ! Check that the loop has been split off into a function. ! { dg-final { scan-tree-dump-times "(?n);; Function MAIN__._omp_fn.0 " 1 "optimized" } } + +! { dg-final { scan-tree-dump-times "(?n)oacc function \\(0," 1 "parloops1" } }