[PATCH, rs6000] Cleanup some vstrir define_expand naming inconsistencies Hi, This cleans up some of the naming around the vstrir and vstril instruction definitions, with some cosmetic changes for consistency. No functional changes. Regtested just in case, no regressions. :-) OK for trunk?
Thanks, gcc/ * config/rs6000/altivec.md (vstrir_code_<mode>): Rename to vstrir_internal_<mode>. (vstrir_p_code_<mode>): Rename to vstrir_p_internal_<mode>. (vstril_code_<mode>): Rename to vstril_internal_<mode>. (vstril_p_code_<mode>): Rename to vstril_p_internal_<mode>. diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md index efc8ae35c2e7..5aea02e9ad6e 100644 --- a/gcc/config/rs6000/altivec.md +++ b/gcc/config/rs6000/altivec.md @@ -884,44 +884,44 @@ (define_expand "vstrir_<mode>" (unspec:VIshort [(match_operand:VIshort 1 "altivec_register_operand")] UNSPEC_VSTRIR))] "TARGET_POWER10" { if (BYTES_BIG_ENDIAN) - emit_insn (gen_vstrir_code_<mode> (operands[0], operands[1])); + emit_insn (gen_vstrir_internal_<mode> (operands[0], operands[1])); else - emit_insn (gen_vstril_code_<mode> (operands[0], operands[1])); + emit_insn (gen_vstril_internal_<mode> (operands[0], operands[1])); DONE; }) -(define_insn "vstrir_code_<mode>" +(define_insn "vstrir_internal_<mode>" [(set (match_operand:VIshort 0 "altivec_register_operand" "=v") (unspec:VIshort [(match_operand:VIshort 1 "altivec_register_operand" "v")] UNSPEC_VSTRIR))] "TARGET_POWER10" "vstri<wd>r %0,%1" [(set_attr "type" "vecsimple")]) -;; This expands into same code as vstrir_<mode> followed by condition logic +;; This expands into same code as vstrir<mode> followed by condition logic ;; so that a single vstribr. or vstrihr. or vstribl. or vstrihl. instruction ;; can, for example, satisfy the needs of a vec_strir () function paired ;; with a vec_strir_p () function if both take the same incoming arguments. (define_expand "vstrir_p_<mode>" [(match_operand:SI 0 "gpc_reg_operand") (match_operand:VIshort 1 "altivec_register_operand")] "TARGET_POWER10" { rtx scratch = gen_reg_rtx (<MODE>mode); if (BYTES_BIG_ENDIAN) - emit_insn (gen_vstrir_p_code_<mode> (scratch, operands[1])); + emit_insn (gen_vstrir_p_internal_<mode> (scratch, operands[1])); else - emit_insn (gen_vstril_p_code_<mode> (scratch, operands[1])); + emit_insn (gen_vstril_p_internal_<mode> (scratch, operands[1])); emit_insn (gen_cr6_test_for_zero (operands[0])); DONE; }) -(define_insn "vstrir_p_code_<mode>" +(define_insn "vstrir_p_internal_<mode>" [(set (match_operand:VIshort 0 "altivec_register_operand" "=v") (unspec:VIshort [(match_operand:VIshort 1 "altivec_register_operand" "v")] UNSPEC_VSTRIR)) (set (reg:CC CR6_REGNO) @@ -936,17 +936,17 @@ (define_expand "vstril_<mode>" (unspec:VIshort [(match_operand:VIshort 1 "altivec_register_operand")] UNSPEC_VSTRIR))] "TARGET_POWER10" { if (BYTES_BIG_ENDIAN) - emit_insn (gen_vstril_code_<mode> (operands[0], operands[1])); + emit_insn (gen_vstril_internal_<mode> (operands[0], operands[1])); else - emit_insn (gen_vstrir_code_<mode> (operands[0], operands[1])); + emit_insn (gen_vstrir_internal_<mode> (operands[0], operands[1])); DONE; }) -(define_insn "vstril_code_<mode>" +(define_insn "vstril_internal_<mode>" [(set (match_operand:VIshort 0 "altivec_register_operand" "=v") (unspec:VIshort [(match_operand:VIshort 1 "altivec_register_operand" "v")] UNSPEC_VSTRIL))] "TARGET_POWER10" @@ -962,18 +962,18 @@ (define_expand "vstril_p_<mode>" (match_operand:VIshort 1 "altivec_register_operand")] "TARGET_POWER10" { rtx scratch = gen_reg_rtx (<MODE>mode); if (BYTES_BIG_ENDIAN) - emit_insn (gen_vstril_p_code_<mode> (scratch, operands[1])); + emit_insn (gen_vstril_p_internal_<mode> (scratch, operands[1])); else - emit_insn (gen_vstrir_p_code_<mode> (scratch, operands[1])); + emit_insn (gen_vstrir_p_internal_<mode> (scratch, operands[1])); emit_insn (gen_cr6_test_for_zero (operands[0])); DONE; }) -(define_insn "vstril_p_code_<mode>" +(define_insn "vstril_p_internal_<mode>" [(set (match_operand:VIshort 0 "altivec_register_operand" "=v") (unspec:VIshort [(match_operand:VIshort 1 "altivec_register_operand" "v")] UNSPEC_VSTRIL)) (set (reg:CC CR6_REGNO)