i386: Fix <rounding_insn><mode>2 expander [PR95255]

2020-05-24  Uroš Bizjak  <ubizjak@gmail.com>

gcc/ChangeLog:
	PR target/95255
	* config/i386/i386.md (<rounding_insn><mode>2): Do not try to
	expand non-sse4 ROUND_ROUNDEVEN rounding via SSE support routines.

gcc/testsuite/ChangeLog:
	PR target/95255
	* gcc.target/i386/pr95255.c: New test.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c047aaf9f11cb3bea0c70549016aaa79bf96801d..95977edec53d74560a3e55fda43534d54e50d263 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2020-05-24  Uroš Bizjak  <ubizjak@gmail.com>
+
+       PR target/95255
+       * config/i386/i386.md (<rounding_insn><mode>2): Do not try to
+       expand non-sse4 ROUND_ROUNDEVEN rounding via SSE support routines.
+
 2020-05-24  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backported from master.

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index b426c21d3ddd071a3579a3ed6c219b00c2d71584..292de142e903ed9c91e31c3213d6eabf7d803f31 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -16941,16 +16941,18 @@
     && (flag_fp_int_builtin_inexact || !flag_trapping_math))
    || (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
        && (TARGET_SSE4_1
-         || (ROUND_<ROUNDING> != ROUND_ROUNDEVEN
-             && (flag_fp_int_builtin_inexact || !flag_trapping_math))))"
+          || (ROUND_<ROUNDING> != ROUND_ROUNDEVEN
+              && (flag_fp_int_builtin_inexact || !flag_trapping_math))))"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && (TARGET_SSE4_1 || flag_fp_int_builtin_inexact || !flag_trapping_math))
+      && (TARGET_SSE4_1
+         || (ROUND_<ROUNDING> != ROUND_ROUNDEVEN
+             && (flag_fp_int_builtin_inexact || !flag_trapping_math))))
     {
       if (TARGET_SSE4_1)
        emit_insn (gen_sse4_1_round<mode>2
-                  (operands[0], operands[1], GEN_INT (ROUND_<ROUNDING>
-                                                      | ROUND_NO_EXC)));
+                  (operands[0], operands[1],
+                   GEN_INT (ROUND_<ROUNDING> | ROUND_NO_EXC)));
       else if (TARGET_64BIT || (<MODE>mode != DFmode))
        {
          if (ROUND_<ROUNDING> == ROUND_FLOOR)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 479904e1349a98ab58a36c7d63e0e4e69fd32fea..58f7e2f7876222d650e280c9b115f2e78ce99be7 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-24  Uroš Bizjak  <ubizjak@gmail.com>
+
+       PR target/95255
+       * gcc.target/i386/pr95255.c: New test.
+
 2020-05-24  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backported from mainline

diff --git a/gcc/testsuite/gcc.target/i386/pr95255.c b/gcc/testsuite/gcc.target/i386/pr95255.c
new file mode 100644 (file)
index 0000000..5b73194
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr95255.c
@@ -0,0 +1,8 @@
+/* PR target/95255 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -msse2 -mno-sse4.1 -mfpmath=both" } */
+
+double foo (double x)
+{
+  return __builtin_roundeven (x);
+}