From 6cd13dea0c3298cbe4c43b0d362318a86d82b699 Mon Sep 17 00:00:00 2001 From: Yunsong Wang Date: Fri, 15 Nov 2024 13:58:40 -0800 Subject: [PATCH] Get rid of default benchmark axes --- benchmarks/bloom_filter/add_bench.cu | 4 ++-- benchmarks/bloom_filter/contains_bench.cu | 4 ++-- benchmarks/static_multiset/retrieve_bench.cu | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/benchmarks/bloom_filter/add_bench.cu b/benchmarks/bloom_filter/add_bench.cu index 8e4d0b762..8b502d0d5 100644 --- a/benchmarks/bloom_filter/add_bench.cu +++ b/benchmarks/bloom_filter/add_bench.cu @@ -49,7 +49,7 @@ void bloom_filter_add(nvbench::state& state, auto const num_keys = state.get_int64("NumInputs"); auto const filter_size_mb = state.get_int64("FilterSizeMB"); - auto const pattern_bits = state.get_int64_or_default("PatternBits", WordsPerBlock); + auto const pattern_bits = WordsPerBlock; try { auto const policy = policy_type{static_cast(pattern_bits)}; @@ -171,4 +171,4 @@ NVBENCH_BENCH_TYPES(arrow_bloom_filter_add, .set_type_axes_names({"Key", "Distribution"}) .set_max_noise(defaults::MAX_NOISE) .add_int64_axis("NumInputs", {defaults::BF_N}) - .add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE); \ No newline at end of file + .add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE); diff --git a/benchmarks/bloom_filter/contains_bench.cu b/benchmarks/bloom_filter/contains_bench.cu index bf81f5d83..3d2ed1e54 100644 --- a/benchmarks/bloom_filter/contains_bench.cu +++ b/benchmarks/bloom_filter/contains_bench.cu @@ -51,7 +51,7 @@ void bloom_filter_contains( auto const num_keys = state.get_int64("NumInputs"); auto const filter_size_mb = state.get_int64("FilterSizeMB"); - auto const pattern_bits = state.get_int64_or_default("PatternBits", WordsPerBlock); + auto const pattern_bits = WordsPerBlock; try { auto const policy = policy_type{static_cast(pattern_bits)}; @@ -181,4 +181,4 @@ NVBENCH_BENCH_TYPES(arrow_bloom_filter_contains, .set_type_axes_names({"Key", "Distribution"}) .set_max_noise(defaults::MAX_NOISE) .add_int64_axis("NumInputs", {defaults::BF_N}) - .add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE); \ No newline at end of file + .add_int64_axis("FilterSizeMB", defaults::BF_SIZE_MB_RANGE_CACHE); diff --git a/benchmarks/static_multiset/retrieve_bench.cu b/benchmarks/static_multiset/retrieve_bench.cu index efd694946..01ce7599b 100644 --- a/benchmarks/static_multiset/retrieve_bench.cu +++ b/benchmarks/static_multiset/retrieve_bench.cu @@ -34,9 +34,9 @@ using namespace cuco::utility; template void static_multiset_retrieve(nvbench::state& state, nvbench::type_list) { - auto const num_keys = state.get_int64_or_default("NumInputs", defaults::N); - auto const occupancy = state.get_float64_or_default("Occupancy", defaults::OCCUPANCY); - auto const matching_rate = state.get_float64_or_default("MatchingRate", defaults::MATCHING_RATE); + auto const num_keys = state.get_int64("NumInputs"); + auto const occupancy = state.get_float64("Occupancy"); + auto const matching_rate = state.get_float64("MatchingRate"); std::size_t const size = num_keys / occupancy; @@ -68,7 +68,10 @@ NVBENCH_BENCH_TYPES(static_multiset_retrieve, .set_name("static_multiset_retrieve_uniform_occupancy") .set_type_axes_names({"Key", "Distribution"}) .set_max_noise(defaults::MAX_NOISE) - .add_float64_axis("Occupancy", defaults::OCCUPANCY_RANGE); + .add_int64_axis("NumInputs", {defaults::N}) + .add_float64_axis("Occupancy", defaults::OCCUPANCY_RANGE) + .add_float64_axis("MatchingRate", {defaults::MATCHING_RATE}) + .add_int64_axis("Multiplicity", {defaults::MULTIPLICITY}); NVBENCH_BENCH_TYPES(static_multiset_retrieve, NVBENCH_TYPE_AXES(defaults::KEY_TYPE_RANGE, @@ -76,7 +79,10 @@ NVBENCH_BENCH_TYPES(static_multiset_retrieve, .set_name("static_multiset_retrieve_uniform_matching_rate") .set_type_axes_names({"Key", "Distribution"}) .set_max_noise(defaults::MAX_NOISE) - .add_float64_axis("MatchingRate", defaults::MATCHING_RATE_RANGE); + .add_int64_axis("NumInputs", {defaults::N}) + .add_float64_axis("Occupancy", {defaults::OCCUPANCY}) + .add_float64_axis("MatchingRate", defaults::MATCHING_RATE_RANGE) + .add_int64_axis("Multiplicity", {defaults::MULTIPLICITY}); NVBENCH_BENCH_TYPES(static_multiset_retrieve, NVBENCH_TYPE_AXES(defaults::KEY_TYPE_RANGE, @@ -84,4 +90,7 @@ NVBENCH_BENCH_TYPES(static_multiset_retrieve, .set_name("static_multiset_retrieve_uniform_multiplicity") .set_type_axes_names({"Key", "Distribution"}) .set_max_noise(defaults::MAX_NOISE) + .add_int64_axis("NumInputs", {defaults::N}) + .add_float64_axis("Occupancy", {defaults::OCCUPANCY}) + .add_float64_axis("MatchingRate", {defaults::MATCHING_RATE}) .add_int64_axis("Multiplicity", defaults::MULTIPLICITY_RANGE);