From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yb1-xb2e.google.com (mail-yb1-xb2e.google.com [IPv6:2607:f8b0:4864:20::b2e]) by sourceware.org (Postfix) with ESMTPS id 42CE23858CD1 for ; Fri, 23 Feb 2024 02:39:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42CE23858CD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 42CE23858CD1 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::b2e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708655969; cv=none; b=kqckzUm7xvHQIAEvYIvq6jWN/1FHyWBheq2Xv2JQuxdBotK4BEqsfbhI2gUKu1u1nYeU5bgXgSWnTAozUZ3VTjqB+LZ9a9D+y/ZH0PBHvoJdEmFA4GNGTK9i4TrJNn5hgMW/V9AjJHm5SezMfvoRlzK6n4hv05FbkmJ2RTWc1DE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708655969; c=relaxed/simple; bh=pjOmzg2u2oTyfPLGohleRrQao/HKJXHm6TjppcrIPYA=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=e+lsSE+zC1p99e2VSFLyegJ+Ws6qKBXvx7VWn+3SsjuFLlfmgwioU2sEggg07Cbm2loE0u1nY0w4Vm18Oxy8KqVakx6NmY5tk8Omgy1PyrcHkDdzw138qWyhnvbn38+PzJP5jlPDqCfm7QNG8l8wsRQrQ872lgIVZTkIrif/evM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-yb1-xb2e.google.com with SMTP id 3f1490d57ef6-dc23bf7e5aaso419181276.0 for ; Thu, 22 Feb 2024 18:39:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708655966; x=1709260766; darn=gcc.gnu.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=pHt8HHPmdxy5GpjrcIHaeHrCXOXQsrlNy1DxGmg93nM=; b=ame8mtrUvwMU/O/XgkgxGJ1xlCHC4dUPnnF/KnF9+0K+rz7H74dYfP3vLDefNwJycw 6ZWOQIB6jU3SdzI5xfMHj4dfmGbyJPFRupVsgvI3Esiu3bUh11Ljf3B1Seuue2Kkk1+K pCbIVFYrv9SJB6uwEbf/c5cbucLzXMwFoEt9k16zv5KNuRFf7coJRXDXzw5FvHYJxkmX fwZBkuhhgXSzyNwHF0FsPuOEChvDBpjGZfVpRym0Kz9fXFrDs0HrThJSlWHlLfuIbnAe Nnp53kr+Zx/t9r2eWls0Td7hhTXFlbBaW7Yi/9BCW8FxBpNDR64mz0W8XR00HGTD9mkw mm4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708655966; x=1709260766; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pHt8HHPmdxy5GpjrcIHaeHrCXOXQsrlNy1DxGmg93nM=; b=ErapKsmdCH/dNp6r38z5YXGvXM3dlijBgJMzNsweE217xPWExlUcaxCnKlbgGc91Ok oJtwIqZpFEnsc8lga+Ln8En/5Cb5rXQlbzZEaxTQNxJJCRomb87+Abapn2ea7cflkYMz pucPVvnydYE+MXvm89Ckm9D3bM8vFmFn3qkfaIWPs2V1rUzh/yqnCOO4pOT+J0AKL971 5fAX8a3pwFjZjdKci0WUx7tOmSXJVihE2ggxhqU9ukuYugpXs8rF3PKdk//ByNYZFp+Y VtosGUGuEroLliAW1s0/y24YoubX+zjLiP6HQA2Rd/KcyYyB20PlbAKm3ykeLgZLHjP0 7dlQ== X-Gm-Message-State: AOJu0YykGbSbB6gqCKan3WbPW7gllnAOIIxeLL+MFRfeZK7MTulUq1p8 cj3mGMFy3E69chXDjaM8IQzT0Hls3knFpi0NFXCY8nJNawmJMSKEH8wMB39yeLIIxZ36vUquNr8 KHILbFfDrEywDLebbtTJMWga2x70K2j/Rmr4= X-Google-Smtp-Source: AGHT+IHL6EM/nLcrd5AfzMF9iyYRd1d7UOU+S98ULUzPjPPXDdutUs7npt14COFx11A75NGrM6f70KLAntPtW+i98mI= X-Received: by 2002:a25:b301:0:b0:dcf:1690:ee7d with SMTP id l1-20020a25b301000000b00dcf1690ee7dmr1199103ybj.32.1708655965673; Thu, 22 Feb 2024 18:39:25 -0800 (PST) MIME-Version: 1.0 References: <20240218160214.154341-1-hjl.tools@gmail.com> In-Reply-To: From: Hongtao Liu Date: Fri, 23 Feb 2024 10:39:13 +0800 Message-ID: Subject: Re: PING: [PATCH] x86-64: Check R_X86_64_CODE_6_GOTTPOFF support To: "H.J. Lu" Cc: GCC Patches Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_SHORT,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: On Thu, Feb 22, 2024 at 10:33=E2=80=AFPM H.J. Lu wrot= e: > > On Sun, Feb 18, 2024 at 8:02=E2=80=AFAM H.J. Lu wro= te: > > > > If assembler and linker supports > > > > add %reg1, name@gottpoff(%rip), %reg2 > > > > with R_X86_64_CODE_6_GOTTPOFF, we can generate it instead of > > > > mov name@gottpoff(%rip), %reg2 > > add %reg1, %reg2 x86 part LGTM, but I'm not familiar with the changes in config related file= s. > > > > gcc/ > > > > * configure.ac (HAVE_AS_R_X86_64_CODE_6_GOTTPOFF): Defined as 1 > > if R_X86_64_CODE_6_GOTTPOFF is supported. > > * config.in: Regenerated. > > * configure: Likewise. > > * config/i386/predicates.md (apx_ndd_add_memory_operand): Allow > > UNSPEC_GOTNTPOFF if R_X86_64_CODE_6_GOTTPOFF is supported. > > > > gcc/testsuite/ > > > > * gcc.target/i386/apx-ndd-tls-1b.c: New test. > > * lib/target-supports.exp > > (check_effective_target_code_6_gottpoff_reloc): New. > > --- > > gcc/config.in | 7 +++ > > gcc/config/i386/predicates.md | 6 +- > > gcc/configure | 62 +++++++++++++++++++ > > gcc/configure.ac | 37 +++++++++++ > > .../gcc.target/i386/apx-ndd-tls-1b.c | 9 +++ > > gcc/testsuite/lib/target-supports.exp | 48 ++++++++++++++ > > 6 files changed, 168 insertions(+), 1 deletion(-) > > create mode 100644 gcc/testsuite/gcc.target/i386/apx-ndd-tls-1b.c > > > > diff --git a/gcc/config.in b/gcc/config.in > > index ce1d073833f..f3de4ba6776 100644 > > --- a/gcc/config.in > > +++ b/gcc/config.in > > @@ -737,6 +737,13 @@ > > #endif > > > > > > +/* Define 0/1 if your assembler and linker support R_X86_64_CODE_6_GOT= TPOFF. > > + */ > > +#ifndef USED_FOR_TARGET > > +#undef HAVE_AS_R_X86_64_CODE_6_GOTTPOFF > > +#endif > > + > > + > > /* Define if your assembler supports relocs needed by -fpic. */ > > #ifndef USED_FOR_TARGET > > #undef HAVE_AS_SMALL_PIC_RELOCS > > diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates= .md > > index 4c1aedd7e70..391f108c360 100644 > > --- a/gcc/config/i386/predicates.md > > +++ b/gcc/config/i386/predicates.md > > @@ -2299,10 +2299,14 @@ (define_predicate "apx_ndd_memory_operand" > > > > ;; Return true if OP is a memory operand which can be used in APX NDD > > ;; ADD with register source operand. UNSPEC_GOTNTPOFF memory operand > > -;; isn't allowed with APX NDD ADD. > > +;; is allowed with APX NDD ADD only if R_X86_64_CODE_6_GOTTPOFF works. > > (define_predicate "apx_ndd_add_memory_operand" > > (match_operand 0 "memory_operand") > > { > > + /* OK if "add %reg1, name@gottpoff(%rip), %reg2" is supported. */ > > + if (HAVE_AS_R_X86_64_CODE_6_GOTTPOFF) > > + return true; > > + > > op =3D XEXP (op, 0); > > > > /* Disallow APX NDD ADD with UNSPEC_GOTNTPOFF. */ > > diff --git a/gcc/configure b/gcc/configure > > index 41b978b0380..c59c971862c 100755 > > --- a/gcc/configure > > +++ b/gcc/configure > > @@ -29834,6 +29834,68 @@ cat >>confdefs.h <<_ACEOF > > _ACEOF > > > > > > + if echo "$ld_ver" | grep GNU > /dev/null; then > > + if $gcc_cv_ld -V 2>/dev/null | grep elf_x86_64_sol2 > /dev/null;= then > > + ld_ix86_gld_64_opt=3D"-melf_x86_64_sol2" > > + else > > + ld_ix86_gld_64_opt=3D"-melf_x86_64" > > + fi > > + fi > > + conftest_s=3D' > > + .text > > + .globl _start > > + .type _start, @function > > +_start: > > + addq %r23,foo@GOTTPOFF(%rip), %r15 > > + .section .tdata,"awT",@progbits > > + .type foo, @object > > +foo: > > + .quad 0' > > + { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for R_= X86_64_CODE_6_GOTTPOFF reloc" >&5 > > +$as_echo_n "checking assembler for R_X86_64_CODE_6_GOTTPOFF reloc... "= >&6; } > > +if ${gcc_cv_as_x86_64_code_6_gottpoff+:} false; then : > > + $as_echo_n "(cached) " >&6 > > +else > > + gcc_cv_as_x86_64_code_6_gottpoff=3Dno > > + if test x$gcc_cv_as !=3D x; then > > + $as_echo "$conftest_s" > conftest.s > > + if { ac_try=3D'$gcc_cv_as $gcc_cv_as_flags -o conftest.o conftest= .s >&5' > > + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 > > + (eval $ac_try) 2>&5 > > + ac_status=3D$? > > + $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 > > + test $ac_status =3D 0; }; } > > + then > > + if test x$gcc_cv_ld !=3D x && test x$gcc_cv_objdump !=3D x \ > > + && test x$gcc_cv_readelf !=3D x \ > > + && $gcc_cv_readelf --relocs --wide conftest.o 2>&1 \ > > + | grep R_X86_64_CODE_6_GOTTPOFF > /dev/null 2>&1 \ > > + && $gcc_cv_ld $ld_ix86_gld_64_opt -o conftest conftest.o > = /dev/null 2>&1; then > > + if $gcc_cv_objdump -dw conftest 2>&1 \ > > + | grep "add \+\$0xf\+8,%r23,%r15" > /dev/null 2>&1; then > > + gcc_cv_as_x86_64_code_6_gottpoff=3Dyes > > + else > > + gcc_cv_as_x86_64_code_6_gottpoff=3Dno > > + fi > > + fi > > + rm -f conftest > > + else > > + echo "configure: failed program was" >&5 > > + cat conftest.s >&5 > > + fi > > + rm -f conftest.o conftest.s > > + fi > > +fi > > +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_x86_64_cod= e_6_gottpoff" >&5 > > +$as_echo "$gcc_cv_as_x86_64_code_6_gottpoff" >&6; } > > + > > + > > + > > +cat >>confdefs.h <<_ACEOF > > +#define HAVE_AS_R_X86_64_CODE_6_GOTTPOFF `if test x"$gcc_cv_as_x86_64_= code_6_gottpoff" =3D xyes; then echo 1; else echo 0; fi` > > +_ACEOF > > + > > + > > { $as_echo "$as_me:${as_lineno-$LINENO}: checking assembler for GO= TOFF in data" >&5 > > $as_echo_n "checking assembler for GOTOFF in data... " >&6; } > > if ${gcc_cv_as_ix86_gotoff_in_data+:} false; then : > > diff --git a/gcc/configure.ac b/gcc/configure.ac > > index 72012d61e67..0ae6a4c66f1 100644 > > --- a/gcc/configure.ac > > +++ b/gcc/configure.ac > > @@ -5057,6 +5057,43 @@ _start: > > [`if test x"$gcc_cv_as_ix86_got32x" =3D xyes; then echo 1; else = echo 0; fi`], > > [Define 0/1 if your assembler and linker support @GOT.]) > > > > + if echo "$ld_ver" | grep GNU > /dev/null; then > > + if $gcc_cv_ld -V 2>/dev/null | grep elf_x86_64_sol2 > /dev/null;= then > > + ld_ix86_gld_64_opt=3D"-melf_x86_64_sol2" > > + else > > + ld_ix86_gld_64_opt=3D"-melf_x86_64" > > + fi > > + fi > > + conftest_s=3D' > > + .text > > + .globl _start > > + .type _start, @function > > +_start: > > + addq %r23,foo@GOTTPOFF(%rip), %r15 > > + .section .tdata,"awT",@progbits > > + .type foo, @object > > +foo: > > + .quad 0' > > + gcc_GAS_CHECK_FEATURE([R_X86_64_CODE_6_GOTTPOFF reloc], > > + gcc_cv_as_x86_64_code_6_gottpoff,, > > + [$conftest_s], > > + [if test x$gcc_cv_ld !=3D x && test x$gcc_cv_objdump !=3D x \ > > + && test x$gcc_cv_readelf !=3D x \ > > + && $gcc_cv_readelf --relocs --wide conftest.o 2>&1 \ > > + | grep R_X86_64_CODE_6_GOTTPOFF > /dev/null 2>&1 \ > > + && $gcc_cv_ld $ld_ix86_gld_64_opt -o conftest conftest.o > = /dev/null 2>&1; then > > + if $gcc_cv_objdump -dw conftest 2>&1 \ > > + | grep "add \+\$0xf\+8,%r23,%r15" > /dev/null 2>&1; then > > + gcc_cv_as_x86_64_code_6_gottpoff=3Dyes > > + else > > + gcc_cv_as_x86_64_code_6_gottpoff=3Dno > > + fi > > + fi > > + rm -f conftest]) > > + AC_DEFINE_UNQUOTED(HAVE_AS_R_X86_64_CODE_6_GOTTPOFF, > > + [`if test x"$gcc_cv_as_x86_64_code_6_gottpoff" =3D xyes; then ec= ho 1; else echo 0; fi`], > > + [Define 0/1 if your assembler and linker support R_X86_64_CODE_6= _GOTTPOFF.]) > > + > > gcc_GAS_CHECK_FEATURE([GOTOFF in data], > > gcc_cv_as_ix86_gotoff_in_data, > > [$as_ix86_gas_32_opt], > > diff --git a/gcc/testsuite/gcc.target/i386/apx-ndd-tls-1b.c b/gcc/tests= uite/gcc.target/i386/apx-ndd-tls-1b.c > > new file mode 100644 > > index 00000000000..a3eb8106508 > > --- /dev/null > > +++ b/gcc/testsuite/gcc.target/i386/apx-ndd-tls-1b.c > > @@ -0,0 +1,9 @@ > > +/* PR target/113733 */ > > +/* { dg-do assemble { target { apxf && { ! ia32 } } } } */ > > +/* { dg-require-effective-target tls } */ > > +/* { dg-require-effective-target code_6_gottpoff_reloc } */ > > +/* { dg-options "-save-temps -mapxf -O3 -w" } */ > > + > > +#include "apx-ndd-tls-1a.c" > > + > > +/* { dg-final { scan-assembler-times "addq\[ \t]+%r\[a-z0-9\]+, a@gott= poff\\(%rip\\), %r\[a-z0-9\]+" 1 { target lp64 } } } */ > > diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/= target-supports.exp > > index 6f4e25f280c..8b3b39411b0 100644 > > --- a/gcc/testsuite/lib/target-supports.exp > > +++ b/gcc/testsuite/lib/target-supports.exp > > @@ -12241,6 +12241,54 @@ proc check_effective_target_pie_copyreloc { } = { > > }] > > } > > > > +# Return 1 if the x86-64 target supports R_X86_64_CODE_6_GOTTPOFF > > +# relocation, 0 otherwise. Cache the result. > > + > > +proc check_effective_target_code_6_gottpoff_reloc { } { > > + global tool > > + global GCC_UNDER_TEST > > + > > + if { !([istarget i?86-*-*] || [istarget x86_64-*-*]) } { > > + return 0 > > + } > > + > > + # Need auto-host.h to check linker support. > > + if { ![file exists ../../auto-host.h ] } { > > + return 0 > > + } > > + > > + return [check_cached_effective_target code_6_gottpoff_reloc { > > + # Include the current process ID in the file names to prevent > > + # conflicts with invocations for multiple testsuites. > > + > > + set src code_6_gottpoff[pid].c > > + set obj code_6_gottpoff[pid].o > > + > > + set f [open $src "w"] > > + puts $f "#include \"../../auto-host.h\"" > > + puts $f "#if HAVE_AS_R_X86_64_CODE_6_GOTTPOFF =3D=3D 0" > > + puts $f "# error Assembler does not support R_X86_64_CODE_6_GOT= TPOFF." > > + puts $f "#endif" > > + close $f > > + > > + verbose "check_effective_target_code_6_gottpoff_reloc compiling= testfile $src" 2 > > + set lines [${tool}_target_compile $src $obj object ""] > > + > > + file delete $src > > + file delete $obj > > + > > + if [string match "" $lines] then { > > + verbose "check_effective_target_code_6_gottpoff_reloc testf= ile compilation passed" 2 > > + return 1 > > + } else { > > + verbose "check_effective_target_code_6_gottpoff_reloc testf= ile compilation failed" 2 > > + return 0 > > + } > > + }] > > + > > + return $code_6_gottpoff_reloc_available_saved > > +} > > + > > # Return 1 if the x86 target supports R_386_GOT32X relocation, 0 > > # otherwise. Cache the result. > > > > -- > > 2.43.2 > > > > PING. > > -- > H.J. --=20 BR, Hongtao