ERMIA, MOCC, SS2PL

ERMIA : Makefile に KEY_SORT define 追加．
MOCC : KEY_SORT を mocc.cc から削除．
SS2PL : 上に同じ．
ccbench/include/util.hh の makeProcedure に KEY_SORT ディレクティブ追加．

Author: tanabe takayuki

ermia/Makefile

@@ -6,9 +6,10 @@ include $(REL)Makefile
 ERMIA_ALLSRC = $(ERMIA_SRCS1) $(wildcard include/*.hh)
 
 KEY_SIZE=8
-VAL_SIZE=4
+VAL_SIZE=10000
 ADD_ANALYSIS=1
-BACK_OFF=1
+BACK_OFF=0
+KEY_SORT=0
 MASSTREE_USE=1
 
 CC = g++
@@ -20,6 +21,7 @@ CFLAGS = -c -pipe -g -O3 -std=c++17 -march=native \
 				 -DVAL_SIZE=$(VAL_SIZE) \
 				 -DADD_ANALYSIS=$(ADD_ANALYSIS) \
 				 -DBACK_OFF=$(BACK_OFF) \
+				 -DKEY_SORT=$(KEY_SORT) \
 				 -DMASSTREE_USE=$(MASSTREE_USE) \
 
 LDFLAGS = -L../third_party/mimalloc/out/release

include/util.hh

@@ -118,6 +118,11 @@ inline void makeProcedure(std::vector<Procedure> &pro, Xoroshiro128Plus &rnd,
 
   (*pro.begin()).ronly_ = ronly_flag;
   (*pro.begin()).wonly_ = wonly_flag;
+
+#if KEY_SORT
+  std::sort(pro.begin(), pro.end());
+#endif // KEY_SORT
+
 #if ADD_ANALYSIS
   res.local_make_procedure_latency_ += rdtscp() - start;
 #endif

mocc/mocc.cc

@@ -63,9 +63,6 @@ void worker(size_t thid, char& ready, const bool& start, const bool& quit,
   while (!loadAcquire(quit)) {
     makeProcedure(trans.pro_set_, rnd, zipf, TUPLE_NUM, MAX_OPE, THREAD_NUM,
                   RRATIO, RMW, YCSB, false, thid, myres);
-#if KEY_SORT
-    sort(trans.pro_set_.begin(), trans.pro_set_.end());
-#endif
   RETRY:
     if (thid == 0) {
       leaderWork(epoch_timer_start, epoch_timer_stop, myres);

ss2pl/ss2pl.cc

@@ -65,10 +65,6 @@ void worker(size_t thid, char& ready, const bool& start, const bool& quit,
   while (!loadAcquire(quit)) {
     makeProcedure(trans.pro_set_, rnd, zipf, TUPLE_NUM, MAX_OPE, THREAD_NUM,
                   RRATIO, RMW, YCSB, false, thid, myres);
-#if KEY_SORT
-    std::sort(trans.pro_set_.begin(), trans.pro_set_.end());
-#endif
-
   RETRY:
     if (loadAcquire(quit)) break;
     if (thid == 0) leaderBackoffWork(backoff, res);