From 1ea4fb4b587f8373d8f602f4dd2953e12af73c77 Mon Sep 17 00:00:00 2001 From: jakub Date: Tue, 13 Nov 2018 09:45:50 +0000 Subject: [PATCH] PR rtl-optimization/87918 * simplify-rtx.c (simplify_merge_mask): For COMPARISON_P, use simplify_gen_relational rather than simplify_gen_binary. * gcc.target/i386/pr87918.c: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@266062 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/simplify-rtx.c | 16 +++++++++++++--- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/i386/pr87918.c | 14 ++++++++++++++ 4 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr87918.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 29a216cd42d..14a310ef99f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-11-13 Jakub Jelinek + + PR rtl-optimization/87918 + * simplify-rtx.c (simplify_merge_mask): For COMPARISON_P, use + simplify_gen_relational rather than simplify_gen_binary. + 2018-11-13 Richard Biener * tree-ssanames.h (set_range_info): Use value_range_base. diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index 0d53135f1ff..db8af2f7692 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -5647,9 +5647,19 @@ simplify_merge_mask (rtx x, rtx mask, int op) rtx top0 = simplify_merge_mask (XEXP (x, 0), mask, op); rtx top1 = simplify_merge_mask (XEXP (x, 1), mask, op); if (top0 || top1) - return simplify_gen_binary (GET_CODE (x), GET_MODE (x), - top0 ? top0 : XEXP (x, 0), - top1 ? top1 : XEXP (x, 1)); + { + if (COMPARISON_P (x)) + return simplify_gen_relational (GET_CODE (x), GET_MODE (x), + GET_MODE (XEXP (x, 0)) != VOIDmode + ? GET_MODE (XEXP (x, 0)) + : GET_MODE (XEXP (x, 1)), + top0 ? top0 : XEXP (x, 0), + top1 ? top1 : XEXP (x, 1)); + else + return simplify_gen_binary (GET_CODE (x), GET_MODE (x), + top0 ? top0 : XEXP (x, 0), + top1 ? top1 : XEXP (x, 1)); + } } if (GET_RTX_CLASS (GET_CODE (x)) == RTX_TERNARY && VECTOR_MODE_P (GET_MODE (XEXP (x, 0))) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e7d4ad7143c..1427960e534 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-11-13 Jakub Jelinek + + PR rtl-optimization/87918 + * gcc.target/i386/pr87918.c: New test. + 2018-11-13 Alan Modra * gcc.target/powerpc/rotmask.c: New. diff --git a/gcc/testsuite/gcc.target/i386/pr87918.c b/gcc/testsuite/gcc.target/i386/pr87918.c new file mode 100644 index 00000000000..dd62910a539 --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr87918.c @@ -0,0 +1,14 @@ +/* PR rtl-optimization/87918 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -msse2" } */ + +#include + +__m128 b, c, d; + +void +foo (float f) +{ + c = _mm_set_ss (f); + d = _mm_cmple_ss (c, b); +} -- 2.11.4.GIT