[PATCH] RISC-V: Add "m_" prefix for private member
From: Juzhe-Zhong Since the current framework is hard to maintain and hard to be used in the future possible auto-vectorization patterns. We will need to keep adding more helpers and arguments during the auto-vectorization supporting. We should refactor the framework now for the future use since the we don't support too much auto-vectorization patterns for now. Start with this simple patch, this patch is adding "m_" prefix for private the members. gcc/ChangeLog: * config/riscv/riscv-v.cc: Add "m_" prefix. --- gcc/config/riscv/riscv-v.cc | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc index d65e7300303..e0b19bc1754 100644 --- a/gcc/config/riscv/riscv-v.cc +++ b/gcc/config/riscv/riscv-v.cc @@ -66,7 +66,7 @@ const_vlmax_p (machine_mode mode) template class insn_expander { public: - insn_expander () : m_opno (0), has_dest(false) {} + insn_expander () : m_opno (0), m_has_dest_p(false) {} void add_output_operand (rtx x, machine_mode mode) { create_output_operand (&m_ops[m_opno++], x, mode); @@ -99,41 +99,41 @@ public: void set_dest_and_mask (rtx mask, rtx dest, machine_mode mask_mode) { -dest_mode = GET_MODE (dest); -has_dest = true; +m_dest_mode = GET_MODE (dest); +m_has_dest_p = true; -add_output_operand (dest, dest_mode); +add_output_operand (dest, m_dest_mode); if (mask) add_input_operand (mask, GET_MODE (mask)); else add_all_one_mask_operand (mask_mode); -add_vundef_operand (dest_mode); +add_vundef_operand (m_dest_mode); } void set_len_and_policy (rtx len, bool force_vlmax = false) { bool vlmax_p = force_vlmax || !len; - gcc_assert (has_dest); + gcc_assert (m_has_dest_p); - if (vlmax_p && const_vlmax_p (dest_mode)) + if (vlmax_p && const_vlmax_p (m_dest_mode)) { /* Optimize VLS-VLMAX code gen, we can use vsetivli instead of the vsetvli to obtain the value of vlmax. */ - poly_uint64 nunits = GET_MODE_NUNITS (dest_mode); + poly_uint64 nunits = GET_MODE_NUNITS (m_dest_mode); len = gen_int_mode (nunits, Pmode); vlmax_p = false; /* It has became NONVLMAX now. */ } else if (!len) { len = gen_reg_rtx (Pmode); - emit_vlmax_vsetvl (dest_mode, len); + emit_vlmax_vsetvl (m_dest_mode, len); } add_input_operand (len, Pmode); - if (GET_MODE_CLASS (dest_mode) != MODE_VECTOR_BOOL) + if (GET_MODE_CLASS (m_dest_mode) != MODE_VECTOR_BOOL) add_policy_operand (get_prefer_tail_policy (), get_prefer_mask_policy ()); add_avl_type_operand (vlmax_p ? avl_type::VLMAX : avl_type::NONVLMAX); @@ -152,8 +152,8 @@ public: private: int m_opno; - bool has_dest; - machine_mode dest_mode; + bool m_has_dest_p; + machine_mode m_dest_mode; expand_operand m_ops[MAX_OPERANDS]; }; -- 2.36.3
Re: [PATCH] RISC-V: Add "m_" prefix for private member
LGTM On Mon, May 22, 2023 at 8:10 PM wrote: > > From: Juzhe-Zhong > > Since the current framework is hard to maintain and > hard to be used in the future possible auto-vectorization patterns. > > We will need to keep adding more helpers and arguments during the > auto-vectorization supporting. We should refactor the framework > now for the future use since the we don't support too much auto-vectorization > patterns for now. > > Start with this simple patch, this patch is adding "m_" prefix for private > the members. > > gcc/ChangeLog: > > * config/riscv/riscv-v.cc: Add "m_" prefix. > > --- > gcc/config/riscv/riscv-v.cc | 24 > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc > index d65e7300303..e0b19bc1754 100644 > --- a/gcc/config/riscv/riscv-v.cc > +++ b/gcc/config/riscv/riscv-v.cc > @@ -66,7 +66,7 @@ const_vlmax_p (machine_mode mode) > template class insn_expander > { > public: > - insn_expander () : m_opno (0), has_dest(false) {} > + insn_expander () : m_opno (0), m_has_dest_p(false) {} >void add_output_operand (rtx x, machine_mode mode) >{ > create_output_operand (&m_ops[m_opno++], x, mode); > @@ -99,41 +99,41 @@ public: > >void set_dest_and_mask (rtx mask, rtx dest, machine_mode mask_mode) >{ > -dest_mode = GET_MODE (dest); > -has_dest = true; > +m_dest_mode = GET_MODE (dest); > +m_has_dest_p = true; > > -add_output_operand (dest, dest_mode); > +add_output_operand (dest, m_dest_mode); > > if (mask) >add_input_operand (mask, GET_MODE (mask)); > else >add_all_one_mask_operand (mask_mode); > > -add_vundef_operand (dest_mode); > +add_vundef_operand (m_dest_mode); >} > >void set_len_and_policy (rtx len, bool force_vlmax = false) > { >bool vlmax_p = force_vlmax || !len; > - gcc_assert (has_dest); > + gcc_assert (m_has_dest_p); > > - if (vlmax_p && const_vlmax_p (dest_mode)) > + if (vlmax_p && const_vlmax_p (m_dest_mode)) > { > /* Optimize VLS-VLMAX code gen, we can use vsetivli instead of the > vsetvli to obtain the value of vlmax. */ > - poly_uint64 nunits = GET_MODE_NUNITS (dest_mode); > + poly_uint64 nunits = GET_MODE_NUNITS (m_dest_mode); > len = gen_int_mode (nunits, Pmode); > vlmax_p = false; /* It has became NONVLMAX now. */ > } >else if (!len) > { > len = gen_reg_rtx (Pmode); > - emit_vlmax_vsetvl (dest_mode, len); > + emit_vlmax_vsetvl (m_dest_mode, len); > } > >add_input_operand (len, Pmode); > > - if (GET_MODE_CLASS (dest_mode) != MODE_VECTOR_BOOL) > + if (GET_MODE_CLASS (m_dest_mode) != MODE_VECTOR_BOOL) > add_policy_operand (get_prefer_tail_policy (), get_prefer_mask_policy > ()); > >add_avl_type_operand (vlmax_p ? avl_type::VLMAX : avl_type::NONVLMAX); > @@ -152,8 +152,8 @@ public: > > private: >int m_opno; > - bool has_dest; > - machine_mode dest_mode; > + bool m_has_dest_p; > + machine_mode m_dest_mode; >expand_operand m_ops[MAX_OPERANDS]; > }; > > -- > 2.36.3 >
RE: [PATCH] RISC-V: Add "m_" prefix for private member
Committed, thanks Kito. Pan -Original Message- From: Gcc-patches On Behalf Of Kito Cheng via Gcc-patches Sent: Monday, May 22, 2023 9:49 PM To: juzhe.zh...@rivai.ai Cc: gcc-patches@gcc.gnu.org; kito.ch...@gmail.com; pal...@dabbelt.com; pal...@rivosinc.com; jeffreya...@gmail.com; rdapp@gmail.com Subject: Re: [PATCH] RISC-V: Add "m_" prefix for private member LGTM On Mon, May 22, 2023 at 8:10 PM wrote: > > From: Juzhe-Zhong > > Since the current framework is hard to maintain and hard to be used in > the future possible auto-vectorization patterns. > > We will need to keep adding more helpers and arguments during the > auto-vectorization supporting. We should refactor the framework now > for the future use since the we don't support too much > auto-vectorization patterns for now. > > Start with this simple patch, this patch is adding "m_" prefix for private > the members. > > gcc/ChangeLog: > > * config/riscv/riscv-v.cc: Add "m_" prefix. > > --- > gcc/config/riscv/riscv-v.cc | 24 > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc > index d65e7300303..e0b19bc1754 100644 > --- a/gcc/config/riscv/riscv-v.cc > +++ b/gcc/config/riscv/riscv-v.cc > @@ -66,7 +66,7 @@ const_vlmax_p (machine_mode mode) template MAX_OPERANDS> class insn_expander { > public: > - insn_expander () : m_opno (0), has_dest(false) {} > + insn_expander () : m_opno (0), m_has_dest_p(false) {} >void add_output_operand (rtx x, machine_mode mode) >{ > create_output_operand (&m_ops[m_opno++], x, mode); @@ -99,41 > +99,41 @@ public: > >void set_dest_and_mask (rtx mask, rtx dest, machine_mode mask_mode) >{ > -dest_mode = GET_MODE (dest); > -has_dest = true; > +m_dest_mode = GET_MODE (dest); > +m_has_dest_p = true; > > -add_output_operand (dest, dest_mode); > +add_output_operand (dest, m_dest_mode); > > if (mask) >add_input_operand (mask, GET_MODE (mask)); > else >add_all_one_mask_operand (mask_mode); > > -add_vundef_operand (dest_mode); > +add_vundef_operand (m_dest_mode); >} > >void set_len_and_policy (rtx len, bool force_vlmax = false) > { >bool vlmax_p = force_vlmax || !len; > - gcc_assert (has_dest); > + gcc_assert (m_has_dest_p); > > - if (vlmax_p && const_vlmax_p (dest_mode)) > + if (vlmax_p && const_vlmax_p (m_dest_mode)) > { > /* Optimize VLS-VLMAX code gen, we can use vsetivli instead of the > vsetvli to obtain the value of vlmax. */ > - poly_uint64 nunits = GET_MODE_NUNITS (dest_mode); > + poly_uint64 nunits = GET_MODE_NUNITS (m_dest_mode); > len = gen_int_mode (nunits, Pmode); > vlmax_p = false; /* It has became NONVLMAX now. */ > } >else if (!len) > { > len = gen_reg_rtx (Pmode); > - emit_vlmax_vsetvl (dest_mode, len); > + emit_vlmax_vsetvl (m_dest_mode, len); > } > >add_input_operand (len, Pmode); > > - if (GET_MODE_CLASS (dest_mode) != MODE_VECTOR_BOOL) > + if (GET_MODE_CLASS (m_dest_mode) != MODE_VECTOR_BOOL) > add_policy_operand (get_prefer_tail_policy (), > get_prefer_mask_policy ()); > >add_avl_type_operand (vlmax_p ? avl_type::VLMAX : > avl_type::NONVLMAX); @@ -152,8 +152,8 @@ public: > > private: >int m_opno; > - bool has_dest; > - machine_mode dest_mode; > + bool m_has_dest_p; > + machine_mode m_dest_mode; >expand_operand m_ops[MAX_OPERANDS]; }; > > -- > 2.36.3 >