diff options
author | Martin Jambor <mjambor@suse.cz> | 2017-01-11 11:35:31 +0100 |
---|---|---|
committer | Martin Jambor <jamborm@gcc.gnu.org> | 2017-01-11 11:35:31 +0100 |
commit | 51020892466d37f71ee13137bdadcbb32545c55d (patch) | |
tree | f2d05c5ca8dd4a860cc74dd72658a92146d66d22 /gcc | |
parent | 80c74722bc934e376b06fa2e59925cb134202266 (diff) | |
download | gcc-51020892466d37f71ee13137bdadcbb32545c55d.zip gcc-51020892466d37f71ee13137bdadcbb32545c55d.tar.gz gcc-51020892466d37f71ee13137bdadcbb32545c55d.tar.bz2 |
[hsa] Fix hsa function cloning test
2017-01-11 Martin Jambor <mjambor@suse.cz>
* hsa.c (hsa_callable_function_p): Revert addition of DECL_ARTIFICIAL
test.
* ipa-hsa.c (process_hsa_functions): Only duplicate non-artificial
decorated functions.
From-SVN: r244308
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 7 | ||||
-rw-r--r-- | gcc/hsa.c | 5 | ||||
-rw-r--r-- | gcc/ipa-hsa.c | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index caa26f8..3c8f977 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-01-11 Martin Jambor <mjambor@suse.cz> + + * hsa.c (hsa_callable_function_p): Revert addition of DECL_ARTIFICIAL + test. + * ipa-hsa.c (process_hsa_functions): Only duplicate non-artificial + decorated functions. + 2017-01-11 Richard Biener <rguenther@suse.de> * tree-vrp.c (evrp_dom_walker::before_dom_children): Also @@ -90,10 +90,7 @@ bool hsa_callable_function_p (tree fndecl) { return (lookup_attribute ("omp declare target", DECL_ATTRIBUTES (fndecl)) - && !lookup_attribute ("oacc function", DECL_ATTRIBUTES (fndecl)) - /* At this point, this is enough to identify clones for - parallel, which for HSA would need to be kernels anyway. */ - && !DECL_ARTIFICIAL (fndecl)); + && !lookup_attribute ("oacc function", DECL_ATTRIBUTES (fndecl))); } /* Allocate HSA structures that are are used when dealing with different diff --git a/gcc/ipa-hsa.c b/gcc/ipa-hsa.c index 4391b58..6a3f660 100644 --- a/gcc/ipa-hsa.c +++ b/gcc/ipa-hsa.c @@ -100,7 +100,10 @@ process_hsa_functions (void) clone->name (), s->m_kind == HSA_KERNEL ? "kernel" : "function"); } - else if (hsa_callable_function_p (node->decl)) + else if (hsa_callable_function_p (node->decl) + /* At this point, this is enough to identify clones for + parallel, which for HSA would need to be kernels anyway. */ + && !DECL_ARTIFICIAL (node->decl)) { if (!check_warn_node_versionable (node)) continue; |