From patchwork Mon Apr 17 21:27:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uros Bizjak X-Patchwork-Id: 84473 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2412162vqo; Mon, 17 Apr 2023 14:28:27 -0700 (PDT) X-Google-Smtp-Source: AKy350byQPLNA7OAnlESqehs1zbLIMhqvjhMpeqNlFtQPVCfLJDH4hYZ1y4ZMYJ/AF0KRhRqI6bk X-Received: by 2002:a17:907:98d9:b0:94e:e039:98cc with SMTP id kd25-20020a17090798d900b0094ee03998ccmr7786170ejc.42.1681766906777; Mon, 17 Apr 2023 14:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681766906; cv=none; d=google.com; s=arc-20160816; b=Jp6m2oaSQ0ztaW8WLsxqRA8HgADNUKc0RprjM3G7lMfZp2QRE6v0YIMep0/M7g1Qfx T0NsBpi0VzXwNKMHtXI6ashvY2MUTYtorzOQv/sVzny1W/c+ceCGuXhlqe3uvOiH11Zk nBRlCrtf4osCWGZyWhFDrv+Qms7/S059wCp4yu3vT0/uW4NIho/VsDYvkZOecKCyLEh+ ZT6FssZ866piRENab7RU+e20CV4YUdgnBFlw12mTQ1IA5xnU04L+l8kFwNvD3bTScv6H L634G+rwmBIVTodM68qR94HdyVZRAgsLeLRwBBL6LQOABP3qbM7MFduLaX815eH0BFKv YNIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:to:subject :message-id:date:mime-version:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=tFCQB7kmWd7yZvOmPeRMTVCe66bkmMVpwtWBts+NcEQ=; b=USisXKAe7GBsqh3l6SBiF3Zyeuc9Glmgl6J5bkmlI8WWCV+VLKRNSYY4Oj3JmadsD1 wyo6qLIaKcee/mGQBYwajSHEv0aTiqf1WNTkL2ZX/40SoYbAWpP2A8Yo+9yQNzxpH3/8 IbkNSnjYZCLjei3UWHYAbWlqlO5Cs6L6tLAT/wYRiohgPP3KxqPZT8jBM2KsOvov2K/V e+CoVCXzAjazCUqE/IeI6MUT5YJJqan8GCasG37zskEXSj+KgHYieUMbIRwejNHrCzg5 HexK89AAjx4aoYh9BBLSqo/cvSTAZg5giLiYbzSpPHpEExqNpP1RwByw+UqrtD0tR4uH Qk+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=tndfRIcb; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id ff18-20020a1709069c1200b0094a6d9f31e0si10876443ejc.840.2023.04.17.14.28.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 14:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=tndfRIcb; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6BFD63857712 for ; Mon, 17 Apr 2023 21:28:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6BFD63857712 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1681766905; bh=tFCQB7kmWd7yZvOmPeRMTVCe66bkmMVpwtWBts+NcEQ=; h=Date:Subject:To:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=tndfRIcbf+AFvAtw3B1myKs6/wzQiETkAlSqJH5cEMH2zSv3pIbE5mbTe9mb0ESO4 80uldwYAKUfTTvzcJ3Fc+taerpmvODmvhZOqKDDhx9AbBzgagrVVtyyhOP8817DbOV /OqjHyWlsMY3bXkgumsLIYfNqju0Z5BA/G7eEUYI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by sourceware.org (Postfix) with ESMTPS id 8FF9D3858D28 for ; Mon, 17 Apr 2023 21:27:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8FF9D3858D28 Received: by mail-qt1-x82f.google.com with SMTP id fv6so13391622qtb.9 for ; Mon, 17 Apr 2023 14:27:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681766860; x=1684358860; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tFCQB7kmWd7yZvOmPeRMTVCe66bkmMVpwtWBts+NcEQ=; b=htqCcNc/HA6elqnLgRPVeOdKUTJU3Ck1noGnlYR8TuheIdAtNeOmf1D3c2DN7Vw4s2 wht1fb970VTGPcbm/6zGuwsXC5p5EtA2tDdXaVMoMG7kHd9eZPnd2com504hyuXxNpRV 9+IeYm2aikoAaPcFzkaB6Gkpq7eDrrGQZgWgB9cQJCeTiB/l2hFQbuEKByuRLsxWlGCX B+9XqhBuC34Kn3p0CVcuy/s13+gWFMaxFG+dB1UQdyGpLjxp+LdeBhqcw4Os72p1Yqq9 4x/pqUlY2IUi7k3igOKMkYWs4TpdaMY2W7Q19DzrE1QUhyMergHQ+5viIluIL++fNhcL YVFQ== X-Gm-Message-State: AAQBX9fcjN6bmfgYO5bhXKCsLO4Rd3XhCQ7Z2+nqD8iDWeFAeOmS943g wu93ikSsxdcpdJhiUe/LK/HNuCyKKqAELuax03obdeMa0w/tJw== X-Received: by 2002:a05:6214:2504:b0:537:7d76:ea7c with SMTP id gf4-20020a056214250400b005377d76ea7cmr22314858qvb.25.1681766860375; Mon, 17 Apr 2023 14:27:40 -0700 (PDT) MIME-Version: 1.0 Date: Mon, 17 Apr 2023 23:27:28 +0200 Message-ID: Subject: [PATCH] Introduce VIRTUAL_REGISTER_P and VIRTUAL_REGISTER_NUM_P predicates To: "gcc-patches@gcc.gnu.org" X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Uros Bizjak via Gcc-patches From: Uros Bizjak Reply-To: Uros Bizjak Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763460416103667613?= X-GMAIL-MSGID: =?utf-8?q?1763460416103667613?= These two predicates are similar to existing HARD_REGISTER_P and HARD_REGISTER_NUM_P predicates and return 1 if the given register corresponds to a virtual register. gcc/ChangeLog: * rtl.h (VIRTUAL_REGISTER_P): New predicate. (VIRTUAL_REGISTER_NUM_P): Ditto. (REGNO_PTR_FRAME_P): Use VIRTUAL_REGISTER_NUM_P predicate. * expr.cc (force_operand): Use VIRTUAL_REGISTER_P predicate. * function.cc (instantiate_decl_rtl): Ditto. * rtlanal.cc (rtx_addr_can_trap_p_1): Ditto. (nonzero_address_p): Ditto. (refers_to_regno_p): Use VIRTUAL_REGISTER_NUM_P predicate. Bootstrapped and regression tested on x86_64-linux-gnu {,-m32}. OK for master? Uros. diff --git a/gcc/expr.cc b/gcc/expr.cc index f8f5cc5a6ca..758dda9ec68 100644 --- a/gcc/expr.cc +++ b/gcc/expr.cc @@ -8178,8 +8178,7 @@ force_operand (rtx value, rtx target) if (code == PLUS && CONST_INT_P (op2) && GET_CODE (XEXP (value, 0)) == PLUS && REG_P (XEXP (XEXP (value, 0), 0)) - && REGNO (XEXP (XEXP (value, 0), 0)) >= FIRST_VIRTUAL_REGISTER - && REGNO (XEXP (XEXP (value, 0), 0)) <= LAST_VIRTUAL_REGISTER) + && VIRTUAL_REGISTER_P (XEXP (XEXP (value, 0), 0))) { rtx temp = expand_simple_binop (GET_MODE (value), code, XEXP (XEXP (value, 0), 0), op2, diff --git a/gcc/function.cc b/gcc/function.cc index edf0b2ec6cf..f0ae641512d 100644 --- a/gcc/function.cc +++ b/gcc/function.cc @@ -1838,8 +1838,7 @@ instantiate_decl_rtl (rtx x) addr = XEXP (x, 0); if (CONSTANT_P (addr) || (REG_P (addr) - && (REGNO (addr) < FIRST_VIRTUAL_REGISTER - || REGNO (addr) > LAST_VIRTUAL_REGISTER))) + && !VIRTUAL_REGISTER_P (addr))) return; instantiate_virtual_regs_in_rtx (&XEXP (x, 0)); diff --git a/gcc/rtl.h b/gcc/rtl.h index 60852aeecd8..2f27490444b 100644 --- a/gcc/rtl.h +++ b/gcc/rtl.h @@ -1972,6 +1972,13 @@ set_regno_raw (rtx x, unsigned int regno, unsigned int nregs) /* 1 if the given register number REG_NO corresponds to a hard register. */ #define HARD_REGISTER_NUM_P(REG_NO) ((REG_NO) < FIRST_PSEUDO_REGISTER) +/* 1 if the given register REG corresponds to a virtual register. */ +#define VIRTUAL_REGISTER_P(REG) (VIRTUAL_REGISTER_NUM_P (REGNO (REG))) + +/* 1 if the given register number REG_NO corresponds to a virtual register. */ +#define VIRTUAL_REGISTER_NUM_P(REG_NO) \ + (IN_RANGE (REG_NO, FIRST_VIRTUAL_REGISTER, LAST_VIRTUAL_REGISTER)) + /* For a CONST_INT rtx, INTVAL extracts the integer. */ #define INTVAL(RTX) XCWINT (RTX, 0, CONST_INT) #define UINTVAL(RTX) ((unsigned HOST_WIDE_INT) INTVAL (RTX)) @@ -4078,8 +4085,7 @@ PUT_MODE (rtx x, machine_mode mode) || (REGNUM) == FRAME_POINTER_REGNUM \ || (REGNUM) == HARD_FRAME_POINTER_REGNUM \ || (REGNUM) == ARG_POINTER_REGNUM \ - || ((REGNUM) >= FIRST_VIRTUAL_REGISTER \ - && (REGNUM) <= LAST_VIRTUAL_POINTER_REGISTER)) + || VIRTUAL_REGISTER_NUM_P (REGNUM)) /* REGNUM never really appearing in the INSN stream. */ #define INVALID_REGNUM (~(unsigned int) 0) diff --git a/gcc/rtlanal.cc b/gcc/rtlanal.cc index e69d2e8a9f5..c96a88cebf1 100644 --- a/gcc/rtlanal.cc +++ b/gcc/rtlanal.cc @@ -643,8 +643,7 @@ rtx_addr_can_trap_p_1 (const_rtx x, poly_int64 offset, poly_int64 size, return 1; } /* All of the virtual frame registers are stack references. */ - if (REGNO (x) >= FIRST_VIRTUAL_REGISTER - && REGNO (x) <= LAST_VIRTUAL_REGISTER) + if (VIRTUAL_REGISTER_P (x)) return 0; return 1; @@ -733,8 +732,7 @@ nonzero_address_p (const_rtx x) || (x == arg_pointer_rtx && fixed_regs[ARG_POINTER_REGNUM])) return true; /* All of the virtual frame registers are stack references. */ - if (REGNO (x) >= FIRST_VIRTUAL_REGISTER - && REGNO (x) <= LAST_VIRTUAL_REGISTER) + if (VIRTUAL_REGISTER_P (x)) return true; return false; @@ -1769,7 +1767,7 @@ refers_to_regno_p (unsigned int regno, unsigned int endregno, const_rtx x, || (FRAME_POINTER_REGNUM != ARG_POINTER_REGNUM && x_regno == ARG_POINTER_REGNUM) || x_regno == FRAME_POINTER_REGNUM) - && regno >= FIRST_VIRTUAL_REGISTER && regno <= LAST_VIRTUAL_REGISTER) + && VIRTUAL_REGISTER_NUM_P (regno)) return true; return endregno > x_regno && regno < END_REGNO (x);