From patchwork Mon Jun 27 11:49:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 55441 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 60956383E689 for ; Mon, 27 Jun 2022 11:49:26 +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 CA691386F0DB for ; Mon, 27 Jun 2022 11:49:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CA691386F0DB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="5.92,226,1650960000"; d="diff'?scan'208";a="77889724" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa2.mentor.iphmx.com with ESMTP; 27 Jun 2022 03:49:08 -0800 IronPort-SDR: ih7flo8UJsOZcdliil3rU0AyA/Ozc1JBEhTpKZ9MM4Nu5e09j8DNhIK6F420Q6E2tD+HDVBze7 OAHnmNrx4ooVxSKLO5Rysid8QQr3UZEz75fq0bOS64O7ezV3eTH/xoL0ZGE4N+VuGMOkgsGaNU PaVifKGwupN+bvUixopFRhfBVJB5dQX2ajYzKqQRqa71gYiM7cCFZ/9/9HgAZCct2MLCrQdOEP 6tk3CuvHOtNXabT1mh/BhvHqeGV7gpz5CaTdUloqmxKyC2skHfOh6CL+s/vPuugI7Pd6yYfX0s yco= Message-ID: Date: Mon, 27 Jun 2022 13:49:04 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: gcc-patches From: Tobias Burnus Subject: [OG11][committed] Fix gfortran.dg/gomp/affinity-clause-1.f90 / Fix gfortran.dg/gomp/num-teams-2.f90 X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) To svr-ies-mbx-12.mgc.mentorg.com (139.181.222.12) X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, KAM_DMARC_STATUS, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: "Vollweiler, Marcel" Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Committed to fix OG11-only fails. For details, see commit log + patch (attached) – with two commits. Tobias ----------------- 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 commit 88c73dbc2de129c5d4f1af95c6e5433447d847a2 Author: Tobias Burnus Date: Mon Jun 27 13:44:36 2022 +0200 Fix gfortran.dg/gomp/affinity-clause-1.f90 The patch [OG11][committed][PATCH 01/22] Fortran: delinearize multi-dimensional array accesses https://gcc.gnu.org/pipermail/gcc-patches/2021-November/584716.html OG11 commit e208eefbaa3f9f590171fce79c7366636770b348 causes a different dump - update the testcase accordingly. gcc/testsuite/ * gfortran.dg/gomp/affinity-clause-1.f90: Fix scan-tree-dump-times. --- gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90 b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90 index 08c7740cf0d..9e70bd769d4 100644 --- a/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/affinity-clause-1.f90 @@ -22,7 +22,7 @@ end ! { dg-final { scan-tree-dump-times "D\\.\[0-9\]+ = .integer.kind=4.. __builtin_cosf ..real.kind=4.. a \\+ 1.0e\\+0\\);" 2 "original" } } -! { dg-final { scan-tree-dump-times "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) jj=2:5:2, integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):b\\\[.* ? \\+ -1\\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) jj=2:5:2, integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):d\\\[\\(.*jj \\* 5 \\+ .* ?\\) \\+ -6\\\]\\)" 1 "original" } } +! { dg-final { scan-tree-dump-times "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) jj=2:5:2, integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):b\\\[.* ? \\+ -1\\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) jj=2:5:2, integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):\\(\\(integer\\(kind=4\\)\\\[1:5\\\]\\\[1:5\\\]\\) d\\)\\\[\[^ \]* *jj\\\]{lb: 1 sz: 20}\\\[\[^ \]* *i\\\]{lb: 1 sz: 4}\\)" 1 "original" } } ! { dg final { scan-tree-dump-times "#pragma omp task affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):b\\\[\\(.* ? \\+ -1\\\]\\) affinity\\(iterator\\(integer\\(kind=4\\) i=D\\.\[0-9\]+:5:1\\):d\\\[\\(\\(integer\\(kind=8\\)\\) i \\+ -1\\) \\* 6\\\]\\)" 1 "original" } } commit 1cbfde1cc2ce51488808d068a1afa3e5581b709c Author: Tobias Burnus Date: Mon Jun 27 13:26:43 2022 +0200 Fix gfortran.dg/gomp/num-teams-2.f90 OG11 contrary to mainline issues an error for resolve_positive_int_expr (-> OG11 commit a14b3f29681da1d2465e15f98b8cf8d5c64a2c3c). Update testcase accordingly. gcc/testsuite/ * gfortran.dg/gomp/num-teams-2.f90: Use dg-error not dg-warning. --- gcc/testsuite/gfortran.dg/gomp/num-teams-2.f90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/testsuite/gfortran.dg/gomp/num-teams-2.f90 b/gcc/testsuite/gfortran.dg/gomp/num-teams-2.f90 index e7814a11a5a..f3031481d4a 100644 --- a/gcc/testsuite/gfortran.dg/gomp/num-teams-2.f90 +++ b/gcc/testsuite/gfortran.dg/gomp/num-teams-2.f90 @@ -9,13 +9,13 @@ subroutine foo (i) !$omp teams num_teams (6 : 4) ! { dg-warning "NUM_TEAMS lower bound at .1. larger than upper bound at .2." } !$omp end teams - !$omp teams num_teams (-7) ! { dg-warning "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } + !$omp teams num_teams (-7) ! { dg-error "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } !$omp end teams - !$omp teams num_teams (i : -7) ! { dg-warning "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } + !$omp teams num_teams (i : -7) ! { dg-error "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } !$omp end teams - !$omp teams num_teams (-7 : 8) ! { dg-warning "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } + !$omp teams num_teams (-7 : 8) ! { dg-error "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } !$omp end teams end @@ -25,13 +25,13 @@ subroutine bar (i) !$omp target teams num_teams (6 : 4) ! { dg-warning "NUM_TEAMS lower bound at .1. larger than upper bound at .2." } !$omp end target teams - !$omp target teams num_teams (-7) ! { dg-warning "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } + !$omp target teams num_teams (-7) ! { dg-error "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } !$omp end target teams - !$omp target teams num_teams (i : -7) ! { dg-warning "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } + !$omp target teams num_teams (i : -7) ! { dg-error "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } !$omp end target teams - !$omp target teams num_teams (-7 : 8) ! { dg-warning "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } + !$omp target teams num_teams (-7 : 8) ! { dg-error "INTEGER expression of NUM_TEAMS clause at .1. must be positive" } !$omp end target teams end end module