| Message ID | 20230621113338.290127-1-juzhe.zhong@rivai.ai |
|---|---|
| State | New |
| Headers | show |
| Series | : [NFC] Move can_vec_mask_load_store_p and get_len_load_store_mode from "optabs-query" into "optabs-tree" | expand |
On Wed, 21 Jun 2023, juzhe.zhong@rivai.ai wrote: > From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai> > > Since we want both can_vec_mask_load_store_p and get_len_load_store_mode > can see "internal_fn", move these 2 functions into optabs-tree. OK. Thanks, Richard. > gcc/ChangeLog: > > * optabs-query.cc (can_vec_mask_load_store_p): Move to optabs-tree.cc. > (get_len_load_store_mode): Ditto. > * optabs-query.h (can_vec_mask_load_store_p): Move to optabs-tree.h. > (get_len_load_store_mode): Ditto. > * optabs-tree.cc (can_vec_mask_load_store_p): New function. > (get_len_load_store_mode): Ditto. > * optabs-tree.h (can_vec_mask_load_store_p): Ditto. > (get_len_load_store_mode): Ditto. > * tree-if-conv.cc: include optabs-tree instead of optabs-query > > --- > gcc/optabs-query.cc | 66 --------------------------------------------- > gcc/optabs-query.h | 2 -- > gcc/optabs-tree.cc | 65 ++++++++++++++++++++++++++++++++++++++++++++ > gcc/optabs-tree.h | 2 ++ > gcc/tree-if-conv.cc | 2 +- > 5 files changed, 68 insertions(+), 69 deletions(-) > > diff --git a/gcc/optabs-query.cc b/gcc/optabs-query.cc > index 276f8408dd7..2fdd0d34354 100644 > --- a/gcc/optabs-query.cc > +++ b/gcc/optabs-query.cc > @@ -558,72 +558,6 @@ can_mult_highpart_p (machine_mode mode, bool uns_p) > return 0; > } > > -/* Return true if target supports vector masked load/store for mode. */ > - > -bool > -can_vec_mask_load_store_p (machine_mode mode, > - machine_mode mask_mode, > - bool is_load) > -{ > - optab op = is_load ? maskload_optab : maskstore_optab; > - machine_mode vmode; > - > - /* If mode is vector mode, check it directly. */ > - if (VECTOR_MODE_P (mode)) > - return convert_optab_handler (op, mode, mask_mode) != CODE_FOR_nothing; > - > - /* Otherwise, return true if there is some vector mode with > - the mask load/store supported. */ > - > - /* See if there is any chance the mask load or store might be > - vectorized. If not, punt. */ > - scalar_mode smode; > - if (!is_a <scalar_mode> (mode, &smode)) > - return false; > - > - vmode = targetm.vectorize.preferred_simd_mode (smode); > - if (VECTOR_MODE_P (vmode) > - && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > - && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > - return true; > - > - auto_vector_modes vector_modes; > - targetm.vectorize.autovectorize_vector_modes (&vector_modes, true); > - for (machine_mode base_mode : vector_modes) > - if (related_vector_mode (base_mode, smode).exists (&vmode) > - && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > - && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > - return true; > - return false; > -} > - > -/* If target supports vector load/store with length for vector mode MODE, > - return the corresponding vector mode, otherwise return opt_machine_mode (). > - There are two flavors for vector load/store with length, one is to measure > - length with bytes, the other is to measure length with lanes. > - As len_{load,store} optabs point out, for the flavor with bytes, we use > - VnQI to wrap the other supportable same size vector modes. */ > - > -opt_machine_mode > -get_len_load_store_mode (machine_mode mode, bool is_load) > -{ > - optab op = is_load ? len_load_optab : len_store_optab; > - gcc_assert (VECTOR_MODE_P (mode)); > - > - /* Check if length in lanes supported for this mode directly. */ > - if (direct_optab_handler (op, mode)) > - return mode; > - > - /* Check if length in bytes supported for same vector size VnQI. */ > - machine_mode vmode; > - poly_uint64 nunits = GET_MODE_SIZE (mode); > - if (related_vector_mode (mode, QImode, nunits).exists (&vmode) > - && direct_optab_handler (op, vmode)) > - return vmode; > - > - return opt_machine_mode (); > -} > - > /* Return true if there is a compare_and_swap pattern. */ > > bool > diff --git a/gcc/optabs-query.h b/gcc/optabs-query.h > index b266d2fe990..043e9791bc1 100644 > --- a/gcc/optabs-query.h > +++ b/gcc/optabs-query.h > @@ -187,8 +187,6 @@ enum insn_code find_widening_optab_handler_and_mode (optab, machine_mode, > machine_mode, > machine_mode *); > int can_mult_highpart_p (machine_mode, bool); > -bool can_vec_mask_load_store_p (machine_mode, machine_mode, bool); > -opt_machine_mode get_len_load_store_mode (machine_mode, bool); > bool can_compare_and_swap_p (machine_mode, bool); > bool can_atomic_exchange_p (machine_mode, bool); > bool can_atomic_load_p (machine_mode); > diff --git a/gcc/optabs-tree.cc b/gcc/optabs-tree.cc > index 33ca529094d..77bf745ae40 100644 > --- a/gcc/optabs-tree.cc > +++ b/gcc/optabs-tree.cc > @@ -543,3 +543,68 @@ target_supports_op_p (tree type, enum tree_code code, > && optab_handler (ot, TYPE_MODE (type)) != CODE_FOR_nothing); > } > > +/* Return true if target supports vector masked load/store for mode. */ > + > +bool > +can_vec_mask_load_store_p (machine_mode mode, > + machine_mode mask_mode, > + bool is_load) > +{ > + optab op = is_load ? maskload_optab : maskstore_optab; > + machine_mode vmode; > + > + /* If mode is vector mode, check it directly. */ > + if (VECTOR_MODE_P (mode)) > + return convert_optab_handler (op, mode, mask_mode) != CODE_FOR_nothing; > + > + /* Otherwise, return true if there is some vector mode with > + the mask load/store supported. */ > + > + /* See if there is any chance the mask load or store might be > + vectorized. If not, punt. */ > + scalar_mode smode; > + if (!is_a <scalar_mode> (mode, &smode)) > + return false; > + > + vmode = targetm.vectorize.preferred_simd_mode (smode); > + if (VECTOR_MODE_P (vmode) > + && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > + && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > + return true; > + > + auto_vector_modes vector_modes; > + targetm.vectorize.autovectorize_vector_modes (&vector_modes, true); > + for (machine_mode base_mode : vector_modes) > + if (related_vector_mode (base_mode, smode).exists (&vmode) > + && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > + && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > + return true; > + return false; > +} > + > +/* If target supports vector load/store with length for vector mode MODE, > + return the corresponding vector mode, otherwise return opt_machine_mode (). > + There are two flavors for vector load/store with length, one is to measure > + length with bytes, the other is to measure length with lanes. > + As len_{load,store} optabs point out, for the flavor with bytes, we use > + VnQI to wrap the other supportable same size vector modes. */ > + > +opt_machine_mode > +get_len_load_store_mode (machine_mode mode, bool is_load) > +{ > + optab op = is_load ? len_load_optab : len_store_optab; > + gcc_assert (VECTOR_MODE_P (mode)); > + > + /* Check if length in lanes supported for this mode directly. */ > + if (direct_optab_handler (op, mode)) > + return mode; > + > + /* Check if length in bytes supported for same vector size VnQI. */ > + machine_mode vmode; > + poly_uint64 nunits = GET_MODE_SIZE (mode); > + if (related_vector_mode (mode, QImode, nunits).exists (&vmode) > + && direct_optab_handler (op, vmode)) > + return vmode; > + > + return opt_machine_mode (); > +} > diff --git a/gcc/optabs-tree.h b/gcc/optabs-tree.h > index 526bfe8761b..a3f79b6bd43 100644 > --- a/gcc/optabs-tree.h > +++ b/gcc/optabs-tree.h > @@ -47,5 +47,7 @@ bool expand_vec_cond_expr_p (tree, tree, enum tree_code); > void init_tree_optimization_optabs (tree); > bool target_supports_op_p (tree, enum tree_code, > enum optab_subtype = optab_default); > +bool can_vec_mask_load_store_p (machine_mode, machine_mode, bool); > +opt_machine_mode get_len_load_store_mode (machine_mode, bool); > > #endif > diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc > index 1393ce184e3..e342532a343 100644 > --- a/gcc/tree-if-conv.cc > +++ b/gcc/tree-if-conv.cc > @@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see > #include "ssa.h" > #include "expmed.h" > #include "expr.h" > -#include "optabs-query.h" > +#include "optabs-tree.h" > #include "gimple-pretty-print.h" > #include "alias.h" > #include "fold-const.h" >
Committed, thanks Richard. Pan -----Original Message----- From: Gcc-patches <gcc-patches-bounces+pan2.li=intel.com@gcc.gnu.org> On Behalf Of Richard Biener via Gcc-patches Sent: Wednesday, June 21, 2023 7:42 PM To: Ju-Zhe Zhong <juzhe.zhong@rivai.ai> Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH]: [NFC] Move can_vec_mask_load_store_p and get_len_load_store_mode from "optabs-query" into "optabs-tree" On Wed, 21 Jun 2023, juzhe.zhong@rivai.ai wrote: > From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai> > > Since we want both can_vec_mask_load_store_p and get_len_load_store_mode > can see "internal_fn", move these 2 functions into optabs-tree. OK. Thanks, Richard. > gcc/ChangeLog: > > * optabs-query.cc (can_vec_mask_load_store_p): Move to optabs-tree.cc. > (get_len_load_store_mode): Ditto. > * optabs-query.h (can_vec_mask_load_store_p): Move to optabs-tree.h. > (get_len_load_store_mode): Ditto. > * optabs-tree.cc (can_vec_mask_load_store_p): New function. > (get_len_load_store_mode): Ditto. > * optabs-tree.h (can_vec_mask_load_store_p): Ditto. > (get_len_load_store_mode): Ditto. > * tree-if-conv.cc: include optabs-tree instead of optabs-query > > --- > gcc/optabs-query.cc | 66 --------------------------------------------- > gcc/optabs-query.h | 2 -- > gcc/optabs-tree.cc | 65 ++++++++++++++++++++++++++++++++++++++++++++ > gcc/optabs-tree.h | 2 ++ > gcc/tree-if-conv.cc | 2 +- > 5 files changed, 68 insertions(+), 69 deletions(-) > > diff --git a/gcc/optabs-query.cc b/gcc/optabs-query.cc > index 276f8408dd7..2fdd0d34354 100644 > --- a/gcc/optabs-query.cc > +++ b/gcc/optabs-query.cc > @@ -558,72 +558,6 @@ can_mult_highpart_p (machine_mode mode, bool uns_p) > return 0; > } > > -/* Return true if target supports vector masked load/store for mode. */ > - > -bool > -can_vec_mask_load_store_p (machine_mode mode, > - machine_mode mask_mode, > - bool is_load) > -{ > - optab op = is_load ? maskload_optab : maskstore_optab; > - machine_mode vmode; > - > - /* If mode is vector mode, check it directly. */ > - if (VECTOR_MODE_P (mode)) > - return convert_optab_handler (op, mode, mask_mode) != CODE_FOR_nothing; > - > - /* Otherwise, return true if there is some vector mode with > - the mask load/store supported. */ > - > - /* See if there is any chance the mask load or store might be > - vectorized. If not, punt. */ > - scalar_mode smode; > - if (!is_a <scalar_mode> (mode, &smode)) > - return false; > - > - vmode = targetm.vectorize.preferred_simd_mode (smode); > - if (VECTOR_MODE_P (vmode) > - && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > - && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > - return true; > - > - auto_vector_modes vector_modes; > - targetm.vectorize.autovectorize_vector_modes (&vector_modes, true); > - for (machine_mode base_mode : vector_modes) > - if (related_vector_mode (base_mode, smode).exists (&vmode) > - && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > - && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > - return true; > - return false; > -} > - > -/* If target supports vector load/store with length for vector mode MODE, > - return the corresponding vector mode, otherwise return opt_machine_mode (). > - There are two flavors for vector load/store with length, one is to measure > - length with bytes, the other is to measure length with lanes. > - As len_{load,store} optabs point out, for the flavor with bytes, we use > - VnQI to wrap the other supportable same size vector modes. */ > - > -opt_machine_mode > -get_len_load_store_mode (machine_mode mode, bool is_load) > -{ > - optab op = is_load ? len_load_optab : len_store_optab; > - gcc_assert (VECTOR_MODE_P (mode)); > - > - /* Check if length in lanes supported for this mode directly. */ > - if (direct_optab_handler (op, mode)) > - return mode; > - > - /* Check if length in bytes supported for same vector size VnQI. */ > - machine_mode vmode; > - poly_uint64 nunits = GET_MODE_SIZE (mode); > - if (related_vector_mode (mode, QImode, nunits).exists (&vmode) > - && direct_optab_handler (op, vmode)) > - return vmode; > - > - return opt_machine_mode (); > -} > - > /* Return true if there is a compare_and_swap pattern. */ > > bool > diff --git a/gcc/optabs-query.h b/gcc/optabs-query.h > index b266d2fe990..043e9791bc1 100644 > --- a/gcc/optabs-query.h > +++ b/gcc/optabs-query.h > @@ -187,8 +187,6 @@ enum insn_code find_widening_optab_handler_and_mode (optab, machine_mode, > machine_mode, > machine_mode *); > int can_mult_highpart_p (machine_mode, bool); > -bool can_vec_mask_load_store_p (machine_mode, machine_mode, bool); > -opt_machine_mode get_len_load_store_mode (machine_mode, bool); > bool can_compare_and_swap_p (machine_mode, bool); > bool can_atomic_exchange_p (machine_mode, bool); > bool can_atomic_load_p (machine_mode); > diff --git a/gcc/optabs-tree.cc b/gcc/optabs-tree.cc > index 33ca529094d..77bf745ae40 100644 > --- a/gcc/optabs-tree.cc > +++ b/gcc/optabs-tree.cc > @@ -543,3 +543,68 @@ target_supports_op_p (tree type, enum tree_code code, > && optab_handler (ot, TYPE_MODE (type)) != CODE_FOR_nothing); > } > > +/* Return true if target supports vector masked load/store for mode. */ > + > +bool > +can_vec_mask_load_store_p (machine_mode mode, > + machine_mode mask_mode, > + bool is_load) > +{ > + optab op = is_load ? maskload_optab : maskstore_optab; > + machine_mode vmode; > + > + /* If mode is vector mode, check it directly. */ > + if (VECTOR_MODE_P (mode)) > + return convert_optab_handler (op, mode, mask_mode) != CODE_FOR_nothing; > + > + /* Otherwise, return true if there is some vector mode with > + the mask load/store supported. */ > + > + /* See if there is any chance the mask load or store might be > + vectorized. If not, punt. */ > + scalar_mode smode; > + if (!is_a <scalar_mode> (mode, &smode)) > + return false; > + > + vmode = targetm.vectorize.preferred_simd_mode (smode); > + if (VECTOR_MODE_P (vmode) > + && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > + && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > + return true; > + > + auto_vector_modes vector_modes; > + targetm.vectorize.autovectorize_vector_modes (&vector_modes, true); > + for (machine_mode base_mode : vector_modes) > + if (related_vector_mode (base_mode, smode).exists (&vmode) > + && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) > + && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) > + return true; > + return false; > +} > + > +/* If target supports vector load/store with length for vector mode MODE, > + return the corresponding vector mode, otherwise return opt_machine_mode (). > + There are two flavors for vector load/store with length, one is to measure > + length with bytes, the other is to measure length with lanes. > + As len_{load,store} optabs point out, for the flavor with bytes, we use > + VnQI to wrap the other supportable same size vector modes. */ > + > +opt_machine_mode > +get_len_load_store_mode (machine_mode mode, bool is_load) > +{ > + optab op = is_load ? len_load_optab : len_store_optab; > + gcc_assert (VECTOR_MODE_P (mode)); > + > + /* Check if length in lanes supported for this mode directly. */ > + if (direct_optab_handler (op, mode)) > + return mode; > + > + /* Check if length in bytes supported for same vector size VnQI. */ > + machine_mode vmode; > + poly_uint64 nunits = GET_MODE_SIZE (mode); > + if (related_vector_mode (mode, QImode, nunits).exists (&vmode) > + && direct_optab_handler (op, vmode)) > + return vmode; > + > + return opt_machine_mode (); > +} > diff --git a/gcc/optabs-tree.h b/gcc/optabs-tree.h > index 526bfe8761b..a3f79b6bd43 100644 > --- a/gcc/optabs-tree.h > +++ b/gcc/optabs-tree.h > @@ -47,5 +47,7 @@ bool expand_vec_cond_expr_p (tree, tree, enum tree_code); > void init_tree_optimization_optabs (tree); > bool target_supports_op_p (tree, enum tree_code, > enum optab_subtype = optab_default); > +bool can_vec_mask_load_store_p (machine_mode, machine_mode, bool); > +opt_machine_mode get_len_load_store_mode (machine_mode, bool); > > #endif > diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc > index 1393ce184e3..e342532a343 100644 > --- a/gcc/tree-if-conv.cc > +++ b/gcc/tree-if-conv.cc > @@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see > #include "ssa.h" > #include "expmed.h" > #include "expr.h" > -#include "optabs-query.h" > +#include "optabs-tree.h" > #include "gimple-pretty-print.h" > #include "alias.h" > #include "fold-const.h" >
diff --git a/gcc/optabs-query.cc b/gcc/optabs-query.cc index 276f8408dd7..2fdd0d34354 100644 --- a/gcc/optabs-query.cc +++ b/gcc/optabs-query.cc @@ -558,72 +558,6 @@ can_mult_highpart_p (machine_mode mode, bool uns_p) return 0; } -/* Return true if target supports vector masked load/store for mode. */ - -bool -can_vec_mask_load_store_p (machine_mode mode, - machine_mode mask_mode, - bool is_load) -{ - optab op = is_load ? maskload_optab : maskstore_optab; - machine_mode vmode; - - /* If mode is vector mode, check it directly. */ - if (VECTOR_MODE_P (mode)) - return convert_optab_handler (op, mode, mask_mode) != CODE_FOR_nothing; - - /* Otherwise, return true if there is some vector mode with - the mask load/store supported. */ - - /* See if there is any chance the mask load or store might be - vectorized. If not, punt. */ - scalar_mode smode; - if (!is_a <scalar_mode> (mode, &smode)) - return false; - - vmode = targetm.vectorize.preferred_simd_mode (smode); - if (VECTOR_MODE_P (vmode) - && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) - && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) - return true; - - auto_vector_modes vector_modes; - targetm.vectorize.autovectorize_vector_modes (&vector_modes, true); - for (machine_mode base_mode : vector_modes) - if (related_vector_mode (base_mode, smode).exists (&vmode) - && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) - && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) - return true; - return false; -} - -/* If target supports vector load/store with length for vector mode MODE, - return the corresponding vector mode, otherwise return opt_machine_mode (). - There are two flavors for vector load/store with length, one is to measure - length with bytes, the other is to measure length with lanes. - As len_{load,store} optabs point out, for the flavor with bytes, we use - VnQI to wrap the other supportable same size vector modes. */ - -opt_machine_mode -get_len_load_store_mode (machine_mode mode, bool is_load) -{ - optab op = is_load ? len_load_optab : len_store_optab; - gcc_assert (VECTOR_MODE_P (mode)); - - /* Check if length in lanes supported for this mode directly. */ - if (direct_optab_handler (op, mode)) - return mode; - - /* Check if length in bytes supported for same vector size VnQI. */ - machine_mode vmode; - poly_uint64 nunits = GET_MODE_SIZE (mode); - if (related_vector_mode (mode, QImode, nunits).exists (&vmode) - && direct_optab_handler (op, vmode)) - return vmode; - - return opt_machine_mode (); -} - /* Return true if there is a compare_and_swap pattern. */ bool diff --git a/gcc/optabs-query.h b/gcc/optabs-query.h index b266d2fe990..043e9791bc1 100644 --- a/gcc/optabs-query.h +++ b/gcc/optabs-query.h @@ -187,8 +187,6 @@ enum insn_code find_widening_optab_handler_and_mode (optab, machine_mode, machine_mode, machine_mode *); int can_mult_highpart_p (machine_mode, bool); -bool can_vec_mask_load_store_p (machine_mode, machine_mode, bool); -opt_machine_mode get_len_load_store_mode (machine_mode, bool); bool can_compare_and_swap_p (machine_mode, bool); bool can_atomic_exchange_p (machine_mode, bool); bool can_atomic_load_p (machine_mode); diff --git a/gcc/optabs-tree.cc b/gcc/optabs-tree.cc index 33ca529094d..77bf745ae40 100644 --- a/gcc/optabs-tree.cc +++ b/gcc/optabs-tree.cc @@ -543,3 +543,68 @@ target_supports_op_p (tree type, enum tree_code code, && optab_handler (ot, TYPE_MODE (type)) != CODE_FOR_nothing); } +/* Return true if target supports vector masked load/store for mode. */ + +bool +can_vec_mask_load_store_p (machine_mode mode, + machine_mode mask_mode, + bool is_load) +{ + optab op = is_load ? maskload_optab : maskstore_optab; + machine_mode vmode; + + /* If mode is vector mode, check it directly. */ + if (VECTOR_MODE_P (mode)) + return convert_optab_handler (op, mode, mask_mode) != CODE_FOR_nothing; + + /* Otherwise, return true if there is some vector mode with + the mask load/store supported. */ + + /* See if there is any chance the mask load or store might be + vectorized. If not, punt. */ + scalar_mode smode; + if (!is_a <scalar_mode> (mode, &smode)) + return false; + + vmode = targetm.vectorize.preferred_simd_mode (smode); + if (VECTOR_MODE_P (vmode) + && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) + && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) + return true; + + auto_vector_modes vector_modes; + targetm.vectorize.autovectorize_vector_modes (&vector_modes, true); + for (machine_mode base_mode : vector_modes) + if (related_vector_mode (base_mode, smode).exists (&vmode) + && targetm.vectorize.get_mask_mode (vmode).exists (&mask_mode) + && convert_optab_handler (op, vmode, mask_mode) != CODE_FOR_nothing) + return true; + return false; +} + +/* If target supports vector load/store with length for vector mode MODE, + return the corresponding vector mode, otherwise return opt_machine_mode (). + There are two flavors for vector load/store with length, one is to measure + length with bytes, the other is to measure length with lanes. + As len_{load,store} optabs point out, for the flavor with bytes, we use + VnQI to wrap the other supportable same size vector modes. */ + +opt_machine_mode +get_len_load_store_mode (machine_mode mode, bool is_load) +{ + optab op = is_load ? len_load_optab : len_store_optab; + gcc_assert (VECTOR_MODE_P (mode)); + + /* Check if length in lanes supported for this mode directly. */ + if (direct_optab_handler (op, mode)) + return mode; + + /* Check if length in bytes supported for same vector size VnQI. */ + machine_mode vmode; + poly_uint64 nunits = GET_MODE_SIZE (mode); + if (related_vector_mode (mode, QImode, nunits).exists (&vmode) + && direct_optab_handler (op, vmode)) + return vmode; + + return opt_machine_mode (); +} diff --git a/gcc/optabs-tree.h b/gcc/optabs-tree.h index 526bfe8761b..a3f79b6bd43 100644 --- a/gcc/optabs-tree.h +++ b/gcc/optabs-tree.h @@ -47,5 +47,7 @@ bool expand_vec_cond_expr_p (tree, tree, enum tree_code); void init_tree_optimization_optabs (tree); bool target_supports_op_p (tree, enum tree_code, enum optab_subtype = optab_default); +bool can_vec_mask_load_store_p (machine_mode, machine_mode, bool); +opt_machine_mode get_len_load_store_mode (machine_mode, bool); #endif diff --git a/gcc/tree-if-conv.cc b/gcc/tree-if-conv.cc index 1393ce184e3..e342532a343 100644 --- a/gcc/tree-if-conv.cc +++ b/gcc/tree-if-conv.cc @@ -92,7 +92,7 @@ along with GCC; see the file COPYING3. If not see #include "ssa.h" #include "expmed.h" #include "expr.h" -#include "optabs-query.h" +#include "optabs-tree.h" #include "gimple-pretty-print.h" #include "alias.h" #include "fold-const.h"
From: Ju-Zhe Zhong <juzhe.zhong@rivai.ai> Since we want both can_vec_mask_load_store_p and get_len_load_store_mode can see "internal_fn", move these 2 functions into optabs-tree. gcc/ChangeLog: * optabs-query.cc (can_vec_mask_load_store_p): Move to optabs-tree.cc. (get_len_load_store_mode): Ditto. * optabs-query.h (can_vec_mask_load_store_p): Move to optabs-tree.h. (get_len_load_store_mode): Ditto. * optabs-tree.cc (can_vec_mask_load_store_p): New function. (get_len_load_store_mode): Ditto. * optabs-tree.h (can_vec_mask_load_store_p): Ditto. (get_len_load_store_mode): Ditto. * tree-if-conv.cc: include optabs-tree instead of optabs-query --- gcc/optabs-query.cc | 66 --------------------------------------------- gcc/optabs-query.h | 2 -- gcc/optabs-tree.cc | 65 ++++++++++++++++++++++++++++++++++++++++++++ gcc/optabs-tree.h | 2 ++ gcc/tree-if-conv.cc | 2 +- 5 files changed, 68 insertions(+), 69 deletions(-)