[PATCH] RISC-V: Add v_uimm_operand

[PATCH] RISC-V: Add v_uimm_operand

[Palmer Dabbelt]

The vector shift immediates happen to have the same constraints as some
of the CSR-related operands, but it's a different usage.  This adds a
name for them, so I don't get confused again next time.

gcc/ChangeLog:

	* config/riscv/autovec.md (shifts): Use v_uimm_operand.
	* config/riscv/predicates.md (v_uimm_operand): New predicate.
---
I haven't even build tested this one, I just saw it when reviewing some
patch and figured I'd send it along.
---
 gcc/config/riscv/autovec.md    | 2 +-
 gcc/config/riscv/predicates.md | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gcc/config/riscv/autovec.md b/gcc/config/riscv/autovec.md
index ac0c939d277..daad51abbc2 100644
--- a/gcc/config/riscv/autovec.md
+++ b/gcc/config/riscv/autovec.md
@@ -132,7 +132,7 @@ (define_expand "<optab><mode>3"
   [(set (match_operand:VI 0 "register_operand")
     (any_shift:VI
      (match_operand:VI 1 "register_operand")
-     (match_operand:<VEL> 2 "csr_operand")))]
+     (match_operand:<VEL> 2 "v_uimm_operand")))]
   "TARGET_VECTOR"
 {
   if (!CONST_SCALAR_INT_P (operands[2]))
diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates.md
index e5adf06fa25..62007d6c6e3 100644
--- a/gcc/config/riscv/predicates.md
+++ b/gcc/config/riscv/predicates.md
@@ -43,6 +43,11 @@ (define_predicate "csr_operand"
   (ior (match_operand 0 "const_csr_operand")
        (match_operand 0 "register_operand")))
 
+;; V has 32-bit unsigned immediates.  This happens to be the same constraint as
+;  the csr_operand, but it's not CSR related.
+(define_predicate "v_uimm_operand"
+  (match_operand 0 "csr_operand"))
+
 (define_predicate "sle_operand"
   (and (match_code "const_int")
        (match_test "SMALL_OPERAND (INTVAL (op) + 1)")))
-- 
2.40.0

Re: [PATCH] RISC-V: Add v_uimm_operand

[Palmer Dabbelt]

On Thu, 11 May 2023 15:00:48 PDT (-0700), juzhe.zhong@rivai.ai wrote:
>>>  ;; V has 32-bit unsigned immediates.  This happens to be the same constraint asIt should be 5-bit unsigned immediates>> ;  the csr_operand, but it's not CSR related.
>>> (define_predicate "v_uimm_operand"
>>>   (match_operand 0 "csr_operand"))
> To make name consistent, it should be "vector_xxxx", so I suggest it to be "vector_scalar_shift_operand".

Makes sense, I sent a v2.

[PATCH] RISC-V: Add v_uimm_operand

[钟居哲]

[-- Attachment #1: Type: text/plain, Size: 391 bytes --]

>>  ;; V has 32-bit unsigned immediates.  This happens to be the same constraint asIt should be 5-bit unsigned immediates>> ;  the csr_operand, but it's not CSR related.
>> (define_predicate "v_uimm_operand"
>>   (match_operand 0 "csr_operand"))
To make name consistent, it should be "vector_xxxx", so I suggest it to be "vector_scalar_shift_operand".

Thanks.


juzhe.zhong@rivai.ai