middle-end: Revert can_special_div_by_const changes [PR108583]

This reverts the changes for the CAN_SPECIAL_DIV_BY_CONST hook.

gcc/ChangeLog:

	PR target/108583
	* doc/tm.texi (TARGET_VECTORIZE_CAN_SPECIAL_DIV_BY_CONST): Remove.
	* doc/tm.texi.in: Likewise.
	* explow.cc (round_push, align_dynamic_address): Revert previous patch.
	* expmed.cc (expand_divmod): Likewise.
	* expmed.h (expand_divmod): Likewise.
	* expr.cc (force_operand, expand_expr_divmod): Likewise.
	* optabs.cc (expand_doubleword_mod, expand_doubleword_divmod): Likewise.
	* target.def (can_special_div_by_const): Remove.
	* target.h: Remove tree-core.h include
	* targhooks.cc (default_can_special_div_by_const): Remove.
	* targhooks.h (default_can_special_div_by_const): Remove.
	* tree-vect-generic.cc (expand_vector_operation): Remove hook.
	* tree-vect-patterns.cc (vect_recog_divmod_pattern): Remove hook.
	* tree-vect-stmts.cc (vectorizable_operation): Remove hook.

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index ec90c46ea2ffd80d5c56dcd0458f9b901c5e627f..144862e00c4d6984d4aa93641b2c5d832379e94e 100644 (file)
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -6146,20 +6146,6 @@ instruction pattern.  There is no need for the hook to handle these two
 implementation approaches itself.
 @end deftypefn
 
-@deftypefn {Target Hook} bool TARGET_VECTORIZE_CAN_SPECIAL_DIV_BY_CONST (enum @var{tree_code}, tree @var{vectype}, wide_int @var{constant}, rtx *@var{output}, rtx @var{in0}, rtx @var{in1})
-This hook is used to test whether the target has a special method of
-division of vectors of type @var{vectype} using the value @var{constant},
-and producing a vector of type @var{vectype}.  The division
-will then not be decomposed by the vectorizer and kept as a div.
-
-When the hook is being used to test whether the target supports a special
-divide, @var{in0}, @var{in1}, and @var{output} are all null.  When the hook
-is being used to emit a division, @var{in0} and @var{in1} are the source
-vectors of type @var{vecttype} and @var{output} is the destination vector of
-type @var{vectype}.
-
-Return true if the operation is possible, emitting instructions for it
-if rtxes are provided and updating @var{output}.
 @end deftypefn
 
 @deftypefn {Target Hook} tree TARGET_VECTORIZE_BUILTIN_VECTORIZED_FUNCTION (unsigned @var{code}, tree @var{vec_type_out}, tree @var{vec_type_in})

diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index 930b109863f236e42dff0924244154bb35ba9667..146f461ddad247906705d03bb389ac707e5f8cde 100644 (file)
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -4175,7 +4175,6 @@ address;  but often a machine-dependent strategy can generate better code.
 
 @hook TARGET_VECTORIZE_VEC_PERM_CONST
 
-@hook TARGET_VECTORIZE_CAN_SPECIAL_DIV_BY_CONST
 
 @hook TARGET_VECTORIZE_BUILTIN_VECTORIZED_FUNCTION
 

diff --git a/gcc/explow.cc b/gcc/explow.cc
index 32e9498ee07a4d4b2ca47f85244d4a4a786f04cd..6424c0802f07f05a2e6513044b92a02394488796 100644 (file)
--- a/gcc/explow.cc
+++ b/gcc/explow.cc
@@ -1042,7 +1042,7 @@ round_push (rtx size)
      TRUNC_DIV_EXPR.  */
   size = expand_binop (Pmode, add_optab, size, alignm1_rtx,
                       NULL_RTX, 1, OPTAB_LIB_WIDEN);
-  size = expand_divmod (0, TRUNC_DIV_EXPR, Pmode, NULL, NULL, size, align_rtx,
+  size = expand_divmod (0, TRUNC_DIV_EXPR, Pmode, size, align_rtx,
                        NULL_RTX, 1);
   size = expand_mult (Pmode, size, align_rtx, NULL_RTX, 1);
 
@@ -1208,7 +1208,7 @@ align_dynamic_address (rtx target, unsigned required_align)
                         gen_int_mode (required_align / BITS_PER_UNIT - 1,
                                       Pmode),
                         NULL_RTX, 1, OPTAB_LIB_WIDEN);
