re PR libstdc++/81706 (std::sin vectorization bug)

	PR libstdc++/81706
	* attribs.c (attribute_value_equal): Use omp_declare_simd_clauses_equal
	for comparison of OMP_CLAUSEs regardless of flag_openmp{,_simd}.
	(duplicate_one_attribute, copy_attributes_to_builtin): New functions.
	* attribs.h (duplicate_one_attribute, copy_attributes_to_builtin): New
	declarations.

	* c-decl.c (merge_decls): Copy "omp declare simd" attributes from
	newdecl to corresponding __builtin_ if any.

	* decl.c (duplicate_decls): Copy "omp declare simd" attributes from
	newdecl to corresponding __builtin_ if any.

	* gcc.target/i386/pr81706.c: New test.
	* g++.dg/ext/pr81706.C: New test.

From-SVN: r254069

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9b749af5e6629b76d07acaeb1dade886ae56adfb..783515917e67ae4165f971142d346f0726300da0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2017-10-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libstdc++/81706
+       * attribs.c (attribute_value_equal): Use omp_declare_simd_clauses_equal
+       for comparison of OMP_CLAUSEs regardless of flag_openmp{,_simd}.
+       (duplicate_one_attribute, copy_attributes_to_builtin): New functions.
+       * attribs.h (duplicate_one_attribute, copy_attributes_to_builtin): New
+       declarations.
+
 2017-10-25  Richard Biener  <rguenther@suse.de>
 
        * tree-ssa-pre.c (need_eh_cleanup, need_ab_cleanup, el_to_remove,

diff --git a/gcc/attribs.c b/gcc/attribs.c
index ed76a8dab6f2bbc019049a366a4f07d32269c0c7..809f4c3a8d55b461e8c546281d63675547afd1dc 100644 (file)
--- a/gcc/attribs.c
+++ b/gcc/attribs.c
@@ -1125,9 +1125,9 @@ attribute_value_equal (const_tree attr1, const_tree attr2)
                                     TREE_VALUE (attr2)) == 1);
     }
 
-  if ((flag_openmp || flag_openmp_simd)
-      && TREE_VALUE (attr1) && TREE_VALUE (attr2)
+  if (TREE_VALUE (attr1)
       && TREE_CODE (TREE_VALUE (attr1)) == OMP_CLAUSE
+      && TREE_VALUE (attr2)
       && TREE_CODE (TREE_VALUE (attr2)) == OMP_CLAUSE)
     return omp_declare_simd_clauses_equal (TREE_VALUE (attr1),
                                           TREE_VALUE (attr2));
@@ -1322,6 +1322,44 @@ merge_decl_attributes (tree olddecl, tree newdecl)
                           DECL_ATTRIBUTES (newdecl));
 }
 
+/* Duplicate all attributes with name NAME in ATTR list to *ATTRS if
+   they are missing there.  */
+
+void
+duplicate_one_attribute (tree *attrs, tree attr, const char *name)
+{
+  attr = lookup_attribute (name, attr);
+  if (!attr)
+    return;
+  tree a = lookup_attribute (name, *attrs);
+  while (attr)
+    {
+      tree a2;
+      for (a2 = a; a2; a2 = lookup_attribute (name, TREE_CHAIN (a2)))
+       if (attribute_value_equal (attr, a2))
+         break;
+      if (!a2)
+       {
+         a2 = copy_node (attr);
+         TREE_CHAIN (a2) = *attrs;
+         *attrs = a2;
+       }
+      attr = lookup_attribute (name, TREE_CHAIN (attr));
+    }
+}
+
+/* Duplicate all attributes from user DECL to the corresponding
+   builtin that should be propagated.  */
+
+void
+copy_attributes_to_builtin (tree decl)
+{
+  tree b = builtin_decl_explicit (DECL_FUNCTION_CODE (decl));
+  if (b)
+    duplicate_one_attribute (&DECL_ATTRIBUTES (b),
+                            DECL_ATTRIBUTES (decl), "omp declare simd");
+}
+
 #if TARGET_DLLIMPORT_DECL_ATTRIBUTES
 
 /* Specialization of merge_decl_attributes for various Windows targets.

diff --git a/gcc/attribs.h b/gcc/attribs.h
index 65e002ce988221fb360e04c82939b25c572b4aff..f4bfe03e4673008eb2fa3bba3154e09ca31fd374 100644 (file)
--- a/gcc/attribs.h
+++ b/gcc/attribs.h
@@ -77,6 +77,16 @@ extern tree remove_attribute (const char *, tree);
 
 extern tree merge_attributes (tree, tree);
 
+/* Duplicate all attributes with name NAME in ATTR list to *ATTRS if
+   they are missing there.  */
+
+extern void duplicate_one_attribute (tree *, tree, const char *);
+
+/* Duplicate all attributes from user DECL to the corresponding
+   builtin that should be propagated.  */
+
+extern void copy_attributes_to_builtin (tree);
+
 /* Given two Windows decl attributes lists, possibly including
    dllimport, return a list of their union .  */
 extern tree merge_dllimport_decl_attributes (tree, tree);

diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index c260f62b11166edd133d7f8a95e7fac3f35e1ba9..b4fde0dccf7e6d162a3d620276aec57089857141 100644 (file)
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libstdc++/81706
+       * c-decl.c (merge_decls): Copy "omp declare simd" attributes from
+       newdecl to corresponding __builtin_ if any.
+
 2017-10-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/82466

diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c
index 5c472e66af8b363e63c0702e94a23c0a35861f0a..90f07297a3744e066a8270def4eac75240c74bc0 100644 (file)
--- a/gcc/c/c-decl.c
+++ b/gcc/c/c-decl.c
@@ -2570,6 +2570,8 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
                        set_builtin_decl_declared_p (fncode, true);
                      break;
                    }
+
+                 copy_attributes_to_builtin (newdecl);
                }
            }
          else

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8c587a3e845db17ee925ede0d725fbaec00ac613..fdb2c9b52a8181961606c344a66bab1086e0112e 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libstdc++/81706
+       * decl.c (duplicate_decls): Copy "omp declare simd" attributes from
+       newdecl to corresponding __builtin_ if any.
+
 2017-10-24  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR c++/82466

diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index bb48099da56cede342d430006726ddb906b1f153..c9c3d0a2711fd5d5382f0293e4987639871ffb61 100644 (file)
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -2478,6 +2478,8 @@ next_arg:;
                  break;
                }
            }
+
+         copy_attributes_to_builtin (newdecl);
        }
       if (new_defines_function)
        /* If defining a function declared with other language

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8dbf3b5604dcbaac7d6c2e1730f55046bdf71b9a..00dde9f9d6d60daf20ca9fda388415b27ebfe283 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2017-10-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR libstdc++/81706
+       * gcc.target/i386/pr81706.c: New test.
+       * g++.dg/ext/pr81706.C: New test.
+
 2017-10-24  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/82460

diff --git a/gcc/testsuite/g++.dg/ext/pr81706.C b/gcc/testsuite/g++.dg/ext/pr81706.C
new file mode 100644 (file)
index 0000000..f0ed8ab
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/pr81706.C
@@ -0,0 +1,32 @@
+// PR libstdc++/81706
+// { dg-do compile { target i?86-*-* x86_64-*-* } }
+// { dg-options "-O3 -mavx2 -mno-avx512f" }
+// { dg-final { scan-assembler "call\[^\n\r]_ZGVdN4v_cos" } }
+// { dg-final { scan-assembler "call\[^\n\r]_ZGVdN4v_sin" } }
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern double cos (double) __attribute__ ((nothrow, leaf, simd ("notinbranch")));
+extern double sin (double) __attribute__ ((nothrow, leaf, simd ("notinbranch")));
+#ifdef __cplusplus
+}
+#endif
+double p[1024] = { 1.0 };
+double q[1024] = { 1.0 };
+
+void
+foo (void)
+{
+  int i;
+  for (i = 0; i < 1024; i++)
+    p[i] = cos (q[i]);
+}
+
+void
+bar (void)
+{
+  int i;
+  for (i = 0; i < 1024; i++)
+    p[i] = __builtin_sin (q[i]);
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr81706.c b/gcc/testsuite/gcc.target/i386/pr81706.c
new file mode 100644 (file)
index 0000000..333fd15
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr81706.c
@@ -0,0 +1,32 @@
+/* PR libstdc++/81706 */
+/* { dg-do compile } */
+/* { dg-options "-O3 -mavx2 -mno-avx512f" } */
+/* { dg-final { scan-assembler "call\[^\n\r]_ZGVdN4v_cos" } } */
+/* { dg-final { scan-assembler "call\[^\n\r]_ZGVdN4v_sin" } } */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern double cos (double) __attribute__ ((nothrow, leaf, simd ("notinbranch")));
+extern double sin (double) __attribute__ ((nothrow, leaf, simd ("notinbranch")));
+#ifdef __cplusplus
+}
+#endif
+double p[1024] = { 1.0 };
+double q[1024] = { 1.0 };
+
+void
+foo (void)
+{
+  int i;
+  for (i = 0; i < 1024; i++)
+    p[i] = cos (q[i]);
+}
+
+void
+bar (void)
+{
+  int i;
+  for (i = 0; i < 1024; i++)
+    p[i] = __builtin_sin (q[i]);
+}