[gcc(refs/vendors/ARM/heads/arm-perf-staging)] i386: Fix <rounding_insn><mode>2 expander [PR95255]

[Tamar Christina]

https://gcc.gnu.org/g:217a22416575c638940b25ea5937ff09d40cf808

commit 217a22416575c638940b25ea5937ff09d40cf808
Author: Uros Bizjak <ubizjak@gmail.com>
Date:   Sun May 24 18:01:08 2020 +0200

    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:
---
 gcc/ChangeLog                           |  6 ++++++
 gcc/config/i386/i386.md                 | 12 +++++++-----
 gcc/testsuite/ChangeLog                 |  5 +++++
 gcc/testsuite/gcc.target/i386/pr95255.c |  8 ++++++++
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c047aaf9f11..95977edec53 100644
--- 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 b426c21d3dd..292de142e90 100644
--- 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 479904e1349..58f7e2f7876 100644
--- 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
index 00000000000..5b731941f72
--- /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);
+}