@@ -25,10 +25,8 @@ using namespace o2::soa;
2525// Validation of new event mixing: time complexity same as for naive loop
2626
2727#ifdef __APPLE__
28- constexpr unsigned int maxPairsRange = 8 ;
2928constexpr unsigned int maxColPairsRange = 21 ;
3029#else
31- constexpr unsigned int maxPairsRange = 8 ;
3230constexpr unsigned int maxColPairsRange = 23 ;
3331#endif
3432constexpr int numEventsToMix = 5 ;
@@ -126,7 +124,7 @@ static void BM_EventMixingTraditional(benchmark::State& state)
126124 state.SetBytesProcessed (state.iterations () * sizeof (float ) * count);
127125}
128126
129- BENCHMARK (BM_EventMixingTraditional)->RangeMultiplier(2 )->Range(4 , 2 << maxPairsRange );
127+ BENCHMARK (BM_EventMixingTraditional)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange );
130128
131129static void BM_EventMixingCombinations (benchmark::State& state)
132130{
@@ -197,7 +195,7 @@ static void BM_EventMixingCombinations(benchmark::State& state)
197195 state.SetBytesProcessed (state.iterations () * sizeof (float ) * count);
198196}
199197
200- BENCHMARK (BM_EventMixingCombinations)->RangeMultiplier(2 )->Range(4 , 2 << maxPairsRange );
198+ BENCHMARK (BM_EventMixingCombinations)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange );
201199
202200static void BM_EventMixingNaiveCollisionsPairsSameCategories (benchmark::State& state)
203201{
@@ -261,7 +259,7 @@ static void BM_EventMixingNaiveCollisionsPairsSameCategories(benchmark::State& s
261259 state.SetBytesProcessed (state.iterations () * sizeof (float ) * colCount);
262260}
263261
264- BENCHMARK (BM_EventMixingNaiveCollisionsPairsSameCategories)->RangeMultiplier(2 )->Range(4 , 2 << maxColPairsRange);
262+ BENCHMARK (BM_EventMixingNaiveCollisionsPairsSameCategories)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
265263
266264static void BM_EventMixingCombGenCollisionsPairsSameCategories (benchmark::State& state)
267265{
@@ -306,6 +304,6 @@ static void BM_EventMixingCombGenCollisionsPairsSameCategories(benchmark::State&
306304 state.SetBytesProcessed (state.iterations () * sizeof (float ) * colCount);
307305}
308306
309- BENCHMARK (BM_EventMixingCombGenCollisionsPairsSameCategories)->RangeMultiplier(2 )->Range(4 , 2 << maxColPairsRange);
307+ BENCHMARK (BM_EventMixingCombGenCollisionsPairsSameCategories)->RangeMultiplier(2 )->Range(4UL , 2UL << maxColPairsRange);
310308
311309BENCHMARK_MAIN ();
0 commit comments