diff options
| author | Tobias Burnus <tobias@codesourcery.com> | 2022-11-16 08:58:44 +0100 |
|---|---|---|
| committer | Tobias Burnus <tobias@codesourcery.com> | 2022-11-16 08:58:44 +0100 |
| commit | d59858f6ee7f356f27ccc2d29129826781f9483f (patch) | |
| tree | 17e87a2709f7fd026ab3ef4070ae7812acc25c2d | |
| parent | 7f014022861b5b3f00be9bb32fe3fe772517ddac (diff) | |
| download | gcc-d59858f6ee7f356f27ccc2d29129826781f9483f.zip gcc-d59858f6ee7f356f27ccc2d29129826781f9483f.tar.gz gcc-d59858f6ee7f356f27ccc2d29129826781f9483f.tar.bz2 | |
nvptx/mkoffload.cc: Fix "$nohost" check
If lhd_set_decl_assembler_name is invoked - in particular if
!TREE_PUBLIC (decl) && !DECL_FILE_SCOPE_P (decl) - the '.nohost' suffix
might change to '.nohost.2'. This happens for the existing reverse offload
testcases via cgraph_node::analyze and is a side effect of
r13-3455-g178ac530fe67e4f2fc439cc4ce89bc19d571ca31 for some reason.
The solution is to not only check for a tailing '$nohost' but also for
'$nohost$' in nvptx/mkoffload.cc.
gcc/ChangeLog:
* config/nvptx/mkoffload.cc (process): Recognize '$nohost$...'
besides tailing '$nohost' as being for reverse offload.
| -rw-r--r-- | gcc/config/nvptx/mkoffload.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc/config/nvptx/mkoffload.cc b/gcc/config/nvptx/mkoffload.cc index 854cd72..5d89ba8 100644 --- a/gcc/config/nvptx/mkoffload.cc +++ b/gcc/config/nvptx/mkoffload.cc @@ -364,7 +364,8 @@ process (FILE *in, FILE *out, uint32_t omp_requires) Alternatively, besides searching for 'BEGIN FUNCTION DECL', checking for '.visible .entry ' + id->ptx_name would be required. */ - if (!endswith (id->ptx_name, "$nohost")) + if (!endswith (id->ptx_name, "$nohost") + && !strstr (id->ptx_name, "$nohost$")) continue; fprintf (out, "\t\".extern "); const char *p = input + file_idx[fidx]; @@ -402,7 +403,8 @@ process (FILE *in, FILE *out, uint32_t omp_requires) "$offload_func_table[] = {"); for (comma = "", id = func_ids; id; comma = ",", id = id->next) fprintf (out, "%s\"\n\t\t\"%s", comma, - endswith (id->ptx_name, "$nohost") ? id->ptx_name : "0"); + (endswith (id->ptx_name, "$nohost") + || strstr (id->ptx_name, "$nohost$")) ? id->ptx_name : "0"); fprintf (out, "};\\n\";\n\n"); } |