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.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 89cfb07b457b279252cf157099fc6a183cefa937..c63b65a82b0c265a22771d72a3c0b47ed05e8e1f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+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

diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c
index 6528832487e089eddbecef83ddb26a3c54ddd1c6..3c70279dc7c5cba4f8d5cd2f24f047c9beda0372 100644 (file)
--- 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 07f7cf516babd13893685ad4dd3545d0a6661d7d..7505a0e1e8e18b34110c82d2fdc4dca6f6796720 100644 (file)
--- 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 cccfd2774db0ca92d16c76b51223270ae21634d3..c1cfe8ff978192b73c704a4f5a380f6392addf9a 100644 (file)
--- 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 59f15af69ac1317b1b9610b0c250c3e5ebd3a39c..3db4098a8d211f11a8baa3ae713042f6f0885bfc 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 89c4752986119b160388cadeee1ca0ed84a7c699..334838631d0ff091e41134e3c1a8e34fbfbb7248 100644 (file)
--- 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" } } */