From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x82a.google.com (mail-qt1-x82a.google.com [IPv6:2607:f8b0:4864:20::82a]) by sourceware.org (Postfix) with ESMTPS id 6AD733858C27 for ; Tue, 19 Jan 2021 14:11:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6AD733858C27 Received: by mail-qt1-x82a.google.com with SMTP id z9so3788202qtv.6 for ; Tue, 19 Jan 2021 06:11:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=m2kT7OPdg0X+f4VtxrZKCl+USboK0tvW28PrLiYCQJI=; b=bal2nURSp0syJ2I79O8w5DwvNEWI4HW/+DAXtZ84Kk1xwD8ddGA2gUNcy138ns69zI j/R9GVoI/GjjUSnoHCFPWu42SFiK5TQ5J5iE1a/5Tdv9u9qCDLU5GeA/S7UKNtmzQIws Z7qaS/rQfRPo6XEk2VrDcFJXHxbDqb7ev4BT7XCFqBHlIcClPOSUYJCgBvrHF64k8Np6 WqagsFZMKcW5IYYlLHI8tN6nLC97XsGXokYG0uTktJEM3dxuxrNRiZEm6sQvbF/9RWID brm8GWW3zPPMX8pSsgqvNXHDNOUPGxNHBkm9sKBp9gRdhe7PZUZQiixW+QRvOZOdeRtW 2qNA== X-Gm-Message-State: AOAM530urb/gxTiXoyaHfaz1hW3sF/qqPjFvfd9grkbLHLFsfwPT9f/k dJgodJwPF6/oHzwlubTrTYl/cKrrq34Qlg== X-Google-Smtp-Source: ABdhPJxzOkp/LUE0yCqpAm1IApVSql/raIIeZ5oaJxH9h7KM57r2PPDud15oISBBtB/zutNIdOlVww== X-Received: by 2002:ac8:4553:: with SMTP id z19mr4276312qtn.278.1611065517642; Tue, 19 Jan 2021 06:11:57 -0800 (PST) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id c7sm12315261qtm.60.2021.01.19.06.11.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 19 Jan 2021 06:11:57 -0800 (PST) Subject: Re: [PATCH v4 09/10] x86: Check ifunc resolver with CPU_FEATURE_USABLE [BZ #27072] To: Szabolcs Nagy , libc-alpha@sourceware.org References: <9d9d859c0eb4060d631832291f927a9d8d9b52ba.1610986541.git.szabolcs.nagy@arm.com> From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= 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 Message-ID: <03665e96-1452-72ec-47ee-4a598472acfd@linaro.org> Date: Tue, 19 Jan 2021 11:11:54 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <9d9d859c0eb4060d631832291f927a9d8d9b52ba.1610986541.git.szabolcs.nagy@arm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-13.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2021 14:12:02 -0000 On 18/01/2021 13:25, Szabolcs Nagy via Libc-alpha wrote: > From: "H.J. Lu" > > Check ifunc resolver with CPU_FEATURE_USABLE and tunables in dynamic and > static executables to verify that CPUID features are initialized early in > static PIE. LGTM, thanks. Maybe refactor the tests to use a common file with the ifunc definitions, since both a copying and pasting similar code. Reviewed-by: Adhemerval Zanella > --- > sysdeps/x86/Makefile | 14 ++++ > sysdeps/x86/tst-ifunc-isa-1-static.c | 1 + > sysdeps/x86/tst-ifunc-isa-1.c | 115 ++++++++++++++++++++++++++ > sysdeps/x86/tst-ifunc-isa-2-static.c | 1 + > sysdeps/x86/tst-ifunc-isa-2.c | 119 +++++++++++++++++++++++++++ > 5 files changed, 250 insertions(+) > create mode 100644 sysdeps/x86/tst-ifunc-isa-1-static.c > create mode 100644 sysdeps/x86/tst-ifunc-isa-1.c > create mode 100644 sysdeps/x86/tst-ifunc-isa-2-static.c > create mode 100644 sysdeps/x86/tst-ifunc-isa-2.c > > diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile > index adaa2a92cd..f7969309bc 100644 > --- a/sysdeps/x86/Makefile > +++ b/sysdeps/x86/Makefile > @@ -9,6 +9,16 @@ sysdep_headers += sys/platform/x86.h > tests += tst-get-cpu-features tst-get-cpu-features-static \ > tst-cpu-features-cpuinfo tst-cpu-features-supports > tests-static += tst-get-cpu-features-static > +ifeq (yes,$(have-ifunc)) > +tests += \ > + tst-ifunc-isa-1 \ > + tst-ifunc-isa-1-static \ > + tst-ifunc-isa-2 \ > + tst-ifunc-isa-2-static > +tests-static += \ > + tst-ifunc-isa-1-static \ > + tst-ifunc-isa-2-static > +endif > ifeq (yes,$(enable-x86-isa-level)) > tests += tst-isa-level-1 > modules-names += tst-isa-level-mod-1-baseline \ > @@ -39,6 +49,10 @@ $(objpfx)tst-isa-level-1.out: $(objpfx)tst-isa-level-mod-1-baseline.so \ > $(objpfx)tst-isa-level-mod-1-v3.so \ > $(objpfx)tst-isa-level-mod-1-v4.so > endif > +ifneq ($(have-tunables),no) > +tst-ifunc-isa-2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-SSE4_2,-AVX,-AVX2,-AVX512F > +tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV) > +endif > endif > > ifeq ($(subdir),math) Ok. > diff --git a/sysdeps/x86/tst-ifunc-isa-1-static.c b/sysdeps/x86/tst-ifunc-isa-1-static.c > new file mode 100644 > index 0000000000..0e94f6119b > --- /dev/null > +++ b/sysdeps/x86/tst-ifunc-isa-1-static.c > @@ -0,0 +1 @@ > +#include "tst-ifunc-isa-1.c" Ok. > diff --git a/sysdeps/x86/tst-ifunc-isa-1.c b/sysdeps/x86/tst-ifunc-isa-1.c > new file mode 100644 > index 0000000000..b3bc2a55a2 > --- /dev/null > +++ b/sysdeps/x86/tst-ifunc-isa-1.c > @@ -0,0 +1,115 @@ > +/* Check ifunc with CPU_FEATURE_USABLE. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > + > +enum isa > +{ > + none, > + sse2, > + sse4_2, > + avx, > + avx2, > + avx512f > +}; > + > +enum isa > +get_isa (void) > +{ > + if (CPU_FEATURE_USABLE (AVX512F)) > + return avx512f; > + if (CPU_FEATURE_USABLE (AVX2)) > + return avx2; > + if (CPU_FEATURE_USABLE (AVX)) > + return avx; > + if (CPU_FEATURE_USABLE (SSE4_2)) > + return sse4_2; > + if (CPU_FEATURE_USABLE (SSE2)) > + return sse2; > + return none; > +} > + > +static int > +isa_sse2 (void) > +{ > + return sse2; > +} > + > +static int > +isa_sse4_2 (void) > +{ > + return sse4_2; > +} > + > +static int > +isa_avx (void) > +{ > + return avx; > +} > + > +static int > +isa_avx2 (void) > +{ > + return avx2; > +} > + > +static int > +isa_avx512f (void) > +{ > + return avx512f; > +} > + > +static int > +isa_none (void) > +{ > + return none; > +} > + > +int foo (void) __attribute__ ((ifunc ("foo_ifunc"))); > + > +void * > +foo_ifunc (void) > +{ > + switch (get_isa ()) > + { > + case avx512f: > + return isa_avx512f; > + case avx2: > + return isa_avx2; > + case avx: > + return isa_avx; > + case sse4_2: > + return isa_sse4_2; > + case sse2: > + return isa_sse2; > + default: > + break; > + } > + return isa_none; > +} > + > +static int > +do_test (void) > +{ > + enum isa value = foo (); > + enum isa expected = get_isa (); > + return value == expected ? EXIT_SUCCESS : EXIT_FAILURE; > +} > + > +#include Ok. > diff --git a/sysdeps/x86/tst-ifunc-isa-2-static.c b/sysdeps/x86/tst-ifunc-isa-2-static.c > new file mode 100644 > index 0000000000..4a5af9a270 > --- /dev/null > +++ b/sysdeps/x86/tst-ifunc-isa-2-static.c > @@ -0,0 +1 @@ > +#include "tst-ifunc-isa-2.c" Ok. > diff --git a/sysdeps/x86/tst-ifunc-isa-2.c b/sysdeps/x86/tst-ifunc-isa-2.c > new file mode 100644 > index 0000000000..bb0f76c3e4 > --- /dev/null > +++ b/sysdeps/x86/tst-ifunc-isa-2.c > @@ -0,0 +1,119 @@ > +/* Check ifunc with CPU_FEATURE_USABLE and tunables. > + Copyright (C) 2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > + > +enum isa > +{ > + none, > + sse2, > + sse4_2, > + avx, > + avx2, > + avx512f > +}; > + > +enum isa > +get_isa (void) > +{ > + if (CPU_FEATURE_USABLE (AVX512F)) > + return avx512f; > + if (CPU_FEATURE_USABLE (AVX2)) > + return avx2; > + if (CPU_FEATURE_USABLE (AVX)) > + return avx; > + if (CPU_FEATURE_USABLE (SSE4_2)) > + return sse4_2; > + if (CPU_FEATURE_USABLE (SSE2)) > + return sse2; > + return none; > +} > + > +static int > +isa_sse2 (void) > +{ > + return sse2; > +} > + > +static int > +isa_sse4_2 (void) > +{ > + return sse4_2; > +} > + > +static int > +isa_avx (void) > +{ > + return avx; > +} > + > +static int > +isa_avx2 (void) > +{ > + return avx2; > +} > + > +static int > +isa_avx512f (void) > +{ > + return avx512f; > +} > + > +static int > +isa_none (void) > +{ > + return none; > +} > + > +int foo (void) __attribute__ ((ifunc ("foo_ifunc"))); > + > +void * > +foo_ifunc (void) > +{ > + switch (get_isa ()) > + { > + case avx512f: > + return isa_avx512f; > + case avx2: > + return isa_avx2; > + case avx: > + return isa_avx; > + case sse4_2: > + return isa_sse4_2; > + case sse2: > + return isa_sse2; > + default: > + break; > + } > + return isa_none; > +} > + Maybe move this part to a common file? > +static int > +do_test (void) > +{ > + /* CPU must support SSE2. */ > + if (!__builtin_cpu_supports ("sse2")) > + return EXIT_UNSUPPORTED; > + enum isa value = foo (); > + /* All ISAs, but SSE2, are disabled by tunables. */ > + return value == sse2 ? EXIT_SUCCESS : EXIT_FAILURE; > +} > + > +#include > Ok.