[gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] fix PR 111259 invalid zcmp mov predicate.

[gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] fix PR 111259 invalid zcmp mov predicate.

[Jeff Law]

https://gcc.gnu.org/g:b81cf20475ea81573f2e9eae30a583de26432b54

commit b81cf20475ea81573f2e9eae30a583de26432b54
Author: Fei Gao <gaofei@eswincomputing.com>
Date:   Fri Sep 15 01:20:08 2023 +0000

    fix PR 111259 invalid zcmp mov predicate.
    
    The code changes are from Palmer.
    
    root cause:
    In a gcc build with --enable-checking=yes, REGNO (op) checks
    rtx code and expected code 'reg'. so a rtx with 'subreg' causes
    an internal compiler error.
    
    solution:
    Restrict predicate to allow 'reg' only.
    
    gcc/ChangeLog:
    
            * config/riscv/predicates.md: Restrict predicate
            to allow 'reg' only.
    Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
    Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
    
    (cherry picked from commit d7b6020276a843e97f6135259b4ab3b53a5850e2)

Diff:
---
 gcc/config/riscv/predicates.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/config/riscv/predicates.md b/gcc/config/riscv/predicates.md
index 53e7c1d03aa..4bc7ff2c9d8 100644
--- a/gcc/config/riscv/predicates.md
+++ b/gcc/config/riscv/predicates.md
@@ -74,6 +74,7 @@
   (ior (match_operand 0 "const_0_operand")
        (match_operand 0 "register_operand")))
 
+;; ZCMP predicates
 (define_predicate "stack_push_up_to_ra_operand"
   (and (match_code "const_int")
        (match_test "riscv_zcmp_valid_stack_adj_bytes_p (INTVAL (op) * -1, 1)")))
@@ -170,13 +171,12 @@
   (and (match_code "const_int")
        (match_test "riscv_zcmp_valid_stack_adj_bytes_p (INTVAL (op), 13)")))
 
-;; ZCMP predicates
 (define_predicate "a0a1_reg_operand"
-  (and (match_operand 0 "register_operand")
+  (and (match_code "reg")
        (match_test "IN_RANGE (REGNO (op), A0_REGNUM, A1_REGNUM)")))
 
 (define_predicate "zcmp_mv_sreg_operand"
-  (and (match_operand 0 "register_operand")
+  (and (match_code "reg")
        (match_test "TARGET_RVE ? IN_RANGE (REGNO (op), S0_REGNUM, S1_REGNUM)
                     : IN_RANGE (REGNO (op), S0_REGNUM, S1_REGNUM)
                     || IN_RANGE (REGNO (op), S2_REGNUM, S7_REGNUM)")))