f5bfc65f9a
This is a merge of: https://gcc.gnu.org/pipermail/gcc-patches/2021-January/563393.html This patch completes more of the reverse_offload, unified_address, and unified_shared_memory clauses for the OpenMP 5.0 requires directive, including runtime verification of the offload target. (currently no offload devices actually support above features, only warning messages are emitted) This may possibly reverted/updated when a final patch is approved for mainline. 2021-02-02 Chung-Lin Tang <cltang@codesourcery.com> gcc/c/ChangeLog: * c-parser.c (c_parser_declaration_or_fndef): Set OMP_REQUIRES_TARGET_USED in omp_requires_mask if function has "omp declare target" attribute. (c_parser_omp_target_data): Set OMP_REQUIRES_TARGET_USED in omp_requires_mask. (c_parser_omp_target_enter_data): Likewise. (c_parser_omp_target_exit_data): Likewise. (c_parser_omp_requires): Adjust to only mention "not implemented yet" for OMP_REQUIRES_DYNAMIC_ALLOCATORS. gcc/cp/ChangeLog: * parser.c (cp_parser_simple_declaration): Set OMP_REQUIRES_TARGET_USED in omp_requires_mask if function has "omp declare target" attribute. (cp_parser_omp_target_data): Set OMP_REQUIRES_TARGET_USED in omp_requires_mask. (cp_parser_omp_target_enter_data): Likewise. (cp_parser_omp_target_exit_data): Likewise. (cp_parser_omp_requires): Adjust to only mention "not implemented yet" for OMP_REQUIRES_DYNAMIC_ALLOCATORS. gcc/fortran/ChangeLog: * openmp.c (gfc_check_omp_requires): Fix REVERSE_OFFLOAD typo. (gfc_match_omp_requires): Adjust to only mention "not implemented yet" for OMP_REQUIRES_DYNAMIC_ALLOCATORS. * parse.c ("tree.h"): Add include. ("omp-general.h"): Likewise. (gfc_parse_file): Add code to merge omp_requires to omp_requires_mask. gcc/ChangeLog: * omp-offload.c (omp_finish_file): Add code to reate OpenMP requires mask variable in .gnu.gomp_requires section if needed. gcc/testsuite/ChangeLog: * c-c++-common/gomp/requires-4.c: Remove prune of "not supported yet". * gcc/testsuite/gfortran.dg/gomp/requires-4.f90: Fix REVERSE_OFFLOAD typo. * gcc/testsuite/gfortran.dg/gomp/requires-8.f90: Likewise. include/ChangeLog: * gomp-constants.h (GOMP_REQUIRES_UNIFIED_ADDRESS): New symbol. (GOMP_REQUIRES_UNIFIED_SHARED_MEMORY): Likewise. (GOMP_REQUIRES_REVERSE_OFFLOAD): Likewise. libgcc/ChangeLog: * offloadstuff.c (__requires_mask_table): New symbol to mark start of .gnu.gomp_requires section. (__requires_mask_table_end): New symbol to mark end of .gnu.gomp_requires section. libgomp/ChangeLog: * libgomp-plugin.h (GOMP_OFFLOAD_supported_features): New declaration. * libgomp.h (struct gomp_device_descr): New 'supported_features_func' plugin hook field. * oacc-host.c (host_supported_features): New host hook function. (host_dispatch): Initialize 'supported_features_func' host hook. * plugin/plugin-gcn.c (GOMP_OFFLOAD_supported_features): New function. * plugin/plugin-nvptx.c (GOMP_OFFLOAD_supported_features): Likewise. * target.c (<stdio.h>): Add include of standard header. (gomp_requires_mask): New static variable. (__requires_mask_table): New declaration. (__requires_mask_table_end): Likewise. (gomp_load_plugin_for_device): Add loading of 'supported_features' hook. (gomp_target_init): Add code to summarize .gnu._gomp_requires section mask values, emit error if inconsistency found. * testsuite/libgomp.c-c++-common/requires-1.c: New test. * testsuite/libgomp.c-c++-common/requires-1-aux.c: New file linked with above test. * testsuite/libgomp.c-c++-common/requires-2.c: New test. * testsuite/libgomp.c-c++-common/requires-2-aux.c: New file linked with above test. liboffloadmic/ChangeLog: * plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_supported_features): New function.
94 lines
3.1 KiB
C
94 lines
3.1 KiB
C
/* Specialized bits of code needed for the offloading tables.
|
|
Copyright (C) 2014-2021 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* Target machine header files require this define. */
|
|
#define IN_LIBGCC2
|
|
|
|
/* FIXME: Including auto-host is incorrect, but until we have
|
|
identified the set of defines that need to go into auto-target.h,
|
|
this will have to do. */
|
|
#include "auto-host.h"
|
|
#undef caddr_t
|
|
#undef pid_t
|
|
#undef rlim_t
|
|
#undef ssize_t
|
|
#undef vfork
|
|
#include "tconfig.h"
|
|
#include "tsystem.h"
|
|
#include "coretypes.h"
|
|
#include "tm.h"
|
|
#include "libgcc_tm.h"
|
|
|
|
#if defined(HAVE_GAS_HIDDEN) && ENABLE_OFFLOADING == 1
|
|
|
|
#define OFFLOAD_FUNC_TABLE_SECTION_NAME ".gnu.offload_funcs"
|
|
#define OFFLOAD_VAR_TABLE_SECTION_NAME ".gnu.offload_vars"
|
|
|
|
#ifdef CRT_BEGIN
|
|
|
|
const void *const __offload_func_table[0]
|
|
__attribute__ ((__used__, visibility ("hidden"),
|
|
section (OFFLOAD_FUNC_TABLE_SECTION_NAME))) = { };
|
|
const void *const __offload_var_table[0]
|
|
__attribute__ ((__used__, visibility ("hidden"),
|
|
section (OFFLOAD_VAR_TABLE_SECTION_NAME))) = { };
|
|
|
|
const unsigned int const __requires_mask_table[0]
|
|
__attribute__ ((__used__, section (".gnu.gomp_requires"))) = { };
|
|
|
|
#elif defined CRT_END
|
|
|
|
const void *const __offload_funcs_end[0]
|
|
__attribute__ ((__used__, visibility ("hidden"),
|
|
section (OFFLOAD_FUNC_TABLE_SECTION_NAME))) = { };
|
|
const void *const __offload_vars_end[0]
|
|
__attribute__ ((__used__, visibility ("hidden"),
|
|
section (OFFLOAD_VAR_TABLE_SECTION_NAME))) = { };
|
|
|
|
const unsigned int const __requires_mask_table_end[0]
|
|
__attribute__ ((__used__, section (".gnu.gomp_requires"))) = { };
|
|
|
|
#elif defined CRT_TABLE
|
|
|
|
extern const void *const __offload_func_table[];
|
|
extern const void *const __offload_var_table[];
|
|
extern const void *const __offload_funcs_end[];
|
|
extern const void *const __offload_vars_end[];
|
|
|
|
const void *const __OFFLOAD_TABLE__[]
|
|
__attribute__ ((__visibility__ ("hidden"))) =
|
|
{
|
|
&__offload_func_table, &__offload_funcs_end,
|
|
&__offload_var_table, &__offload_vars_end
|
|
};
|
|
|
|
extern const unsigned int const __requires_mask_table[];
|
|
extern const unsigned int const __requires_mask_table_end[];
|
|
|
|
#else /* ! CRT_BEGIN && ! CRT_END && ! CRT_TABLE */
|
|
#error "One of CRT_BEGIN, CRT_END or CRT_TABLE must be defined."
|
|
#endif
|
|
|
|
#endif
|