From patchwork Mon Nov 9 18:41:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 40979 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2A4FA3896C38; Mon, 9 Nov 2020 18:41:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A4FA3896C38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1604947295; bh=iQECaJCSdKgxXMu8eSxK7MuZS2stXm5EqNbW2Hc5EdU=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=PM1GUlqZ9P7zO9mIGdceR1QOWU/EsFaemlg6kuF3gIXdcIxbtfwPUz2R3E30PczmS Yixxv+7CEa9ZBh5IvT6lfvPw30P88e/DlAKsgjkRrWG58j/SORbZnR2ZBDwK9F81/u TJZDOSr8Vnqa2wx39f1MWk5+AKJFHaiiyoCn8Dh8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id F21E93894C17 for ; Mon, 9 Nov 2020 18:41:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F21E93894C17 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-251-RWUjJ8tOPee7w0-kYDYjlA-1; Mon, 09 Nov 2020 13:41:30 -0500 X-MC-Unique: RWUjJ8tOPee7w0-kYDYjlA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0759A8015A8 for ; Mon, 9 Nov 2020 18:41:29 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-113-222.ams2.redhat.com [10.36.113.222]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4CA3E19D7C for ; Mon, 9 Nov 2020 18:41:28 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 11/11] powerpc64le: Add glibc-hwcaps support In-Reply-To: References: Message-Id: <38719cefeb0737c1640f749177e6f0902890cf3d.1604946656.git.fweimer@redhat.com> Date: Mon, 09 Nov 2020 19:41:26 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The "power10" and "power9" subdirectories are selected in a way that matches the -mcpu=power10 and -mcpu=power9 options of GCC. Reviewed-by: Adhemerval Zanella --- elf/Makefile | 2 +- elf/tst-glibc-hwcaps-cache.script | 6 +++ sysdeps/powerpc/powerpc64/le/Makefile | 28 ++++++++++ .../powerpc/powerpc64/le/dl-hwcaps-subdirs.c | 46 ++++++++++++++++ .../powerpc/powerpc64/le/tst-glibc-hwcaps.c | 54 +++++++++++++++++++ 5 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 sysdeps/powerpc/powerpc64/le/dl-hwcaps-subdirs.c create mode 100644 sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c diff --git a/elf/Makefile b/elf/Makefile index 0a44b19a0e..60e8662e5d 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1826,7 +1826,7 @@ $(objpfx)argv0test.out: tst-rtld-argv0.sh $(objpfx)ld.so \ # Most likely search subdirectories, for each supported architecture. # Used to obtain test coverage wide test coverage. -glibc-hwcaps-first-subdirs-for-tests = x86-64-v2 +glibc-hwcaps-first-subdirs-for-tests = power9 x86-64-v2 # The test modules are parameterized by preprocessor macros. LDFLAGS-libmarkermod1-1.so += -Wl,-soname,libmarkermod1.so diff --git a/elf/tst-glibc-hwcaps-cache.script b/elf/tst-glibc-hwcaps-cache.script index 2aef9fb177..a3e3317bbf 100644 --- a/elf/tst-glibc-hwcaps-cache.script +++ b/elf/tst-glibc-hwcaps-cache.script @@ -10,3 +10,9 @@ mkdirp 0770 $L/glibc-hwcaps/x86-64-v4 cp $B/elf/libmarkermod4-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod4.so cp $B/elf/libmarkermod4-3.so $L/glibc-hwcaps/x86-64-v3/libmarkermod4.so cp $B/elf/libmarkermod4-4.so $L/glibc-hwcaps/x86-64-v4/libmarkermod4.so + +mkdirp 0770 $L/glibc-hwcaps/power9 +cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/power9/libmarkermod2.so +mkdirp 0770 $L/glibc-hwcaps/power10 +cp $B/elf/libmarkermod3-2.so $L/glibc-hwcaps/power9/libmarkermod3.so +cp $B/elf/libmarkermod3-3.so $L/glibc-hwcaps/power10/libmarkermod3.so diff --git a/sysdeps/powerpc/powerpc64/le/Makefile b/sysdeps/powerpc/powerpc64/le/Makefile index 033dc77b01..7c036b45fc 100644 --- a/sysdeps/powerpc/powerpc64/le/Makefile +++ b/sysdeps/powerpc/powerpc64/le/Makefile @@ -188,3 +188,31 @@ ifeq ($(subdir),nptl) CFLAGS-tst-thread_local1.cc += -mno-float128 CFLAGS-tst-minstack-throw.cc += -mno-float128 endif + +ifeq ($(subdir),elf) +$(objpfx)tst-glibc-hwcaps: \ + $(objpfx)libmarkermod2-1.so $(objpfx)libmarkermod3-1.so +$(objpfx)tst-glibc-hwcaps.out: \ + $(objpfx)libmarkermod2.so \ + $(objpfx)glibc-hwcaps/power9/libmarkermod2.so \ + $(objpfx)libmarkermod3.so \ + $(objpfx)glibc-hwcaps/power9/libmarkermod3.so \ + $(objpfx)glibc-hwcaps/power10/libmarkermod3.so \ + +$(objpfx)glibc-hwcaps/power9/libmarkermod2.so: $(objpfx)libmarkermod2-2.so + $(make-target-directory) + cp $< $@ +$(objpfx)glibc-hwcaps/power9/libmarkermod3.so: $(objpfx)libmarkermod3-2.so + $(make-target-directory) + cp $< $@ +$(objpfx)glibc-hwcaps/power10/libmarkermod3.so: $(objpfx)libmarkermod3-3.so + $(make-target-directory) + cp $< $@ + +ifeq (no,$(build-hardcoded-path-in-tests)) +# This is an ld.so.cache test, and RPATH/RUNPATH in the executable +# interferes with its test objectives. +tests-container += tst-glibc-hwcaps-cache +endif + +endif # $(subdir) == elf diff --git a/sysdeps/powerpc/powerpc64/le/dl-hwcaps-subdirs.c b/sysdeps/powerpc/powerpc64/le/dl-hwcaps-subdirs.c new file mode 100644 index 0000000000..0ce76c2fe5 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/le/dl-hwcaps-subdirs.c @@ -0,0 +1,46 @@ +/* Architecture-specific glibc-hwcaps subdirectories. powerpc64le version. + Copyright (C) 2020 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 + +const char _dl_hwcaps_subdirs[] = "power10:power9"; +enum { subdirs_count = 2 }; /* Number of components in _dl_hwcaps_subdirs. */ + +uint32_t +_dl_hwcaps_subdirs_active (void) +{ + int active = 0; + + /* Test in reverse preference order. Altivec and VSX are implied by + the powerpc64le ABI definition. */ + + /* POWER9. GCC enables float128 hardware support for -mcpu=power9. */ + if ((GLRO (dl_hwcap2) & PPC_FEATURE2_ARCH_3_00) == 0 + || (GLRO (dl_hwcap2) & PPC_FEATURE2_HAS_IEEE128) == 0) + return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active); + ++active; + + /* POWER10. GCC defines __MMA__ for -mcpu=power10. */ + if ((GLRO (dl_hwcap2) & PPC_FEATURE2_ARCH_3_1) == 0 + || (GLRO (dl_hwcap2) & PPC_FEATURE2_MMA) == 0) + return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active); + ++active; + + return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active); +} diff --git a/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c new file mode 100644 index 0000000000..e510fca80a --- /dev/null +++ b/sysdeps/powerpc/powerpc64/le/tst-glibc-hwcaps.c @@ -0,0 +1,54 @@ +/* glibc-hwcaps subdirectory test. powerpc64le version. + Copyright (C) 2020 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 +#include +#include + +extern int marker2 (void); +extern int marker3 (void); + +/* Return the POWER level, 8 for the baseline. */ +static int +compute_level (void) +{ + const char *platform = (const char *) getauxval (AT_PLATFORM); + if (strcmp (platform, "power8") == 0) + return 8; + if (strcmp (platform, "power9") == 0) + return 9; + if (strcmp (platform, "power10") == 0) + return 10; + printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform); + /* Assume that the new platform supports POWER10. */ + return 10; +} + +static int +do_test (void) +{ + int level = compute_level (); + printf ("info: detected POWER level: %d\n", level); + TEST_COMPARE (marker2 (), MIN (level - 7, 2)); + TEST_COMPARE (marker3 (), MIN (level - 7, 3)); + return 0; +} + +#include