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.

diff --git a/gcc/config/i386/intelmic-mkoffload.cc b/gcc/config/i386/intelmic-mkoffload.cc
index c683d6f473edc9dab022159bddaaaacc84b97241..596f6f107b8c2b249d259fb50638243c1a09ed74 100644 (file)
--- 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/target.c b/libgomp/target.c
index c66c61b06217b5f9f6fda2fb7b217e6f13904cec..86f9d3050d908664ffe2920b56cd7eb5160be5de 100644 (file)
--- a/libgomp/target.c
+++ b/libgomp/target.c
@@ -2410,6 +2410,8 @@ GOMP_offload_register_ver (unsigned version, const void *host_table,
   gomp_mutex_unlock (&register_lock);
 }
 
+/* Legacy entry point.  */
+
 void
 GOMP_offload_register (const void *host_table, int target_type,
                       const void *target_data)
@@ -2462,6 +2464,8 @@ GOMP_offload_unregister_ver (unsigned version, const void *host_table,
   gomp_mutex_unlock (&register_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 891f90929d2201ccc552bc477021f0c5ac9293d3..107a3c2ac9de16f5d5d19c056682b815f47c1b50 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -348,6 +348,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 fedf977976954d39ef6df93c9dbe0e4e9ea31de9..ab9a8ddfcde2a3fe85a2c89f6810f5038c127da6 100644 (file)
--- 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 7091f400ef047a38086cc9315ed510128864f64b..1c204c8a21e590c95b5e27743f08493356dba778 100644 (file)
--- 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 c94a4c1084636029a2d39f387dfb92976e1d60e7..7473aa62e081fe4028cfecf87a591e9a01e37924 100644 (file)
--- 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 33741af15f1a0ab8ded42900f9fe1fd026c6f52a..e957b1b5918a649a86e2a2a089d99ff4ad196e58 100644 (file)
--- 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.