[OG11][committed] OpenMP metadirective support

[OG11][committed] OpenMP metadirective support

[Kwok Cheung Yeung]

Hello

I have backported and committed my metadirective patches onto the 
current OpenMP development branch (devel/omp/gcc-11). These are:

f464df13a44b9814341659be631f051377a2ce25 openmp: Add C support for 
parsing metadirectives
a238b6934b62ce3e8342047e41840c804d83b59d openmp: Add middle-end support 
for metadirectives
7e672d2ba146ca55dfffc36b198fbb3f3200f8f2 openmp: Add support for 
resolving metadirectives during parsing and Gimplification
b6fd3d1a54736c87fcd29a4ed294b31346b3af75 openmp: Add support for 
streaming metadirectives and resolving them after LTO
360db2054413d21399473173a85870da6479ab8c openmp: Add C++ support for 
parsing metadirectives
ceb0beb7ba9357146994895070762f8a9d94ca7c openmp, fortran: Add Fortran 
support for parsing metadirectives
eb4bea483010d91fbeeae9c863e92da873fbeef9 openmp: Add testcases for 
metadirectives
b597c0835ede0067d1b009e0d7381515b44d8753 openmp: Metadirective fixes
21766085775bd52c9db53629636c830fc9dc6fa0 openmp: Add support for 
'target_device' context selector set

The following backport from mainline was also required:

94c179971913b4837ec76a9e02a9a8a5cbf8e024 Expose stable sort algorithm to 
gcc_sort_r and add vec::stablesort

Thanks

Kwok

Re: [OG11][committed] OpenMP metadirective support

[Kwok Cheung Yeung]

[-- Attachment #1: Type: text/plain, Size: 468 bytes --]

> 21766085775bd52c9db53629636c830fc9dc6fa0 openmp: Add support for 'target_device' context selector set

I have committed an extra fix to remove an extra comma in an error 
message changed by this patch. This causes regressions in an existing 
test for 'declare variant' because the expected wording of the error 
message has changed. This fix is already in the version of the patch 
posted at:

https://gcc.gnu.org/pipermail/gcc-patches/2022-January/589191.html

Kwok

[-- Attachment #2: 0001-openmp-Fix-error-message-in-Fortran-front-end.patch --]
[-- Type: text/plain, Size: 1702 bytes --]

From 23dd64c4715b2df2181aaf995e3040d54edba129 Mon Sep 17 00:00:00 2001
From: Kwok Cheung Yeung <kcy@codesourcery.com>
Date: Mon, 31 Jan 2022 05:44:21 -0800
Subject: [PATCH] openmp: Fix error message in Fortran front-end

An extra comma in an error message causes failures in the Fortran tests for
declare variant, because the message differs from that expected.

2022-01-31  Kwok Cheung Yeung  <kcy@codesourcery.com>

	gcc/fortran/
	* openmp.c (gfc_match_omp_context_selector_specification): Remove
	extra comma in error message.
---
 gcc/fortran/ChangeLog.omp | 5 +++++
 gcc/fortran/openmp.c      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/fortran/ChangeLog.omp b/gcc/fortran/ChangeLog.omp
index 81c4d9a129b..a78fab44352 100644
--- a/gcc/fortran/ChangeLog.omp
+++ b/gcc/fortran/ChangeLog.omp
@@ -1,3 +1,8 @@
+2022-01-31  Kwok Cheung Yeung  <kcy@codesourcery.com>
+
+	* openmp.c (gfc_match_omp_context_selector_specification): Remove
+	extra comma in error message.
+
 2022-01-25  Kwok Cheung Yeung  <kcy@codesourcery.com>
 
 	* openmp.c (omp_target_device_selectors): New.
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index e448868d246..94930fed059 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -4844,7 +4844,7 @@ gfc_match_omp_context_selector_specification (gfc_omp_set_selector **oss_head,
 	    gfc_error ("expected 'construct', 'device', 'implementation', "
 		       "'target_device' or 'user' at %C");
 	  else
-	    gfc_error ("expected 'construct', 'device', 'implementation', "
+	    gfc_error ("expected 'construct', 'device', 'implementation' "
 		       "or 'user' at %C");
 	  return MATCH_ERROR;
 	}
-- 
2.30.0.335.ge636282