diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2022-07-05 18:23:15 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2022-07-06 22:53:04 +0200 |
| commit | 3f05e03d6cfdf723ca0556318b6a9aa37be438e7 (patch) | |
| tree | 7ef272d37b6d5817125bb1ec3359699c8e665e94 /gcc | |
| parent | 2f0d819a81edee50a98a8a05eed585f0a72bb932 (diff) | |
| download | gcc-3f05e03d6cfdf723ca0556318b6a9aa37be438e7.zip gcc-3f05e03d6cfdf723ca0556318b6a9aa37be438e7.tar.gz gcc-3f05e03d6cfdf723ca0556318b6a9aa37be438e7.tar.bz2 | |
Restore 'GOMP_offload_unregister_ver' functionality
The recent commit 683f11843974f0bdf42f79cdcbb0c2b43c7b81b0
"OpenMP: Move omp requires checks to libgomp" changed the
'GOMP_offload_register_ver' interface but didn't change
'GOMP_offload_unregister_ver' accordingly, so we're no longer
actually unregistering.
gcc/
* config/gcn/mkoffload.cc (process_obj): Clarify 'target_data' ->
'[...]_data'.
* config/nvptx/mkoffload.cc (process): Likewise.
libgomp/
* target.c (GOMP_offload_register_ver): Clarify 'target_data' ->
'data'.
(GOMP_offload_unregister_ver): Likewise. Fix up 'target_data'.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/config/gcn/mkoffload.cc | 8 | ||||
| -rw-r--r-- | gcc/config/nvptx/mkoffload.cc | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gcc/config/gcn/mkoffload.cc b/gcc/config/gcn/mkoffload.cc index b8b3fec..d246433 100644 --- a/gcc/config/gcn/mkoffload.cc +++ b/gcc/config/gcn/mkoffload.cc @@ -692,13 +692,13 @@ process_obj (FILE *in, FILE *cfile, uint32_t omp_requires) len); fprintf (cfile, - "static const struct gcn_image_desc {\n" + "static const struct gcn_data {\n" " uintptr_t omp_requires_mask;\n" " const struct gcn_image *gcn_image;\n" " unsigned kernel_count;\n" " const struct hsa_kernel_description *kernel_infos;\n" " unsigned global_variable_count;\n" - "} target_data = {\n" + "} gcn_data = {\n" " %d,\n" " &gcn_image,\n" " sizeof (gcn_kernels) / sizeof (gcn_kernels[0]),\n" @@ -723,7 +723,7 @@ process_obj (FILE *in, FILE *cfile, uint32_t omp_requires) fprintf (cfile, "static __attribute__((constructor)) void init (void)\n" "{\n" " GOMP_offload_register_ver (%#x, __OFFLOAD_TABLE__," - " %d/*GCN*/, &target_data);\n" + " %d/*GCN*/, &gcn_data);\n" "};\n", GOMP_VERSION_PACK (GOMP_VERSION, GOMP_VERSION_GCN), GOMP_DEVICE_GCN); @@ -731,7 +731,7 @@ process_obj (FILE *in, FILE *cfile, uint32_t omp_requires) fprintf (cfile, "static __attribute__((destructor)) void fini (void)\n" "{\n" " GOMP_offload_unregister_ver (%#x, __OFFLOAD_TABLE__," - " %d/*GCN*/, &target_data);\n" + " %d/*GCN*/, &gcn_data);\n" "};\n", GOMP_VERSION_PACK (GOMP_VERSION, GOMP_VERSION_GCN), GOMP_DEVICE_GCN); diff --git a/gcc/config/nvptx/mkoffload.cc b/gcc/config/nvptx/mkoffload.cc index d8c81eb..0fa5f44 100644 --- a/gcc/config/nvptx/mkoffload.cc +++ b/gcc/config/nvptx/mkoffload.cc @@ -310,7 +310,7 @@ process (FILE *in, FILE *out, uint32_t omp_requires) fprintf (out, "\n};\n\n"); fprintf (out, - "static const struct nvptx_tdata {\n" + "static const struct nvptx_data {\n" " uintptr_t omp_requires_mask;\n" " const struct ptx_obj *ptx_objs;\n" " unsigned ptx_num;\n" @@ -318,7 +318,7 @@ process (FILE *in, FILE *out, uint32_t omp_requires) " unsigned var_num;\n" " const struct nvptx_fn *fn_names;\n" " unsigned fn_num;\n" - "} target_data = {\n" + "} nvptx_data = {\n" " %d, ptx_objs, sizeof (ptx_objs) / sizeof (ptx_objs[0]),\n" " var_mappings," " sizeof (var_mappings) / sizeof (var_mappings[0]),\n" @@ -344,7 +344,7 @@ process (FILE *in, FILE *out, uint32_t omp_requires) fprintf (out, "static __attribute__((constructor)) void init (void)\n" "{\n" " GOMP_offload_register_ver (%#x, __OFFLOAD_TABLE__," - " %d/*NVIDIA_PTX*/, &target_data);\n" + " %d/*NVIDIA_PTX*/, &nvptx_data);\n" "};\n", GOMP_VERSION_PACK (GOMP_VERSION, GOMP_VERSION_NVIDIA_PTX), GOMP_DEVICE_NVIDIA_PTX); @@ -352,7 +352,7 @@ process (FILE *in, FILE *out, uint32_t omp_requires) fprintf (out, "static __attribute__((destructor)) void fini (void)\n" "{\n" " GOMP_offload_unregister_ver (%#x, __OFFLOAD_TABLE__," - " %d/*NVIDIA_PTX*/, &target_data);\n" + " %d/*NVIDIA_PTX*/, &nvptx_data);\n" "};\n", GOMP_VERSION_PACK (GOMP_VERSION, GOMP_VERSION_NVIDIA_PTX), GOMP_DEVICE_NVIDIA_PTX); |