On Fri, Aug 19, 2022 at 6:08 AM apinski--- via Gcc-patches <gcc-patches@gcc.gnu.org> wrote: > > From: Andrew Pinski <apin...@marvell.com> > > The constraints should be n instead of i. Also there > needs to a check for out of bounds zero_extract for > *bexti. > > gcc/ChangeLog: > > PR target/106632 > PR target/106588 > * config/riscv/bitmanip.md (*shNadduw): Use n constraint > instead of i. > (*slliuw): Likewise. > (*bexti): Likewise. Also add a check for operands[2] to be less > than the mode bitsize. > --- > gcc/config/riscv/bitmanip.md | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/gcc/config/riscv/bitmanip.md b/gcc/config/riscv/bitmanip.md > index 026299d6703..ecf5b51b533 100644 > --- a/gcc/config/riscv/bitmanip.md > +++ b/gcc/config/riscv/bitmanip.md > @@ -44,7 +44,7 @@ (define_insn "*shNadduw" > (plus:DI > (and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r") > (match_operand:QI 2 "imm123_operand" "Ds3")) > - (match_operand 3 "immediate_operand" "")) > + (match_operand 3 "immediate_operand" "n")) > (match_operand:DI 4 "register_operand" "r")))] > "TARGET_64BIT && TARGET_ZBA > && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff" > @@ -110,7 +110,7 @@ (define_insn "*slliuw" > [(set (match_operand:DI 0 "register_operand" "=r") > (and:DI (ashift:DI (match_operand:DI 1 "register_operand" "r") > (match_operand:QI 2 "immediate_operand" "I")) > - (match_operand 3 "immediate_operand" "")))] > + (match_operand 3 "immediate_operand" "n")))] > "TARGET_64BIT && TARGET_ZBA > && (INTVAL (operands[3]) >> INTVAL (operands[2])) == 0xffffffff" > "slli.uw\t%0,%1,%2" > @@ -354,6 +354,7 @@ (define_insn "*bexti" > (zero_extract:X (match_operand:X 1 "register_operand" "r") > (const_int 1) > (match_operand 2 "immediate_operand" "i")))]
Seems something wrong during generating this patch, this line should be removed. > - "TARGET_ZBS" > + (match_operand 2 "immediate_operand" "n")))] > + "TARGET_ZBS && UINTVAL (operands[2]) < GET_MODE_BITSIZE (<MODE>mode)" > "bexti\t%0,%1,%2" > [(set_attr "type" "bitmanip")]) > -- > 2.27.0 >
