From: Pan Li Date: Fri, 26 May 2023 11:26:24 +0000 (+0800) Subject: RISC-V: Refactor comments and naming of riscv-v.cc. X-Git-Tag: basepoints/gcc-15~8777 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b828454246c5aef7f984bb6a2888699f8dcfb2d;p=thirdparty%2Fgcc.git RISC-V: Refactor comments and naming of riscv-v.cc. This patch would like to remove unnecessary comments of some self explained parameters and try a better name to avoid misleading. Signed-off-by: Pan Li gcc/ChangeLog: * config/riscv/riscv-v.cc (emit_vlmax_insn): Remove unnecessary comments and rename local variables. (emit_nonvlmax_insn): Diito. (emit_vlmax_merge_insn): Ditto. (emit_vlmax_cmp_insn): Ditto. (emit_vlmax_cmp_mu_insn): Ditto. (emit_scalar_move_insn): Ditto. Signed-off-by: Pan Li --- diff --git a/gcc/config/riscv/riscv-v.cc b/gcc/config/riscv/riscv-v.cc index 3525bf62a0f8..b381970140d8 100644 --- a/gcc/config/riscv/riscv-v.cc +++ b/gcc/config/riscv/riscv-v.cc @@ -349,16 +349,16 @@ autovec_use_vlmax_p (void) void emit_vlmax_insn (unsigned icode, int op_num, rtx *ops, rtx vl) { - machine_mode data_mode = GET_MODE (ops[0]); - machine_mode mask_mode = get_mask_mode (data_mode).require (); - insn_expander e (/*OP_NUM*/ op_num, - /*HAS_DEST_P*/ true, - /*FULLY_UNMASKED_P*/ true, - /*USE_REAL_MERGE_P*/ false, - /*HAS_AVL_P*/ true, - /*VLMAX_P*/ true, - /*DEST_MODE*/ data_mode, - /*MASK_MODE*/ mask_mode); + machine_mode dest_mode = GET_MODE (ops[0]); + machine_mode mask_mode = get_mask_mode (dest_mode).require (); + insn_expander e (op_num, + /* HAS_DEST_P */ true, + /* FULLY_UNMASKED_P */ true, + /* USE_REAL_MERGE_P */ false, + /* HAS_AVL_P */ true, + /* VLMAX_P */ true, + dest_mode, + mask_mode); e.set_policy (TAIL_ANY); e.set_policy (MASK_ANY); @@ -393,16 +393,16 @@ emit_vlmax_ternary_insn (unsigned icode, int op_num, rtx *ops, rtx vl) void emit_nonvlmax_insn (unsigned icode, int op_num, rtx *ops, rtx avl) { - machine_mode data_mode = GET_MODE (ops[0]); - machine_mode mask_mode = get_mask_mode (data_mode).require (); - insn_expander e (/*OP_NUM*/ op_num, - /*HAS_DEST_P*/ true, - /*FULLY_UNMASKED_P*/ true, - /*USE_REAL_MERGE_P*/ false, - /*HAS_AVL_P*/ true, - /*VLMAX_P*/ false, - /*DEST_MODE*/ data_mode, - /*MASK_MODE*/ mask_mode); + machine_mode dest_mode = GET_MODE (ops[0]); + machine_mode mask_mode = get_mask_mode (dest_mode).require (); + insn_expander e (op_num, + /* HAS_DEST_P */ true, + /* FULLY_UNMASKED_P */ true, + /* USE_REAL_MERGE_P */ false, + /* HAS_AVL_P */ true, + /* VLMAX_P */ false, + dest_mode, + mask_mode); e.set_policy (TAIL_ANY); e.set_policy (MASK_ANY); @@ -416,14 +416,14 @@ emit_vlmax_merge_insn (unsigned icode, int op_num, rtx *ops) { machine_mode dest_mode = GET_MODE (ops[0]); machine_mode mask_mode = get_mask_mode (dest_mode).require (); - insn_expander e (/*OP_NUM*/ op_num, - /*HAS_DEST_P*/ true, - /*FULLY_UNMASKED_P*/ false, - /*USE_REAL_MERGE_P*/ false, - /*HAS_AVL_P*/ true, - /*VLMAX_P*/ true, - /*DEST_MODE*/ dest_mode, - /*MASK_MODE*/ mask_mode); + insn_expander e (op_num, + /* HAS_DEST_P */ true, + /* FULLY_UNMASKED_P */ false, + /* USE_REAL_MERGE_P */ false, + /* HAS_AVL_P */ true, + /* VLMAX_P */ true, + dest_mode, + mask_mode); e.set_policy (TAIL_ANY); e.emit_insn ((enum insn_code) icode, ops); @@ -434,14 +434,14 @@ void emit_vlmax_cmp_insn (unsigned icode, rtx *ops) { machine_mode mode = GET_MODE (ops[0]); - insn_expander e (/*OP_NUM*/ RVV_CMP_OP, - /*HAS_DEST_P*/ true, - /*FULLY_UNMASKED_P*/ true, - /*USE_REAL_MERGE_P*/ false, - /*HAS_AVL_P*/ true, - /*VLMAX_P*/ true, - /*DEST_MODE*/ mode, - /*MASK_MODE*/ mode); + insn_expander e (RVV_CMP_OP, + /* HAS_DEST_P */ true, + /* FULLY_UNMASKED_P */ true, + /* USE_REAL_MERGE_P */ false, + /* HAS_AVL_P */ true, + /* VLMAX_P */ true, + mode, + mode); e.set_policy (MASK_ANY); e.emit_insn ((enum insn_code) icode, ops); @@ -452,14 +452,14 @@ void emit_vlmax_cmp_mu_insn (unsigned icode, rtx *ops) { machine_mode mode = GET_MODE (ops[0]); - insn_expander e (/*OP_NUM*/ RVV_CMP_MU_OP, - /*HAS_DEST_P*/ true, - /*FULLY_UNMASKED_P*/ false, - /*USE_REAL_MERGE_P*/ true, - /*HAS_AVL_P*/ true, - /*VLMAX_P*/ true, - /*DEST_MODE*/ mode, - /*MASK_MODE*/ mode); + insn_expander e (RVV_CMP_MU_OP, + /* HAS_DEST_P */ true, + /* FULLY_UNMASKED_P */ false, + /* USE_REAL_MERGE_P */ true, + /* HAS_AVL_P */ true, + /* VLMAX_P */ true, + mode, + mode); e.set_policy (MASK_UNDISTURBED); e.emit_insn ((enum insn_code) icode, ops); @@ -1486,15 +1486,17 @@ expand_vector_init_insert_elems (rtx target, const rvv_builder &builder, static void emit_scalar_move_insn (unsigned icode, rtx *ops) { - machine_mode data_mode = GET_MODE (ops[0]); - machine_mode mask_mode = get_mask_mode (data_mode).require (); + machine_mode dest_mode = GET_MODE (ops[0]); + machine_mode mask_mode = get_mask_mode (dest_mode).require (); insn_expander e (riscv_vector::RVV_SCALAR_MOV_OP, /* HAS_DEST_P */ true, /* FULLY_UNMASKED_P */ false, /* USE_REAL_MERGE_P */ true, /* HAS_AVL_P */ true, /* VLMAX_P */ false, - data_mode, mask_mode); + dest_mode, + mask_mode); + e.set_policy (TAIL_ANY); e.set_policy (MASK_ANY); e.set_vl (CONST1_RTX (Pmode));