From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by sourceware.org (Postfix) with ESMTPS id 92A30385AC3F for ; Wed, 27 Jul 2022 14:47:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 92A30385AC3F Received: by mail-pj1-x1035.google.com with SMTP id 15-20020a17090a098f00b001f305b453feso2447368pjo.1 for ; Wed, 27 Jul 2022 07:47:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=kEwz2qoxF951eSmmunWk2BO2BQreQIxuxLK3FsBUwHI=; b=iS6baPjniqa9x8CtPkdsCPWcxFCQjBexe7Kwzz5iUBZB4rvjnfsxXTTasZXukCcpbo qbDoD3GKbpCSmTjMF/GgysAozNvCdMcngJITDGqm9FGzuArJbKtAMxCiY+YVasdVkKKt 7Ov03DkSvMjZ3tE1xoffy+2yzkl+VtCz9qc0zrtSjnAol08qK7anPz0pLT7qEui5T7Tf fJAzDCQ+t2s9ovVH4tsC5gD6RQH0LamqDpvYpX02c53WsmhuAFCeiGj8W8k9ppvu3jXm RE6w6l5BzjWu5zCNr8+3jyxF81xk2g1f8YZ22X/W1qOrctCSAnyrgp3d8DEuasbBzJaO 3xmQ== X-Gm-Message-State: AJIora//NCzuJGkzdP3sbqSzC4arI999fLdamTVNXisxB+rbTI0559y7 PplukGtIw8Htc5xUVglDmV+zS77lfX8zxauQlrQWfYg4 X-Google-Smtp-Source: AGRyM1vm0ddlB9ELomanaFE/VJ+5WEDiBBRly9PY2LuXYv2x52wIeaGPiTj2wG4ir8wgjliJiJa2+YiVo+Q21bnINkw= X-Received: by 2002:a17:902:a502:b0:15e:c251:b769 with SMTP id s2-20020a170902a50200b0015ec251b769mr22252483plq.115.1658933239164; Wed, 27 Jul 2022 07:47:19 -0700 (PDT) MIME-Version: 1.0 References: <20220721185306.1497618-1-hjl.tools@gmail.com> In-Reply-To: <20220721185306.1497618-1-hjl.tools@gmail.com> From: "H.J. Lu" Date: Wed, 27 Jul 2022 07:46:43 -0700 Message-ID: Subject: PING [PATCH] x86: Add ix86_ifunc_ref_local_ok To: GCC Patches Cc: Uros Bizjak , liuhongt Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3024.8 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 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-List-Received-Date: Wed, 27 Jul 2022 14:47:23 -0000 On Thu, Jul 21, 2022 at 11:53 AM H.J. Lu wrote: > > We can't always use the PLT entry as the function address for local IFUNC > functions. When the PIC register is needed for PLT call, indirect call > via the PLT entry will fail since the PIC register may not be set up > properly for indirect call. Add ix86_ifunc_ref_local_ok to return false > when the PLT entry can't be used as local IFUNC function pointers. > > gcc/ > > PR target/83782 > * config/i386/i386.cc (ix86_ifunc_ref_local_ok): New. > (TARGET_IFUNC_REF_LOCAL_OK): Use it. > > gcc/testsuite/ > > PR target/83782 > * gcc.target/i386/pr83782-1.c: Require non-ia32. > * gcc.target/i386/pr83782-2.c: Likewise. > * gcc.target/i386/pr83782-3.c: New test. > --- > gcc/config/i386/i386.cc | 15 ++++++++++- > gcc/testsuite/gcc.target/i386/pr83782-1.c | 8 +++--- > gcc/testsuite/gcc.target/i386/pr83782-2.c | 4 +-- > gcc/testsuite/gcc.target/i386/pr83782-3.c | 32 +++++++++++++++++++++++ > 4 files changed, 50 insertions(+), 9 deletions(-) > create mode 100644 gcc/testsuite/gcc.target/i386/pr83782-3.c > > diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc > index e03f86d4a23..5e30dc884bf 100644 > --- a/gcc/config/i386/i386.cc > +++ b/gcc/config/i386/i386.cc > @@ -16070,6 +16070,19 @@ ix86_call_use_plt_p (rtx call_op) > return true; > } > > +/* Implement TARGET_IFUNC_REF_LOCAL_OK. If this hook returns true, > + the PLT entry will be used as the function address for local IFUNC > + functions. When the PIC register is needed for PLT call, indirect > + call via the PLT entry will fail since the PIC register may not be > + set up properly for indirect call. In this case, we should return > + false. */ > + > +static bool > +ix86_ifunc_ref_local_ok (void) > +{ > + return !flag_pic || (TARGET_64BIT && ix86_cmodel != CM_LARGE_PIC); > +} > + > /* Return true if the function being called was marked with attribute > "noplt" or using -fno-plt and we are compiling for non-PIC. We need > to handle the non-PIC case in the backend because there is no easy > @@ -24953,7 +24966,7 @@ ix86_libgcc_floating_mode_supported_p > ix86_get_multilib_abi_name > > #undef TARGET_IFUNC_REF_LOCAL_OK > -#define TARGET_IFUNC_REF_LOCAL_OK hook_bool_void_true > +#define TARGET_IFUNC_REF_LOCAL_OK ix86_ifunc_ref_local_ok > > #if !TARGET_MACHO && !TARGET_DLLIMPORT_DECL_ATTRIBUTES > # undef TARGET_ASM_RELOC_RW_MASK > diff --git a/gcc/testsuite/gcc.target/i386/pr83782-1.c b/gcc/testsuite/gcc.target/i386/pr83782-1.c > index ce97b12e65d..85674346aec 100644 > --- a/gcc/testsuite/gcc.target/i386/pr83782-1.c > +++ b/gcc/testsuite/gcc.target/i386/pr83782-1.c > @@ -1,4 +1,4 @@ > -/* { dg-do compile } */ > +/* { dg-do compile { target { ! ia32 } } } */ > /* { dg-require-ifunc "" } */ > /* { dg-options "-O2 -fpic" } */ > > @@ -20,7 +20,5 @@ bar(void) > return foo; > } > > -/* { dg-final { scan-assembler {leal[ \t]foo@GOTOFF\(%[^,]*\),[ \t]%eax} { target ia32 } } } */ > -/* { dg-final { scan-assembler {lea(?:l|q)[ \t]foo\(%rip\),[ \t]%(?:e|r)ax} { target { ! ia32 } } } } */ > -/* { dg-final { scan-assembler-not "foo@GOT\\\(" { target ia32 } } } */ > -/* { dg-final { scan-assembler-not "foo@GOTPCREL\\\(" { target { ! ia32 } } } } */ > +/* { dg-final { scan-assembler {lea(?:l|q)[ \t]foo\(%rip\),[ \t]%(?:e|r)ax} } } */ > +/* { dg-final { scan-assembler-not "foo@GOTPCREL\\\(" } } */ > diff --git a/gcc/testsuite/gcc.target/i386/pr83782-2.c b/gcc/testsuite/gcc.target/i386/pr83782-2.c > index e25d258bbda..a654ded771f 100644 > --- a/gcc/testsuite/gcc.target/i386/pr83782-2.c > +++ b/gcc/testsuite/gcc.target/i386/pr83782-2.c > @@ -1,4 +1,4 @@ > -/* { dg-do compile } */ > +/* { dg-do compile { target { ! ia32 } } } */ > /* { dg-require-ifunc "" } */ > /* { dg-options "-O2 -fpic" } */ > > @@ -20,7 +20,5 @@ bar(void) > return foo; > } > > -/* { dg-final { scan-assembler {leal[ \t]foo@GOTOFF\(%[^,]*\),[ \t]%eax} { target ia32 } } } */ > /* { dg-final { scan-assembler {lea(?:l|q)[ \t]foo\(%rip\),[ \t]%(?:e|r)ax} { target { ! ia32 } } } } */ > -/* { dg-final { scan-assembler-not "foo@GOT\\\(" { target ia32 } } } */ > /* { dg-final { scan-assembler-not "foo@GOTPCREL\\\(" { target { ! ia32 } } } } */ > diff --git a/gcc/testsuite/gcc.target/i386/pr83782-3.c b/gcc/testsuite/gcc.target/i386/pr83782-3.c > new file mode 100644 > index 00000000000..1536481cb79 > --- /dev/null > +++ b/gcc/testsuite/gcc.target/i386/pr83782-3.c > @@ -0,0 +1,32 @@ > +/* { dg-do run } */ > +/* { dg-require-ifunc "" } */ > +/* { dg-require-effective-target pie } */ > +/* { dg-options "-fpie -pie" } */ > + > +#include > + > +static int __attribute__((noinline)) > +implementation (void) > +{ > + printf ("'ere I am JH\n"); > + return 0; > +} > + > +static __typeof__ (implementation) *resolver (void) > +{ > + return (void *)implementation; > +} > + > +extern int magic (void) __attribute__ ((ifunc ("resolver"))); > + > +__attribute__ ((weak)) > +int > +call_magic (int (*ptr) (void)) > +{ > + return ptr (); > +} > + > +int main () > +{ > + return call_magic (magic); > +} > -- > 2.36.1 > PING. -- H.J.