re PR target/91498 (STV change in r274481 causes 300.twolf regression on Haswell)

2019-08-20  Richard Biener  <rguenther@suse.de>

	PR target/91498
	* config/i386/i386-features.c (general_scalar_chain::convert_op):
	Use (vec_merge (vec_duplicate..)) style vector from scalar move.
	(convert_scalars_to_vector): Add timode_p parameter and use it
	to guard TImode-only operation.
	(pass_stv::gate): Adjust so STV runs twice for TARGET_64BIT.
	(pass_stv::execute): Pass down timode_p.

	* gcc.target/i386/minmax-7.c: New testcase.

From-SVN: r274694

4 files changed, 44 insertions, 7 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5879431..7975480 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2019-08-20  Richard Biener  <rguenther@suse.de>
+
+	PR target/91498
+	* config/i386/i386-features.c (general_scalar_chain::convert_op):
+	Use (vec_merge (vec_duplicate..)) style vector from scalar move.
+	(convert_scalars_to_vector): Add timode_p parameter and use it
+	to guard TImode-only operation.
+	(pass_stv::gate): Adjust so STV runs twice for TARGET_64BIT.
+	(pass_stv::execute): Pass down timode_p.
+
 2019-08-20  Lili Cui  <lili.cui@intel.com>
 
 	* common/config/i386/i386-common.c
diff --git a/gcc/config/i386/i386-features.c b/gcc/config/i386/i386-features.c
index c4a3d30..c27ea16 100644
--- a/gcc/config/i386/i386-features.c
+++ b/gcc/config/i386/i386-features.c
@@ -910,7 +910,9 @@ general_scalar_chain::convert_op (rtx *op, rtx_insn *insn)
     {
       rtx tmp = gen_reg_rtx (GET_MODE (*op));
 
-      emit_insn_before (gen_move_insn (tmp, *op), insn);
+      emit_insn_before (gen_rtx_SET (gen_rtx_SUBREG (vmode, tmp, 0),
+				     gen_gpr_to_xmm_move_src (vmode, *op)),
+			insn);
       *op = gen_rtx_SUBREG (vmode, tmp, 0);
 
       if (dump_file)
@@ -1664,7 +1666,7 @@ timode_remove_non_convertible_regs (bitmap candidates)
    instructions into vector mode when profitable.  */
 
 static unsigned int
-convert_scalars_to_vector ()
+convert_scalars_to_vector (bool timode_p)
 {
   basic_block bb;
   int converted_insns = 0;
@@ -1690,7 +1692,7 @@ convert_scalars_to_vector ()
     {
       rtx_insn *insn;
       FOR_BB_INSNS (bb, insn)
-	if (TARGET_64BIT
+	if (timode_p
 	    && timode_scalar_to_vector_candidate_p (insn))
 	  {
 	    if (dump_file)
@@ -1699,7 +1701,7 @@ convert_scalars_to_vector ()
 
 	    bitmap_set_bit (&candidates[2], INSN_UID (insn));
 	  }
-	else
+	else if (!timode_p)
 	  {
 	    /* Check {SI,DI}mode.  */
 	    for (unsigned i = 0; i <= 1; ++i)
@@ -1715,7 +1717,7 @@ convert_scalars_to_vector ()
 	  }
     }
 
-  if (TARGET_64BIT)
+  if (timode_p)
     timode_remove_non_convertible_regs (&candidates[2]);
   for (unsigned i = 0; i <= 1; ++i)
     general_remove_non_convertible_regs (&candidates[i]);
@@ -1875,13 +1877,13 @@ public:
   /* opt_pass methods: */
   virtual bool gate (function *)
     {
-      return (timode_p == !!TARGET_64BIT
+      return ((!timode_p || TARGET_64BIT)
 	      && TARGET_STV && TARGET_SSE2 && optimize > 1);
     }
 
   virtual unsigned int execute (function *)
     {
-      return convert_scalars_to_vector ();
+      return convert_scalars_to_vector (timode_p);
     }
 
   opt_pass *clone ()
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7f24b8d..9dee58c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-20  Richard Biener  <rguenther@suse.de>
+
+	PR target/91498
+	* gcc.target/i386/minmax-7.c: New testcase.
+
 2019-08-20  Lili Cui  <lili.cui@intel.com>
 
 	* gcc.target/i386/funcspec-56.inc: Handle new march.
diff --git a/gcc/testsuite/gcc.target/i386/minmax-7.c b/gcc/testsuite/gcc.target/i386/minmax-7.c
new file mode 100644
index 0000000..905f085
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/minmax-7.c
@@ -0,0 +1,20 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -march=haswell" } */
+
+extern int numBins;
+extern int binOffst;
+extern int binWidth;
+extern int Trybin;
+void foo (int);
+
+void bar (int aleft, int axcenter)
+{
+  int a1LoBin = (((Trybin=((axcenter + aleft)-binOffst)/binWidth)<0)
+		 ? 0 : ((Trybin>numBins) ? numBins : Trybin));
+  foo (a1LoBin);
+}
+
+/* We do not want the RA to spill %esi for it's dual-use but using
+   pminsd is OK.  */
+/* { dg-final { scan-assembler-not "rsp" { target { ! { ia32 } } } } } */
+/* { dg-final { scan-assembler "pminsd" } } */