rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Auto-sync with upstream branch master

Browse Source 
Upstream commit: 9469261cf1924d350feeec64d2c80cafbbdcdd4d

- Drop glibc-benchtests-aarch64.patch; fix applied upstream

- x86: Only align destination to 1x VEC_SIZE in memset 4x loop
- elf: Fix TLS modid reuse generation assignment (BZ 29039)
- Add TCP_MD5SIG_FLAG_IFINDEX from Linux 5.6 to netinet/tcp.h.
- elf: Relocate libc.so early during startup and dlmopen (bug 31083)
- elf: Introduce the _dl_open_relocate_one_object function
- elf: In _dl_relocate_object, skip processing if object is relocated
- Remove __access_noerrno
- malloc: Use __get_nprocs on arena_get2 (BZ 30945)
- aarch64: Fix libmvec benchmarks
This commit is contained in:
Arjun Shankar 2023-11-28 22:00:39 +01:00
parent 6f9b4d9d90
commit e1c3cc05d0
3 changed files with 18 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
glibc-benchtests-aarch64.patch
View File

@ -1,250 +0,0 @@
Author: Joe Ramsay <Joe.Ramsay@arm.com>
Date: Tue Nov 21 14:39:39 2023 +0000
aarch64: Fix libmvec benchmarks
These were broken by the new atan2 functions, as they were only
set up for univariate functions. Arity is now detected from the
input file - this revealed a mistake that the double-precision
inputs were being used for both single- and double-precision
routines, which is now remedied.
diff --git a/sysdeps/aarch64/fpu/scripts/bench_libmvec_advsimd.py b/sysdeps/aarch64/fpu/scripts/bench_libmvec_advsimd.py
index 3e124c781065fea9..3661a24044cc9770 100644
--- a/sysdeps/aarch64/fpu/scripts/bench_libmvec_advsimd.py
+++ b/sysdeps/aarch64/fpu/scripts/bench_libmvec_advsimd.py
@@ -22,40 +22,49 @@ TEMPLATE = """
#include <math.h>
#include <arm_neon.h>
-#define STRIDE {stride}
+#define STRIDE {rowlen}
-#define CALL_BENCH_FUNC(v, i) (__extension__ ({{ \\
- {rtype} mx0 = {fname}(vld1q_f{prec_short} (variants[v].in[i].arg0)); \\
+#define CALL_BENCH_FUNC_1(v, i) (__extension__ ({{ \\
+ {rtype} mx0 = {fname}(vld1q_f{prec_short} (&variants[v].in->arg0[i * STRIDE])); \\
mx0; }}))
-struct args
+#define CALL_BENCH_FUNC_2(v, i) (__extension__ ({{ \\
+ {rtype} mx0 = {fname}(vld1q_f{prec_short} (&variants[v].in->arg0[i * STRIDE]), \\
+ vld1q_f{prec_short} (&variants[v].in->arg1[i * STRIDE])); \\
+ mx0; }}))
+
+struct args_1
+{{
+ {stype} arg0[{nelems}];
+}};
+
+struct args_2
{{
- {stype} arg0[STRIDE];
- double timing;
+ {stype} arg0[{nelems}];
+ {stype} arg1[{nelems}];
}};
struct _variants
{{
const char *name;
- int count;
- const struct args *in;
+ const struct args_{arity} *in;
}};
-static const struct args in0[{rowcount}] = {{
+static const struct args_{arity} in0 = {{
{in_data}
}};
static const struct _variants variants[1] = {{
- {{"", {rowcount}, in0}},
+ {{"", &in0}},
}};
#define NUM_VARIANTS 1
-#define NUM_SAMPLES(i) (variants[i].count)
+#define NUM_SAMPLES(i) ({nelems} / STRIDE)
#define VARIANT(i) (variants[i].name)
static {rtype} volatile ret;
-#define BENCH_FUNC(i, j) ({{ ret = CALL_BENCH_FUNC(i, j); }})
+#define BENCH_FUNC(i, j) ({{ ret = CALL_BENCH_FUNC_{arity}(i, j); }})
#define FUNCNAME "{fname}"
#include <bench-libmvec-skeleton.c>
"""
@@ -63,27 +72,34 @@ static {rtype} volatile ret;
def main(name):
_, prec, _, func = name.split("-")
scalar_to_advsimd_type = {"double": "float64x2_t", "float": "float32x4_t"}
-
- stride = {"double": 2, "float": 4}[prec]
+ rowlen = {"double": 2, "float": 4}[prec]
rtype = scalar_to_advsimd_type[prec]
atype = scalar_to_advsimd_type[prec]
- fname = f"_ZGVnN{stride}v_{func}{'f' if prec == 'float' else ''}"
prec_short = {"double": 64, "float": 32}[prec]
-
- with open(f"../benchtests/libmvec/{func}-inputs") as f:
- in_vals = [l.strip() for l in f.readlines() if l and not l.startswith("#")]
- in_vals = [in_vals[i:i+stride] for i in range(0, len(in_vals), stride)]
- rowcount= len(in_vals)
- in_data = ",\n".join("{{" + ", ".join(row) + "}, 0}" for row in in_vals)
-
- print(TEMPLATE.format(stride=stride,
+ input_filename = {"double": f"{func}-inputs", "float": f"{func}f-inputs"}[prec]
+
+ with open(f"../benchtests/libmvec/{input_filename}") as f:
+ input_file = f.readlines()
+ in_vals = (l.strip() for l in input_file if l and not l.startswith("#"))
+ # Split in case of multivariate signature
+ in_vals = (l.split(", ") for l in in_vals)
+ # Transpose
+ in_vals = list(zip(*in_vals))
+ in_data = ",\n".join("{" + (", ".join(val for val in col) + "}")
+ for col in in_vals)
+
+ arity = [l for l in input_file if l.startswith("## args: ")][0].count(prec)
+ fname = f"_ZGVnN{rowlen}{'v' * arity}_{func}{'f' if prec == 'float' else ''}"
+
+ print(TEMPLATE.format(rowlen=rowlen,
rtype=rtype,
atype=atype,
fname=fname,
prec_short=prec_short,
in_data=in_data,
- rowcount=rowcount,
- stype=prec))
+ stype=prec,
+ arity=arity,
+ nelems=len(in_vals[0])))
if __name__ == "__main__":
diff --git a/sysdeps/aarch64/fpu/scripts/bench_libmvec_sve.py b/sysdeps/aarch64/fpu/scripts/bench_libmvec_sve.py
index 66f2c8e0f465f9ce..5d9332be9c5a536a 100755
--- a/sysdeps/aarch64/fpu/scripts/bench_libmvec_sve.py
+++ b/sysdeps/aarch64/fpu/scripts/bench_libmvec_sve.py
@@ -22,46 +22,55 @@ TEMPLATE = """
#include <math.h>
#include <arm_sve.h>
-#define MAX_STRIDE {max_stride}
#define STRIDE {stride}
#define PTRUE svptrue_b{prec_short}
#define SV_LOAD svld1_f{prec_short}
#define SV_STORE svst1_f{prec_short}
#define REQUIRE_SVE
-#define CALL_BENCH_FUNC(v, i) (__extension__ ({{ \\
- {rtype} mx0 = {fname}(SV_LOAD (PTRUE(), variants[v].in[i].arg0), PTRUE()); \\
+#define CALL_BENCH_FUNC_1(v, i) (__extension__ ({{ \\
+ {rtype} mx0 = {fname}(SV_LOAD (PTRUE(), &variants[v].in->arg0[i * STRIDE]), PTRUE()); \\
mx0; }}))
-struct args
+#define CALL_BENCH_FUNC_2(v, i) (__extension__ ({{ \\
+ {rtype} mx0 = {fname}(SV_LOAD (PTRUE(), &variants[v].in->arg0[i * STRIDE]), \\
+ SV_LOAD (PTRUE(), &variants[v].in->arg1[i * STRIDE]), \\
+ PTRUE()); \\
+ mx0; }}))
+
+struct args_1
{{
- {stype} arg0[MAX_STRIDE];
- double timing;
+ {stype} arg0[{nelems}];
+}};
+
+struct args_2
+{{
+ {stype} arg0[{nelems}];
+ {stype} arg1[{nelems}];
}};
struct _variants
{{
const char *name;
- int count;
- const struct args *in;
+ const struct args_{arity} *in;
}};
-static const struct args in0[{rowcount}] = {{
+static const struct args_{arity} in0 = {{
{in_data}
}};
static const struct _variants variants[1] = {{
- {{"", {rowcount}, in0}},
+ {{"", &in0}},
}};
#define NUM_VARIANTS 1
-#define NUM_SAMPLES(i) (variants[i].count)
+#define NUM_SAMPLES(i) ({nelems} / STRIDE)
#define VARIANT(i) (variants[i].name)
// Cannot pass volatile pointer to svst1. This still does not appear to get optimised out.
-static {stype} /*volatile*/ ret[MAX_STRIDE];
+static {stype} /*volatile*/ ret[{rowlen}];
-#define BENCH_FUNC(i, j) ({{ SV_STORE(PTRUE(), ret, CALL_BENCH_FUNC(i, j)); }})
+#define BENCH_FUNC(i, j) ({{ SV_STORE(PTRUE(), ret, CALL_BENCH_FUNC_{arity}(i, j)); }})
#define FUNCNAME "{fname}"
#include <bench-libmvec-skeleton.c>
"""
@@ -69,23 +78,29 @@ static {stype} /*volatile*/ ret[MAX_STRIDE];
def main(name):
_, prec, _, func = name.split("-")
scalar_to_sve_type = {"double": "svfloat64_t", "float": "svfloat32_t"}
-
stride = {"double": "svcntd()", "float": "svcntw()"}[prec]
rtype = scalar_to_sve_type[prec]
atype = scalar_to_sve_type[prec]
- fname = f"_ZGVsMxv_{func}{'f' if prec == 'float' else ''}"
prec_short = {"double": 64, "float": 32}[prec]
# Max SVE vector length is 2048 bits. To ensure benchmarks are
# vector-length-agnostic, but still use as wide vectors as
# possible on any given target, divide input data into 2048-bit
# rows, then load/store as many elements as the target will allow.
- max_stride = 2048 // prec_short
-
- with open(f"../benchtests/libmvec/{func}-inputs") as f:
- in_vals = [l.strip() for l in f.readlines() if l and not l.startswith("#")]
- in_vals = [in_vals[i:i+max_stride] for i in range(0, len(in_vals), max_stride)]
- rowcount= len(in_vals)
- in_data = ",\n".join("{{" + ", ".join(row) + "}, 0}" for row in in_vals)
+ rowlen = {"double": 32, "float": 64}[prec]
+ input_filename = {"double": f"{func}-inputs", "float": f"{func}f-inputs"}[prec]
+
+ with open(f"../benchtests/libmvec/{input_filename}") as f:
+ input_file = f.readlines()
+ in_vals = (l.strip() for l in input_file if l and not l.startswith("#"))
+ # Split in case of multivariate signature
+ in_vals = (l.split(", ") for l in in_vals)
+ # Transpose
+ in_vals = list(zip(*in_vals))
+ in_data = ",\n".join("{" + (", ".join(val for val in col) + "}")
+ for col in in_vals)
+
+ arity = [l for l in input_file if l.startswith("## args: ")][0].count(prec)
+ fname = f"_ZGVsMx{'v' * arity}_{func}{'f' if prec == 'float' else ''}"
print(TEMPLATE.format(stride=stride,
rtype=rtype,
@@ -93,9 +108,10 @@ def main(name):
fname=fname,
prec_short=prec_short,
in_data=in_data,
- rowcount=rowcount,
stype=prec,
- max_stride=max_stride))
+ rowlen=rowlen,
+ arity=arity,
+ nelems=len(in_vals[0])))
if __name__ == "__main__":

