From patchwork Fri Nov 6 17:47:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 541052 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 5B95F1402A2 for ; Sat, 7 Nov 2015 04:48:00 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=qXETJ+zp; 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:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=A5agYz0mhrvjVpYEo7N+VTKtwk4R++y0VZ3Th4iGmIuxwOVoZ7 /qHn+11FUrIhlqzQbyjwq/04bFF3+cBZKsfJVht6rtdVh0NxL76NU6P3PGKelqAD acW7eiaYlXKF7S1rSYYYCVXVwmLtq9QWv3IvRYUEZ79JNlYX36o1dQAyU= 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=E95Do5gN1+1c+irI74VGzt+sMPc=; b=qXETJ+zpq3faTmjhCygl UWASlSBOfMwZBXPLuRIAukEoGlV1md4VlIpU7lhHdfWA6y2BAVwwJBjOQed9+vTS AmwTU8W718NluIxjAlDh8FPF4j2LinQsP99WZv37o6PCEWoXj4u6hC/c7nMlMHyw 1S82zpEzF0EBgNh9GISmoK0= Received: (qmail 84982 invoked by alias); 6 Nov 2015 17:47:52 -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 84971 invoked by uid 89); 6 Nov 2015 17:47:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 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, 06 Nov 2015 17:47:50 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50802) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1Zul76-00068J-AH for gcc-patches@gnu.org; Fri, 06 Nov 2015 12:47:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zul71-0006UJ-01 for gcc-patches@gnu.org; Fri, 06 Nov 2015 12:47:47 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:52224) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zul70-0006Tx-QM for gcc-patches@gnu.org; Fri, 06 Nov 2015 12:47:42 -0500 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1Zul70-0005yL-2k from Tom_deVries@mentor.com ; Fri, 06 Nov 2015 09:47:42 -0800 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Fri, 6 Nov 2015 17:47:40 +0000 To: "gcc-patches@gnu.org" CC: Jakub Jelinek From: Tom de Vries Subject: Revert "Add kernels-loop-nest-independent.f95" Message-ID: <563CE7AA.9030101@mentor.com> Date: Fri, 6 Nov 2015 18:47:22 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 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, this patch reverts aanother independent clause in oacc kernels region related test-case. Committed to gomp-4_0-branch. Thanks, - Tom Revert "Add kernels-loop-nest-independent.f95" 2015-07-15 Tom de Vries * gfortran.dg/goacc/kernels-loop-nest-independent.f95: New test. * testsuite/libgomp.oacc-fortran/kernels-loop-nest-independent.f95: New test. --- .../goacc/kernels-loop-nest-independent.f95 | 41 ---------------------- .../kernels-loop-nest-independent.f95 | 28 --------------- 2 files changed, 69 deletions(-) delete mode 100644 gcc/testsuite/gfortran.dg/goacc/kernels-loop-nest-independent.f95 delete mode 100644 libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-nest-independent.f95 diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-nest-independent.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-loop-nest-independent.f95 deleted file mode 100644 index af151ca..0000000 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-loop-nest-independent.f95 +++ /dev/null @@ -1,41 +0,0 @@ -! { dg-do compile } -! { dg-additional-options "-O2" } -! { dg-additional-options "-ftree-parallelize-loops=32" } -! { dg-additional-options "-fdump-tree-parloops_oacc_kernels-all" } -! { dg-additional-options "-fdump-tree-optimized" } - -! Based on autopar/outer-1.c. - -program main - implicit none - integer, parameter :: n = 500 - integer, dimension (0:n-1, 0:n-1) :: x - integer :: i, j, ii, jj - - - !$acc kernels copyout (x) - !$acc loop independent - do ii = 0, n - 1 - do jj = 0, n - 1 - x(jj, ii) = ii + jj + 3 - end do - end do - !$acc end kernels - - do i = 0, n - 1 - do j = 0, n - 1 - if (x(i, j) .ne. i + j + 3) call abort - end do - end do - -end program main - -! Check that only one loop is analyzed, and that it can be parallelized. -! { dg-final { scan-tree-dump-times "SUCCESS: may be parallelized, marked independent" 1 "parloops_oacc_kernels" } } -! { dg-final { scan-tree-dump-not "FAILED:" "parloops_oacc_kernels" } } -! { dg-final { scan-tree-dump-times "parallelizing outer loop" 1 "parloops_oacc_kernels" } } - -! 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 \\(32," 1 "parloops_oacc_kernels" } } diff --git a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-nest-independent.f95 b/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-nest-independent.f95 deleted file mode 100644 index 87a3d23..0000000 --- a/libgomp/testsuite/libgomp.oacc-fortran/kernels-loop-nest-independent.f95 +++ /dev/null @@ -1,28 +0,0 @@ -! { dg-do run } -! { dg-options "-ftree-parallelize-loops=32" } - -! Based on autopar/outer-1.c. - -program main - implicit none - integer, parameter :: n = 500 - integer, dimension (0:n-1, 0:n-1) :: x - integer :: i, j, ii, jj - - - !$acc kernels copyout (x) - !$acc loop independent - do ii = 0, n - 1 - do jj = 0, n - 1 - x(jj, ii) = ii + jj + 3 - end do - end do - !$acc end kernels - - do i = 0, n - 1 - do j = 0, n - 1 - if (x(i, j) .ne. i + j + 3) call abort - end do - end do - -end program main -- 1.9.1