Skip to content

Commit 7884357

Browse files
Added BITCOUNT benchmarks
1 parent b0f898e commit 7884357

File tree

5 files changed

+123
-41
lines changed

5 files changed

+123
-41
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redis-benchmarks-specification"
3-
version = "0.1.230"
3+
version = "0.1.234"
44
description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
55
authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
66
readme = "Readme.md"

redis_benchmarks_specification/__builder__/builder.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -370,16 +370,17 @@ def builder_process_stream(
370370
deps_list.append("fpconv")
371371
redis_temporary_dir = temporary_dir + "/" + redis_dir + "/"
372372
logging.info("Using redis temporary dir {}".format(redis_temporary_dir))
373-
build_command = "bash -c 'make Makefile.dep && cd ./deps && CXX={} CC={} make {} {} -j && cd .. && CXX={} CC={} make {} {} -j'".format(
374-
cpp_compiler,
375-
compiler,
376-
" ".join(deps_list),
377-
build_vars_str,
378-
cpp_compiler,
379-
compiler,
380-
"redis-server",
381-
build_vars_str,
382-
)
373+
# build_command = "bash -c 'make Makefile.dep && cd ./deps && CXX={} CC={} make {} {} -j && cd .. && CXX={} CC={} make {} {} -j'".format(
374+
# cpp_compiler,
375+
# compiler,
376+
# " ".join(deps_list),
377+
# build_vars_str,
378+
# cpp_compiler,
379+
# compiler,
380+
# "redis-server",
381+
# build_vars_str,
382+
# )
383+
build_command = "sh -c 'make -j'"
383384
if b"build_command" in testDetails:
384385
build_command = testDetails[b"build_command"].decode()
385386
server_name = "redis"

redis_benchmarks_specification/__self_contained_coordinator__/self_contained_coordinator.py

Lines changed: 37 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ def process_self_contained_coordinator_stream(
13741374
(
13751375
detected_regressions,
13761376
table_output,
1377-
total_improvements,
1377+
improvement_list,
13781378
regressions_list,
13791379
total_stable,
13801380
total_unstable,
@@ -1410,37 +1410,44 @@ def process_self_contained_coordinator_stream(
14101410
running_platform,
14111411
)
14121412
total_regressions = len(regressions_list)
1413+
total_improvements = len(improvement_list)
14131414
auto_approve = True
14141415
grafana_link_base = "https://benchmarksredisio.grafana.net/d/1fWbtb7nz/experimental-oss-spec-benchmarks"
1415-
1416-
prepare_regression_comment(
1417-
auto_approve,
1418-
baseline_branch,
1419-
baseline_tag,
1420-
comparison_branch,
1421-
comparison_tag,
1422-
contains_regression_comment,
1423-
github_pr,
1424-
grafana_link_base,
1425-
is_actionable_pr,
1426-
old_regression_comment_body,
1427-
pr_link,
1428-
regression_comment,
1429-
datasink_conn,
1430-
running_platform,
1431-
table_output,
1432-
tf_github_org,
1433-
tf_github_repo,
1434-
tf_triggering_env,
1435-
total_comparison_points,
1436-
total_improvements,
1437-
total_regressions,
1438-
total_stable,
1439-
total_unstable,
1440-
verbose,
1441-
regressions_percent_lower_limit,
1442-
regressions_list,
1443-
)
1416+
try:
1417+
prepare_regression_comment(
1418+
auto_approve,
1419+
baseline_branch,
1420+
baseline_tag,
1421+
comparison_branch,
1422+
comparison_tag,
1423+
contains_regression_comment,
1424+
github_pr,
1425+
grafana_link_base,
1426+
is_actionable_pr,
1427+
old_regression_comment_body,
1428+
pr_link,
1429+
regression_comment,
1430+
datasink_conn,
1431+
running_platform,
1432+
table_output,
1433+
tf_github_org,
1434+
tf_github_repo,
1435+
tf_triggering_env,
1436+
total_comparison_points,
1437+
total_improvements,
1438+
total_regressions,
1439+
total_stable,
1440+
total_unstable,
1441+
verbose,
1442+
regressions_percent_lower_limit,
1443+
regressions_list,
1444+
)
1445+
except Exception as e:
1446+
logging.error(
1447+
"Failed to produce regression comment but continuing... Error: {}".format(
1448+
e.__str__()
1449+
)
1450+
)
14441451
logging.info(
14451452
f"Added test named {test_name} to the completed test list in key {stream_test_list_completed}"
14461453
)
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
version: 0.4
2+
name: memtier_benchmark-1key-100M-bits-bitmap-bitcount
3+
description: Runs memtier_benchmark, for a keyspace length of 1 keys focusing on BITCOUNT performance. The bitmap has a size of 100M bits and approximately 2M bits are set. The size of it is ~15MB
4+
dbconfig:
5+
configuration-parameters:
6+
save: '""'
7+
check:
8+
keyspacelen: 1
9+
init_commands:
10+
- '"SETBIT" "users" "100000000" "1"'
11+
preload_tool:
12+
run_image: redislabs/memtier_benchmark:edge
13+
tool: memtier_benchmark
14+
arguments: --hide-histogram --command "SETBIT users __key__ 1" --key-maximum 100000000 --key-minimum 1 -n 10000 --key-prefix "" --command-key-pattern R --distinct-client-seed --pipeline 10
15+
resources:
16+
requests:
17+
cpus: '2'
18+
memory: 1g
19+
tested-commands:
20+
- bitcount
21+
tested-groups:
22+
- bitmap
23+
redis-topologies:
24+
- oss-standalone
25+
build-variants:
26+
- gcc:8.5.0-amd64-debian-buster-default
27+
- dockerhub
28+
clientconfig:
29+
run_image: redislabs/memtier_benchmark:edge
30+
tool: memtier_benchmark
31+
arguments: --command "BITCOUNT users __key__ -1" --key-maximum 100000000 --key-minimum 1 --key-prefix "" --command-key-pattern R --distinct-client-seed --test-time 120
32+
resources:
33+
requests:
34+
cpus: '2'
35+
memory: 2g
36+
37+
priority: 19
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
version: 0.4
2+
name: memtier_benchmark-1key-1Billion-bits-bitmap-bitcount
3+
description: Runs memtier_benchmark, for a keyspace length of 1 keys focusing on BITCOUNT performance. The bitmap has a size of 1 Billion bits and approximately 20M bits are set. The size of it is ~140MB
4+
dbconfig:
5+
configuration-parameters:
6+
save: '""'
7+
check:
8+
keyspacelen: 1
9+
init_commands:
10+
- '"SETBIT" "users" "1000000000" "1"'
11+
preload_tool:
12+
run_image: redislabs/memtier_benchmark:edge
13+
tool: memtier_benchmark
14+
arguments: --hide-histogram --command "SETBIT users __key__ 1" --key-maximum 1000000000 --key-minimum 1 -n 100000 --key-prefix "" --command-key-pattern R --distinct-client-seed --pipeline 10
15+
resources:
16+
requests:
17+
cpus: '2'
18+
memory: 1g
19+
tested-commands:
20+
- bitcount
21+
tested-groups:
22+
- bitmap
23+
redis-topologies:
24+
- oss-standalone
25+
build-variants:
26+
- gcc:8.5.0-amd64-debian-buster-default
27+
- dockerhub
28+
clientconfig:
29+
run_image: redislabs/memtier_benchmark:edge
30+
tool: memtier_benchmark
31+
arguments: --command "BITCOUNT users __key__ -1" --key-maximum 1000000000 --key-minimum 1 --key-prefix "" --command-key-pattern R --distinct-client-seed --test-time 120
32+
resources:
33+
requests:
34+
cpus: '2'
35+
memory: 2g
36+
37+
priority: 19

0 commit comments

Comments
 (0)