From 0b360982ac4045bb4adbc3f1e8bd07a1eb22a303 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@cs.fau.de>
Date: Mon, 14 Dec 2020 14:53:48 +0100
Subject: [PATCH] Add meson option for scheduling strategy and according CI
jobs
Co-authored-by: Florian Fischer <florian.fl.fischer@fau.de>
---
.gitlab-ci.yml | 18 ++++++++++++++++++
emper/Runtime.cpp | 18 +++++++++++++++++-
meson.build | 3 +++
meson_options.txt | 9 +++++++++
4 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0c3c633..4b6bbfce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,14 @@ variables:
CC: clang
CXX: clang++
+.emper-ws-scheduling:
+ variables:
+ EMPER_DEFAULT_SCHEDULING_STRATEGY: "work_stealing"
+
+.emper-laws-scheduling:
+ variables:
+ EMPER_DEFAULT_SCHEDULING_STRATEGY: "locality_aware_work_stealing"
+
.emper-worker-no-sleep:
variables:
EMPER_WORKER_SLEEP: 'false'
@@ -157,3 +165,13 @@ test-clang-sanitizer-undefined:
# - .test
# - .clang
# - .sanitizer-address
+
+test-laws:
+ extends:
+ - .test
+ - .emper-laws-scheduling
+
+test-laws-release:
+ extends:
+ - test-laws
+ - .release-build
diff --git a/emper/Runtime.cpp b/emper/Runtime.cpp
index 964cd248..5f8c2755 100644
--- a/emper/Runtime.cpp
+++ b/emper/Runtime.cpp
@@ -23,7 +23,14 @@
#include "RuntimeStrategyStats.hpp" // for RuntimeStrategyStats
#include "emper-config.h" // IWYU pragma: keep
#include "lib/DebugUtil.hpp"
+
+#ifdef EMPER_DEFAULT_SCHEDULING_STRATEGY_WORK_STEALING
#include "strategies/ws/WsStrategy.hpp" // for WsStrategy, WsStrategy::INST...
+#elif defined EMPER_DEFAULT_SCHEDULING_STRATEGY_LOCALITY_AWARE_WORK_STEALING
+#include "strategies/laws/LawsStrategy.hpp"
+#else
+#error "Unknown default scheduling strategy"
+#endif
#ifdef EMPER_LIBURCU
#include <urcu.h> // for rcu_register_thread
@@ -38,7 +45,16 @@
std::mutex Runtime::currentRuntimeMutex;
Runtime* Runtime::currentRuntime;
-RuntimeStrategy& Runtime::DEFAULT_STRATEGY = WsStrategy::INSTANCE;
+
+RuntimeStrategy& Runtime::DEFAULT_STRATEGY =
+#ifdef EMPER_DEFAULT_SCHEDULING_STRATEGY_WORK_STEALING
+ WsStrategy::INSTANCE
+#elif defined EMPER_DEFAULT_SCHEDULING_STRATEGY_LOCALITY_AWARE_WORK_STEALING
+ LawsStrategy::INSTANCE
+#else
+#error "Unknown default scheduling strategy"
+#endif
+ ;
Runtime::Runtime(workerid_t workerCount, RuntimeStrategy& strategy, unsigned int seed)
: workerCount(workerCount),
diff --git a/meson.build b/meson.build
index 17175803..06b758c8 100644
--- a/meson.build
+++ b/meson.build
@@ -31,6 +31,9 @@ conf_data.set('EMPER_OVERFLOW_QUEUE', get_option('overflow_queue'))
conf_data.set('EMPER_LOCKED_MPSC_QUEUE', get_option('locked_mpsc_queue'))
conf_data.set('EMPER_STATS', get_option('stats'))
+default_scheduling_strategy = get_option('default_scheduling_strategy')
+conf_data.set('EMPER_DEFAULT_SCHEDULING_STRATEGY_' + default_scheduling_strategy.to_upper(), true)
+
log_level = get_option('log_level')
if log_level == 'automatic'
# output only error messages in release builds
diff --git a/meson_options.txt b/meson_options.txt
index 7f506e64..1eb8a304 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,3 +40,12 @@ option(
value: false,
description: 'Collect stats and print them at the end of the execution'
)
+option(
+ 'default_scheduling_strategy',
+ type: 'combo',
+ choices: [
+ 'work_stealing',
+ 'locality_aware_work_stealing',
+ ],
+ value: 'work_stealing',
+)
--
GitLab