From 0c03cb54c808173d8e7ba96f6152dfcf627ac496 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Wed, 13 Apr 2022 14:36:09 +0200 Subject: [PATCH] S390: Add new s390 platform z16. 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 2376944b9e5c0364b9fb473e4d8dabca31b57167) --- elf/Makefile | 8 ++++++++ elf/tst-glibc-hwcaps-cache.script | 6 ++++++ sysdeps/s390/dl-procinfo.c | 5 +++-- sysdeps/s390/dl-procinfo.h | 2 +- sysdeps/s390/s390-64/Makefile | 25 ++++++++++++++++++++++-- sysdeps/s390/s390-64/dl-hwcap-check.h | 6 +++++- sysdeps/s390/s390-64/dl-hwcaps-subdirs.c | 11 +++++++++-- sysdeps/s390/s390-64/tst-glibc-hwcaps.c | 8 ++++++-- 8 files changed, 61 insertions(+), 10 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index fe954374c9..3ce0b7298f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -555,6 +555,11 @@ modules-names = \ libmarkermod4-2 \ libmarkermod4-3 \ libmarkermod4-4 \ + libmarkermod5-1 \ + libmarkermod5-2 \ + libmarkermod5-3 \ + libmarkermod5-4 \ + libmarkermod5-5 \ ltglobmod1 \ ltglobmod2 \ neededobj1 \ @@ -2368,6 +2373,7 @@ LDFLAGS-libmarkermod1-1.so += -Wl,-soname,libmarkermod1.so LDFLAGS-libmarkermod2-1.so += -Wl,-soname,libmarkermod2.so LDFLAGS-libmarkermod3-1.so += -Wl,-soname,libmarkermod3.so LDFLAGS-libmarkermod4-1.so += -Wl,-soname,libmarkermod4.so +LDFLAGS-libmarkermod5-1.so += -Wl,-soname,libmarkermod5.so $(objpfx)libmarkermod%.os : markermodMARKER-VALUE.c $(compile-command.c) \ -DMARKER=marker$(firstword $(subst -, ,$*)) \ @@ -2380,6 +2386,8 @@ $(objpfx)libmarkermod3.so: $(objpfx)libmarkermod3-1.so cp $< $@ $(objpfx)libmarkermod4.so: $(objpfx)libmarkermod4-1.so cp $< $@ +$(objpfx)libmarkermod5.so: $(objpfx)libmarkermod5-1.so + cp $< $@ # tst-glibc-hwcaps-prepend checks that --glibc-hwcaps-prepend is # preferred over auto-detected subdirectories. diff --git a/elf/tst-glibc-hwcaps-cache.script b/elf/tst-glibc-hwcaps-cache.script index c3271f61f9..d58fc8c5de 100644 --- a/elf/tst-glibc-hwcaps-cache.script +++ b/elf/tst-glibc-hwcaps-cache.script @@ -4,6 +4,7 @@ cp $B/elf/libmarkermod2-1.so $L/libmarkermod2.so cp $B/elf/libmarkermod3-1.so $L/libmarkermod3.so cp $B/elf/libmarkermod4-1.so $L/libmarkermod4.so +cp $B/elf/libmarkermod5-1.so $L/libmarkermod5.so mkdirp 0770 $L/glibc-hwcaps/power9 cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/power9/libmarkermod2.so @@ -20,6 +21,11 @@ mkdirp 0770 $L/glibc-hwcaps/z15 cp $B/elf/libmarkermod4-2.so $L/glibc-hwcaps/z13/libmarkermod4.so cp $B/elf/libmarkermod4-3.so $L/glibc-hwcaps/z14/libmarkermod4.so cp $B/elf/libmarkermod4-4.so $L/glibc-hwcaps/z15/libmarkermod4.so +mkdirp 0770 $L/glibc-hwcaps/z16 +cp $B/elf/libmarkermod5-2.so $L/glibc-hwcaps/z13/libmarkermod5.so +cp $B/elf/libmarkermod5-3.so $L/glibc-hwcaps/z14/libmarkermod5.so +cp $B/elf/libmarkermod5-4.so $L/glibc-hwcaps/z15/libmarkermod5.so +cp $B/elf/libmarkermod5-5.so $L/glibc-hwcaps/z16/libmarkermod5.so mkdirp 0770 $L/glibc-hwcaps/x86-64-v2 cp $B/elf/libmarkermod2-2.so $L/glibc-hwcaps/x86-64-v2/libmarkermod2.so diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c index 155f0bd99e..755b54ff13 100644 --- a/sysdeps/s390/dl-procinfo.c +++ b/sysdeps/s390/dl-procinfo.c @@ -64,11 +64,12 @@ PROCINFO_CLASS const char _dl_s390_cap_flags[23][9] #if !defined PROCINFO_DECL && defined SHARED ._dl_s390_platforms #else -PROCINFO_CLASS const char _dl_s390_platforms[10][7] +PROCINFO_CLASS const char _dl_s390_platforms[11][7] #endif #ifndef PROCINFO_DECL = { - "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15" + "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15", + "z16" } #endif #if !defined SHARED || defined PROCINFO_DECL diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index e4e3e334a5..d44e1dd974 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -23,7 +23,7 @@ #define _DL_HWCAP_COUNT 23 -#define _DL_PLATFORMS_COUNT 10 +#define _DL_PLATFORMS_COUNT 11 /* The kernel provides up to 32 capability bits with elf_hwcap. */ #define _DL_FIRST_PLATFORM 32 diff --git a/sysdeps/s390/s390-64/Makefile b/sysdeps/s390/s390-64/Makefile index e5da26871c..66ed844e68 100644 --- a/sysdeps/s390/s390-64/Makefile +++ b/sysdeps/s390/s390-64/Makefile @@ -7,8 +7,11 @@ CFLAGS-rtld.c += -Wno-uninitialized -Wno-unused CFLAGS-dl-load.c += -Wno-unused CFLAGS-dl-reloc.c += -Wno-unused -$(objpfx)tst-glibc-hwcaps: $(objpfx)libmarkermod2-1.so \ - $(objpfx)libmarkermod3-1.so $(objpfx)libmarkermod4-1.so +$(objpfx)tst-glibc-hwcaps: \ + $(objpfx)libmarkermod2-1.so \ + $(objpfx)libmarkermod3-1.so \ + $(objpfx)libmarkermod4-1.so \ + $(objpfx)libmarkermod5-1.so $(objpfx)tst-glibc-hwcaps.out: \ $(objpfx)libmarkermod2.so \ $(objpfx)glibc-hwcaps/z13/libmarkermod2.so \ @@ -19,6 +22,11 @@ $(objpfx)tst-glibc-hwcaps.out: \ $(objpfx)glibc-hwcaps/z13/libmarkermod4.so \ $(objpfx)glibc-hwcaps/z14/libmarkermod4.so \ $(objpfx)glibc-hwcaps/z15/libmarkermod4.so \ + $(objpfx)libmarkermod5.so \ + $(objpfx)glibc-hwcaps/z13/libmarkermod5.so \ + $(objpfx)glibc-hwcaps/z14/libmarkermod5.so \ + $(objpfx)glibc-hwcaps/z15/libmarkermod5.so \ + $(objpfx)glibc-hwcaps/z16/libmarkermod5.so $(objpfx)glibc-hwcaps/z13/libmarkermod2.so: $(objpfx)libmarkermod2-2.so $(make-target-directory) @@ -38,6 +46,19 @@ $(objpfx)glibc-hwcaps/z14/libmarkermod4.so: $(objpfx)libmarkermod4-3.so $(objpfx)glibc-hwcaps/z15/libmarkermod4.so: $(objpfx)libmarkermod4-4.so $(make-target-directory) cp $< $@ +$(objpfx)glibc-hwcaps/z13/libmarkermod5.so: $(objpfx)libmarkermod5-2.so + $(make-target-directory) + cp $< $@ +$(objpfx)glibc-hwcaps/z14/libmarkermod5.so: $(objpfx)libmarkermod5-3.so + $(make-target-directory) + cp $< $@ +$(objpfx)glibc-hwcaps/z15/libmarkermod5.so: $(objpfx)libmarkermod5-4.so + $(make-target-directory) + cp $< $@ +$(objpfx)glibc-hwcaps/z16/libmarkermod5.so: $(objpfx)libmarkermod5-5.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 diff --git a/sysdeps/s390/s390-64/dl-hwcap-check.h b/sysdeps/s390/s390-64/dl-hwcap-check.h index 87e18be6bd..7372da870d 100644 --- a/sysdeps/s390/s390-64/dl-hwcap-check.h +++ b/sysdeps/s390/s390-64/dl-hwcap-check.h @@ -25,7 +25,11 @@ static inline void dl_hwcap_check (void) { #if defined __ARCH__ -# if __ARCH__ >= 13 +# if __ARCH__ >= 14 + if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_PDE2)) + _dl_fatal_printf ("\ +Fatal glibc error: CPU lacks VXRS_PDE2 support (z16 or later required)\n"); +# elif __ARCH__ >= 13 if (!(GLRO(dl_hwcap) & HWCAP_S390_VXRS_EXT2)) _dl_fatal_printf ("\ Fatal glibc error: CPU lacks VXRS_EXT2 support (z15 or later required)\n"); diff --git a/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c b/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c index b9d094f3d7..187d732d56 100644 --- a/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c +++ b/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c @@ -19,8 +19,8 @@ #include #include -const char _dl_hwcaps_subdirs[] = "z15:z14:z13"; -enum { subdirs_count = 3 }; /* Number of components in _dl_hwcaps_subdirs. */ +const char _dl_hwcaps_subdirs[] = "z16:z15:z14:z13"; +enum { subdirs_count = 4 }; /* Number of components in _dl_hwcaps_subdirs. */ uint32_t _dl_hwcaps_subdirs_active (void) @@ -50,5 +50,12 @@ _dl_hwcaps_subdirs_active (void) return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active); ++active; + /* z16. + Note: We do not list HWCAP_S390_NNPA here as, according to the Principles of + Operation, those instructions may be replaced or removed in future. */ + if (!(GLRO (dl_hwcap) & HWCAP_S390_VXRS_PDE2)) + return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active); + ++active; + return _dl_hwcaps_subdirs_build_bitmask (subdirs_count, active); } diff --git a/sysdeps/s390/s390-64/tst-glibc-hwcaps.c b/sysdeps/s390/s390-64/tst-glibc-hwcaps.c index 02397a478c..f3b8ef3dec 100644 --- a/sysdeps/s390/s390-64/tst-glibc-hwcaps.c +++ b/sysdeps/s390/s390-64/tst-glibc-hwcaps.c @@ -25,6 +25,7 @@ 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 @@ -63,9 +64,11 @@ compute_level (void) 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 z15. */ - return 13; + /* Assume that the new platform supports z16. */ + return 14; } static int @@ -76,6 +79,7 @@ do_test (void) 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; }