From b10e12569d15e5cb38e5cc733f22663aa6eedca7 Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Wed, 29 Jan 2025 22:48:53 +0100 Subject: [PATCH] Fix misleading items_per_thread tuning parameter for select --- cub/benchmarks/bench/select/flagged.cu | 4 ++-- cub/benchmarks/bench/select/if.cu | 4 ++-- cub/benchmarks/bench/select/unique.cu | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cub/benchmarks/bench/select/flagged.cu b/cub/benchmarks/bench/select/flagged.cu index 3a180a65adc..4436ffc5d3c 100644 --- a/cub/benchmarks/bench/select/flagged.cu +++ b/cub/benchmarks/bench/select/flagged.cu @@ -34,7 +34,7 @@ // %RANGE% TUNE_TRANSPOSE trp 0:1:1 // %RANGE% TUNE_LOAD ld 0:1:1 -// %RANGE% TUNE_ITEMS_PER_THREAD ipt 7:24:1 +// %RANGE% TUNE_NOMINAL_ITEMS_PER_THREAD nipt 7:24:1 // %RANGE% TUNE_THREADS_PER_BLOCK tpb 128:1024:32 // %RANGE% TUNE_MAGIC_NS ns 0:2048:4 // %RANGE% TUNE_DELAY_CONSTRUCTOR_ID dcid 0:7:1 @@ -60,7 +60,7 @@ struct policy_hub_t { struct policy_t : cub::ChainedPolicy<300, policy_t, policy_t> { - static constexpr int NOMINAL_4B_ITEMS_PER_THREAD = TUNE_ITEMS_PER_THREAD; + static constexpr int NOMINAL_4B_ITEMS_PER_THREAD = TUNE_NOMINAL_ITEMS_PER_THREAD; static constexpr int ITEMS_PER_THREAD = CUB_MIN(NOMINAL_4B_ITEMS_PER_THREAD, CUB_MAX(1, (NOMINAL_4B_ITEMS_PER_THREAD * 4 / sizeof(InputT)))); diff --git a/cub/benchmarks/bench/select/if.cu b/cub/benchmarks/bench/select/if.cu index 03d6d57a1ad..1951cc4a6e2 100644 --- a/cub/benchmarks/bench/select/if.cu +++ b/cub/benchmarks/bench/select/if.cu @@ -36,7 +36,7 @@ // %RANGE% TUNE_TRANSPOSE trp 0:1:1 // %RANGE% TUNE_LOAD ld 0:1:1 -// %RANGE% TUNE_ITEMS_PER_THREAD ipt 7:24:1 +// %RANGE% TUNE_NOMINAL_ITEMS_PER_THREAD nipt 7:24:1 // %RANGE% TUNE_THREADS_PER_BLOCK tpb 128:1024:32 // %RANGE% TUNE_MAGIC_NS ns 0:2048:4 // %RANGE% TUNE_DELAY_CONSTRUCTOR_ID dcid 0:7:1 @@ -62,7 +62,7 @@ struct policy_hub_t { struct policy_t : cub::ChainedPolicy<300, policy_t, policy_t> { - static constexpr int NOMINAL_4B_ITEMS_PER_THREAD = TUNE_ITEMS_PER_THREAD; + static constexpr int NOMINAL_4B_ITEMS_PER_THREAD = TUNE_NOMINAL_ITEMS_PER_THREAD; static constexpr int ITEMS_PER_THREAD = CUB_MIN(NOMINAL_4B_ITEMS_PER_THREAD, CUB_MAX(1, (NOMINAL_4B_ITEMS_PER_THREAD * 4 / sizeof(InputT)))); diff --git a/cub/benchmarks/bench/select/unique.cu b/cub/benchmarks/bench/select/unique.cu index 110fe4d8fd2..9ab933f333e 100644 --- a/cub/benchmarks/bench/select/unique.cu +++ b/cub/benchmarks/bench/select/unique.cu @@ -10,7 +10,7 @@ // %RANGE% TUNE_TRANSPOSE trp 0:1:1 // %RANGE% TUNE_LOAD ld 0:1:1 -// %RANGE% TUNE_ITEMS_PER_THREAD ipt 7:24:1 +// %RANGE% TUNE_NOMINAL_ITEMS_PER_THREAD nipt 7:24:1 // %RANGE% TUNE_THREADS_PER_BLOCK tpb 128:1024:32 // %RANGE% TUNE_MAGIC_NS ns 0:2048:4 // %RANGE% TUNE_DELAY_CONSTRUCTOR_ID dcid 0:7:1 @@ -36,7 +36,7 @@ struct policy_hub_t { struct policy_t : cub::ChainedPolicy<300, policy_t, policy_t> { - static constexpr int NOMINAL_4B_ITEMS_PER_THREAD = TUNE_ITEMS_PER_THREAD; + static constexpr int NOMINAL_4B_ITEMS_PER_THREAD = TUNE_NOMINAL_ITEMS_PER_THREAD; static constexpr int ITEMS_PER_THREAD = CUB_MIN(NOMINAL_4B_ITEMS_PER_THREAD, CUB_MAX(1, (NOMINAL_4B_ITEMS_PER_THREAD * 4 / sizeof(InputT))));