@@ -63,7 +63,7 @@ static void BM_EventMixingTableCreation(benchmark::State& state)
6363 state.SetBytesProcessed (state.iterations () * (12 * sizeof (float ) + sizeof (int64_t ) + 3 * sizeof (int )) * state.range (0 ));
6464}
6565
66- BENCHMARK (BM_EventMixingTableCreation)->RangeMultiplier(2 )->Range(4 , 2 << maxColPairsRange);
66+ BENCHMARK (BM_EventMixingTableCreation)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
6767
6868static void BM_EventMixingBinningCreation (benchmark::State& state)
6969{
@@ -77,7 +77,7 @@ static void BM_EventMixingBinningCreation(benchmark::State& state)
7777 state.SetBytesProcessed (state.iterations () * sizeof (float ));
7878}
7979
80- BENCHMARK (BM_EventMixingBinningCreation)->RangeMultiplier(2 )->Range(4 , 2 << maxColPairsRange);
80+ BENCHMARK (BM_EventMixingBinningCreation)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
8181
8282static void BM_EventMixingPolicyCreation (benchmark::State& state)
8383{
@@ -115,7 +115,7 @@ static void BM_EventMixingPolicyCreation(benchmark::State& state)
115115 state.SetBytesProcessed (state.iterations () * sizeof (float ) * state.range (0 ));
116116}
117117
118- BENCHMARK (BM_EventMixingPolicyCreation)->RangeMultiplier(2 )->Range(2UL << maxColPairsRange , 2UL << maxColPairsRange);
118+ BENCHMARK (BM_EventMixingPolicyCreation)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
119119
120120static void BM_EventMixingCombinationsCreation (benchmark::State& state)
121121{
@@ -146,7 +146,7 @@ static void BM_EventMixingCombinationsCreation(benchmark::State& state)
146146 std::vector<double > yBins{VARIABLE_WIDTH, -0.320 , -0.301 , -0.300 , 0.330 , 0.340 , 0.350 , 0.360 };
147147 using BinningType = ColumnBinningPolicy<o2::aod::collision::PosX, o2::aod::collision::PosY>;
148148 BinningType binningOnPositions{{xBins, yBins}, true }; // true is for 'ignore overflows' (true by default)
149-
149+
150150 auto combPolicy = CombinationsBlockUpperSameIndexPolicy (binningOnPositions, numEventsToMix - 1 , -1 , collisions, collisions);
151151
152152 for (auto _ : state) {
@@ -155,7 +155,7 @@ static void BM_EventMixingCombinationsCreation(benchmark::State& state)
155155 state.SetBytesProcessed (state.iterations () * sizeof (float ));
156156}
157157
158- BENCHMARK (BM_EventMixingCombinationsCreation)->RangeMultiplier(2 )->Range(2 << 25 , 2UL << maxColPairsRange);
158+ BENCHMARK (BM_EventMixingCombinationsCreation)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
159159
160160static void BM_EventMixingCombinations (benchmark::State& state)
161161{
@@ -186,7 +186,7 @@ static void BM_EventMixingCombinations(benchmark::State& state)
186186 std::vector<double > yBins{VARIABLE_WIDTH, -0.320 , -0.301 , -0.300 , 0.330 , 0.340 , 0.350 , 0.360 };
187187 using BinningType = ColumnBinningPolicy<o2::aod::collision::PosX, o2::aod::collision::PosY>;
188188 BinningType binningOnPositions{{xBins, yBins}, true }; // true is for 'ignore overflows' (true by default)
189-
189+
190190 auto combPolicy = CombinationsBlockUpperSameIndexPolicy (binningOnPositions, numEventsToMix - 1 , -1 , collisions, collisions);
191191
192192 auto comb = combinations (combPolicy);
@@ -204,6 +204,6 @@ static void BM_EventMixingCombinations(benchmark::State& state)
204204 state.SetBytesProcessed (state.iterations () * sizeof (float ) * colCount);
205205}
206206
207- BENCHMARK (BM_EventMixingCombinations)->RangeMultiplier(2 )->Range(2 << maxColPairsRange , 2UL << maxColPairsRange);
207+ BENCHMARK (BM_EventMixingCombinations)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
208208
209209BENCHMARK_MAIN ();
0 commit comments