mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-11 08:30:32 -05:00
9817ae4595
Re-running the `git repack -adfq` benchmark from
6a29c2dfec ("mingw: use mimalloc",
2019-06-24) against the platform's *current* default allocator (so
without `nedmalloc` in the picture at all) shows mimalloc is no longer
faster than the system allocator on any of Windows, macOS, or Linux,
neither for the original ~30-second `linux v2.6.20` workload nor for a
4x larger `linux v3.0` workload where each individual run takes ~2
minutes (and the noise floor on Linux is below 0.3% of the mean, so
even small differences would be visible if any existed).
`mimalloc` was originally chosen over nedmalloc, not over the system
allocator. Six years on, with nedmalloc now being dropped from the
codebase entirely, the allocator that mimalloc has to beat is whatever
the OS ships by default; modern Windows segment-heap, glibc malloc, and
the macOS libsystem allocator have all closed the gap, and there is no
longer a measurable benefit to keep maintaining a custom allocator.
The actual benchmark methodology, the per-platform numbers, and links
to the workflow runs that produced them are spelled out in the PR
description rather than repeated across each fixup.
The `fixup!` subject is so that the next rebase against an upstream
Git that already lacks this commit will autosquash this revert into
the original (which becomes empty and is dropped), leaving the tree
free of `mimalloc`.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
114 lines
3.7 KiB
Plaintext
114 lines
3.7 KiB
Plaintext
ifndef COMPILER_FEATURES
|
|
COMPILER_FEATURES := $(shell ./tools/detect-compiler $(CC))
|
|
endif
|
|
|
|
ifeq ($(filter no-error,$(DEVOPTS)),)
|
|
DEVELOPER_CFLAGS += -Werror
|
|
SPARSE_FLAGS += -Wsparse-error
|
|
endif
|
|
|
|
DEVELOPER_CFLAGS += -Wall
|
|
ifeq ($(filter no-pedantic,$(DEVOPTS)),)
|
|
DEVELOPER_CFLAGS += -pedantic
|
|
ifneq ($(or $(filter gcc5,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),)
|
|
DEVELOPER_CFLAGS += -Wpedantic
|
|
ifneq ($(filter gcc10,$(COMPILER_FEATURES)),)
|
|
ifeq ($(uname_S),MINGW)
|
|
DEVELOPER_CFLAGS += -Wno-pedantic-ms-format
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifneq ($(uname_S),FreeBSD)
|
|
ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),)
|
|
DEVELOPER_CFLAGS += -std=gnu99
|
|
endif
|
|
else
|
|
# FreeBSD cannot limit to C99 because its system headers unconditionally
|
|
# rely on C11 features.
|
|
endif
|
|
|
|
DEVELOPER_CFLAGS += -Wdeclaration-after-statement
|
|
DEVELOPER_CFLAGS += -Wformat-security
|
|
DEVELOPER_CFLAGS += -Wold-style-definition
|
|
DEVELOPER_CFLAGS += -Woverflow
|
|
DEVELOPER_CFLAGS += -Wpointer-arith
|
|
DEVELOPER_CFLAGS += -Wstrict-prototypes
|
|
DEVELOPER_CFLAGS += -Wunused
|
|
DEVELOPER_CFLAGS += -Wvla
|
|
DEVELOPER_CFLAGS += -Wwrite-strings
|
|
DEVELOPER_CFLAGS += -fno-common
|
|
DEVELOPER_CFLAGS += -Wunreachable-code
|
|
|
|
ifneq ($(filter clang9,$(COMPILER_FEATURES)),)
|
|
DEVELOPER_CFLAGS += -Wcomma
|
|
endif
|
|
|
|
ifneq ($(filter clang4,$(COMPILER_FEATURES)),)
|
|
DEVELOPER_CFLAGS += -Wtautological-constant-out-of-range-compare
|
|
endif
|
|
|
|
ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang4,$(COMPILER_FEATURES))),)
|
|
DEVELOPER_CFLAGS += -Wextra
|
|
# if a function is public, there should be a prototype and the right
|
|
# header file should be included. If not, it should be static.
|
|
DEVELOPER_CFLAGS += -Wmissing-prototypes
|
|
ifeq ($(filter extra-all,$(DEVOPTS)),)
|
|
# These are disabled because we have these all over the place.
|
|
DEVELOPER_CFLAGS += -Wno-empty-body
|
|
DEVELOPER_CFLAGS += -Wno-missing-field-initializers
|
|
endif
|
|
endif
|
|
|
|
# uninitialized warnings on gcc 4.9.2 in xdiff/xdiffi.c and config.c
|
|
# not worth fixing since newer compilers correctly stop complaining
|
|
#
|
|
# Likewise, gcc older than 4.9 complains about initializing a
|
|
# struct-within-a-struct using just "{ 0 }"
|
|
ifneq ($(filter gcc4,$(COMPILER_FEATURES)),)
|
|
ifeq ($(filter gcc5,$(COMPILER_FEATURES)),)
|
|
DEVELOPER_CFLAGS += -Wno-uninitialized
|
|
DEVELOPER_CFLAGS += -Wno-missing-braces
|
|
endif
|
|
endif
|
|
|
|
# Old versions of clang complain about initializing a
|
|
# struct-within-a-struct using just "{0}" rather than "{{0}}". This
|
|
# error is considered a false-positive and not worth fixing, because
|
|
# new clang versions do not, so just disable it.
|
|
#
|
|
# The "bug" was fixed in upstream clang 9.
|
|
#
|
|
# Complicating this is that versions of clang released by Apple have
|
|
# their own version numbers (associated with the corresponding version
|
|
# of XCode) unrelated to the official clang version numbers.
|
|
#
|
|
# The bug was fixed in Apple clang 12.
|
|
#
|
|
ifneq ($(filter clang1,$(COMPILER_FEATURES)),) # if we are using clang
|
|
ifeq ($(uname_S),Darwin) # if we are on darwin
|
|
ifeq ($(filter clang12,$(COMPILER_FEATURES)),) # if version < 12
|
|
DEVELOPER_CFLAGS += -Wno-missing-braces
|
|
endif
|
|
else # not darwin
|
|
ifeq ($(filter clang9,$(COMPILER_FEATURES)),) # if version < 9
|
|
DEVELOPER_CFLAGS += -Wno-missing-braces
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
# glibc 2.43 headers unconditionally use _Generic even when we ask the
|
|
# compiler to stick to -std=gnu99 and unlike GCC, clang lacks a
|
|
# workaround to squelch warnings from system headers.
|
|
ifneq ($(filter clang1,$(COMPILER_FEATURES)),) # if we are using clang
|
|
DEVELOPER_CFLAGS += -Wno-c11-extensions
|
|
endif
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2075786
|
|
ifneq ($(filter gcc12,$(COMPILER_FEATURES)),)
|
|
DEVELOPER_CFLAGS += -Wno-error=stringop-overread
|
|
endif
|
|
|
|
GIT_TEST_PERL_FATAL_WARNINGS = YesPlease
|