mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
benchtests: Reformat Makefile.
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.
This commit is contained in:
parent
ebd928224a
commit
85c3569cf4
1 changed files with 32 additions and 15 deletions
|
@ -87,11 +87,12 @@ bench-math := \
|
||||||
truncf \
|
truncf \
|
||||||
y0 \
|
y0 \
|
||||||
y1 \
|
y1 \
|
||||||
|
# bench-math
|
||||||
|
|
||||||
ifneq (,$(filter yes,$(float96-fcts)))
|
ifneq (,$(filter yes,$(float96-fcts)))
|
||||||
bench-math += \
|
bench-math += \
|
||||||
cbrtl \
|
cbrtl \
|
||||||
# bench-math
|
# bench-math
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(filter yes,$(float128-fcts) $(float128-alias-fcts)))
|
ifneq (,$(filter yes,$(float128-fcts) $(float128-alias-fcts)))
|
||||||
|
@ -100,7 +101,7 @@ bench-math += \
|
||||||
ilogbf128 \
|
ilogbf128 \
|
||||||
powf128 \
|
powf128 \
|
||||||
sinf128 \
|
sinf128 \
|
||||||
# bench-math
|
# bench-math
|
||||||
endif
|
endif
|
||||||
|
|
||||||
bench-pthread := \
|
bench-pthread := \
|
||||||
|
@ -111,7 +112,7 @@ bench-pthread := \
|
||||||
pthread-spin-trylock \
|
pthread-spin-trylock \
|
||||||
pthread_once \
|
pthread_once \
|
||||||
thread_create \
|
thread_create \
|
||||||
# bench-pthread
|
# bench-pthread
|
||||||
|
|
||||||
LDLIBS-bench-pthread-mutex-lock += -lm
|
LDLIBS-bench-pthread-mutex-lock += -lm
|
||||||
LDLIBS-bench-pthread-mutex-trylock += -lm
|
LDLIBS-bench-pthread-mutex-trylock += -lm
|
||||||
|
@ -121,7 +122,7 @@ LDLIBS-bench-pthread-spin-trylock += -lm
|
||||||
bench-string := \
|
bench-string := \
|
||||||
ffs \
|
ffs \
|
||||||
ffsll \
|
ffsll \
|
||||||
# bench-string
|
# bench-string
|
||||||
|
|
||||||
# String function benchmarks.
|
# String function benchmarks.
|
||||||
string-benchset := \
|
string-benchset := \
|
||||||
|
@ -174,7 +175,7 @@ string-benchset := \
|
||||||
strspn \
|
strspn \
|
||||||
strstr \
|
strstr \
|
||||||
strtok \
|
strtok \
|
||||||
# string-benchset
|
# string-benchset
|
||||||
|
|
||||||
# Build and run locale-dependent benchmarks only if we're building natively.
|
# Build and run locale-dependent benchmarks only if we're building natively.
|
||||||
ifeq (no,$(cross-compiling))
|
ifeq (no,$(cross-compiling))
|
||||||
|
@ -199,7 +200,7 @@ wcsmbs-benchset := \
|
||||||
wmemchr \
|
wmemchr \
|
||||||
wmemcmp \
|
wmemcmp \
|
||||||
wmemset \
|
wmemset \
|
||||||
# wcsmbs-benchset
|
# wcsmbs-benchset
|
||||||
else
|
else
|
||||||
wcsmbs-benchset :=
|
wcsmbs-benchset :=
|
||||||
endif
|
endif
|
||||||
|
@ -233,7 +234,7 @@ LOCALES := \
|
||||||
tr_TR.UTF-8 \
|
tr_TR.UTF-8 \
|
||||||
vi_VN.UTF-8 \
|
vi_VN.UTF-8 \
|
||||||
zh_CN.UTF-8 \
|
zh_CN.UTF-8 \
|
||||||
# LOCALES
|
# LOCALES
|
||||||
include ../gen-locales.mk
|
include ../gen-locales.mk
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -241,7 +242,7 @@ hash-benchset := \
|
||||||
dl-elf-hash \
|
dl-elf-hash \
|
||||||
dl-new-hash \
|
dl-new-hash \
|
||||||
nss-hash \
|
nss-hash \
|
||||||
# hash-benchset
|
# hash-benchset
|
||||||
|
|
||||||
stdlib-benchset := \
|
stdlib-benchset := \
|
||||||
arc4random \
|
arc4random \
|
||||||
|
@ -253,8 +254,13 @@ stdio-common-benchset := sprintf
|
||||||
math-benchset := math-inlines
|
math-benchset := math-inlines
|
||||||
|
|
||||||
ifeq (${BENCHSET},)
|
ifeq (${BENCHSET},)
|
||||||
benchset := $(string-benchset-all) $(stdlib-benchset) $(stdio-common-benchset) \
|
benchset := \
|
||||||
$(math-benchset) $(hash-benchset)
|
$(hash-benchset) \
|
||||||
|
$(math-benchset) \
|
||||||
|
$(stdio-common-benchset) \
|
||||||
|
$(stdlib-benchset) \
|
||||||
|
$(string-benchset-all) \
|
||||||
|
# benchset
|
||||||
else
|
else
|
||||||
benchset := $(foreach B,$(filter %-benchset,${BENCHSET}), ${${B}})
|
benchset := $(foreach B,$(filter %-benchset,${BENCHSET}), ${${B}})
|
||||||
endif
|
endif
|
||||||
|
@ -275,7 +281,10 @@ CFLAGS-bench-isinf.c += $(config-cflags-signaling-nans)
|
||||||
CFLAGS-bench-isfinite.c += $(config-cflags-signaling-nans)
|
CFLAGS-bench-isfinite.c += $(config-cflags-signaling-nans)
|
||||||
|
|
||||||
ifeq (${BENCHSET},)
|
ifeq (${BENCHSET},)
|
||||||
bench-malloc := malloc-thread malloc-simple
|
bench-malloc := \
|
||||||
|
malloc-simple \
|
||||||
|
malloc-thread \
|
||||||
|
# bench-malloc
|
||||||
else
|
else
|
||||||
bench-malloc := $(filter malloc-%,${BENCHSET})
|
bench-malloc := $(filter malloc-%,${BENCHSET})
|
||||||
endif
|
endif
|
||||||
|
@ -352,7 +361,11 @@ include ../Rules
|
||||||
bench-math += $(bench-libmvec)
|
bench-math += $(bench-libmvec)
|
||||||
|
|
||||||
ifeq (${BENCHSET},)
|
ifeq (${BENCHSET},)
|
||||||
bench := $(bench-math) $(bench-pthread) $(bench-string)
|
bench := \
|
||||||
|
$(bench-math) \
|
||||||
|
$(bench-pthread) \
|
||||||
|
$(bench-string) \
|
||||||
|
# bench
|
||||||
else
|
else
|
||||||
bench := $(foreach B,$(filter bench-%,${BENCHSET}), ${${B}})
|
bench := $(foreach B,$(filter bench-%,${BENCHSET}), ${${B}})
|
||||||
endif
|
endif
|
||||||
|
@ -368,8 +381,12 @@ extra-objs += $(addsuffix .o,$(addprefix bench-,$(bench-malloc)))
|
||||||
|
|
||||||
# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
|
# This makes sure CPPFLAGS-nonlib and CFLAGS-nonlib are passed
|
||||||
# for all these modules.
|
# for all these modules.
|
||||||
cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
|
cpp-srcs-left := \
|
||||||
$(binaries-bench-malloc:=.c) $(timing-type:=.c)
|
$(binaries-bench-malloc:=.c) \
|
||||||
|
$(binaries-bench:=.c) \
|
||||||
|
$(binaries-benchset:=.c) \
|
||||||
|
$(timing-type:=.c) \
|
||||||
|
# cpp-srcs-left
|
||||||
lib := nonlib
|
lib := nonlib
|
||||||
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|
include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
|
||||||
|
|
||||||
|
@ -394,7 +411,7 @@ VALIDBENCHSETNAMES := \
|
||||||
stdlib-benchset \
|
stdlib-benchset \
|
||||||
string-benchset \
|
string-benchset \
|
||||||
wcsmbs-benchset \
|
wcsmbs-benchset \
|
||||||
# VALIDBENCHSETNAMES
|
# VALIDBENCHSETNAMES
|
||||||
|
|
||||||
INVALIDBENCHSETNAMES := $(filter-out ${VALIDBENCHSETNAMES},${BENCHSET})
|
INVALIDBENCHSETNAMES := $(filter-out ${VALIDBENCHSETNAMES},${BENCHSET})
|
||||||
ifneq (${INVALIDBENCHSETNAMES},)
|
ifneq (${INVALIDBENCHSETNAMES},)
|
||||||
|
|
Loading…
Add table
Reference in a new issue