From patchwork Wed Dec 15 15:54:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frederik Harwath X-Patchwork-Id: 48946 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E73C73858428 for ; Wed, 15 Dec 2021 15:58:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from esa2.mentor.iphmx.com (esa2.mentor.iphmx.com [68.232.141.98]) by sourceware.org (Postfix) with ESMTPS id BE7F7385801E; Wed, 15 Dec 2021 15:55:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org BE7F7385801E Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com IronPort-SDR: MsmJumfmodvUnOzHrpWiangHCz/uwL/3KeH6SL8FlK6ZdfUKfunYJN3CuQPl0U2oLiyABkJMvJ efWy1SFazs6Rdk9lslL0OEe3schT9mR4RW3p2yvoLwq9M8IJ96wF5x51ZyIZ8IntcisE54nV2s yOffmkuaWoE81PpI6GWBqDVWY8TS5y7oW1H76QxH5EDPiZ74J26PAdqcOFKRLAyvfoCUsYFbvj B0tF3uAsg+3Wh5utPrIzqB3YVzgTJmbzQ4uujNIxGgHvmBZ6HF7klGwX81xlp3LCHV3W/DjnLg kdTTahojddc/U6NuV34FNmtn X-IronPort-AV: E=Sophos;i="5.88,207,1635235200"; d="scan'208";a="69736533" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 15 Dec 2021 07:55:14 -0800 IronPort-SDR: Th46J/ZALpO5UxfeMMLXMNtnqz6KKXVcAB7AF9I7lsQD+fAFLJT+ej+aaStNUMo9OD67mGez2J UW3IBFjW6iU6MXDSv/pPZzID7oc9SMMebuQ0+BVwcBm6TnKIzW6vJ+Cy3Ff4awCmJKRSA2zV0R VUy9FtqCJQWFescwPUWnvfIBW0z9RrdYBEPXCWniJXP8gOggs3BZ6e70oykKckU3qOAuU+5SlP 4j1tTB7HNkPYH0wH9srr9ERIyeVlsp0GGey9S/SVFevwTQ72nD5tCbpeTLo1DULvyMcH4ujXdD HRw= From: Frederik Harwath To: Subject: [PATCH 04/40] Additional Fortran testsuite fixes for kernels loops annotation pass. Date: Wed, 15 Dec 2021 16:54:11 +0100 Message-ID: <20211215155447.19379-5-frederik@codesourcery.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211215155447.19379-1-frederik@codesourcery.com> References: <20211215155447.19379-1-frederik@codesourcery.com> MIME-Version: 1.0 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-10.mgc.mentorg.com (139.181.222.10) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tobias@codesourcery.com, Sandra Loosemore , thomas@codesourcery.com, fortran@gcc.gnu.org Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" From: Sandra Loosemore 2020-03-27 Sandra Loosemore gcc/testsuite/ * gfortran.dg/goacc/classify-kernels-unparallelized.f95: Adjust line numbering. * gfortran.dg/goacc/classify-kernels.f95: Likewise. * gfortran.dg/goacc/kernels-decompose-2.f95: Add -fno-openacc-kernels-annotate-loops. --- .../gfortran.dg/goacc/classify-kernels-unparallelized.f95 | 5 +++-- gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 | 5 +++-- gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) -- 2.33.0 ----------------- Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201, 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer: Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München; Registergericht München, HRB 106955 diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 index 2ceae2088070..00aac9aa94ea 100644 --- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels-unparallelized.f95 @@ -23,8 +23,9 @@ program main call setup(a, b) - !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) ! { dg-message "optimized: assigned OpenACC seq loop parallelism" } - do i = 0, n - 1 + !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) + do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC seq loop parallelism" } + ! { dg-message "note: beginning .parloops. part in OpenACC .kernels. region" "" { target *-*-* } 24 } c(i) = a(f (i)) + b(f (i)) end do !$acc end kernels diff --git a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 index d061a241074b..ba815319abf2 100644 --- a/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/classify-kernels.f95 @@ -19,8 +19,9 @@ program main call setup(a, b) - !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } - do i = 0, n - 1 + !$acc kernels copyin (a(0:n-1), b(0:n-1)) copyout (c(0:n-1)) + do i = 0, n - 1 ! { dg-message "optimized: assigned OpenACC gang loop parallelism" } + ! { dg-message "beginning .parloops. part in OpenACC .kernels. region" "" { target *-*-* } 20 } c(i) = a(i) + b(i) end do !$acc end kernels diff --git a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 index 238482b91a49..04c998d11dad 100644 --- a/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 +++ b/gcc/testsuite/gfortran.dg/goacc/kernels-decompose-2.f95 @@ -1,5 +1,6 @@ ! Test OpenACC 'kernels' construct decomposition. +! { dg-additional-options "-fno-openacc-kernels-annotate-loops" } ! { dg-additional-options "-fopt-info-omp-all" } ! { dg-additional-options "--param=openacc-kernels=decompose" } ! { dg-additional-options "-O2" } for 'parloops'.