diff mbox series

[og10] Fix gfortran.dg/goacc/routine-module-mod-1.f90 testcase

Message ID c8158776-6f23-c2fb-31d2-5565bd5c2959@codesourcery.com
State New
Headers show
Series [og10] Fix gfortran.dg/goacc/routine-module-mod-1.f90 testcase | expand

Commit Message

Kwok Cheung Yeung July 22, 2020, 3:27 p.m. UTC
The testcase gfortran.dg/goacc/routine-module-mod-1.f90 fails due to an extra 
'warning: region is worker partitioned but does not contain worker partitioned 
code' message in subroutine g_1. subroutine g_1 is marked with '!$acc routine 
gang', but the loop inside is only assigned gang vector loop parallelism, which 
triggers the message as there is no worker parallelism.

This patch makes the message expected. Okay for OG10 branch?

Kwok
From 824a4d600380a8b02bb65f055ff0423bbd849a4f Mon Sep 17 00:00:00 2001
From: Kwok Cheung Yeung <kcy@codesourcery.com>
Date: Wed, 1 Jul 2020 08:26:42 -0700
Subject: [PATCH 6/6] Fix failure in testcase
 gfortran.dg/goacc/routine-module-mod-1.f90

2020-07-21  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/testsuite/
	* gfortran.dg/goacc/routine-module-mod-1.f90 (g_1): Add
	expected output.
---
 gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Schwinge July 24, 2020, 8:59 a.m. UTC | #1
Hi Kwok!

On 2020-07-22T16:27:10+0100, Kwok Cheung Yeung <kcy@codesourcery.com> wrote:
> The testcase gfortran.dg/goacc/routine-module-mod-1.f90 fails due to an extra
> 'warning: region is worker partitioned but does not contain worker partitioned
> code' message in subroutine g_1. subroutine g_1 is marked with '!$acc routine
> gang', but the loop inside is only assigned gang vector loop parallelism, which
> triggers the message as there is no worker parallelism.

Seems strange to diagnose "does not contain worker partitioned code" in
this case, though -- but resolving that mystery can be left for later.

> This patch makes the message expected. Okay for OG10 branch?

Ok, thanks.

> From 824a4d600380a8b02bb65f055ff0423bbd849a4f Mon Sep 17 00:00:00 2001
> From: Kwok Cheung Yeung <kcy@codesourcery.com>
> Date: Wed, 1 Jul 2020 08:26:42 -0700
> Subject: [PATCH 6/6] Fix failure in testcase
>  gfortran.dg/goacc/routine-module-mod-1.f90
>
> 2020-07-21  Kwok Cheung Yeung  <kcy@codesourcery.com>
>
>       gcc/testsuite/
>       * gfortran.dg/goacc/routine-module-mod-1.f90 (g_1): Add
>       expected output.

Again, please reference og10 commit
4472e4cdcd264b8e9102a2804c0ce35a5865f7a1 "Default compute dimensions
(compile time)" here, which introduces this diagnostic.


Grüße
 Thomas


>  gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90 b/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
> index 23c673f..2ea4094 100644
> --- a/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
> +++ b/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
> @@ -50,7 +50,7 @@ contains
>      end do
>    end subroutine w_1
>
> -  subroutine g_1
> +  subroutine g_1 ! { dg-warning "region is worker partitioned but does not contain worker partitioned code" }
>      implicit none
>      !$acc routine gang
>
-----------------
Mentor Graphics (Deutschland) GmbH, Arnulfstraße 201, 80634 München / Germany
Registergericht München HRB 106955, Geschäftsführer: Thomas Heurung, Alexander Walter
diff mbox series

Patch

diff --git a/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90 b/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
index 23c673f..2ea4094 100644
--- a/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
+++ b/gcc/testsuite/gfortran.dg/goacc/routine-module-mod-1.f90
@@ -50,7 +50,7 @@  contains
     end do
   end subroutine w_1
 
-  subroutine g_1
+  subroutine g_1 ! { dg-warning "region is worker partitioned but does not contain worker partitioned code" }
     implicit none
     !$acc routine gang