From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by sourceware.org (Postfix) with ESMTPS id 58A6A385840C; Fri, 23 Feb 2024 10:12:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 58A6A385840C 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 58A6A385840C Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708683176; cv=none; b=ZhFaLUiEER44sOReWLwxw2Hkgtn0V56wJiqz6vTXvOhUnphfExaHJyUKjmdA0Tk63IBwTEAA9kKcSPOv1LCbeFLtKo6xMoEnYH/OeT894cs1ak2N0ujfOUKtPRoRIscqjLSHzYs6cs3uZwi90yP6V2klSkDu4duYZ+z4kWrkIAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1708683176; c=relaxed/simple; bh=ywTO4q7+YQB+opPxCWj3EmQPB3IuyL/zIkx3fmUN2Qs=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=nDcPO4xjg1LkPnBpNz+sFpadadurOzxxlwjMunw6zDoF84y7KlnOcQFtmCPnAqBgm0f8AQ1JZ2O2rh4vVTWNDHEIfV0Jxae11D5/Hud85cQBNF+cplYjbsxMqbwIb1NvErUhkgm2XCOtTAGMtnFCykaCmfYtcOnbhLjxxlVPF7A= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-56566dfeb3bso601029a12.3; Fri, 23 Feb 2024 02:12:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708683173; x=1709287973; 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=IGuSeUw5ElWsXVBYj4sFhJrENOy8bVbmxZWVtA+pjZ8=; b=hmLvgRO7+9onfo34fLrXhx0FXLMMg7t1wKqrSTS5GlPeXbWk7F9NZlAg2J4WAsstED HC7EjN/HP1drcFAR9dL18nSZahkvAdgyzP4+WlLtQ5CMVzsZ37ptabrJ6KMUFynp+kEg vuX9erhjMZRYiwryELp/NnL+Q+qgULasCfdHmaZ9jtathxQlYOhSb9DI6H2LjGmdOGRt /CbL8DTfxgwaNahYLawS69ybvnnumpVAmqzjfZFNSyIeJ07o5T2lvfzYtTXzsYGhpnAu SR/96W9BWGGyEPqmQfHEaN1r5cjjRQrFgxi+RGFSXC4LccnMx40QFsQ8hBUehbGVH+Hf YRMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708683173; x=1709287973; 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=IGuSeUw5ElWsXVBYj4sFhJrENOy8bVbmxZWVtA+pjZ8=; b=P557GtpbxytqnxdQwhXeq/2OWVv1Dz4cIyeoywEm4UassGH3Ztq21EI21KQBinnYgN VauPHeqsA7SzaYkPlgQuvfYhqFok4EbjWmEKqZi1FcYkzod7jyyz6Xtqt89wXMIaqw8M 1L2Uu23LhPcRYKA6mDtnAFSNERBsFIvpHyytHmbVaeND45ENcjtYQhXyB5tO/Aqqc5ko LJY2Yf104srucsctmPN52wBlMf7BBLHoWSuC9tqTkSlBGU7t5TJwYQo637i5cMZD7X0E uFROTBlWhRZBBQMlVZebodpvNCbQwof6dsN1Av/s5h1iEzHsEBe5ARKHk8wZD9tbJD/p lcUQ== X-Forwarded-Encrypted: i=1; AJvYcCWE/tzvLanZfOdTP/ZJH20C+vMrqgWiYk4Vq+4ODi7vWamDyS5In0cRqsWBwU/YlnQbpz65OylcA60xhRr82qxprlXH1zNabbgtCQDA89p6dY3dtUfcZjMK0t53 X-Gm-Message-State: AOJu0Yym8IVSsyYyHwy20QG8mhm3+Zb3rUeqfKBBQawObCABOS0zW5Bl ssgfACtIxG3VIkNaYNoiW3DZgVG118Qbs33cZrR4CrXsMOXAbq1ulYYvgZmdA8iEXkPK1avV/M8 3foj8diRA6hyA1x6KQSevWmS+lCr6m6KNnwM= X-Google-Smtp-Source: AGHT+IEOj5fMwNPZSM2BlwRaH1iysI4pITTh/yHWgqiM4cTullR3m/7KfORndocbGNauHmg7oZPiyszfjTWb3GGpqak= X-Received: by 2002:aa7:cd64:0:b0:565:1593:8131 with SMTP id ca4-20020aa7cd64000000b0056515938131mr838355edb.26.1708683172735; Fri, 23 Feb 2024 02:12:52 -0800 (PST) MIME-Version: 1.0 References: <20240218160214.154341-1-hjl.tools@gmail.com> In-Reply-To: From: Uros Bizjak Date: Fri, 23 Feb 2024 11:12:41 +0100 Message-ID: Subject: Re: PING: [PATCH] x86-64: Check R_X86_64_CODE_6_GOTTPOFF support To: "H.J. Lu" Cc: Hongtao Liu , aoliva@gcc.gnu.org, Jakub Jelinek , GCC Patches Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-8.6 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 Fri, Feb 23, 2024 at 3:45=E2=80=AFAM H.J. Lu wrote= : > > On Thu, Feb 22, 2024 at 6:39=E2=80=AFPM Hongtao Liu = wrote: > > > > On Thu, Feb 22, 2024 at 10:33=E2=80=AFPM H.J. Lu = wrote: > > > > > > On Sun, Feb 18, 2024 at 8:02=E2=80=AFAM H.J. Lu = wrote: > > > > > > > > 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 = files. > > Jakub, Uros, Alexandre, can you review the configure.ac change in this pa= tch? > > https://patchwork.sourceware.org/project/gcc/list/?series=3D31075 > > Thanks. > > > > > > > > > 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): A= llow > > > > 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= _GOTTPOFF. > > > > + */ > > > > +#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/predic= ates.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 oper= and > > > > -;; isn't allowed with APX NDD ADD. > > > > +;; is allowed with APX NDD ADD only if R_X86_64_CODE_6_GOTTPOFF wo= rks. > > > > (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/n= ull; 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 fo= r 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 conf= test.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; t= hen > > > > + 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= _code_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 fo= r GOTOFF 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; e= lse echo 0; fi`], > > > > [Define 0/1 if your assembler and linker support @GOT.]) Please add some comment here, and also check gas (as is the case with 32-bit enforcement): # Enforce 64-bit output with gas and gld. if test x$gas =3D xyes; then as_ix86_gas_64_opt=3D"--64" fi > > > > > > > > + if echo "$ld_ver" | grep GNU > /dev/null; then > > > > + if $gcc_cv_ld -V 2>/dev/null | grep elf_x86_64_sol2 > /dev/n= ull; 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, add here [$as_ix86_gas_64_opt], see many examples with as_ix86_gas_32_opt. > > > > + [$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; t= hen > > > > + 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; the= n echo 1; else echo 0; fi`], > > > > + [Define 0/1 if your assembler and linker support R_X86_64_CO= DE_6_GOTTPOFF.]) The above is similar to the check for HAVE_AS_IX86_GOT32X, so LGTM. Thanks, Uros.