Skip to content
Snippets Groups Projects
Commit 33cd9e4f authored by Florian Fischer's avatar Florian Fischer
Browse files

add sqpoll variants

parent a99a8c98
No related branches found
No related tags found
No related merge requests found
Pipeline #66690 passed
...@@ -6,7 +6,7 @@ MAKEFILES = $(shell dirname $(shell find . -name Makefile \ ...@@ -6,7 +6,7 @@ MAKEFILES = $(shell dirname $(shell find . -name Makefile \
-not -path "./haystack/*")) -not -path "./haystack/*"))
EMPER_ROOT := emper EMPER_ROOT := emper
EMPER_VARIANTS := vanilla pipe pipe-no-completer no-completer EMPER_VARIANTS := vanilla pipe pipe-no-completer no-completer sqpoll-single sqpoll
EMPER_PREP_TARGETS := $(addprefix $(EMPER_ROOT)/build-,$(EMPER_VARIANTS)) EMPER_PREP_TARGETS := $(addprefix $(EMPER_ROOT)/build-,$(EMPER_VARIANTS))
EMPER_BUILD_TARGETS := $(addprefix emper-,$(EMPER_VARIANTS)) EMPER_BUILD_TARGETS := $(addprefix emper-,$(EMPER_VARIANTS))
...@@ -34,19 +34,34 @@ $(MAKEFILES): ...@@ -34,19 +34,34 @@ $(MAKEFILES):
COMMON_EMPER_MESON_ARGS := --buildtype=release --fatal-meson-warnings -Dstats=true COMMON_EMPER_MESON_ARGS := --buildtype=release --fatal-meson-warnings -Dstats=true
$(EMPER_ROOT)/build-vanilla: .PHONY: checkout-master
checkout-master:
git -C $(EMPER_ROOT) checkout master
.PHONY: checkout-sqpoll
checkout-sqpoll: muhq-remote
git -C $(EMPER_ROOT) fetch origin merge-requests/210/head:sqpoll && \
git -C $(EMPER_ROOT) checkout sqpoll
$(EMPER_ROOT)/build-vanilla: checkout-master
meson setup $(COMMON_EMPER_MESON_ARGS) $@ $(EMPER_ROOT) meson setup $(COMMON_EMPER_MESON_ARGS) $@ $(EMPER_ROOT)
$(EMPER_ROOT)/build-pipe: $(EMPER_ROOT)/build-pipe: checkout-master
meson setup $(COMMON_EMPER_MESON_ARGS) -Dworker_sleep_strategy=pipe $@ $(EMPER_ROOT) meson setup $(COMMON_EMPER_MESON_ARGS) -Dworker_sleep_strategy=pipe $@ $(EMPER_ROOT)
$(EMPER_ROOT)/build-pipe-no-completer: $(EMPER_ROOT)/build-pipe-no-completer: checkout-master
meson setup $(COMMON_EMPER_MESON_ARGS) -Dio_completer_behavior=none \ meson setup $(COMMON_EMPER_MESON_ARGS) -Dio_completer_behavior=none \
-Dworker_sleep_strategy=pipe $@ $(EMPER_ROOT) -Dworker_sleep_strategy=pipe $@ $(EMPER_ROOT)
$(EMPER_ROOT)/build-no-completer: $(EMPER_ROOT)/build-no-completer: checkout-master
meson setup $(COMMON_EMPER_MESON_ARGS) -Dio_completer_behavior=none $@ $(EMPER_ROOT) meson setup $(COMMON_EMPER_MESON_ARGS) -Dio_completer_behavior=none $@ $(EMPER_ROOT)
$(EMPER_ROOT)/build-sqpoll: checkout-sqpoll
meson setup $(COMMON_EMPER_MESON_ARGS) -Dio_uring_sq_poller=each $@ $(EMPER_ROOT)
$(EMPER_ROOT)/build-sqpoll-single: checkout-sqpoll
meson setup $(COMMON_EMPER_MESON_ARGS) -Dio_uring_sq_poller=one $@ $(EMPER_ROOT)
define buildEmper define buildEmper
emper-$(1): $(EMPER_ROOT)/build-$(1) emper-$(1): $(EMPER_ROOT)/build-$(1)
......
...@@ -47,6 +47,13 @@ TARGETS = { ...@@ -47,6 +47,13 @@ TARGETS = {
f'{ROOT_DIR}/emper/build-pipe-no-completer/apps/fsearch/fsearch {{NEEDLE}}', f'{ROOT_DIR}/emper/build-pipe-no-completer/apps/fsearch/fsearch {{NEEDLE}}',
'env': {'EMPER_WORKER_COUNT=12'} 'env': {'EMPER_WORKER_COUNT=12'}
}, },
'emper-sqpoll': {
'cmd': f'{ROOT_DIR}/emper/build-sqpoll/apps/fsearch/fsearch {{NEEDLE}}'
},
'emper-sqpoll-single': {
'cmd':
f'{ROOT_DIR}/emper/build-sqpoll-single/apps/fsearch/fsearch {{NEEDLE}}'
},
'ripgrep': { 'ripgrep': {
'cmd': 'rg -l -F -uuu {NEEDLE} .' 'cmd': 'rg -l -F -uuu {NEEDLE} .'
}, },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment