From ebe7513a5b2f7da5e5dd006a58d597bd0955e828 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Tue, 10 Mar 2020 14:30:47 +0100
Subject: bump speedymalloc version and fix flavors names

---
 src/allocators/speedymalloc.py  | 26 +++++++++++++++-----------
 src/allocators/speedymallocs.py |  5 +++--
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'src/allocators')

diff --git a/src/allocators/speedymalloc.py b/src/allocators/speedymalloc.py
index 6e37b6c..4b6e77a 100644
--- a/src/allocators/speedymalloc.py
+++ b/src/allocators/speedymalloc.py
@@ -14,17 +14,17 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with allocbench.  If not, see <http://www.gnu.org/licenses/>.
-"""Bumpptr allocator
+"""Speedymalloc
 
-The bumpptr allocator makes the biggest possible tradeoff between speed and
+Speedymalloc is a cached bump pointer allocator.
+A bump pointer allocator makes the biggest possible tradeoff between speed and
 memory in speeds favor. Memory is mmapped per thread and never freed.
-See src/bumpptr.c for the actual implementation.
 """
 
 from src.artifact import GitArtifact
 from src.allocator import Allocator
 
-VERSION = "7b73dc51bba043d6b3269dd497263f03d52fc1ca"
+VERSION = "cad9cd091b38cd68779c9229e38d72082dd46b57"
 
 
 class Speedymalloc(Allocator):
@@ -49,16 +49,16 @@ class Speedymalloc(Allocator):
 
 speedymalloc = Speedymalloc("speedymalloc", version=VERSION)
 
-speedymalloc_dont_madv_free = Speedymalloc("speedymalloc_dont_madv_free",
-                                           options={"madvise_free": "false"},
-                                           version=VERSION)
+speedymalloc_no_madv_free = Speedymalloc("speedymalloc_no_madv_free",
+                                         options={"madvise_free": "false"},
+                                         version=VERSION)
 
-speedymalloc_dont_madv_willneed = Speedymalloc(
-    "speedymalloc_dont_madv_willneed",
+speedymalloc_no_madv_willneed = Speedymalloc(
+    "speedymalloc_no_madv_willneed",
     options={"madvise_willneed": "false"},
     version=VERSION)
 
-speedymalloc_4095_sc_32 = Speedymalloc("speedymalloc_dont_madv_willneed",
+speedymalloc_4095_sc_32 = Speedymalloc("speedymalloc_4095_sc_32",
                                        options={
                                            "cache_bins": 4095,
                                            "cache_bin_seperation": 32
@@ -66,6 +66,10 @@ speedymalloc_4095_sc_32 = Speedymalloc("speedymalloc_dont_madv_willneed",
                                        version=VERSION)
 
 speedymalloc_no_glab = Speedymalloc(
-    "speedymalloc_dont_madv_willneed",
+    "speedymalloc_no_glab",
     options={"max_local_allocation_buffer_size": 0},
     version=VERSION)
+
+speedymalloc_70d9d160 = Speedymalloc(
+    "speedymalloc_70d9d160",
+    version="70d9d16052fdd482d24940ea56d2ac57485941f8")
diff --git a/src/allocators/speedymallocs.py b/src/allocators/speedymallocs.py
index 73923f7..aae339e 100644
--- a/src/allocators/speedymallocs.py
+++ b/src/allocators/speedymallocs.py
@@ -19,6 +19,7 @@
 import src.allocators.speedymalloc as sm
 
 allocators = [
-    sm.speedymalloc, sm.speedymalloc_dont_madv_free,
-    sm.speedymalloc_dont_madv_willneed, sm.speedymalloc_4095_sc_32
+    sm.speedymalloc, sm.speedymalloc_no_madv_free,
+    sm.speedymalloc_no_madv_willneed, sm.speedymalloc_4095_sc_32,
+    sm.speedymalloc_no_glab, sm.speedymallo_70d9d160
 ]
-- 
cgit v1.2.3