From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by sourceware.org (Postfix) with ESMTPS id 5A76E3858D1E for ; Fri, 5 Apr 2024 21:35:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A76E3858D1E 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 5A76E3858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712352912; cv=none; b=wcDhV/8q4vzZ+FEdlBcJybl5Rq4zvNABmJq9o5lVwM4ufgnm0OIH5579tyDZJslc5uTI+xiUKx3kTfKXxJHFo5YsVmok9BTbyOQwlIqlRJcS+ug3ClI35ohEW5oEN7nNG7/IZ1XgJioQP+Nk4HtDH58pd8HlqSNyhhVfTuj1i8U= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712352912; c=relaxed/simple; bh=OcOARhoC1dduXqUHertqTTP+k7NhQ/Dbg8mqCkfvbMM=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=bXvmzQhfeb0DiuQefpqeUA0shPBs3wm5nx0qAMAC77zQY4v4JwAMP5Zvq+EAVVutMnLe7mzz7fglWmXQKJnRHNigQtu82vvnfjeJCjomnlwiJ03KrBrKRXlgItlSvhlB5NCBp8XZlwZpbt10tDO+La9o8Bm2X7ygR8IwUXf9TLs= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-3442f4e098bso81330f8f.1 for ; Fri, 05 Apr 2024 14:35:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712352908; x=1712957708; darn=sourceware.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=f+geYyyy3afni5AjQE1MNdyOohYo6erMX+I9mzceXkM=; b=G0bcSZudxEyNkCEDI3iM2OOAUap6nxhufk0PYxk6Q0jwWdT+zZoasV1TnU6tu3xTQb K7dwKOaKmlT3lB8v9cYRDRDWMfTgHRqGExrYzfkWgaTypLrRJUfwPl7cCBQTvrZwhGeZ xTvN7F9q2Irr24PRbb+sxJ5NLfveWmfobzUjdzIOE2nCgxgE7KYakH+T6tiRq39HEVzN qXpyyFG+ibdyKd/kU4zyxv6mOarP1jNAQjJA2VLzWnh/umCr+W2CNAhRcb/Op/a+zbun EJ7qO+HDWSjA7t3bCmUdbt4F3HLd0P4Hb03u/+MnqLoLMzwbx+keCEzqyamiG/OAx0/v ClIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712352908; x=1712957708; h=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=f+geYyyy3afni5AjQE1MNdyOohYo6erMX+I9mzceXkM=; b=kMiRrRwCXzBD63D3yk9YypSMo++D3/YxlgCK73i+qBMwJEvM338MVUgrUtwZ32SuS7 cGM2mkognde/7yzNiTM+1dVyzSp5yyMcMaKCp5mut1YqIujqwqVufwGnodYuoXDT7CWA loSDo7LmO+QvNT/hB2LvMqeaJ8os83OED+r9e9HMnznX/h00mfESer0MwnpTaamZTBKd 0soEwdPLAGAcRNPQUyo57V1kqsqZoso/6ajg9CMFTLrlXdIyaOlfWt9TbeYz4V5scgEc wZcqSlx6UBP3O191Dk+DvPF0tu7biGKzbi5b0YAezrNIi/VezsUyFV1JAB5sf9oowTJq yy2w== X-Gm-Message-State: AOJu0YxqlU92cfVI6ejuOfYj/+4LSVnDZwIkatCq6GkbMyRFDpcDknt+ KWL7AtFwdFBUZbL/5C8/55tD/sdWvDqt/pmXa/DHLC2/twDxQSY6R3IpVUAb9ocIWJOpWWV9MxK WGZE/dbM+f2R4FKipUkwhibSz/Aw= X-Google-Smtp-Source: AGHT+IFUC8eC5B28EctRDz+k4TsoXircM9nVlcVRKKSqMbgrBc8UeeeiK8valEpEL5VGa7vZOlmFT+h9Dfozn2Yhk2o= X-Received: by 2002:a5d:66c1:0:b0:343:7913:4221 with SMTP id k1-20020a5d66c1000000b0034379134221mr2969382wrw.11.1712352907810; Fri, 05 Apr 2024 14:35:07 -0700 (PDT) MIME-Version: 1.0 References: <20240404224350.1517977-1-hjl.tools@gmail.com> In-Reply-To: <20240404224350.1517977-1-hjl.tools@gmail.com> From: Sunil Pandey Date: Fri, 5 Apr 2024 14:34:31 -0700 Message-ID: Subject: Re: [PATCH] x86-64: Exclude FMA4 IFUNC functions for -mapxf To: "H.J. Lu" Cc: libc-alpha@sourceware.org, fweimer@redhat.com Content-Type: multipart/alternative; boundary="000000000000ccdffa0615603a46" X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_0,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,HTML_MESSAGE,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: --000000000000ccdffa0615603a46 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Apr 4, 2024 at 3:44=E2=80=AFPM H.J. Lu wrote: > When -mapxf is used to build glibc, the resulting glibc will never run > on FMA4 machines. Exclude FMA4 IFUNC functions when -mapxf is used. > This requires GCC which defines __APX_F__ for -mapxf with commit: > > 1df56719bd8 x86: Define __APX_F__ for -mapxf > --- > config.h.in | 3 ++ > sysdeps/x86_64/configure | 32 +++++++++++++++++++ > sysdeps/x86_64/configure.ac | 18 +++++++++++ > sysdeps/x86_64/fpu/multiarch/Makefile | 22 +++++++------ > sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h | 2 ++ > sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h | 2 ++ > 6 files changed, 70 insertions(+), 9 deletions(-) > > diff --git a/config.h.in b/config.h.in > index 4108d9d460..7b008420dc 100644 > --- a/config.h.in > +++ b/config.h.in > @@ -298,4 +298,7 @@ > /* Define if -mmovbe is enabled by default on x86. */ > #undef HAVE_X86_MOVBE > > +/* Define if -mapxf is enabled by default on x86. */ > +#undef HAVE_X86_APX > + > #endif > diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure > index 04a534fa12..07bdd40a37 100755 > --- a/sysdeps/x86_64/configure > +++ b/sysdeps/x86_64/configure > @@ -162,6 +162,38 @@ printf "%s\n" "$libc_cv_x86_have_amx_tile" >&6; } > config_vars=3D"$config_vars > have-mamx-tile =3D $libc_cv_x86_have_amx_tile" > > +# Check if -mapxf is enabled. > +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -mapxf is > enabled" >&5 > +printf %s "checking whether -mapxf is enabled... " >&6; } > +if test ${libc_cv_x86_have_apx+y} > +then : > + printf %s "(cached) " >&6 > +else $as_nop > + cat > conftest.c < +#ifndef __APX_F__ > +# error APX isn't enabled > +#endif > +EOF > + libc_cv_x86_have_apx=3Dno > + if { ac_try=3D'${CC-cc} -c $CFLAGS conftest.c -o conftest.o > 1>&5' > + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 > + (eval $ac_try) 2>&5 > + ac_status=3D$? > + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 > + test $ac_status =3D 0; }; }; then > + libc_cv_x86_have_apx=3Dyes > + fi > + rm -rf conftest* > +fi > +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: > $libc_cv_x86_have_apx" >&5 > +printf "%s\n" "$libc_cv_x86_have_apx" >&6; } > +if test $libc_cv_x86_have_apx =3D yes; then > + printf "%s\n" "#define HAVE_X86_APX 1" >>confdefs.h > + > +fi > +config_vars=3D"$config_vars > +have-x86-apx =3D $libc_cv_x86_have_apx" > + > test -n "$critic_missing" && as_fn_error $? " > *** $critic_missing" "$LINENO" 5 > > diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac > index c714c47351..c7b68544a2 100644 > --- a/sysdeps/x86_64/configure.ac > +++ b/sysdeps/x86_64/configure.ac > @@ -76,5 +76,23 @@ EOF > rm -rf conftest*]) > LIBC_CONFIG_VAR([have-mamx-tile], [$libc_cv_x86_have_amx_tile]) > > +# Check if -mapxf is enabled. > +AC_CACHE_CHECK(whether -mapxf is enabled, > + libc_cv_x86_have_apx, [dnl > +cat > conftest.c < +#ifndef __APX_F__ > +# error APX isn't enabled > +#endif > +EOF > + libc_cv_x86_have_apx=3Dno > + if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.c -o > conftest.o 1>&AS_MESSAGE_LOG_FD); then > + libc_cv_x86_have_apx=3Dyes > + fi > + rm -rf conftest*]) > +if test $libc_cv_x86_have_apx =3D yes; then > + AC_DEFINE(HAVE_X86_APX) > +fi > +LIBC_CONFIG_VAR([have-x86-apx], [$libc_cv_x86_have_apx]) > + > test -n "$critic_missing" && AC_MSG_ERROR([ > *** $critic_missing]) > diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile > b/sysdeps/x86_64/fpu/multiarch/Makefile > index 6ddd50240c..cbe09d49f4 100644 > --- a/sysdeps/x86_64/fpu/multiarch/Makefile > +++ b/sysdeps/x86_64/fpu/multiarch/Makefile > @@ -38,29 +38,36 @@ libm-sysdep_routines +=3D \ > s_truncf-avx \ > # libm-sysdep_routines > else > +ifeq (no,$(have-x86-apx)) > libm-sysdep_routines +=3D \ > - e_asin-fma \ > e_asin-fma4 \ > + e_atan2-fma4 \ > + e_exp-fma4 \ > + e_log-fma4 \ > + e_pow-fma4 \ > + s_atan-fma4 \ > + s_sin-fma4 \ > + s_sincos-fma4 \ > + s_tan-fma4 \ > +# libm-sysdep_routines > +endif > +libm-sysdep_routines +=3D \ > + e_asin-fma \ > e_atan2-avx \ > e_atan2-fma \ > - e_atan2-fma4 \ > e_exp-avx \ > e_exp-fma \ > - e_exp-fma4 \ > e_exp2f-fma \ > e_expf-fma \ > e_log-avx \ > e_log-fma \ > - e_log-fma4 \ > e_log2-fma \ > e_log2f-fma \ > e_logf-fma \ > e_pow-fma \ > - e_pow-fma4 \ > e_powf-fma \ > s_atan-avx \ > s_atan-fma \ > - s_atan-fma4 \ > s_ceil-sse4_1 \ > s_ceilf-sse4_1 \ > s_cosf-fma \ > @@ -77,17 +84,14 @@ libm-sysdep_routines +=3D \ > s_roundevenf-sse4_1 \ > s_sin-avx \ > s_sin-fma \ > - s_sin-fma4 \ > s_sincos-avx \ > s_sincos-fma \ > - s_sincos-fma4 \ > s_sincosf-fma \ > s_sincosf-sse2 \ > s_sinf-fma \ > s_sinf-sse2 \ > s_tan-avx \ > s_tan-fma \ > - s_tan-fma4 \ > s_trunc-sse4_1 \ > s_truncf-sse4_1 \ > # libm-sysdep_routines > diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h > b/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h > index 7719188888..d126cf9cd5 100644 > --- a/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h > +++ b/sysdeps/x86_64/fpu/multiarch/ifunc-avx-fma4.h > @@ -33,8 +33,10 @@ IFUNC_SELECTOR (void) > && CPU_FEATURE_USABLE_P (cpu_features, AVX2)) > return OPTIMIZE (fma); > > +#ifndef HAVE_X86_APX > if (CPU_FEATURE_USABLE_P (cpu_features, FMA4)) > return OPTIMIZE (fma4); > +#endif > > if (CPU_FEATURE_USABLE_P (cpu_features, AVX)) > return OPTIMIZE (avx); > diff --git a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h > b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h > index c35ba13845..18d372d25c 100644 > --- a/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h > +++ b/sysdeps/x86_64/fpu/multiarch/ifunc-fma4.h > @@ -32,8 +32,10 @@ IFUNC_SELECTOR (void) > && CPU_FEATURE_USABLE_P (cpu_features, AVX2)) > return OPTIMIZE (fma); > > +#ifndef HAVE_X86_APX > if (CPU_FEATURE_USABLE_P (cpu_features, FMA4)) > return OPTIMIZE (fma4); > +#endif > > return OPTIMIZE (sse2); > } > -- > 2.44.0 > > LGTM Reviewed-by: Sunil K Pandey --Sunil --000000000000ccdffa0615603a46--