From: Carlos O'Donell <carlos@redhat.com>
To: libc-alpha@sourceware.org
Cc: Carlos O'Donell <carlos@redhat.com>
Subject: [COMMITTED] benchtests: Reformat Makefile.
Date: Thu, 18 May 2023 13:39:47 -0400 [thread overview]
Message-ID: <20230518173947.511863-1-carlos@redhat.com> (raw)
Reflow all long lines adding comment terminators.
Sort all reflowed text using scripts/sort-makefile-lines.py.
No regressions running microbenchmarks.
No code generation changes observed in binary artifacts.
No regressions on x86_64 and i686.
---
benchtests/Makefile | 47 ++++++++++++++++++++++++++++++---------------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 5bd763a19d..e1346bbda1 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -87,11 +87,12 @@ bench-math := \
truncf \
y0 \
y1 \
+ # bench-math
ifneq (,$(filter yes,$(float96-fcts)))
bench-math += \
cbrtl \
-# bench-math
+ # bench-math
endif
ifneq (,$(filter yes,$(float128-fcts) $(float128-alias-fcts)))
@@ -100,7 +101,7 @@ bench-math += \
ilogbf128 \
powf128 \
sinf128 \
-# bench-math
+ # bench-math
endif
bench-pthread := \
@@ -111,7 +112,7 @@ bench-pthread := \
pthread-spin-trylock \
pthread_once \
thread_create \
-# bench-pthread
+ # bench-pthread
LDLIBS-bench-pthread-mutex-lock += -lm
LDLIBS-bench-pthread-mutex-trylock += -lm
@@ -121,7 +122,7 @@ LDLIBS-bench-pthread-spin-trylock += -lm
bench-string := \
ffs \
ffsll \
-# bench-string
+ # bench-string
# String function benchmarks.
string-benchset := \
@@ -174,7 +175,7 @@ string-benchset := \
strspn \
strstr \
strtok \
-# string-benchset
+ # string-benchset
# Build and run locale-dependent benchmarks only if we're building natively.
ifeq (no,$(cross-compiling))
@@ -199,7 +200,7 @@ wcsmbs-benchset := \
wmemchr \
wmemcmp \
wmemset \
-# wcsmbs-benchset
+ # wcsmbs-benchset
else
wcsmbs-benchset :=
endif
@@ -233,7 +234,7 @@ LOCALES := \
tr_TR.UTF-8 \
vi_VN.UTF-8 \
zh_CN.UTF-8 \
-# LOCALES
+ # LOCALES
include ../gen-locales.mk
endif
@@ -241,7 +242,7 @@ hash-benchset := \
dl-elf-hash \
dl-new-hash \
nss-hash \
-# hash-benchset
+ # hash-benchset
stdlib-benchset := \
arc4random \
@@ -253,8 +254,13 @@ stdio-common-benchset := sprintf
math-benchset := math-inlines
ifeq (${BENCHSET},)
-benchset := $(string-benchset-all) $(stdlib-benchset) $(stdio-common-benchset) \
- $(math-benchset) $(hash-benchset)
+benchset := \
+ $(hash-benchset) \
+ $(math-benchset) \
+ $(stdio-common-benchset) \
+ $(stdlib-benchset) \
+ $(string-benchset-all) \
+ # benchset
else
benchset := $(foreach B,$(filter %-benchset,${BENCHSET}), ${${B}})
endif
@@ -275,7 +281,10 @@ CFLAGS-bench-isinf.c += $(config-cflags-signaling-nans)
CFLAGS-bench-isfinite.c += $(config-cflags-signaling-nans)
ifeq (${BENCHSET},)
-bench-malloc := malloc-thread malloc-simple
+bench-malloc := \
+ malloc-simple \
+ malloc-thread \
+ # bench-malloc
else
bench-malloc := $(filter malloc-%,${BENCHSET})
endif
@@ -352,7 +361,11 @@ include ../Rules
bench-math += $(bench-libmvec)
ifeq (${BENCHSET},)
-bench := $(bench-math) $(bench-pthread) $(bench-string)
+bench := \
+ $(bench-math) \
+ $(bench-pthread) \
+ $(bench-string) \
+ # bench
else
bench := $(foreach B,$(filter bench-%,${BENCHSET}), ${${B}})
endif
@@ -368,8 +381,12 @@ extra-objs += $(addsuffix .o,$(addprefix bench-,$(bench-malloc)))
# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
# for all these modules.
-cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
- $(binaries-bench-malloc:=.c) $(timing-type:=.c)
+cpp-srcs-left := \
+ $(binaries-bench-malloc:=.c) \
+ $(binaries-bench:=.c) \
+ $(binaries-benchset:=.c) \
+ $(timing-type:=.c) \
+ # cpp-srcs-left
lib := nonlib
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
@@ -394,7 +411,7 @@ VALIDBENCHSETNAMES := \
stdlib-benchset \
string-benchset \
wcsmbs-benchset \
-# VALIDBENCHSETNAMES
+ # VALIDBENCHSETNAMES
INVALIDBENCHSETNAMES := $(filter-out ${VALIDBENCHSETNAMES},${BENCHSET})
ifneq (${INVALIDBENCHSETNAMES},)
--
2.40.0
reply other threads:[~2023-05-18 17:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230518173947.511863-1-carlos@redhat.com \
--to=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).