From 26acccbe30198d365cea9378eaae9fb41ccb5bb8 Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Wed, 21 Aug 2019 16:15:27 +0200 Subject: use default optimisation flags for tcmalloc, jemalloc and Hoard --- src/allocators/Hoard/hoard_make.patch | 9 +++------ src/allocators/jemalloc.py | 2 +- src/allocators/supermalloc.py | 2 +- src/allocators/tcmalloc.py | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/allocators') diff --git a/src/allocators/Hoard/hoard_make.patch b/src/allocators/Hoard/hoard_make.patch index 4848c57..100f088 100644 --- a/src/allocators/Hoard/hoard_make.patch +++ b/src/allocators/Hoard/hoard_make.patch @@ -1,13 +1,10 @@ diff --git a/src/GNUmakefile b/src/GNUmakefile -index 2b2958e..7fa433a 100644 +index 1f2babf..50e9387 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile -@@ -1,9 +1,9 @@ - # Commands to compile Hoard for various targets. - # Run make (with no arguments) to see the complete target list. +@@ -3,7 +3,7 @@ --CPPFLAGS = -std=c++14 -O3 -DNDEBUG -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized -+CPPFLAGS = -std=c++14 -O2 -DNDEBUG -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized + CPPFLAGS = -std=c++14 -O3 -DNDEBUG -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized #CPPFLAGS = -std=c++14 -g -O0 -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized -CXX = clang++ +CXX = g++ diff --git a/src/allocators/jemalloc.py b/src/allocators/jemalloc.py index dc3baf5..6c37f57 100644 --- a/src/allocators/jemalloc.py +++ b/src/allocators/jemalloc.py @@ -14,7 +14,7 @@ class Jemalloc (src.allocator.Allocator): kwargs["sources"] = sources kwargs["LD_PRELOAD"] = "{srcdir}/lib/libjemalloc.so" - kwargs["build_cmds"] = ["cd {srcdir}; ./configure --prefix={dir} CFLAGS=-O2", + kwargs["build_cmds"] = ["cd {srcdir}; ./configure --prefix={dir}", "cd {srcdir}; make -j4", "mkdir -p {dir}"] diff --git a/src/allocators/supermalloc.py b/src/allocators/supermalloc.py index bea839a..b425303 100644 --- a/src/allocators/supermalloc.py +++ b/src/allocators/supermalloc.py @@ -13,7 +13,7 @@ class SuperMalloc (src.allocator.Allocator): kwargs["sources"] = sources kwargs["LD_PRELOAD"] = "{srcdir}/release/lib/libsupermalloc.so" - kwargs["build_cmds"] = ["cd {srcdir}/release; make CFLAGS=-O2", + kwargs["build_cmds"] = ["cd {srcdir}/release; make", "mkdir -p {dir}"] super().__init__(name, **kwargs) diff --git a/src/allocators/tcmalloc.py b/src/allocators/tcmalloc.py index 0940400..9372f00 100644 --- a/src/allocators/tcmalloc.py +++ b/src/allocators/tcmalloc.py @@ -14,7 +14,7 @@ class TCMalloc (src.allocator.Allocator): kwargs["sources"] = tcmalloc_src kwargs["LD_PRELOAD"] = "{dir}/lib/libtcmalloc.so" - kwargs["build_cmds"] = ["cd {srcdir}; ./configure --prefix={dir} CXXFLAGS=-O2", + kwargs["build_cmds"] = ["cd {srcdir}; ./configure --prefix={dir}", "cd {srcdir}; make install -j4"] super().__init__(name, **kwargs) -- cgit v1.2.3