diff options
author | Martin Liska <mliska@suse.cz> | 2020-03-25 11:03:39 +0100 |
---|---|---|
committer | Martin Liska <mliska@suse.cz> | 2020-03-25 11:03:39 +0100 |
commit | 724ec02c2c6d1b79788be77f68ebb6ca7b5b6acd (patch) | |
tree | 9f339a0ee3d2abe45c3ba1eaed8881c2b6d4a1e1 | |
parent | 0fb0240a051df91d3c24385d1d3c17548b266544 (diff) | |
download | gcc-724ec02c2c6d1b79788be77f68ebb6ca7b5b6acd.zip gcc-724ec02c2c6d1b79788be77f68ebb6ca7b5b6acd.tar.gz gcc-724ec02c2c6d1b79788be77f68ebb6ca7b5b6acd.tar.bz2 |
Make target_clones resolver fn static if possible.
PR target/93274
PR ipa/94271
* config/i386/i386-features.c (make_resolver_func): Drop
public flag for resolver.
* config/rs6000/rs6000.c (make_resolver_func): Add comdat
group for resolver and drop public flag if possible.
* multiple_target.c (create_dispatcher_calls): Drop unique_name
and resolution as we want to enable LTO privatization of the default
symbol.
PR target/93274
PR ipa/94271
* gcc.target/i386/pr81213-2.c: New test.
* gcc.target/i386/pr81213.c: Add additional source.
* gcc.dg/lto/pr94271_0.c: New test.
* gcc.dg/lto/pr94271_1.c: New test.
-rw-r--r-- | gcc/ChangeLog | 12 | ||||
-rw-r--r-- | gcc/config/i386/i386-features.c | 3 | ||||
-rw-r--r-- | gcc/config/rs6000/rs6000.c | 12 | ||||
-rw-r--r-- | gcc/multiple_target.c | 4 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 9 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/lto/pr94271_0.c | 13 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/lto/pr94271_1.c | 17 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/i386/pr81213-2.c | 11 | ||||
-rw-r--r-- | gcc/testsuite/gcc.target/i386/pr81213.c | 7 |
9 files changed, 82 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 89cfb07..c63b65a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,17 @@ 2020-03-25 Martin Liska <mliska@suse.cz> + PR target/93274 + PR ipa/94271 + * config/i386/i386-features.c (make_resolver_func): Drop + public flag for resolver. + * config/rs6000/rs6000.c (make_resolver_func): Add comdat + group for resolver and drop public flag if possible. + * multiple_target.c (create_dispatcher_calls): Drop unique_name + and resolution as we want to enable LTO privatization of the default + symbol. + +2020-03-25 Martin Liska <mliska@suse.cz> + PR lto/94259 * configure.ac: Respect --without-zstd and report error when we can't find header file with --with-zstd. diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c index 6528832..3c70279 100644 --- a/gcc/config/i386/i386-features.c +++ b/gcc/config/i386/i386-features.c @@ -2777,6 +2777,9 @@ make_resolver_func (const tree default_decl, DECL_COMDAT (decl) = 1; make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl)); } + else + TREE_PUBLIC (ifunc_alias_decl) = 0; + /* Build result decl and add to function_decl. */ t = build_decl (UNKNOWN_LOCATION, RESULT_DECL, NULL_TREE, ptr_type_node); DECL_CONTEXT (t) = decl; diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 07f7cf5..7505a0e 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -23894,6 +23894,18 @@ make_resolver_func (const tree default_decl, DECL_INITIAL (decl) = make_node (BLOCK); DECL_STATIC_CONSTRUCTOR (decl) = 0; + if (DECL_COMDAT_GROUP (default_decl) + || TREE_PUBLIC (default_decl)) + { + /* In this case, each translation unit with a call to this + versioned function will put out a resolver. Ensure it + is comdat to keep just one copy. */ + DECL_COMDAT (decl) = 1; + make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl)); + } + else + TREE_PUBLIC (dispatch_decl) = 0; + /* Build result decl and add to function_decl. */ tree t = build_decl (UNKNOWN_LOCATION, RESULT_DECL, NULL_TREE, ptr_type_node); DECL_CONTEXT (t) = decl; diff --git a/gcc/multiple_target.c b/gcc/multiple_target.c index cccfd27..c1cfe8f 100644 --- a/gcc/multiple_target.c +++ b/gcc/multiple_target.c @@ -178,10 +178,6 @@ create_dispatcher_calls (struct cgraph_node *node) node->externally_visible = false; node->forced_by_abi = false; node->set_section (NULL); - node->unique_name = ((node->resolution == LDPR_PREVAILING_DEF_IRONLY - || node->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP) - && !flag_incremental_link); - node->resolution = LDPR_PREVAILING_DEF_IRONLY; DECL_ARTIFICIAL (node->decl) = 1; node->force_output = true; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 59f15af..3db4098 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2020-03-25 Martin Liska <mliska@suse.cz> + + PR target/93274 + PR ipa/94271 + * gcc.target/i386/pr81213-2.c: New test. + * gcc.target/i386/pr81213.c: Add additional source. + * gcc.dg/lto/pr94271_0.c: New test. + * gcc.dg/lto/pr94271_1.c: New test. + 2020-03-25 Jakub Jelinek <jakub@redhat.com> PR debug/94280 diff --git a/gcc/testsuite/gcc.dg/lto/pr94271_0.c b/gcc/testsuite/gcc.dg/lto/pr94271_0.c new file mode 100644 index 0000000..2ce7d65 --- /dev/null +++ b/gcc/testsuite/gcc.dg/lto/pr94271_0.c @@ -0,0 +1,13 @@ +/* PR lto/94271 */ +/* { dg-lto-do link } */ + +int a; + +static int __attribute__ ((target_clones ("default", "avx512f"))) fast_clamp () +{} + +void +c () +{ + a = fast_clamp (); +} diff --git a/gcc/testsuite/gcc.dg/lto/pr94271_1.c b/gcc/testsuite/gcc.dg/lto/pr94271_1.c new file mode 100644 index 0000000..db9bc9d --- /dev/null +++ b/gcc/testsuite/gcc.dg/lto/pr94271_1.c @@ -0,0 +1,17 @@ +int aa; + +static inline int __attribute__ ((target_clones ("default", "avx512f"))) +fast_clamp () +{} + +void +b () +{ + aa = fast_clamp (); +} + +int +main () +{ + return 0; +} diff --git a/gcc/testsuite/gcc.target/i386/pr81213-2.c b/gcc/testsuite/gcc.target/i386/pr81213-2.c new file mode 100644 index 0000000..a80622c --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr81213-2.c @@ -0,0 +1,11 @@ +__attribute__((target_clones("avx","arch=slm","arch=core-avx2","default"))) +static int +foo () +{ + return 2; +} + +int bar() +{ + return foo(); +} diff --git a/gcc/testsuite/gcc.target/i386/pr81213.c b/gcc/testsuite/gcc.target/i386/pr81213.c index 89c4752..3348386 100644 --- a/gcc/testsuite/gcc.target/i386/pr81213.c +++ b/gcc/testsuite/gcc.target/i386/pr81213.c @@ -1,6 +1,9 @@ /* PR ipa/81214. */ -/* { dg-do compile } */ +/* { dg-do run } */ /* { dg-require-ifunc "" } */ +/* { dg-additional-sources "pr81213-2.c" } */ + +int bar(); __attribute__((target_clones("avx","arch=slm","arch=core-avx2","default"))) static int @@ -11,7 +14,7 @@ foo () int main() { - return foo(); + return foo() + bar(); } /* { dg-final { scan-assembler "\t.globl\tfoo" } } */ |