mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 00:19:57 +00:00
5eddc29c92
The new IBM z16 is added to platform string array.
The macro _DL_PLATFORMS_COUNT is incremented.
_dl_hwcaps_subdir is extended by "z16" if HWCAP_S390_VXRS_PDE2
is set. HWCAP_S390_NNPA is not tested in _dl_hwcaps_subdirs_active
as those instructions may be replaced or removed in future.
tst-glibc-hwcaps.c is extended in order to test z16 via new marker5.
A fatal glibc error is dumped if glibc was build with architecture
level set for z16, but run on an older machine. (See dl-hwcap-check.h)
(cherry picked from commit 2376944b9e)
87 lines
2.8 KiB
C
87 lines
2.8 KiB
C
/* glibc-hwcaps subdirectory test. s390x version.
|
|
Copyright (C) 2020-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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <support/check.h>
|
|
#include <sys/auxv.h>
|
|
#include <sys/param.h>
|
|
|
|
extern int marker2 (void);
|
|
extern int marker3 (void);
|
|
extern int marker4 (void);
|
|
extern int marker5 (void);
|
|
|
|
/* Return the arch level, 10 for the baseline libmarkermod*.so's. */
|
|
static int
|
|
compute_level (void)
|
|
{
|
|
const char *platform = (const char *) getauxval (AT_PLATFORM);
|
|
|
|
/* The arch* versions refer to the edition of the Principles of
|
|
Operation, and they are off by two when compared with the recent
|
|
product names. (The code below should not be considered an
|
|
accurate mapping to Principles of Operation editions for earlier
|
|
AT_PLATFORM strings). */
|
|
if (strcmp (platform, "z900") == 0)
|
|
return 10;
|
|
if (strcmp (platform, "z990") == 0)
|
|
return 10;
|
|
if (strcmp (platform, "z9-109") == 0)
|
|
return 10;
|
|
if (strcmp (platform, "z10") == 0)
|
|
return 10;
|
|
if (strcmp (platform, "z196") == 0)
|
|
return 10;
|
|
if (strcmp (platform, "zEC12") == 0)
|
|
return 10;
|
|
|
|
/* If we are running on z13 or newer and the kernel was booted with novx,
|
|
then AT_PLATFORM is z13 or newer, but _dl_hwcaps_subdirs_active will
|
|
return zero and the _dl_hwcaps_subdirs are not searched. */
|
|
const unsigned long int hwcap = getauxval (AT_HWCAP);
|
|
if ((hwcap & HWCAP_S390_VX) == 0)
|
|
return 10;
|
|
|
|
if (strcmp (platform, "z13") == 0)
|
|
return 11;
|
|
if (strcmp (platform, "z14") == 0)
|
|
return 12;
|
|
if (strcmp (platform, "z15") == 0)
|
|
return 13;
|
|
if (strcmp (platform, "z16") == 0)
|
|
return 14;
|
|
printf ("warning: unrecognized AT_PLATFORM value: %s\n", platform);
|
|
/* Assume that the new platform supports z16. */
|
|
return 14;
|
|
}
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int level = compute_level ();
|
|
printf ("info: detected architecture level: arch%d\n", level);
|
|
TEST_COMPARE (marker2 (), MIN (level - 9, 2));
|
|
TEST_COMPARE (marker3 (), MIN (level - 9, 3));
|
|
TEST_COMPARE (marker4 (), MIN (level - 9, 4));
|
|
TEST_COMPARE (marker5 (), MIN (level - 9, 5));
|
|
return 0;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|