@@ -1,3 +1,7 @@
+2022-06-27 Tobias Burnus <tobias@codesourcery.com>
+
+ * gfortran.dg/gomp/num-teams-2.f90: Use dg-error not dg-warning.
+
2022-05-12 Jakub Jelinek <jakub@redhat.com>
Backport from mainline:
@@ -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
Hello I have committed the following forward-ports from OG11 onto the devel/omp/gcc-12 branch to bring OG12 up-to-parity with OG11 again. 12d14a9a255 amdgcn: libgomp plugin USM implementation 687640af27a amdgcn, openmp: Auto-detect USM mode and set HSA_XNACK cbc3dd01de8 amdgcn: Support XNACK mode 1d4e24c9fb4 Fix gfortran.dg/gomp/num-teams-2.f90 Kwok From 1d4e24c9fb40d4df7e742d7631a29329d5fb7c84 Mon Sep 17 00:00:00 2001 From: Tobias Burnus <tobias@codesourcery.com> Date: Mon, 27 Jun 2022 13:26:43 +0200 Subject: [PATCH 1/4] 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/ChangeLog.omp | 4 ++++ gcc/testsuite/gfortran.dg/gomp/num-teams-2.f90 | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)