-  target = expand_divmod (0, TRUNC_DIV_EXPR, Pmode, NULL, NULL, target,
+  target = expand_divmod (0, TRUNC_DIV_EXPR, Pmode, target,
                          gen_int_mode (required_align / BITS_PER_UNIT,
                                        Pmode),
                          NULL_RTX, 1);

diff --git a/gcc/expmed.cc b/gcc/expmed.cc
index 917360199ca56157cf3c3693b65e93cd9d8ed244..1553ea8e31eb6433025ab18a3a59c169d3b7692f 100644 (file)
--- a/gcc/expmed.cc
+++ b/gcc/expmed.cc
@@ -4222,8 +4222,8 @@ expand_sdiv_pow2 (scalar_int_mode mode, rtx op0, HOST_WIDE_INT d)
 
 rtx
 expand_divmod (int rem_flag, enum tree_code code, machine_mode mode,
-              tree treeop0, tree treeop1, rtx op0, rtx op1, rtx target,
-              int unsignedp, enum optab_methods methods)
+              rtx op0, rtx op1, rtx target, int unsignedp,
+              enum optab_methods methods)
 {
   machine_mode compute_mode;
   rtx tquotient;
@@ -4375,17 +4375,6 @@ expand_divmod (int rem_flag, enum tree_code code, machine_mode mode,
 
   last_div_const = ! rem_flag && op1_is_constant ? INTVAL (op1) : 0;
 
-  /* Check if the target has specific expansions for the division.  */
-  tree cst;
-  if (treeop0
-      && treeop1
-      && (cst = uniform_integer_cst_p (treeop1))
-      && targetm.vectorize.can_special_div_by_const (code, TREE_TYPE (treeop0),
-                                                    wi::to_wide (cst),
-                                                    &target, op0, op1))
-    return target;
-
-
   /* Now convert to the best mode to use.  */
   if (compute_mode != mode)
     {
@@ -4629,8 +4618,8 @@ expand_divmod (int rem_flag, enum tree_code code, machine_mode mode,
                            || (optab_handler (sdivmod_optab, int_mode)
                                != CODE_FOR_nothing)))
                      quotient = expand_divmod (0, TRUNC_DIV_EXPR,
-                                               int_mode, treeop0, treeop1,
-                                               op0, gen_int_mode (abs_d,
+                                               int_mode, op0,
+                                               gen_int_mode (abs_d,
                                                              int_mode),
                                                NULL_RTX, 0);
                    else
@@ -4819,8 +4808,8 @@ expand_divmod (int rem_flag, enum tree_code code, machine_mode mode,
                                      size - 1, NULL_RTX, 0);
                t3 = force_operand (gen_rtx_MINUS (int_mode, t1, nsign),
                                    NULL_RTX);
-               t4 = expand_divmod (0, TRUNC_DIV_EXPR, int_mode, treeop0,
-                                   treeop1, t3, op1, NULL_RTX, 0);
+               t4 = expand_divmod (0, TRUNC_DIV_EXPR, int_mode, t3, op1,
+                                   NULL_RTX, 0);
                if (t4)
                  {
                    rtx t5;

diff --git a/gcc/expmed.h b/gcc/expmed.h
index c1aee00c616b5a10b341c20bda895440066d8124..c747a0da1637621bb69ee7058fefe873ec51977e 100644 (file)
--- a/gcc/expmed.h
+++ b/gcc/expmed.h
@@ -710,9 +710,8 @@ extern rtx expand_shift (enum tree_code, machine_mode, rtx, poly_int64, rtx,
 extern rtx maybe_expand_shift (enum tree_code, machine_mode, rtx, int, rtx,
                               int);
 #ifdef GCC_OPTABS_H
-extern rtx expand_divmod (int, enum tree_code, machine_mode, tree, tree,
-                         rtx, rtx, rtx, int,
-                         enum optab_methods = OPTAB_LIB_WIDEN);
+extern rtx expand_divmod (int, enum tree_code, machine_mode, rtx, rtx,
+                         rtx, int, enum optab_methods = OPTAB_LIB_WIDEN);
 #endif
 #endif
 

diff --git a/gcc/expr.cc b/gcc/expr.cc
index 15be1c8db999103bb9e5fa33daa44ae06de5ace8..78d35297e755216339078d5b2280c6e277f26d72 100644 (file)
--- a/gcc/expr.cc
+++ b/gcc/expr.cc
@@ -8207,17 +8207,16 @@ force_operand (rtx value, rtx target)
            return expand_divmod (0,
                                  FLOAT_MODE_P (GET_MODE (value))
                                  ? RDIV_EXPR : TRUNC_DIV_EXPR,
-                                 GET_MODE (value), NULL, NULL, op1, op2,
-                                 target, 0);
+                                 GET_MODE (value), op1, op2, target, 0);
        case MOD:
-         return expand_divmod (1, TRUNC_MOD_EXPR, GET_MODE (value), NULL, NULL,
-                               op1, op2, target, 0);
+         return expand_divmod (1, TRUNC_MOD_EXPR, GET_MODE (value), op1, op2,
+                               target, 0);
        case UDIV:
-         return expand_divmod (0, TRUNC_DIV_EXPR, GET_MODE (value), NULL, NULL,
-                               op1, op2, target, 1);
+         return expand_divmod (0, TRUNC_DIV_EXPR, GET_MODE (value), op1, op2,
+                               target, 1);
        case UMOD:
-         return expand_divmod (1, TRUNC_MOD_EXPR, GET_MODE (value), NULL, NULL,
-                               op1, op2, target, 1);
+         return expand_divmod (1, TRUNC_MOD_EXPR, GET_MODE (value), op1, op2,
+                               target, 1);
        case ASHIFTRT:
          return expand_simple_binop (GET_MODE (value), code, op1, op2,
                                      target, 0, OPTAB_LIB_WIDEN);
@@ -9170,13 +9169,11 @@ expand_expr_divmod (tree_code code, machine_mode mode, tree treeop0,
       bool speed_p = optimize_insn_for_speed_p ();
       do_pending_stack_adjust ();
       start_sequence ();
-      rtx uns_ret = expand_divmod (mod_p, code, mode, treeop0, treeop1,
-                                  op0, op1, target, 1);
+      rtx uns_ret = expand_divmod (mod_p, code, mode, op0, op1, target, 1);
       rtx_insn *uns_insns = get_insns ();
       end_sequence ();
       start_sequence ();
-      rtx sgn_ret = expand_divmod (mod_p, code, mode, treeop0, treeop1,
-                                  op0, op1, target, 0);
+      rtx sgn_ret = expand_divmod (mod_p, code, mode, op0, op1, target, 0);
       rtx_insn *sgn_insns = get_insns ();
       end_sequence ();
       unsigned uns_cost = seq_cost (uns_insns, speed_p);
@@ -9198,8 +9195,7 @@ expand_expr_divmod (tree_code code, machine_mode mode, tree treeop0,
       emit_insn (sgn_insns);
       return sgn_ret;
     }
-  return expand_divmod (mod_p, code, mode, treeop0, treeop1,
-                       op0, op1, target, unsignedp);
+  return expand_divmod (mod_p, code, mode, op0, op1, target, unsignedp);
 }
 
 rtx

diff --git a/gcc/optabs.cc b/gcc/optabs.cc
index c725f357b7fc9de5eac905b03474ef72d2297375..c8e39c82d57a7d726e7da33d247b80f32ec9236c 100644 (file)
--- a/gcc/optabs.cc
+++ b/gcc/optabs.cc
@@ -1106,9 +1106,8 @@ expand_doubleword_mod (machine_mode mode, rtx op0, rtx op1, bool unsignedp)
                return NULL_RTX;
            }
        }
-      rtx remainder = expand_divmod (1, TRUNC_MOD_EXPR, word_mode, NULL, NULL,
-                                    sum, gen_int_mode (INTVAL (op1),
-                                                       word_mode),
+      rtx remainder = expand_divmod (1, TRUNC_MOD_EXPR, word_mode, sum,
+                                    gen_int_mode (INTVAL (op1), word_mode),
                                     NULL_RTX, 1, OPTAB_DIRECT);
       if (remainder == NULL_RTX)
        return NULL_RTX;
@@ -1211,8 +1210,8 @@ expand_doubleword_divmod (machine_mode mode, rtx op0, rtx op1, rtx *rem,
 
   if (op11 != const1_rtx)
     {
-      rtx rem2 = expand_divmod (1, TRUNC_MOD_EXPR, mode, NULL, NULL, quot1,
-                               op11, NULL_RTX, unsignedp, OPTAB_DIRECT);
+      rtx rem2 = expand_divmod (1, TRUNC_MOD_EXPR, mode, quot1, op11,
+                               NULL_RTX, unsignedp, OPTAB_DIRECT);
       if (rem2 == NULL_RTX)
        return NULL_RTX;
 
@@ -1226,8 +1225,8 @@ expand_doubleword_divmod (machine_mode mode, rtx op0, rtx op1, rtx *rem,
       if (rem2 == NULL_RTX)
        return NULL_RTX;
 
-      rtx quot2 = expand_divmod (0, TRUNC_DIV_EXPR, mode, NULL, NULL, quot1,
-                                op11, NULL_RTX, unsignedp, OPTAB_DIRECT);
+      rtx quot2 = expand_divmod (0, TRUNC_DIV_EXPR, mode, quot1, op11,
+                                NULL_RTX, unsignedp, OPTAB_DIRECT);
       if (quot2 == NULL_RTX)
        return NULL_RTX;
 

diff --git a/gcc/target.def b/gcc/target.def
index 4b2c53aba14e65e469c613a8cc30baed8ce439d7..049dab64f683c67d1ea9d2ca8784b1efbb347c3d 100644 (file)
--- a/gcc/target.def
+++ b/gcc/target.def
@@ -1905,25 +1905,6 @@ implementation approaches itself.",
        const vec_perm_indices &sel),
  NULL)
 
-DEFHOOK
-(can_special_div_by_const,
- "This hook is used to test whether the target has a special method of\n\
-division of vectors of type @var{vectype} using the value @var{constant},\n\
-and producing a vector of type @var{vectype}.  The division\n\
-will then not be decomposed by the vectorizer and kept as a div.\n\
-\n\
-When the hook is being used to test whether the target supports a special\n\
-divide, @var{in0}, @var{in1}, and @var{output} are all null.  When the hook\n\
-is being used to emit a division, @var{in0} and @var{in1} are the source\n\
-vectors of type @var{vecttype} and @var{output} is the destination vector of\n\
-type @var{vectype}.\n\
-\n\
-Return true if the operation is possible, emitting instructions for it\n\
-if rtxes are provided and updating @var{output}.",
- bool, (enum tree_code, tree vectype, wide_int constant, rtx *output,
-       rtx in0, rtx in1),
- default_can_special_div_by_const)
-
 /* Return true if the target supports misaligned store/load of a
    specific factor denoted in the third parameter.  The last parameter
    is true if the access is defined in a packed struct.  */

diff --git a/gcc/target.h b/gcc/target.h
index 39de522602613fcfa44b613c3feafa851adf969b..cd448e4b7ab79196bb5fdf17bbc085db23f3875f 100644 (file)
--- a/gcc/target.h
+++ b/gcc/target.h
@@ -51,7 +51,6 @@
 #include "insn-codes.h"
 #include "tm.h"
 #include "hard-reg-set.h"
-#include "tree-core.h"
 
 #if CHECKING_P
 

diff --git a/gcc/targhooks.cc b/gcc/targhooks.cc
index ea1a17cb1ab4acc1a142bfc0b9b9db876e3da349..8b7452ce3364d2a1a11e67b35b9327fa9b050308 100644 (file)
--- a/gcc/targhooks.cc
+++ b/gcc/targhooks.cc
@@ -1845,14 +1845,6 @@ default_have_conditional_execution (void)
   return HAVE_conditional_execution;
 }
 
-/* Default that no division by constant operations are special.  */
-bool
-default_can_special_div_by_const (enum tree_code, tree, wide_int, rtx *, rtx,
-                                 rtx)
-{
-  return false;
-}
-
 /* By default we assume that c99 functions are present at the runtime,
    but sincos is not.  */
 bool

diff --git a/gcc/targhooks.h b/gcc/targhooks.h
index 8725f1bb7d6b8c0b85f83eb1b48ba87675847127..555160da48abb0fbe426345c7baa5977bcf7972d 100644 (file)
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -211,8 +211,6 @@ extern void default_addr_space_diagnose_usage (addr_space_t, location_t);
 extern rtx default_addr_space_convert (rtx, tree, tree);
 extern unsigned int default_case_values_threshold (void);
 extern bool default_have_conditional_execution (void);
-extern bool default_can_special_div_by_const (enum tree_code, tree, wide_int,
-                                             rtx *, rtx, rtx);
 
 extern bool default_libc_has_function (enum function_class, tree);
 extern bool default_libc_has_fast_function (int fcode);

diff --git a/gcc/tree-vect-generic.cc b/gcc/tree-vect-generic.cc
index 166a248f4b9512d4c6fc8d760b458b7a467f7790..519a824ec727d4d4f28c14077dc3e970bed75ef6 100644 (file)
--- a/gcc/tree-vect-generic.cc
+++ b/gcc/tree-vect-generic.cc
@@ -1237,17 +1237,6 @@ expand_vector_operation (gimple_stmt_iterator *gsi, tree type, tree compute_type
          tree rhs2 = gimple_assign_rhs2 (assign);
          tree ret;
 
-         /* Check if the target was going to handle it through the special
-            division callback hook.  */
-         tree cst = uniform_integer_cst_p (rhs2);
-         if (cst &&
-             targetm.vectorize.can_special_div_by_const (code, type,
-                                                         wi::to_wide (cst),
-                                                         NULL,
-                                                         NULL_RTX, NULL_RTX))
-           return NULL_TREE;
-
-
          if (!optimize
              || !VECTOR_INTEGER_TYPE_P (type)
              || TREE_CODE (rhs2) != VECTOR_CST

diff --git a/gcc/tree-vect-patterns.cc b/gcc/tree-vect-patterns.cc
index dd585e59bf7b4182aae22c13449da943f385791b..298fd295a738c111e81093d6c27eceb0d00c461b 100644 (file)
--- a/gcc/tree-vect-patterns.cc
+++ b/gcc/tree-vect-patterns.cc
@@ -3933,14 +3933,6 @@ vect_recog_divmod_pattern (vec_info *vinfo,
 
       return pattern_stmt;
     }
-  else if ((cst = uniform_integer_cst_p (oprnd1))
-          && targetm.vectorize.can_special_div_by_const (rhs_code, vectype,
-                                                         wi::to_wide (cst),
-                                                         NULL, NULL_RTX,
-                                                         NULL_RTX))
-    {
-      return NULL;
-    }
 
   if (prec > HOST_BITS_PER_WIDE_INT
       || integer_zerop (oprnd1))

diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc
index b56457617c09d811633acb384e772e70fdc59216..f5e7561d8c804169e7936fc4fff6bb5c4130e361 100644 (file)
--- a/gcc/tree-vect-stmts.cc
+++ b/gcc/tree-vect-stmts.cc
@@ -6380,15 +6380,6 @@ vectorizable_operation (vec_info *vinfo,
        }
       target_support_p = (optab_handler (optab, vec_mode)
                          != CODE_FOR_nothing);
-      tree cst;
-      if (!target_support_p
-         && op1
-         && (cst = uniform_integer_cst_p (op1)))
-       target_support_p
-         = targetm.vectorize.can_special_div_by_const (code, vectype,
-                                                       wi::to_wide (cst),
-                                                       NULL, NULL_RTX,
-                                                       NULL_RTX);
     }
 
   bool using_emulated_vectors_p = vect_emulated_vector_p (vectype);