public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-12] Fix Intel MIC 'mkoffload' for OpenMP 'requires'
@ 2022-07-07 12:08 Tobias Burnus
0 siblings, 0 replies; only message in thread
From: Tobias Burnus @ 2022-07-07 12:08 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:c4b637d1104b3dbe7b499cdb768554ad0032404e
commit c4b637d1104b3dbe7b499cdb768554ad0032404e
Author: Thomas Schwinge <thomas@codesourcery.com>
Date: Thu Jul 7 14:07:22 2022 +0200
Fix Intel MIC 'mkoffload' for OpenMP 'requires'
Similar to how the other 'mkoffload's got changed in
recent commit 683f11843974f0bdf42f79cdcbb0c2b43c7b81b0
"OpenMP: Move omp requires checks to libgomp".
This also means finally switching Intel MIC 'mkoffload' to
'GOMP_offload_register_ver', 'GOMP_offload_unregister_ver',
making 'GOMP_offload_register', 'GOMP_offload_unregister'
legacy entry points.
gcc/
* config/i386/intelmic-mkoffload.cc (generate_host_descr_file)
(prepare_target_image, main): Handle OpenMP 'requires'.
(generate_host_descr_file): Switch to 'GOMP_offload_register_ver',
'GOMP_offload_unregister_ver'.
libgomp/
* target.c (GOMP_offload_register, GOMP_offload_unregister):
Denote as legacy entry points.
* testsuite/lib/libgomp.exp
(check_effective_target_offload_target_any): New proc.
* testsuite/libgomp.c-c++-common/requires-1.c: Enable for
'offload_target_any'.
* testsuite/libgomp.c-c++-common/requires-3.c: Likewise.
* testsuite/libgomp.c-c++-common/requires-7.c: Likewise.
* testsuite/libgomp.fortran/requires-1.f90: Likewise.
(cherry picked from commit 9ef714539cb7cc1cd746312fd5dcc987bf167471)
Diff:
---
gcc/ChangeLog.omp | 10 ++++
gcc/config/i386/intelmic-mkoffload.cc | 56 +++++++++++++++++-----
libgomp/ChangeLog.omp | 15 ++++++
libgomp/target.c | 4 ++
libgomp/testsuite/lib/libgomp.exp | 5 ++
.../testsuite/libgomp.c-c++-common/requires-1.c | 2 +-
.../testsuite/libgomp.c-c++-common/requires-3.c | 2 +-
.../testsuite/libgomp.c-c++-common/requires-7.c | 2 +-
libgomp/testsuite/libgomp.fortran/requires-1.f90 | 2 +-
9 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index 655cb0175d4..6b594307049 100644
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,13 @@
+2022-07-07 Tobias Burnus <tobias@codesourcery.com>
+
+ Backport from mainline:
+ 2022-07-07 Thomas Schwinge <thomas@codesourcery.com>
+
+ * config/i386/intelmic-mkoffload.cc (generate_host_descr_file)
+ (prepare_target_image, main): Handle OpenMP 'requires'.
+ (generate_host_descr_file): Switch to 'GOMP_offload_register_ver',
+ 'GOMP_offload_unregister_ver'.
+
2022-07-07 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline:
diff --git a/gcc/config/i386/intelmic-mkoffload.cc b/gcc/config/i386/intelmic-mkoffload.cc
index c683d6f473e..596f6f107b8 100644
--- a/gcc/config/i386/intelmic-mkoffload.cc
+++ b/gcc/config/i386/intelmic-mkoffload.cc
@@ -370,7 +370,7 @@ generate_target_offloadend_file (const char *target_compiler)
/* Generates object file with the host side descriptor. */
static const char *
-generate_host_descr_file (const char *host_compiler)
+generate_host_descr_file (const char *host_compiler, uint32_t omp_requires)
{
char *dump_filename = concat (dumppfx, "_host_descr.c", NULL);
const char *src_filename = save_temps
@@ -386,39 +386,50 @@ generate_host_descr_file (const char *host_compiler)
if (!src_file)
fatal_error (input_location, "cannot open '%s'", src_filename);
+ fprintf (src_file, "#include <stdint.h>\n\n");
+
fprintf (src_file,
"extern const void *const __OFFLOAD_TABLE__;\n"
"extern const void *const __offload_image_intelmic_start;\n"
"extern const void *const __offload_image_intelmic_end;\n\n"
- "static const void *const __offload_target_data[] = {\n"
+ "static const struct intelmic_data {\n"
+ " uintptr_t omp_requires_mask;\n"
+ " const void *const image_start;\n"
+ " const void *const image_end;\n"
+ "} intelmic_data = {\n"
+ " %d,\n"
" &__offload_image_intelmic_start, &__offload_image_intelmic_end\n"
- "};\n\n");
+ "};\n\n", omp_requires);
fprintf (src_file,
"#ifdef __cplusplus\n"
"extern \"C\"\n"
"#endif\n"
- "void GOMP_offload_register (const void *, int, const void *);\n"
+ "void GOMP_offload_register_ver (unsigned, const void *, int, const void *);\n"
"#ifdef __cplusplus\n"
"extern \"C\"\n"
"#endif\n"
- "void GOMP_offload_unregister (const void *, int, const void *);\n\n"
+ "void GOMP_offload_unregister_ver (unsigned, const void *, int, const void *);\n\n"
"__attribute__((constructor))\n"
"static void\n"
"init (void)\n"
"{\n"
- " GOMP_offload_register (&__OFFLOAD_TABLE__, %d, __offload_target_data);\n"
- "}\n\n", GOMP_DEVICE_INTEL_MIC);
+ " GOMP_offload_register_ver (%#x, &__OFFLOAD_TABLE__, %d, &intelmic_data);\n"
+ "}\n\n",
+ GOMP_VERSION_PACK (GOMP_VERSION, GOMP_VERSION_INTEL_MIC),
+ GOMP_DEVICE_INTEL_MIC);
fprintf (src_file,
"__attribute__((destructor))\n"
"static void\n"
"fini (void)\n"
"{\n"
- " GOMP_offload_unregister (&__OFFLOAD_TABLE__, %d, __offload_target_data);\n"
- "}\n", GOMP_DEVICE_INTEL_MIC);
+ " GOMP_offload_unregister_ver (%#x, &__OFFLOAD_TABLE__, %d, &intelmic_data);\n"
+ "}\n",
+ GOMP_VERSION_PACK (GOMP_VERSION, GOMP_VERSION_INTEL_MIC),
+ GOMP_DEVICE_INTEL_MIC);
fclose (src_file);
@@ -462,7 +473,7 @@ generate_host_descr_file (const char *host_compiler)
}
static const char *
-prepare_target_image (const char *target_compiler, int argc, char **argv)
+prepare_target_image (const char *target_compiler, int argc, char **argv, uint32_t *omp_requires)
{
const char *target_descr_filename
= generate_target_descr_file (target_compiler);
@@ -509,8 +520,26 @@ prepare_target_image (const char *target_compiler, int argc, char **argv)
obstack_ptr_grow (&argv_obstack, "");
obstack_ptr_grow (&argv_obstack, "-o");
obstack_ptr_grow (&argv_obstack, target_so_filename);
+
+ char *omp_requires_file;
+ if (save_temps)
+ omp_requires_file = concat (dumppfx, ".mkoffload.omp_requires", NULL);
+ else
+ omp_requires_file = make_temp_file (".mkoffload.omp_requires");
+ xputenv (concat ("GCC_OFFLOAD_OMP_REQUIRES_FILE=", omp_requires_file, NULL));
+
compile_for_target (&argv_obstack);
+ unsetenv("GCC_OFFLOAD_OMP_REQUIRES_FILE");
+ FILE *in = fopen (omp_requires_file, "rb");
+ if (!in)
+ fatal_error (input_location, "cannot open omp_requires file %qs",
+ omp_requires_file);
+ if (fread (omp_requires, sizeof (*omp_requires), 1, in) != 1)
+ fatal_error (input_location, "cannot read omp_requires file %qs",
+ omp_requires_file);
+ fclose (in);
+
/* Run objcopy. */
char *rename_section_opt
= XALLOCAVEC (char, sizeof (".data=") + strlen (image_section_name));
@@ -643,10 +672,13 @@ main (int argc, char **argv)
if (!dumppfx)
dumppfx = out_obj_filename;
+ uint32_t omp_requires;
+
const char *target_so_filename
- = prepare_target_image (target_compiler, argc, argv);
+ = prepare_target_image (target_compiler, argc, argv, &omp_requires);
- const char *host_descr_filename = generate_host_descr_file (host_compiler);
+ const char *host_descr_filename
+ = generate_host_descr_file (host_compiler, omp_requires);
/* Perform partial linking for the target image and host side descriptor.
As a result we'll get a finalized object file with all offload data. */
diff --git a/libgomp/ChangeLog.omp b/libgomp/ChangeLog.omp
index e16b1c91d2d..91bf55fe7e1 100644
--- a/libgomp/ChangeLog.omp
+++ b/libgomp/ChangeLog.omp
@@ -1,3 +1,18 @@
+2022-07-07 Tobias Burnus <tobias@codesourcery.com>
+
+ Backport from mainline:
+ 2022-07-07 Thomas Schwinge <thomas@codesourcery.com>
+
+ * target.c (GOMP_offload_register, GOMP_offload_unregister):
+ Denote as legacy entry points.
+ * testsuite/lib/libgomp.exp
+ (check_effective_target_offload_target_any): New proc.
+ * testsuite/libgomp.c-c++-common/requires-1.c: Enable for
+ 'offload_target_any'.
+ * testsuite/libgomp.c-c++-common/requires-3.c: Likewise.
+ * testsuite/libgomp.c-c++-common/requires-7.c: Likewise.
+ * testsuite/libgomp.fortran/requires-1.f90: Likewise.
+
2022-07-07 Tobias Burnus <tobias@codesourcery.com>
Backport from mainline:
diff --git a/libgomp/target.c b/libgomp/target.c
index c88df2cec0e..436547b97e7 100644
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -2600,6 +2600,8 @@ GOMP_offload_register_ver (unsigned version, const void *host_table,
gomp_mutex_unlock (®ister_lock);
}
+/* Legacy entry point. */
+
void
GOMP_offload_register (const void *host_table, int target_type,
const void *target_data)
@@ -2652,6 +2654,8 @@ GOMP_offload_unregister_ver (unsigned version, const void *host_table,
gomp_mutex_unlock (®ister_lock);
}
+/* Legacy entry point. */
+
void
GOMP_offload_unregister (const void *host_table, int target_type,
const void *target_data)
diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 39502bab3aa..c98c1edf57b 100644
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -347,6 +347,11 @@ proc libgomp_check_effective_target_offload_target { target_name } {
return 0
}
+# Return 1 if compiling for any offload target.
+proc check_effective_target_offload_target_any { } {
+ return [libgomp_check_effective_target_offload_target ""]
+}
+
# Return 1 if compiling for offload target nvptx.
proc check_effective_target_offload_target_nvptx { } {
return [libgomp_check_effective_target_offload_target "nvptx"]
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-1.c b/libgomp/testsuite/libgomp.c-c++-common/requires-1.c
index fedf9779769..ab9a8ddfcde 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-1.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-1.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
+/* { dg-do link { target offload_target_any } } */
/* { dg-additional-sources requires-1-aux.c } */
/* Check diagnostic by device-compiler's lto1.
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-3.c b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
index 7091f400ef0..1c204c8a21e 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-3.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
+/* { dg-do link { target offload_target_any } } */
/* { dg-additional-sources requires-3-aux.c } */
/* Check diagnostic by device-compiler's lto1.
diff --git a/libgomp/testsuite/libgomp.c-c++-common/requires-7.c b/libgomp/testsuite/libgomp.c-c++-common/requires-7.c
index c94a4c10846..7473aa62e08 100644
--- a/libgomp/testsuite/libgomp.c-c++-common/requires-7.c
+++ b/libgomp/testsuite/libgomp.c-c++-common/requires-7.c
@@ -1,4 +1,4 @@
-/* { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } } */
+/* { dg-do link { target offload_target_any } } */
/* { dg-additional-sources requires-7-aux.c } */
/* Check diagnostic by device-compiler's lto1.
diff --git a/libgomp/testsuite/libgomp.fortran/requires-1.f90 b/libgomp/testsuite/libgomp.fortran/requires-1.f90
index 33741af15f1..e957b1b5918 100644
--- a/libgomp/testsuite/libgomp.fortran/requires-1.f90
+++ b/libgomp/testsuite/libgomp.fortran/requires-1.f90
@@ -1,4 +1,4 @@
-! { dg-do link { target { offload_target_nvptx || offload_target_amdgcn } } }
+! { dg-do link { target offload_target_any } }
! { dg-additional-sources requires-1-aux.f90 }
! Check diagnostic by device-compiler's lto1.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-07-07 12:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-07 12:08 [gcc/devel/omp/gcc-12] Fix Intel MIC 'mkoffload' for OpenMP 'requires' Tobias Burnus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).