From 0d192f8cf3c21b2382e227fab057dabe16ea5e8b Mon Sep 17 00:00:00 2001 From: Florian Fischer Date: Mon, 17 Jun 2019 14:54:26 +0200 Subject: reduce code duplication by giving each known allocator its own class also move allocator related code to src/allocators --- allocators/BA_allocators.py | 62 ------------------ allocators/all.py | 76 ---------------------- .../glibc_2.28_no_passive_falsesharing.patch | 22 ------- .../glibc_2.28_no_passive_falsesharing_fancy.patch | 25 ------- allocators/glibcs.py | 37 ----------- allocators/hoard_make.patch | 16 ----- allocators/no_falsesharing.py | 42 ------------ .../tcmalloc_2.7_no_active_falsesharing.patch | 17 ----- 8 files changed, 297 deletions(-) delete mode 100644 allocators/BA_allocators.py delete mode 100644 allocators/all.py delete mode 100644 allocators/glibc_2.28_no_passive_falsesharing.patch delete mode 100644 allocators/glibc_2.28_no_passive_falsesharing_fancy.patch delete mode 100644 allocators/glibcs.py delete mode 100644 allocators/hoard_make.patch delete mode 100644 allocators/no_falsesharing.py delete mode 100644 allocators/tcmalloc_2.7_no_active_falsesharing.patch (limited to 'allocators') diff --git a/allocators/BA_allocators.py b/allocators/BA_allocators.py deleted file mode 100644 index 5d29cb6..0000000 --- a/allocators/BA_allocators.py +++ /dev/null @@ -1,62 +0,0 @@ -import os -import subprocess - -from src.allocator import * -from src.allocator import Allocator as Alloc -from src.allocator import Allocator_Sources as Alloc_Src - -optimisation_flag = "-O2" - -glibc_src = Alloc_Src("glibc", - retrieve_cmds=["git clone git://sourceware.org/git/glibc.git"], - prepare_cmds=["git checkout release/2.28/master"]) - -glibc = Alloc("glibc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir}", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path, - color="C1") - -glibc_notc = Alloc("glibc-notc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir} --disable-experimental-malloc", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path, - color="C2") - -tcmalloc = Alloc("tcmalloc", - sources=Alloc_Src("gperftools", - retrieve_cmds=["git clone https://github.com/gperftools/gperftools.git"], - prepare_cmds=["git checkout gperftools-2.7", "./autogen.sh"]), - LD_PRELOAD="{dir}/lib/libtcmalloc.so", - build_cmds=["cd {srcdir}; ./configure --prefix={dir} CXXFLAGS=" + optimisation_flag, - "cd {srcdir}; make install -j4"], - color="C3") - -jemalloc = Alloc("jemalloc", - sources=Alloc_Src("jemalloc", - retrieve_cmds=["git clone https://github.com/jemalloc/jemalloc.git"], - prepare_cmds=["git checkout 5.1.0", "./autogen.sh"]), - LD_PRELOAD="{srcdir}/lib/libjemalloc.so", - build_cmds=["cd {srcdir}; ./configure --prefix={dir} CFLAGS=" + optimisation_flag, - "cd {srcdir}; make -j4", - "mkdir {dir}"], - color="C4") - -hoard = Alloc("Hoard", sources=Alloc_Src("Hoard", - retrieve_cmds=["git clone https://github.com/emeryberger/Hoard.git"], - reset_cmds=["git stash"]), - LD_PRELOAD="{srcdir}/src/libhoard.so", - build_cmds=["cd {srcdir}/src; make", - "mkdir {dir}"], - color="C5", - patches=["allocators/hoard_make.patch"]) - - - -allocators_to_build = [glibc, glibc_notc, tcmalloc, jemalloc, hoard] - -allocators = {a.name: a.build() for a in allocators_to_build} diff --git a/allocators/all.py b/allocators/all.py deleted file mode 100644 index 62fe728..0000000 --- a/allocators/all.py +++ /dev/null @@ -1,76 +0,0 @@ -import os -import subprocess - -from src.allocator import * -from src.allocator import Allocator as Alloc -from src.allocator import Allocator_Sources as Alloc_Src - -optimisation_flag = "-O2" - -glibc_src = Alloc_Src("glibc", - retrieve_cmds=["git clone git://sourceware.org/git/glibc.git"], - prepare_cmds=["git checkout release/2.29/master"], - reset_cmds=["git stash"]) - -glibc = Alloc("glibc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir}", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path) - -glibc_notc = Alloc("glibc_notc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir} --disable-experimental-malloc", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path) - -glibc_nofs = patch_alloc("glibc_nofs", glibc, - ["allocators/glibc_2.28_no_passive_falsesharing.patch"]) - -glibc_nofs_fancy = patch_alloc("glibc_nofs_fancy", glibc, - ["allocators/glibc_2.28_no_passive_falsesharing_fancy.patch"]) - -tcmalloc_src = Alloc_Src("gperftools", - ["git clone https://github.com/gperftools/gperftools.git"], - ["git checkout gperftools-2.7", "./autogen.sh"], - ["git stash"]) - -tcmalloc = Alloc("tcmalloc", sources=tcmalloc_src, - LD_PRELOAD="{dir}/lib/libtcmalloc.so", - build_cmds=["cd {srcdir}; ./configure --prefix={dir} CXXFLAGS=" + optimisation_flag, - "cd {srcdir}; make install -j4"]) - -tcmalloc_nofs = patch_alloc("tcmalloc_nofs", tcmalloc, - ["allocators/tcmalloc_2.7_no_active_falsesharing.patch"]) - -jemalloc = Alloc("jemalloc", - sources=Alloc_Src("jemalloc", - retrieve_cmds=["git clone https://github.com/jemalloc/jemalloc.git"], - prepare_cmds=["git checkout 5.1.0", "./autogen.sh"]), - LD_PRELOAD="{srcdir}/lib/libjemalloc.so", - build_cmds=["cd {srcdir}; ./configure --prefix={dir} CFLAGS=" + optimisation_flag, - "cd {srcdir}; make -j4", - "mkdir {dir}"]) - -hoard = Alloc("Hoard", sources=Alloc_Src("Hoard", - retrieve_cmds=["git clone https://github.com/emeryberger/Hoard.git"], - reset_cmds=["git stash"]), - LD_PRELOAD="{srcdir}/src/libhoard.so", - build_cmds=["cd {srcdir}/src; make", - "mkdir {dir}"], - patches=["allocators/hoard_make.patch"]) - -mesh = Alloc("Mesh", sources=Alloc_Src("Mesh", - retrieve_cmds=["git clone https://github.com/plasma-umass/Mesh"], - reset_cmds=["git stash"]), - LD_PRELOAD="{srcdir}/libmesh.so", - build_cmds=["cd {srcdir}; git submodule update --init", - "cd {srcdir}; ./configure", - "cd {srcdir}; make -j 4", - "mkdir {dir}"]) - -allocators_to_build = [glibc, glibc_notc, glibc_nofs, glibc_nofs_fancy, tcmalloc, tcmalloc_nofs, jemalloc, hoard, mesh] - -allocators = {a.name: a.build() for a in allocators_to_build} diff --git a/allocators/glibc_2.28_no_passive_falsesharing.patch b/allocators/glibc_2.28_no_passive_falsesharing.patch deleted file mode 100644 index fcc695c..0000000 --- a/allocators/glibc_2.28_no_passive_falsesharing.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 27cf6137c2..3aadaddd1d 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -4172,6 +4172,9 @@ _int_free (mstate av, mchunkptr p, int have_lock) - - #if USE_TCACHE - { -+ /* Check if chunk is from our own arena. */ -+ if (av == thread_arena) -+ { - size_t tc_idx = csize2tidx (size); - if (tcache != NULL && tc_idx < mp_.tcache_bins) - { -@@ -4201,6 +4204,7 @@ _int_free (mstate av, mchunkptr p, int have_lock) - return; - } - } -+ } - } - #endif - diff --git a/allocators/glibc_2.28_no_passive_falsesharing_fancy.patch b/allocators/glibc_2.28_no_passive_falsesharing_fancy.patch deleted file mode 100644 index 044909b..0000000 --- a/allocators/glibc_2.28_no_passive_falsesharing_fancy.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/malloc/malloc.c b/malloc/malloc.c -index 27cf6137c2..fbd311801d 100644 ---- a/malloc/malloc.c -+++ b/malloc/malloc.c -@@ -4172,6 +4172,12 @@ _int_free (mstate av, mchunkptr p, int have_lock) - - #if USE_TCACHE - { -+ /* Check if chunk is from our own arena or false sharing is not possible -+ because the chunk is cache line aligned and it's size is a multiple -+ of a cacheline */ -+ if (av == thread_arena -+ || (((size_t)p & 63) == 0 && ((size + 2*SIZE_SZ) % 64) == 0)) -+ { - size_t tc_idx = csize2tidx (size); - if (tcache != NULL && tc_idx < mp_.tcache_bins) - { -@@ -4201,6 +4207,7 @@ _int_free (mstate av, mchunkptr p, int have_lock) - return; - } - } -+ } - } - #endif - diff --git a/allocators/glibcs.py b/allocators/glibcs.py deleted file mode 100644 index 891bf15..0000000 --- a/allocators/glibcs.py +++ /dev/null @@ -1,37 +0,0 @@ -import os -import subprocess - -from src.allocator import * -from src.allocator import Allocator as Alloc -from src.allocator import Allocator_Sources as Alloc_Src - -optimisation_flag = "-O2" - -glibc_src = Alloc_Src("glibc", - retrieve_cmds=["git clone git://sourceware.org/git/glibc.git"], - prepare_cmds=["git checkout release/2.29/master"], - reset_cmds=["git stash"]) - -glibc = Alloc("glibc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir}", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path) - -glibc_notc = Alloc("glibc_notc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir} --disable-experimental-malloc", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path) - -glibc_nofs = patch_alloc("glibc_nofs", glibc, - ["allocators/glibc_2.28_no_passive_falsesharing.patch"]) - -glibc_nofs_fancy = patch_alloc("glibc_nofs_fancy", glibc, - ["allocators/glibc_2.28_no_passive_falsesharing_fancy.patch"]) - -allocators_to_build = [glibc, glibc_notc, glibc_nofs, glibc_nofs_fancy] - -allocators = {a.name: a.build() for a in allocators_to_build} diff --git a/allocators/hoard_make.patch b/allocators/hoard_make.patch deleted file mode 100644 index 4848c57..0000000 --- a/allocators/hoard_make.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/GNUmakefile b/src/GNUmakefile -index 2b2958e..7fa433a 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. - --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 -g -O0 -ffast-math -fno-builtin-malloc -Wall -Wextra -Wshadow -Wconversion -Wuninitialized --CXX = clang++ -+CXX = g++ - - # Compute platform (OS and architecture) and build accordingly. - diff --git a/allocators/no_falsesharing.py b/allocators/no_falsesharing.py deleted file mode 100644 index 628c7fc..0000000 --- a/allocators/no_falsesharing.py +++ /dev/null @@ -1,42 +0,0 @@ -import os -import subprocess - -from src.allocator import * -from src.allocator import Allocator as Alloc -from src.allocator import Allocator_Sources as Alloc_Src - -optimisation_flag = "-O2" - -glibc_src = Alloc_Src("glibc", - retrieve_cmds=["git clone git://sourceware.org/git/glibc.git"], - prepare_cmds=["git checkout release/2.29/master"], - reset_cmds=["git stash"]) - -glibc = Alloc("glibc", sources=glibc_src, - build_cmds=["mkdir -p glibc-build", - "cd glibc-build; {srcdir}/configure --prefix={dir}", - "cd glibc-build; make", - "cd glibc-build; make install"], - cmd_prefix="{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"+library_path) - -glibc_nofs = patch_alloc("glibc_nofs", glibc, - ["allocators/glibc_2.28_no_passive_falsesharing.patch"]) - -tcmalloc_src = Alloc_Src("gperftools", - ["git clone https://github.com/gperftools/gperftools.git"], - ["git checkout gperftools-2.7", "./autogen.sh"], - ["git stash"]) - -tcmalloc = Alloc("tcmalloc", sources=tcmalloc_src, - LD_PRELOAD="{dir}/lib/libtcmalloc.so", - build_cmds=["cd {srcdir}; ./configure --prefix={dir} CXXFLAGS=" + optimisation_flag, - "cd {srcdir}; make install -j4"], - color="C3") - -tcmalloc_nofs = patch_alloc("tcmalloc_nofs", tcmalloc, - ["allocators/tcmalloc_2.7_no_active_falsesharing.patch"], - color="C4") - -allocators_to_build = [glibc, glibc_nofs, tcmalloc, tcmalloc_nofs] - -allocators = {a.name: a.build() for a in allocators_to_build} diff --git a/allocators/tcmalloc_2.7_no_active_falsesharing.patch b/allocators/tcmalloc_2.7_no_active_falsesharing.patch deleted file mode 100644 index c14172d..0000000 --- a/allocators/tcmalloc_2.7_no_active_falsesharing.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/src/thread_cache.cc b/src/thread_cache.cc -index 6d2f832..2074f4a 100644 ---- a/src/thread_cache.cc -+++ b/src/thread_cache.cc -@@ -120,7 +120,11 @@ void* ThreadCache::FetchFromCentralCache(uint32 cl, int32_t byte_size, - ASSERT(list->empty()); - const int batch_size = Static::sizemap()->num_objects_to_move(cl); - -- const int num_to_move = min(list->max_length(), batch_size); -+ int num_to_move = min(list->max_length(), batch_size); -+ const int cache_line_parts = 64 / byte_size; -+ if (cache_line_parts > 0 && cache_line_parts > num_to_move) -+ num_to_move = cache_line_parts; -+ - void *start, *end; - int fetch_count = Static::central_cache()[cl].RemoveRange( - &start, &end, num_to_move); -- cgit v1.2.3