Skip to content

Commit dae6e96

Browse files
dschoGit for Windows Build Agent
authored andcommitted
mimalloc: offer a build-time option to enable it
By defining `USE_MIMALLOC`, Git can now be compiled with that nicely-fast and small allocator. Note that we have to disable a couple `DEVELOPER` options to build mimalloc's source code, as it makes heavy use of declarations after statements, among other things that disagree with Git's conventions. We even have to silence some GCC warnings in non-DEVELOPER mode. For example, the `-Wno-array-bounds` flag is needed because in `-O2` builds, trying to call `NtCurrentTeb()` (which `_mi_thread_id()` does on Windows) causes the bogus warning about a system header, likely related to https://sourceforge.net/p/mingw-w64/mailman/message/37674519/ and to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578: C:/git-sdk-64-minimal/mingw64/include/psdk_inc/intrin-impl.h:838:1: error: array subscript 0 is outside array bounds of 'long long unsigned int[0]' [-Werror=array-bounds] 838 | __buildreadseg(__readgsqword, unsigned __int64, "gs", "q") | ^~~~~~~~~~~~~~ Also: The `mimalloc` library uses C11-style atomics, therefore we must require that standard when compiling with GCC if we want to use `mimalloc` (instead of requiring "only" C99). This is what we do in the CMake definition already, therefore this commit does not need to touch `contrib/buildsystems/`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent 8437789 commit dae6e96

5 files changed

Lines changed: 55 additions & 1 deletion

File tree

Makefile

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1512,6 +1512,7 @@ BUILTIN_OBJS += builtin/write-tree.o
15121512
# upstream unnecessarily (making merging in future changes easier).
15131513
THIRD_PARTY_SOURCES += compat/inet_ntop.c
15141514
THIRD_PARTY_SOURCES += compat/inet_pton.c
1515+
THIRD_PARTY_SOURCES += compat/mimalloc/%
15151516
THIRD_PARTY_SOURCES += compat/nedmalloc/%
15161517
THIRD_PARTY_SOURCES += compat/obstack.%
15171518
THIRD_PARTY_SOURCES += compat/poll/%
@@ -2278,6 +2279,46 @@ ifdef USE_NED_ALLOCATOR
22782279
OVERRIDE_STRDUP = YesPlease
22792280
endif
22802281

2282+
ifdef USE_MIMALLOC
2283+
MIMALLOC_OBJS = \
2284+
compat/mimalloc/alloc-aligned.o \
2285+
compat/mimalloc/alloc.o \
2286+
compat/mimalloc/arena.o \
2287+
compat/mimalloc/bitmap.o \
2288+
compat/mimalloc/heap.o \
2289+
compat/mimalloc/init.o \
2290+
compat/mimalloc/libc.o \
2291+
compat/mimalloc/options.o \
2292+
compat/mimalloc/os.o \
2293+
compat/mimalloc/page.o \
2294+
compat/mimalloc/random.o \
2295+
compat/mimalloc/prim/prim.o \
2296+
compat/mimalloc/segment.o \
2297+
compat/mimalloc/segment-map.o \
2298+
compat/mimalloc/stats.o
2299+
2300+
COMPAT_CFLAGS += -Icompat/mimalloc -DMI_DEBUG=0 -DUSE_MIMALLOC --std=gnu11
2301+
COMPAT_OBJS += $(MIMALLOC_OBJS)
2302+
2303+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += -DBANNED_H
2304+
2305+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2306+
-DMI_WIN_USE_FLS \
2307+
-Wno-attributes \
2308+
-Wno-unknown-pragmas \
2309+
-Wno-unused-function \
2310+
-Wno-array-bounds
2311+
2312+
ifdef DEVELOPER
2313+
$(MIMALLOC_OBJS): COMPAT_CFLAGS += \
2314+
-Wno-pedantic \
2315+
-Wno-declaration-after-statement \
2316+
-Wno-old-style-definition \
2317+
-Wno-missing-prototypes \
2318+
-Wno-implicit-function-declaration
2319+
endif
2320+
endif
2321+
22812322
ifdef OVERRIDE_STRDUP
22822323
COMPAT_CFLAGS += -DOVERRIDE_STRDUP
22832324
COMPAT_OBJS += compat/strdup.o

compat/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/zlib-uncompress2.c whitespace=-indent-with-non-tab,-trailing-space
2+
/mimalloc/**/* whitespace=-trailing-space

compat/posix.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,16 @@ typedef unsigned long uintptr_t;
179179
#define _ALL_SOURCE 1
180180
#endif
181181

182+
#ifdef USE_MIMALLOC
183+
#include "mimalloc.h"
184+
#define malloc mi_malloc
185+
#define calloc mi_calloc
186+
#define realloc mi_realloc
187+
#define free mi_free
188+
#define strdup mi_strdup
189+
#define strndup mi_strndup
190+
#endif
191+
182192
#ifdef MKDIR_WO_TRAILING_SLASH
183193
#define mkdir(a,b) compat_mkdir_wo_trailing_slash((a),(b))
184194
int compat_mkdir_wo_trailing_slash(const char*, mode_t);

config.mak.dev

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ endif
2222

2323
ifneq ($(uname_S),FreeBSD)
2424
ifneq ($(or $(filter gcc6,$(COMPILER_FEATURES)),$(filter clang7,$(COMPILER_FEATURES))),)
25+
ifndef USE_MIMALLOC
2526
DEVELOPER_CFLAGS += -std=gnu99
2627
endif
28+
endif
2729
else
2830
# FreeBSD cannot limit to C99 because its system headers unconditionally
2931
# rely on C11 features.

config.mak.uname

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ endif
521521
CC = compat/vcbuild/scripts/clink.pl
522522
AR = compat/vcbuild/scripts/lib.pl
523523
CFLAGS =
524-
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE
524+
BASIC_CFLAGS = -nologo -I. -Icompat/vcbuild/include -DWIN32 -D_CONSOLE -DHAVE_STRING_H -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -MP -std:c11
525525
COMPAT_OBJS = compat/msvc.o compat/winansi.o \
526526
compat/win32/flush.o \
527527
compat/win32/path-utils.o \

0 commit comments

Comments
 (0)