From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by sourceware.org (Postfix) with ESMTPS id 5B34B3857346 for ; Fri, 23 Sep 2022 16:01:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5B34B3857346 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ej1-x635.google.com with SMTP id 13so1679958ejn.3 for ; Fri, 23 Sep 2022 09:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=JwGZvW+CTI29+DU+O7bICOMUF6+gekfIi+ijSCEopOU=; b=BiHrZkKL0UxoTxTPZr5D3iz0zjsle4pCLHpRn1SWgAT4uvsVKX6W8Y9tkLNf7gtehh GytE3Klxb0jhCHsUji7MJ7PRee6A1r0dqF3DkzjDg9THwgeJJYlMMr8Kmk13FLcT8ePB r9Xx8DGbENjXczYWrB/3GMn6sbdKHIJ0Sti2ryGcfJ9bxV/TFCowu4F1m8cgxbTAtQLG 6tknS6HHN3wLlLCyGeOBu1DpormqtGOqjawU0Vq+0agxJXU6v1dU1kK0Kfl5KAYeFBq3 5Vkih82EIGcvO0Zakk2lyyzGuos+n/JD8b3MEUuN8TQ6d0bbSJ+2HlnIwy+tJXyCAaAs i4qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=JwGZvW+CTI29+DU+O7bICOMUF6+gekfIi+ijSCEopOU=; b=jYZP3gZnxrHh5/TEA+WDfztPXg9hL0Q91hFCbYUHzdDjNlkoETL/NF8GOgJDAqUHss 5y4+8o3tUfyhGSmcUFKfntrNfttE9OmDt1hwZFdl5m5lIQ5VHPxfGyZJwEHSVPxgY3ax x33ajy/rigJwexAHPsD6Jz4f2GtD2aiTaFzSKigNt/MnarnConkqlNnOIHejcnESpKiG MM8/21JMxxGYt9respox0bCb+aTYNenVjeEDqPA2izpzT0SGNo39qLIJDHMQgQaTHTyl 6H7IBAMrGDimgPiKjQCrdJoSWw0h+3aaHguGpsPN9ucdsUZfepndH0ESX4oGtFOrUN9a X8PA== X-Gm-Message-State: ACrzQf10gDUspverBWbe8Hwn/cE/5X7UKnx9l/4riKpedrxPdn85NG5k fUL2C1Z3KXDEnFInVVvo66NDdqOZ7gDwsuSulWc= X-Google-Smtp-Source: AMsMyM47Mn/6/m6OL9JapqWCa1rHIo9MbNZC79zxjFYGo931PKzHO6QmRi8J+1V2EN54zDo+E8ageZZNyLsHSB2jZyY= X-Received: by 2002:a17:907:744:b0:741:36b9:d2cc with SMTP id xc4-20020a170907074400b0074136b9d2ccmr7527683ejb.613.1663948900037; Fri, 23 Sep 2022 09:01:40 -0700 (PDT) MIME-Version: 1.0 References: <51ff4d6d-16be-579a-3a84-3f383c8d038e@rivosinc.com> <20220902230820.381916-1-vineetg@rivosinc.com> In-Reply-To: <20220902230820.381916-1-vineetg@rivosinc.com> From: Kito Cheng Date: Sat, 24 Sep 2022 00:01:27 +0800 Message-ID: Subject: Re: [PATCH] RISC-V: make USE_LOAD_ADDRESS_MACRO easier to understand To: Vineet Gupta Cc: GCC Patches , collison@rivosinc.com, gnu-toolchain@rivosinc.com, Philipp Tomsich Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Committed with ChangeLog and minor naming tweaking. > But I'm not sure if the current checking of local symbol can be simplified > a bit. Isn't the first line enough for GET_CODE == const case too ? SYMBOL_REF_P not work for CONST, SYMBOL_REF_P is just checking GET_CODE is SYMBOL_REF, and SYMBOL_REF_LOCAL_P will also ICE if you feed something other than SYMBOL_REF when checking enabled... On Sat, Sep 3, 2022 at 7:08 AM Vineet Gupta wrote: > > The current macro has several && and || making it really hard to understand > the first time. > > Signed-off-by: Vineet Gupta > --- > Since we are on this topic, perhaps get this simplification too. > > But I'm not sure if the current checking of local symbol can be simplified > a bit. Isn't the first line enough for GET_CODE == const case too ? > > --- > gcc/config/riscv/riscv.h | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/gcc/config/riscv/riscv.h b/gcc/config/riscv/riscv.h > index eb1284e56d69..3e3f67ef8270 100644 > --- a/gcc/config/riscv/riscv.h > +++ b/gcc/config/riscv/riscv.h > @@ -749,18 +749,19 @@ typedef struct { > #define CASE_VECTOR_MODE SImode > #define CASE_VECTOR_PC_RELATIVE (riscv_cmodel != CM_MEDLOW) > > +#define LOCAL_SYM(sym) \ > + ((SYMBOL_REF_P (sym) && SYMBOL_REF_LOCAL_P (sym)) \ > + || ((GET_CODE (sym) == CONST) \ > + && SYMBOL_REF_P (XEXP (XEXP (sym, 0),0)) \ > + && SYMBOL_REF_LOCAL_P (XEXP (XEXP (sym, 0),0)))) > + > /* The load-address macro is used for PC-relative addressing of symbols > that bind locally. Don't use it for symbols that should be addressed > via the GOT. Also, avoid it for CM_MEDLOW, where LUI addressing > currently results in more opportunities for linker relaxation. */ > #define USE_LOAD_ADDRESS_MACRO(sym) \ > (!TARGET_EXPLICIT_RELOCS && \ > - ((flag_pic \ > - && ((SYMBOL_REF_P (sym) && SYMBOL_REF_LOCAL_P (sym)) \ > - || ((GET_CODE (sym) == CONST) \ > - && SYMBOL_REF_P (XEXP (XEXP (sym, 0),0)) \ > - && SYMBOL_REF_LOCAL_P (XEXP (XEXP (sym, 0),0))))) \ > - || riscv_cmodel == CM_MEDANY)) > + ((flag_pic && LOCAL_SYM(sym)) || riscv_cmodel == CM_MEDANY)) > > /* Define this as 1 if `char' should by default be signed; else as 0. */ > #define DEFAULT_SIGNED_CHAR 0 > -- > 2.32.0 >