From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7923) id A812B3858D35; Fri, 15 Sep 2023 20:44:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A812B3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1694810641; bh=OXIfLUrdgcV8s5fq6BELNs+vLu4iivYDaiy6Wo1d6fM=; h=From:To:Subject:Date:From; b=sQN8M2knQuaj3sEXrkPl+s8N/wUrVGyNr8yCXzLu8iUSv9AbgunRhBAgs3PdiW81p g8Ri5o6MHYuXzitYaeEU9W+j0t8vlp+SUM55mLDCxh6nadgMDJoMwXKPgLFUOYCCNv r1jcg8DjZgv5Ny7BX9XV8xE8N7iZ9+BL01ft9uPA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Patrick O'Neill To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-4044] fix PR 111259 invalid zcmp mov predicate. X-Act-Checkin: gcc X-Git-Author: Fei Gao X-Git-Refname: refs/heads/master X-Git-Oldrev: fd5a858eb5ef93c4ac7b0399b67d46805d2dabec X-Git-Newrev: d7b6020276a843e97f6135259b4ab3b53a5850e2 Message-Id: <20230915204401.A812B3858D35@sourceware.org> Date: Fri, 15 Sep 2023 20:44:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d7b6020276a843e97f6135259b4ab3b53a5850e2 commit r14-4044-gd7b6020276a843e97f6135259b4ab3b53a5850e2 Author: Fei Gao 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 Acked-by: Palmer Dabbelt 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)")))