From 37ecc657b22c3367a56df5ebd53908e34e65fa16 Mon Sep 17 00:00:00 2001 From: Noah Goldstein Date: Wed, 29 Jun 2022 16:07:06 -0700 Subject: x86: Add support for building {w}memset{_chk} with explicit ISA level 1. Refactor files so that all implementations are in the multiarch directory - Moved the implementation portion of memset sse2 from memset.S to multiarch/memset-sse2.S - The non-multiarch file now only includes one of the implementations in the multiarch directory based on the compiled ISA level (only used for non-multiarch builds. Otherwise we go through the ifunc selector). 2. Add ISA level build guards to different implementations. - I.e memset-avx2-unaligned-erms.S which is ISA level 3 will only build if compiled ISA level <= 3. Otherwise there is no reason to include it as we will always use one of the ISA level 4 implementations (memset-evex-unaligned-erms.S). 3. Add new multiarch/rtld-memset.S that just include the non-multiarch memset.S which will in turn select the best implementation based on the compiled ISA level. 4. Refactor the ifunc selector and ifunc implementation list to use the ISA level aware wrapper macros that allow functions below the compiled ISA level (with a guranteed replacement) to be skipped. Tested with and without multiarch on x86_64 for ISA levels: {generic, x86-64-v2, x86-64-v3, x86-64-v4} And m32 with and without multiarch. --- sysdeps/x86_64/multiarch/memset-evex-unaligned-erms.S | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'sysdeps/x86_64/multiarch/memset-evex-unaligned-erms.S') diff --git a/sysdeps/x86_64/multiarch/memset-evex-unaligned-erms.S b/sysdeps/x86_64/multiarch/memset-evex-unaligned-erms.S index 6370021506..ac4b2d2d50 100644 --- a/sysdeps/x86_64/multiarch/memset-evex-unaligned-erms.S +++ b/sysdeps/x86_64/multiarch/memset-evex-unaligned-erms.S @@ -1,4 +1,7 @@ -#if IS_IN (libc) +#include + +#if ISA_SHOULD_BUILD (4) + # define USE_WITH_EVEX 1 # define VEC_SIZE 32 @@ -30,8 +33,15 @@ # define WMEMSET_VDUP_TO_VEC0_LOW() # define SECTION(p) p##.evex + +#ifndef MEMSET_SYMBOL # define MEMSET_SYMBOL(p,s) p##_evex_##s +#endif +#ifndef WMEMSET_SYMBOL # define WMEMSET_SYMBOL(p,s) p##_evex_##s +#endif + + # define USE_LESS_VEC_MASK_STORE 1 # include "memset-vec-unaligned-erms.S" #endif -- cgit 1.4.1