reduce code duplication by giving each known allocator its own class

also move allocator related code to src/allocators

18 files changed, 210 insertions, 180 deletions

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/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/src/allocators/BA_allocators.py b/src/allocators/BA_allocators.py
new file mode 100644
index 0000000..5f4577e
--- /dev/null
+++ b/src/allocators/BA_allocators.py
@@ -0,0 +1,20 @@
+from src.allocators.glibc import Glibc
+from src.allocators.tcmalloc import TCMalloc
+from src.allocators.jemalloc import Jemalloc
+from src.allocators.hoard import Hoard
+
+glibc = Glibc("glibc", color="C1")
+
+glibc_notc = Glibc("glibc-notc",
+                   configure_args="--disable-experimental-malloc",
+                   color="C2")
+
+tcmalloc = TCMalloc("tcmalloc", color="C3")
+
+jemalloc = Jemalloc("jemalloc", color="C4")
+
+hoard = Hoard("Hoard", 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/hoard_make.patch b/src/allocators/Hoard/hoard_make.patch
index 4848c57..4848c57 100644
--- a/allocators/hoard_make.patch
+++ b/src/allocators/Hoard/hoard_make.patch
diff --git a/src/allocators/__init__.py b/src/allocators/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/allocators/__init__.py
diff --git a/src/allocators/all.py b/src/allocators/all.py
new file mode 100644
index 0000000..3973c37
--- /dev/null
+++ b/src/allocators/all.py
@@ -0,0 +1,44 @@
+from src.allocator import Allocator as Alloc
+from src.allocator import Allocator_Sources as Alloc_Src
+
+from src.allocators.glibc import Glibc
+from src.allocators.tcmalloc import TCMalloc
+from src.allocators.jemalloc import Jemalloc
+from src.allocators.hoard import Hoard
+
+glibc = Glibc("glibc", color="C1")
+
+glibc_notc = Glibc("glibc-notc",
+                configure_args="--disable-experimental-malloc",
+                color="C2")
+
+glibc_nofs = Glibc("glibc_nofs",
+                   patches=["allocators/glibc_2.28_no_passive_falsesharing.patch"],
+                   color="C3")
+
+glibc_nofs_fancy = Glibc("glibc_nofs_fancy",
+                         patches=["allocators/glibc_2.28_no_passive_falsesharing_fancy.patch"],
+                         color="C4")
+
+tcmalloc = TCMalloc("tcmalloc", color="C5")
+
+tcmalloc_nofs = TCMalloc("tcmalloc_nofs",
+                         patches= ["{patchdir}/tcmalloc_2.7_no_active_falsesharing.patch"],
+                         color="C5")
+
+jemalloc = Jemalloc("jemalloc", color="C6")
+
+hoard = Hoard("Hoard", color="C7", 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/src/allocators/glibc.py b/src/allocators/glibc.py
new file mode 100644
index 0000000..eff71dc
--- /dev/null
+++ b/src/allocators/glibc.py
@@ -0,0 +1,29 @@
+import src.allocator
+
+
+version = 2.29
+
+glibc_src = src.allocator.Allocator_Sources("glibc",
+                      retrieve_cmds=["git clone git://sourceware.org/git/glibc.git"],
+                      prepare_cmds=["git checkout release/{}/master".format(version)],
+                      reset_cmds=["git stash"])
+
+class Glibc (src.allocator.Allocator):
+    """Glibc definition for allocbench"""
+    def __init__(self, name, **kwargs):
+
+        kwargs["sources"] = glibc_src
+
+        configure_args = ""
+        if "configure_args" in kwargs:
+            configure_args = kwargs["configure_args"]
+            del(kwargs["configure_args"])
+
+        kwargs["build_cmds"] = ["mkdir -p glibc-build",
+                                "cd glibc-build; {srcdir}/configure --prefix={dir} " + configure_args,
+                                "cd glibc-build; make",
+                                "cd glibc-build; make install"]
+        kwargs["cmd_prefix"] = ("{dir}/lib/ld-linux-x86-64.so.2 --library-path {dir}/lib:"
+                              + src.allocator.library_path)
+
+        super().__init__(name, **kwargs)
diff --git a/allocators/glibc_2.28_no_passive_falsesharing.patch b/src/allocators/glibc/glibc_2.28_no_passive_falsesharing.patch
index fcc695c..fcc695c 100644
--- a/allocators/glibc_2.28_no_passive_falsesharing.patch
+++ b/src/allocators/glibc/glibc_2.28_no_passive_falsesharing.patch
diff --git a/allocators/glibc_2.28_no_passive_falsesharing_fancy.patch b/src/allocators/glibc/glibc_2.28_no_passive_falsesharing_fancy.patch
index 044909b..044909b 100644
--- a/allocators/glibc_2.28_no_passive_falsesharing_fancy.patch
+++ b/src/allocators/glibc/glibc_2.28_no_passive_falsesharing_fancy.patch
diff --git a/allocators/glibcs.py b/src/allocators/glibcs.py
index 891bf15..891bf15 100644
--- a/allocators/glibcs.py
+++ b/src/allocators/glibcs.py
diff --git a/src/allocators/hoard.py b/src/allocators/hoard.py
new file mode 100644
index 0000000..c50a616
--- /dev/null
+++ b/src/allocators/hoard.py
@@ -0,0 +1,18 @@
+import src.allocator
+
+
+version = 2.7
+sources = src.allocator.Allocator_Sources("Hoard",
+            retrieve_cmds=["git clone https://github.com/emeryberger/Hoard.git"],
+            reset_cmds=["git stash"])
+
+class Hoard (src.allocator.Allocator):
+    """Hoard definition for allocbench"""
+    def __init__(self, name, **kwargs):
+
+        kwargs["sources"] = sources
+        kwargs["LD_PRELOAD"] = "{srcdir}/src/libhoard.so"
+        kwargs["build_cmds"] = ["cd {srcdir}/src; make", "mkdir {dir}"]
+        kwargs["patches"] = ["{patchdir}/hoard_make.patch"]
+
+        super().__init__(name, **kwargs)
diff --git a/src/allocators/je_tc_super.py b/src/allocators/je_tc_super.py
new file mode 100644
index 0000000..2315da3
--- /dev/null
+++ b/src/allocators/je_tc_super.py
@@ -0,0 +1,19 @@
+from src.allocator import Allocator as Alloc
+from src.allocator import Allocator_Sources as Alloc_Src
+
+from src.allocators.glibc import Glibc
+from src.allocators.tcmalloc import TCMalloc
+from src.allocators.jemalloc import Jemalloc
+from src.allocators.supermalloc import SuperMalloc
+
+glibc = Glibc("glibc", color="C1")
+
+tcmalloc = TCMalloc("tcmalloc", color="C5")
+
+jemalloc = Jemalloc("jemalloc", color="C6")
+
+supermalloc = SuperMalloc("SuperMalloc", color="C8")
+
+allocators_to_build = [glibc, tcmalloc, jemalloc, supermalloc]
+
+allocators = {a.name: a.build() for a in allocators_to_build}
diff --git a/src/allocators/jemalloc.py b/src/allocators/jemalloc.py
new file mode 100644
index 0000000..c64f5af
--- /dev/null
+++ b/src/allocators/jemalloc.py
@@ -0,0 +1,20 @@
+import src.allocator
+
+version = "5.1.0"
+
+sources=src.allocator.Allocator_Sources("jemalloc",
+            retrieve_cmds=["git clone https://github.com/jemalloc/jemalloc.git"],
+            prepare_cmds=["git checkout {}".format(version), "./autogen.sh"])
+
+
+class Jemalloc (src.allocator.Allocator):
+    """jemalloc definition for allocbench"""
+    def __init__(self, name, **kwargs):
+
+        kwargs["sources"] = sources
+        kwargs["LD_PRELOAD"] = "{srcdir}/lib/libjemalloc.so"
+        kwargs["build_cmds"] = ["cd {srcdir}; ./configure --prefix={dir} CFLAGS=-O2",
+                                "cd {srcdir}; make -j4",
+                                "mkdir {dir}"]
+
+        super().__init__(name, **kwargs)
diff --git a/src/allocators/no_falsesharing.py b/src/allocators/no_falsesharing.py
new file mode 100644
index 0000000..fee631c
--- /dev/null
+++ b/src/allocators/no_falsesharing.py
@@ -0,0 +1,18 @@
+from src.allocators.tcmalloc import TCMalloc
+from src.allocators.glibc import Glibc
+
+glibc = Glibc("glibc", color="C1")
+
+glibc_nofs = Glibc("glibc_nofs",
+                   patches=["{patchdir}/glibc_2.28_no_passive_falsesharing.patch"],
+                   color="C2")
+
+tcmalloc = TCMalloc("tcmalloc", color="C3")
+
+tcmalloc_nofs = TCMalloc("tcmalloc_nofs",
+                         patches= ["{patchdir}/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/src/allocators/supermalloc.py b/src/allocators/supermalloc.py
new file mode 100644
index 0000000..7b96b80
--- /dev/null
+++ b/src/allocators/supermalloc.py
@@ -0,0 +1,22 @@
+import src.allocator
+
+version = "709663fb81ba091b0a78058869a644a272f4163d"
+
+sources=src.allocator.Allocator_Sources("SuperMalloc",
+            retrieve_cmds=["git clone https://github.com/kuszmaul/SuperMalloc"],
+            prepare_cmds=["git checkout {}".format(version)])
+
+
+class SuperMalloc (src.allocator.Allocator):
+    """jemalloc definition for allocbench"""
+    def __init__(self, name, **kwargs):
+
+        kwargs["sources"] = sources
+        kwargs["LD_PRELOAD"] = "{srcdir}/release/lib/libsupermalloc.so"
+        kwargs["build_cmds"] = ["cd {srcdir}/release; make CFLAGS=-O2",
+                                "mkdir {dir}"]
+
+        super().__init__(name, **kwargs)
+
+supermalloc = SuperMalloc("SuperMalloc", color="C1")
+allocators = {supermalloc.name: supermalloc.build()}
diff --git a/src/allocators/tcmalloc.py b/src/allocators/tcmalloc.py
new file mode 100644
index 0000000..1eb0db4
--- /dev/null
+++ b/src/allocators/tcmalloc.py
@@ -0,0 +1,20 @@
+import src.allocator
+
+
+version = 2.7
+
+tcmalloc_src = src.allocator.Allocator_Sources("tcmalloc",
+                         ["git clone https://github.com/gperftools/gperftools.git"],
+                         ["git checkout gperftools-{}".format(version), "./autogen.sh"],
+                         ["git stash"])
+
+class TCMalloc (src.allocator.Allocator):
+    """TCMalloc definition for allocbench"""
+    def __init__(self, name, **kwargs):
+
+        kwargs["sources"] = tcmalloc_src
+        kwargs["LD_PRELOAD"] = "{dir}/lib/libtcmalloc.so"
+        kwargs["build_cmds"] = ["cd {srcdir}; ./configure --prefix={dir} CXXFLAGS=-O2",
+                                "cd {srcdir}; make install -j4"]
+
+        super().__init__(name, **kwargs)
diff --git a/allocators/tcmalloc_2.7_no_active_falsesharing.patch b/src/allocators/tcmalloc/tcmalloc_2.7_no_active_falsesharing.patch
index c14172d..c14172d 100644
--- a/allocators/tcmalloc_2.7_no_active_falsesharing.patch
+++ b/src/allocators/tcmalloc/tcmalloc_2.7_no_active_falsesharing.patch