21
glibc.spec
View File

@ -1,4 +1,4 @@
%global glibcsrcdir glibc-2.38.9000-295-g5d7f1bce7d
%global glibcsrcdir glibc-2.38.9000-304-g9469261cf1
%global glibcversion 2.38.9000
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
@ -159,7 +159,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX).
%global baserelease 25
%global baserelease 26
Release: %{baserelease}%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
@ -230,8 +230,7 @@ Patch9: glibc-rh827510.patch
Patch13: glibc-fedora-localedata-rh61908.patch
Patch17: glibc-cs-path.patch
Patch23: glibc-python3.patch
Patch24: glibc-benchtests-aarch64.patch
Patch25: glibc-rh2248502.patch
Patch24: glibc-rh2248502.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -2202,6 +2201,20 @@ update_gconv_modules_cache ()
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog
* Tue Nov 28 2023 Arjun Shankar <arjun@redhat.com> - 2.38.9000-26
- Drop glibc-benchtests-aarch64.patch; fix applied upstream, and
- Auto-sync with upstream branch master,
commit 9469261cf1924d350feeec64d2c80cafbbdcdd4d:
- x86: Only align destination to 1x VEC_SIZE in memset 4x loop
- elf: Fix TLS modid reuse generation assignment (BZ 29039)
- Add TCP_MD5SIG_FLAG_IFINDEX from Linux 5.6 to netinet/tcp.h.
- elf: Relocate libc.so early during startup and dlmopen (bug 31083)
- elf: Introduce the _dl_open_relocate_one_object function
- elf: In _dl_relocate_object, skip processing if object is relocated
- Remove __access_noerrno
- malloc: Use __get_nprocs on arena_get2 (BZ 30945)
- aarch64: Fix libmvec benchmarks
* Mon Nov 27 2023 Florian Weimer <fweimer@redhat.com> - 2.38.9000-25
- Fix qsort workaround (#2248502)

2
sources
View File

@ -1 +1 @@
SHA512 (glibc-2.38.9000-295-g5d7f1bce7d.tar.xz) = 7e531ed030bef65198d86d9974dc280ea2897d3d89c0ceecdd2667470ce4418c42f5a1633927786c8a9f4d7d967cec2a462e4a6918dfb92fc419e5ec9ecf28e3
SHA512 (glibc-2.38.9000-304-g9469261cf1.tar.xz) = e30e3ac47f672a992a05ef591b6657784f5c474e66d7533c3ae6b492aa13e48408170884ebd215a59e180bb3a44942bdfe68ca34f3981a0274db23b9dce3ec09