[07/10,RISCV] Use a constraint for bset<mode>_mask and bset<mode>_1_mask
Commit Message
From: Andrew Pinski <apinski@marvell.com>
A constraint here just makes it easier to understand what the
operands are.
OK? Built and tested on riscv32-linux-gnu and riscv64-linux-gnu with
--with-arch=rvNimafdc_zba_zbb_zbc_zbs (where N is 32 and 64).
Thanks,
Andrew Pinski
gcc/ChangeLog:
* config/riscv/constraints.md (DsS): New constraint.
(DsD): New constraint.
* config/riscv/iterators.md (shiftm1c): New iterator.
* config/riscv/bitmanip.md (*bset<mode>_mask):
Use shiftm1c.
(*bset<mode>_1_mask): Likewise.
---
gcc/config/riscv/bitmanip.md | 4 ++--
gcc/config/riscv/constraints.md | 12 ++++++++++++
gcc/config/riscv/iterators.md | 1 +
3 files changed, 15 insertions(+), 2 deletions(-)
@@ -273,7 +273,7 @@ (define_insn "*bset<mode>_mask"
(ior:X (ashift:X (const_int 1)
(subreg:QI
(and:X (match_operand:X 2 "register_operand" "r")
- (match_operand 3 "<X:shiftm1>" "i")) 0))
+ (match_operand 3 "<X:shiftm1>" "<X:shiftm1p>")) 0))
(match_operand:X 1 "register_operand" "r")))]
"TARGET_ZBS"
"bset\t%0,%1,%2"
@@ -292,7 +292,7 @@ (define_insn "*bset<mode>_1_mask"
(ashift:X (const_int 1)
(subreg:QI
(and:X (match_operand:X 1 "register_operand" "r")
- (match_operand 2 "<X:shiftm1>" "i")) 0)))]
+ (match_operand 2 "<X:shiftm1>" "<X:shiftm1p>")) 0)))]
"TARGET_ZBS"
"bset\t%0,x0,%1"
[(set_attr "type" "bitmanip")])
@@ -60,6 +60,18 @@ (define_constraint "Ds3"
(and (match_code "const_int")
(match_test "IN_RANGE (ival, 1, 3)")))
+(define_constraint "DsS"
+ "@internal
+ 31 immediate"
+ (and (match_code "const_int")
+ (match_test "ival == 31")))
+
+(define_constraint "DsD"
+ "@internal
+ 63 immediate"
+ (and (match_code "const_int")
+ (match_test "ival == 63")))
+
;; Floating-point constant +0.0, used for FCVT-based moves when FMV is
;; not available in RV32.
(define_constraint "G"
@@ -115,6 +115,7 @@ (define_mode_attr HALFMODE [(DF "SI") (DI "SI") (TF "DI")])
; bitmanip mode attribute
(define_mode_attr shiftm1 [(SI "const31_operand") (DI "const63_operand")])
+(define_mode_attr shiftm1p [(SI "DsS") (DI "DsD")])
;; -------------------------------------------------------------------
;; Code Iterators