From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2d.google.com (mail-oa1-x2d.google.com [IPv6:2001:4860:4864:20::2d]) by sourceware.org (Postfix) with ESMTPS id A4A093858C2F for ; Thu, 25 Aug 2022 15:08:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org A4A093858C2F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x2d.google.com with SMTP id 586e51a60fabf-11c896b879bso25228866fac.3 for ; Thu, 25 Aug 2022 08:08:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:from:to:cc; bh=2I32K/NwFmhcJ0MMqppsdDjCQjY1qohxm0XNxJUjbHc=; b=ojQxpsssX8kpuEGSeVNOb9zJ8IZDoD6flzOozZ5J77TTfkcDUhSxa1MWw2GJWVKhae HeEENokhCKedotRHh47q6DVj1w/t982g1r95fVs6ISMVJEcAgPxxUU9DL/M54Gc/ZtfA MKAEH5UEUqgH0oE5OgcEKSPNDksFM9mAYcOQniUTGcVo7NkgWoiEvClUjjFLfVdvSRaD gAzwYM/cn8B0y5ZWOC4OVtK0hJFie2cjy4Ec+Jcvz7M2vcNp9IwYz/SDv1zrmbn2zAyt dN5RWdLBrnpPYsfn90ezcPq8BulhAx3XZZkRAY8KBb1BZfxXxkfvm8DkhZ+wH25jdmcd 9ChA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc; bh=2I32K/NwFmhcJ0MMqppsdDjCQjY1qohxm0XNxJUjbHc=; b=hTRYf8RXOZxUs1vQHZ5NEprX0uvvrc9kLued/zKvUylxxTw+Im4SsqHZ1IharxmjSb pcT5hL3zt3MVa/xvtTX+GRzcHj5bPiTiFx4F/VV+jUItUiTzvGu7U2LhVi4LLVegXXHc Zg6xumlgD/4vLc2LEh8UXXgITKklstWMUrj0DLIpO6yMbhqoccEDhAc+R6nxiSoXPQ8a j1QykCo3sTog9Hak7fg4lalcbd8sl5W0mxpoqspGVRw3UhX4TdP0zvuFELsAYDKTRxdW fGljEOvT+XT1DXPFUqsKoFvRBRXyN5kAvjxf40syKzjSq8xIEUR/2YtPv28zeh4Of3Ia HcYg== X-Gm-Message-State: ACgBeo3Zw8n9Jj7JvQAP9AunGqS43taSLNGGaUb8nxXbIJJDh82z+y9/ GBtgBzgzyzkVGxuCHvmUL7qosA== X-Google-Smtp-Source: AA6agR6geXJFyx3zphWoJhCsUbTxcCd2obvtJMWjAmTzUcE4cf4+uoSQ6bD9o1vro1O2ZkbhT1lwoA== X-Received: by 2002:a05:6871:154:b0:11e:33b7:ddf7 with SMTP id z20-20020a056871015400b0011e33b7ddf7mr1051009oab.116.1661440089893; Thu, 25 Aug 2022 08:08:09 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c0:745e:786a:689c:f1e5:7517? ([2804:1b3:a7c0:745e:786a:689c:f1e5:7517]) by smtp.gmail.com with ESMTPSA id q198-20020a4a33cf000000b00435a59fba01sm4563971ooq.47.2022.08.25.08.08.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Aug 2022 08:08:09 -0700 (PDT) Message-ID: <8562da19-d9d3-a4f3-2aae-2a4489af6806@linaro.org> Date: Thu, 25 Aug 2022 12:08:07 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.1.2 Subject: Re: [PATCH 1/2] LoongArch: Fix ptr mangling/demangling features. Content-Language: en-US To: caiyinyu , libc-alpha@sourceware.org, joseph_myers@mentor.com, carlos@redhat.com, i.swmail@xen0n.name, xry111@xry111.site Cc: xuchenghua@loongson.cn References: <20220823122833.1561228-1-caiyinyu@loongson.cn> <20220823122833.1561228-2-caiyinyu@loongson.cn> From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20220823122833.1561228-2-caiyinyu@loongson.cn> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,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 List-Id: Does is really pay off the complexity to use HAVE_LOONGARCH_EXPLICIT_RELOCS? The PTR_MANGLE is used some specific cases and hardly a hotstop. On 23/08/22 09:28, caiyinyu wrote: > Co-authored-by: Xi Ruoyao > --- > sysdeps/loongarch/__longjmp.S | 2 +- > sysdeps/loongarch/configure | 26 ++++++++++++++ > sysdeps/loongarch/configure.ac | 14 ++++++++ > sysdeps/loongarch/setjmp.S | 2 +- > sysdeps/unix/sysv/linux/loongarch/sysdep.h | 40 +++++++++++++--------- > 5 files changed, 65 insertions(+), 19 deletions(-) > > diff --git a/sysdeps/loongarch/__longjmp.S b/sysdeps/loongarch/__longjmp.S > index c2c5b56a80..4207376f5e 100644 > --- a/sysdeps/loongarch/__longjmp.S > +++ b/sysdeps/loongarch/__longjmp.S > @@ -22,7 +22,7 @@ > ENTRY (__longjmp) > #ifdef PTR_MANGLE > REG_L t0, a0, 0*SZREG > - PTR_DEMANGLE (ra, t0, t1, t2) > + PTR_DEMANGLE (ra, t0, t1) > REG_L t0, a0, 1*SZREG > PTR_DEMANGLE2 (sp, t0, t1) > #else > diff --git a/sysdeps/loongarch/configure b/sysdeps/loongarch/configure > index 43b54d4965..54385786d2 100644 > --- a/sysdeps/loongarch/configure > +++ b/sysdeps/loongarch/configure > @@ -3,3 +3,29 @@ > > $as_echo "#define HIDDEN_VAR_NEEDS_DYNAMIC_RELOC 1" >>confdefs.h > > + > +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether explicit relocs can be used" >&5 > +$as_echo_n "checking whether explicit relocs can be used... " >&6; } > +if ${libc_cv_loongarch_explicit_relocs+:} false; then : > + $as_echo_n "(cached) " >&6 > +else > + cat > conftest.s << EOF > +x: pcalau12i \$t0, %pc_hi20(x) > +EOF > +libc_cv_loongarch_explicit_relocs=no > +if { ac_try='${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&5' > + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 > + (eval $ac_try) 2>&5 > + ac_status=$? > + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > + test $ac_status = 0; }; }; then > + libc_cv_loongarch_explicit_relocs=yes > +fi > +rm -f conftest* > +fi > +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_loongarch_explicit_relocs" >&5 > +$as_echo "$libc_cv_loongarch_explicit_relocs" >&6; } > +if test $libc_cv_loongarch_explicit_relocs = yes; then > + $as_echo "#define HAVE_LOONGARCH_EXPLICIT_RELOCS 1" >>confdefs.h > + > +fi > diff --git a/sysdeps/loongarch/configure.ac b/sysdeps/loongarch/configure.ac > index f744367bf3..c5d3cb5ead 100644 > --- a/sysdeps/loongarch/configure.ac > +++ b/sysdeps/loongarch/configure.ac > @@ -4,3 +4,17 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. > dnl It is always possible to access static and hidden symbols in an > dnl position independent way. > AC_DEFINE(HIDDEN_VAR_NEEDS_DYNAMIC_RELOC) > + > +AC_CACHE_CHECK(whether explicit relocs can be used, > + libc_cv_loongarch_explicit_relocs, [dnl > +cat > conftest.s << EOF > +x: pcalau12i \$t0, %pc_hi20(x) > +EOF > +libc_cv_loongarch_explicit_relocs=no > +if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s -o conftest.o 1>&AS_MESSAGE_LOG_FD); then > + libc_cv_loongarch_explicit_relocs=yes > +fi > +rm -f conftest*]) > +if test $libc_cv_loongarch_explicit_relocs = yes; then > + AC_DEFINE(HAVE_LOONGARCH_EXPLICIT_RELOCS) > +fi > diff --git a/sysdeps/loongarch/setjmp.S b/sysdeps/loongarch/setjmp.S > index ec4ddc72da..298bb02a82 100644 > --- a/sysdeps/loongarch/setjmp.S > +++ b/sysdeps/loongarch/setjmp.S > @@ -30,7 +30,7 @@ END (setjmp) > > ENTRY (__sigsetjmp) > #ifdef PTR_MANGLE > - PTR_MANGLE (t0, ra, t1, t2) > + PTR_MANGLE (t0, ra, t1) > REG_S t0, a0, 0*SZREG > PTR_MANGLE2 (t0, sp, t1) > REG_S t0, a0, 1*SZREG > diff --git a/sysdeps/unix/sysv/linux/loongarch/sysdep.h b/sysdeps/unix/sysv/linux/loongarch/sysdep.h > index 157cbd6c6b..0a8773c38d 100644 > --- a/sysdeps/unix/sysv/linux/loongarch/sysdep.h > +++ b/sysdeps/unix/sysv/linux/loongarch/sysdep.h > @@ -316,29 +316,35 @@ extern long int __syscall_error (long int neg_errno); > > /* Pointer mangling is supported for LoongArch. */ > > -/* Load or store to/from a got-relative EXPR into/from G, using T. > +/* Load a got-relative EXPR into G, using T. > Note G and T are register names. */ > -#define LDST_GLOBAL(OP, G, T, EXPR) \ > - pcalau12i T, %got_pc_hi20(EXPR); \ > - OP T, T, %got_pc_lo12(EXPR); \ > - OP G, T, 0; > +#define LD_GLOBAL(G, EXPR) \ > + la.global G, EXPR; \ > + REG_L G, G, 0; > > -/* Load or store to/from a pc-relative EXPR into/from G, using T. > +/* Load a pc-relative EXPR into G, using T. > Note G and T are register names. */ > -#define LDST_PCREL(OP, G, T, EXPR) \ > - pcalau12i T, %pc_hi20(EXPR); \ > - OP G, T, %pc_lo12(EXPR); > + > +#ifdef HAVE_LOONGARCH_EXPLICIT_RELOCS > +#define LD_PCREL(G, EXPR) \ > + pcalau12i G, %pc_hi20(EXPR); \ > + REG_L G, G, %pc_lo12(EXPR); > +#else > +#define LD_PCREL(G, EXPR) \ > + la.pcrel G, EXPR; \ > + REG_L G, G, 0; > +#endif > > #if (IS_IN (rtld) \ > || (!defined SHARED && (IS_IN (libc) \ > || IS_IN (libpthread)))) > > #ifdef __ASSEMBLER__ > -#define PTR_MANGLE(dst, src, guard, tmp) \ > - LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \ > +#define PTR_MANGLE(dst, src, guard) \ > + LD_PCREL (guard, __pointer_chk_guard_local); \ > PTR_MANGLE2 (dst, src, guard); > -#define PTR_DEMANGLE(dst, src, guard, tmp) \ > - LDST_PCREL (REG_L, guard, tmp, __pointer_chk_guard_local); \ > +#define PTR_DEMANGLE(dst, src, guard) \ > + LD_PCREL (guard, __pointer_chk_guard_local); \ > PTR_DEMANGLE2 (dst, src, guard); > /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */ > #define PTR_MANGLE2(dst, src, guard) \ > @@ -355,11 +361,11 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden; > #else > > #ifdef __ASSEMBLER__ > -#define PTR_MANGLE(dst, src, guard, tmp) \ > - LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \ > +#define PTR_MANGLE(dst, src, guard) \ > + LD_GLOBAL (guard, __pointer_chk_guard); \ > PTR_MANGLE2 (dst, src, guard); > -#define PTR_DEMANGLE(dst, src, guard, tmp) \ > - LDST_GLOBAL (REG_L, guard, tmp, __pointer_chk_guard); \ > +#define PTR_DEMANGLE(dst, src, guard) \ > + LD_GLOBAL (guard, __pointer_chk_guard); \ > PTR_DEMANGLE2 (dst, src, guard); > /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */ > #define PTR_MANGLE2(dst, src, guard) \