Skip to content

Commit 5e19e31

Browse files
philnik777philnik777
committed
[libc++][NFC] Canonicalize the benchmark suite a bit
This replaces `BENCHMARK_TEMPLATE` with `BENCHMARK` and uses `BENCHMARK_MAIN()` when possible.
1 parent 8861328 commit 5e19e31

12 files changed

+130
-180
lines changed

‎libcxx/test/benchmarks/format.bench.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ static void BM_format_string(benchmark::State& state) {
2525

2626
state.SetBytesProcessed(state.iterations() * size * sizeof(CharT));
2727
}
28-
BENCHMARK_TEMPLATE(BM_format_string, char)->RangeMultiplier(2)->Range(1, 1 << 20);
29-
BENCHMARK_TEMPLATE(BM_format_string, wchar_t)->RangeMultiplier(2)->Range(1, 1 << 20);
28+
BENCHMARK(BM_format_string<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
29+
BENCHMARK(BM_format_string<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
3030

31-
int main(int argc, char** argv) {
32-
benchmark::Initialize(&argc, argv);
33-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
34-
return 1;
35-
36-
benchmark::RunSpecifiedBenchmarks();
37-
}
31+
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/format_to.bench.cpp

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,28 +81,22 @@ static void BM_format_to_string_pointer(benchmark::State& state) {
8181

8282
/*** Main ***/
8383

84-
BENCHMARK_TEMPLATE(BM_format_to_string_back_inserter, std::string)->RangeMultiplier(2)->Range(1, 1 << 20);
85-
BENCHMARK_TEMPLATE(BM_format_to_string_back_inserter, std::vector<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
86-
BENCHMARK_TEMPLATE(BM_format_to_string_back_inserter, std::list<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
87-
BENCHMARK_TEMPLATE(BM_format_to_string_begin, std::string)->RangeMultiplier(2)->Range(1, 1 << 20);
88-
BENCHMARK_TEMPLATE(BM_format_to_string_begin, std::vector<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
89-
BENCHMARK_TEMPLATE(BM_format_to_string_begin, std::list<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
90-
BENCHMARK_TEMPLATE(BM_format_to_string_span, char)->RangeMultiplier(2)->Range(1, 1 << 20);
91-
BENCHMARK_TEMPLATE(BM_format_to_string_pointer, char)->RangeMultiplier(2)->Range(1, 1 << 20);
92-
93-
BENCHMARK_TEMPLATE(BM_format_to_string_back_inserter, std::wstring)->RangeMultiplier(2)->Range(1, 1 << 20);
94-
BENCHMARK_TEMPLATE(BM_format_to_string_back_inserter, std::vector<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
95-
BENCHMARK_TEMPLATE(BM_format_to_string_back_inserter, std::list<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
96-
BENCHMARK_TEMPLATE(BM_format_to_string_begin, std::wstring)->RangeMultiplier(2)->Range(1, 1 << 20);
97-
BENCHMARK_TEMPLATE(BM_format_to_string_begin, std::vector<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
98-
BENCHMARK_TEMPLATE(BM_format_to_string_begin, std::list<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
99-
BENCHMARK_TEMPLATE(BM_format_to_string_span, wchar_t)->RangeMultiplier(2)->Range(1, 1 << 20);
100-
BENCHMARK_TEMPLATE(BM_format_to_string_pointer, wchar_t)->RangeMultiplier(2)->Range(1, 1 << 20);
101-
102-
int main(int argc, char** argv) {
103-
benchmark::Initialize(&argc, argv);
104-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
105-
return 1;
106-
107-
benchmark::RunSpecifiedBenchmarks();
108-
}
84+
BENCHMARK(BM_format_to_string_back_inserter<std::string>)->RangeMultiplier(2)->Range(1, 1 << 20);
85+
BENCHMARK(BM_format_to_string_back_inserter<std::vector<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
86+
BENCHMARK(BM_format_to_string_back_inserter<std::list<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
87+
BENCHMARK(BM_format_to_string_begin<std::string>)->RangeMultiplier(2)->Range(1, 1 << 20);
88+
BENCHMARK(BM_format_to_string_begin<std::vector<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
89+
BENCHMARK(BM_format_to_string_begin<std::list<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
90+
BENCHMARK(BM_format_to_string_span<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
91+
BENCHMARK(BM_format_to_string_pointer<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
92+
93+
BENCHMARK(BM_format_to_string_back_inserter<std::wstring>)->RangeMultiplier(2)->Range(1, 1 << 20);
94+
BENCHMARK(BM_format_to_string_back_inserter<std::vector<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
95+
BENCHMARK(BM_format_to_string_back_inserter<std::list<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
96+
BENCHMARK(BM_format_to_string_begin<std::wstring>)->RangeMultiplier(2)->Range(1, 1 << 20);
97+
BENCHMARK(BM_format_to_string_begin<std::vector<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
98+
BENCHMARK(BM_format_to_string_begin<std::list<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
99+
BENCHMARK(BM_format_to_string_span<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
100+
BENCHMARK(BM_format_to_string_pointer<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
101+
102+
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/format_to_n.bench.cpp

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -81,28 +81,22 @@ static void BM_format_to_n_string_pointer(benchmark::State& state) {
8181

8282
/*** Main ***/
8383

84-
BENCHMARK_TEMPLATE(BM_format_to_n_string_back_inserter, std::string)->RangeMultiplier(2)->Range(1, 1 << 20);
85-
BENCHMARK_TEMPLATE(BM_format_to_n_string_back_inserter, std::vector<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
86-
BENCHMARK_TEMPLATE(BM_format_to_n_string_back_inserter, std::list<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
87-
BENCHMARK_TEMPLATE(BM_format_to_n_string_begin, std::string)->RangeMultiplier(2)->Range(1, 1 << 20);
88-
BENCHMARK_TEMPLATE(BM_format_to_n_string_begin, std::vector<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
89-
BENCHMARK_TEMPLATE(BM_format_to_n_string_begin, std::list<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
90-
BENCHMARK_TEMPLATE(BM_format_to_n_string_span, char)->RangeMultiplier(2)->Range(1, 1 << 20);
91-
BENCHMARK_TEMPLATE(BM_format_to_n_string_pointer, char)->RangeMultiplier(2)->Range(1, 1 << 20);
92-
93-
BENCHMARK_TEMPLATE(BM_format_to_n_string_back_inserter, std::wstring)->RangeMultiplier(2)->Range(1, 1 << 20);
94-
BENCHMARK_TEMPLATE(BM_format_to_n_string_back_inserter, std::vector<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
95-
BENCHMARK_TEMPLATE(BM_format_to_n_string_back_inserter, std::list<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
96-
BENCHMARK_TEMPLATE(BM_format_to_n_string_begin, std::wstring)->RangeMultiplier(2)->Range(1, 1 << 20);
97-
BENCHMARK_TEMPLATE(BM_format_to_n_string_begin, std::vector<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
98-
BENCHMARK_TEMPLATE(BM_format_to_n_string_begin, std::list<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
99-
BENCHMARK_TEMPLATE(BM_format_to_n_string_span, wchar_t)->RangeMultiplier(2)->Range(1, 1 << 20);
100-
BENCHMARK_TEMPLATE(BM_format_to_n_string_pointer, wchar_t)->RangeMultiplier(2)->Range(1, 1 << 20);
101-
102-
int main(int argc, char** argv) {
103-
benchmark::Initialize(&argc, argv);
104-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
105-
return 1;
106-
107-
benchmark::RunSpecifiedBenchmarks();
108-
}
84+
BENCHMARK(BM_format_to_n_string_back_inserter<std::string>)->RangeMultiplier(2)->Range(1, 1 << 20);
85+
BENCHMARK(BM_format_to_n_string_back_inserter<std::vector<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
86+
BENCHMARK(BM_format_to_n_string_back_inserter<std::list<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
87+
BENCHMARK(BM_format_to_n_string_begin<std::string>)->RangeMultiplier(2)->Range(1, 1 << 20);
88+
BENCHMARK(BM_format_to_n_string_begin<std::vector<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
89+
BENCHMARK(BM_format_to_n_string_begin<std::list<char>>)->RangeMultiplier(2)->Range(1, 1 << 20);
90+
BENCHMARK(BM_format_to_n_string_span<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
91+
BENCHMARK(BM_format_to_n_string_pointer<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
92+
93+
BENCHMARK(BM_format_to_n_string_back_inserter<std::wstring>)->RangeMultiplier(2)->Range(1, 1 << 20);
94+
BENCHMARK(BM_format_to_n_string_back_inserter<std::vector<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
95+
BENCHMARK(BM_format_to_n_string_back_inserter<std::list<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
96+
BENCHMARK(BM_format_to_n_string_begin<std::wstring>)->RangeMultiplier(2)->Range(1, 1 << 20);
97+
BENCHMARK(BM_format_to_n_string_begin<std::vector<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
98+
BENCHMARK(BM_format_to_n_string_begin<std::list<wchar_t>>)->RangeMultiplier(2)->Range(1, 1 << 20);
99+
BENCHMARK(BM_format_to_n_string_span<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
100+
BENCHMARK(BM_format_to_n_string_pointer<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
101+
102+
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/formatted_size.bench.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ static void BM_formatted_size_string(benchmark::State& state) {
2525

2626
state.SetBytesProcessed(state.iterations() * size * sizeof(CharT));
2727
}
28-
BENCHMARK_TEMPLATE(BM_formatted_size_string, char)->RangeMultiplier(2)->Range(1, 1 << 20);
29-
BENCHMARK_TEMPLATE(BM_formatted_size_string, wchar_t)->RangeMultiplier(2)->Range(1, 1 << 20);
28+
BENCHMARK(BM_formatted_size_string<char>)->RangeMultiplier(2)->Range(1, 1 << 20);
29+
BENCHMARK(BM_formatted_size_string<wchar_t>)->RangeMultiplier(2)->Range(1, 1 << 20);
3030

31-
int main(int argc, char** argv) {
32-
benchmark::Initialize(&argc, argv);
33-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
34-
return 1;
35-
36-
benchmark::RunSpecifiedBenchmarks();
37-
}
31+
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/formatter_int.bench.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ static void BM_Basic(benchmark::State& state) {
3232
for (auto value : data)
3333
benchmark::DoNotOptimize(std::format_to(output.begin(), "{}", value));
3434
}
35-
BENCHMARK_TEMPLATE(BM_Basic, uint32_t);
36-
BENCHMARK_TEMPLATE(BM_Basic, int32_t);
37-
BENCHMARK_TEMPLATE(BM_Basic, uint64_t);
38-
BENCHMARK_TEMPLATE(BM_Basic, int64_t);
35+
BENCHMARK(BM_Basic<uint32_t>);
36+
BENCHMARK(BM_Basic<int32_t>);
37+
BENCHMARK(BM_Basic<uint64_t>);
38+
BENCHMARK(BM_Basic<int64_t>);
3939

4040
// Ideally the low values of a 128-bit value are all dispatched to a 64-bit routine.
4141
template <class T>
@@ -49,11 +49,11 @@ static void BM_BasicLow(benchmark::State& state) {
4949
for (auto value : data)
5050
benchmark::DoNotOptimize(std::format_to(output.begin(), "{}", value));
5151
}
52-
BENCHMARK_TEMPLATE(BM_BasicLow, __uint128_t);
53-
BENCHMARK_TEMPLATE(BM_BasicLow, __int128_t);
52+
BENCHMARK(BM_BasicLow<__uint128_t>);
53+
BENCHMARK(BM_BasicLow<__int128_t>);
5454

55-
BENCHMARK_TEMPLATE(BM_Basic, __uint128_t);
56-
BENCHMARK_TEMPLATE(BM_Basic, __int128_t);
55+
BENCHMARK(BM_Basic<__uint128_t>);
56+
BENCHMARK(BM_Basic<__int128_t>);
5757

5858
// *** Localization ***
5959
enum class LocalizationE { False, True };

‎libcxx/test/benchmarks/lexicographical_compare_three_way.bench.cpp

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,8 @@ static void BM_lexicographical_compare_three_way(benchmark::State& state) {
8080
using IntPtr = int*;
8181

8282
// `lexicographical_compare_three_way` has a fast path for random access iterators.
83-
BENCHMARK_TEMPLATE(BM_lexicographical_compare_three_way, IntPtr)->RangeMultiplier(4)->Range(1, 1 << 20);
84-
BENCHMARK_TEMPLATE(BM_lexicographical_compare_three_way, random_access_iterator<IntPtr>)
85-
->RangeMultiplier(4)
86-
->Range(1, 1 << 20);
87-
BENCHMARK_TEMPLATE(BM_lexicographical_compare_three_way, cpp17_input_iterator<IntPtr>)
88-
->RangeMultiplier(4)
89-
->Range(1, 1 << 20);
83+
BENCHMARK(BM_lexicographical_compare_three_way<IntPtr>)->RangeMultiplier(4)->Range(1, 1 << 20);
84+
BENCHMARK(BM_lexicographical_compare_three_way<random_access_iterator<IntPtr>>)->RangeMultiplier(4)->Range(1, 1 << 20);
85+
BENCHMARK(BM_lexicographical_compare_three_way<cpp17_input_iterator<IntPtr>>)->RangeMultiplier(4)->Range(1, 1 << 20);
9086

91-
int main(int argc, char** argv) {
92-
benchmark::Initialize(&argc, argv);
93-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
94-
return 1;
95-
96-
benchmark::RunSpecifiedBenchmarks();
97-
}
87+
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/std_format_spec_string_unicode.bench.cpp

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -276,25 +276,20 @@ void BM_emoji_text(benchmark::State& state) {
276276
BM_text(state, emoji_text<CharT>());
277277
}
278278

279-
BENCHMARK_TEMPLATE(BM_ascii_text, char);
280-
BENCHMARK_TEMPLATE(BM_unicode_text, char);
281-
BENCHMARK_TEMPLATE(BM_cyrillic_text, char);
282-
BENCHMARK_TEMPLATE(BM_japanese_text, char);
283-
BENCHMARK_TEMPLATE(BM_emoji_text, char);
284-
285-
BENCHMARK_TEMPLATE(BM_ascii_text, wchar_t);
286-
BENCHMARK_TEMPLATE(BM_unicode_text, wchar_t);
287-
BENCHMARK_TEMPLATE(BM_cyrillic_text, wchar_t);
288-
BENCHMARK_TEMPLATE(BM_japanese_text, wchar_t);
289-
BENCHMARK_TEMPLATE(BM_emoji_text, wchar_t);
290-
291-
int main(int argc, char** argv) {
292-
benchmark::Initialize(&argc, argv);
293-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
294-
return 1;
295-
296-
benchmark::RunSpecifiedBenchmarks();
297-
}
279+
BENCHMARK(BM_ascii_text<char>);
280+
BENCHMARK(BM_unicode_text<char>);
281+
BENCHMARK(BM_cyrillic_text<char>);
282+
BENCHMARK(BM_japanese_text<char>);
283+
BENCHMARK(BM_emoji_text<char>);
284+
285+
BENCHMARK(BM_ascii_text<wchar_t>);
286+
BENCHMARK(BM_unicode_text<wchar_t>);
287+
BENCHMARK(BM_cyrillic_text<wchar_t>);
288+
BENCHMARK(BM_japanese_text<wchar_t>);
289+
BENCHMARK(BM_emoji_text<wchar_t>);
290+
291+
BENCHMARK_MAIN();
292+
298293
#else
299294
int main(int, char**) { return 0; }
300295
#endif

‎libcxx/test/benchmarks/std_format_spec_string_unicode_escape.bench.cpp

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -279,25 +279,20 @@ void BM_emoji_escaped(benchmark::State& state) {
279279
BM_escaped(state, emoji_text<CharT>());
280280
}
281281

282-
BENCHMARK_TEMPLATE(BM_ascii_escaped, char);
283-
BENCHMARK_TEMPLATE(BM_unicode_escaped, char);
284-
BENCHMARK_TEMPLATE(BM_cyrillic_escaped, char);
285-
BENCHMARK_TEMPLATE(BM_japanese_escaped, char);
286-
BENCHMARK_TEMPLATE(BM_emoji_escaped, char);
287-
288-
BENCHMARK_TEMPLATE(BM_ascii_escaped, wchar_t);
289-
BENCHMARK_TEMPLATE(BM_unicode_escaped, wchar_t);
290-
BENCHMARK_TEMPLATE(BM_cyrillic_escaped, wchar_t);
291-
BENCHMARK_TEMPLATE(BM_japanese_escaped, wchar_t);
292-
BENCHMARK_TEMPLATE(BM_emoji_escaped, wchar_t);
293-
294-
int main(int argc, char** argv) {
295-
benchmark::Initialize(&argc, argv);
296-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
297-
return 1;
298-
299-
benchmark::RunSpecifiedBenchmarks();
300-
}
282+
BENCHMARK(BM_ascii_escaped<char>);
283+
BENCHMARK(BM_unicode_escaped<char>);
284+
BENCHMARK(BM_cyrillic_escaped<char>);
285+
BENCHMARK(BM_japanese_escaped<char>);
286+
BENCHMARK(BM_emoji_escaped<char>);
287+
288+
BENCHMARK(BM_ascii_escaped<wchar_t>);
289+
BENCHMARK(BM_unicode_escaped<wchar_t>);
290+
BENCHMARK(BM_cyrillic_escaped<wchar_t>);
291+
BENCHMARK(BM_japanese_escaped<wchar_t>);
292+
BENCHMARK(BM_emoji_escaped<wchar_t>);
293+
294+
BENCHMARK_MAIN();
295+
301296
#else
302297
int main(int, char**) { return 0; }
303298
#endif

‎libcxx/test/benchmarks/to_chars.bench.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,4 @@ static void BM_to_chars_bad(benchmark::State& state) {
5050
}
5151
BENCHMARK(BM_to_chars_bad)->DenseRange(2, 36, 1);
5252

53-
int main(int argc, char** argv) {
54-
benchmark::Initialize(&argc, argv);
55-
if (benchmark::ReportUnrecognizedArguments(argc, argv))
56-
return 1;
57-
58-
benchmark::RunSpecifiedBenchmarks();
59-
}
53+
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/variant_visit_1.bench.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212

1313
using namespace VariantBenchmarks;
1414

15-
BENCHMARK_TEMPLATE(BM_Visit, 1, 1);
16-
BENCHMARK_TEMPLATE(BM_Visit, 1, 2);
17-
BENCHMARK_TEMPLATE(BM_Visit, 1, 3);
18-
BENCHMARK_TEMPLATE(BM_Visit, 1, 4);
19-
BENCHMARK_TEMPLATE(BM_Visit, 1, 5);
20-
BENCHMARK_TEMPLATE(BM_Visit, 1, 6);
21-
BENCHMARK_TEMPLATE(BM_Visit, 1, 7);
22-
BENCHMARK_TEMPLATE(BM_Visit, 1, 8);
23-
BENCHMARK_TEMPLATE(BM_Visit, 1, 9);
24-
BENCHMARK_TEMPLATE(BM_Visit, 1, 10);
25-
BENCHMARK_TEMPLATE(BM_Visit, 1, 20);
26-
BENCHMARK_TEMPLATE(BM_Visit, 1, 30);
27-
BENCHMARK_TEMPLATE(BM_Visit, 1, 40);
28-
BENCHMARK_TEMPLATE(BM_Visit, 1, 50);
29-
BENCHMARK_TEMPLATE(BM_Visit, 1, 60);
30-
BENCHMARK_TEMPLATE(BM_Visit, 1, 70);
31-
BENCHMARK_TEMPLATE(BM_Visit, 1, 80);
32-
BENCHMARK_TEMPLATE(BM_Visit, 1, 90);
33-
BENCHMARK_TEMPLATE(BM_Visit, 1, 100);
15+
BENCHMARK(BM_Visit<1, 1>);
16+
BENCHMARK(BM_Visit<1, 2>);
17+
BENCHMARK(BM_Visit<1, 3>);
18+
BENCHMARK(BM_Visit<1, 4>);
19+
BENCHMARK(BM_Visit<1, 5>);
20+
BENCHMARK(BM_Visit<1, 6>);
21+
BENCHMARK(BM_Visit<1, 7>);
22+
BENCHMARK(BM_Visit<1, 8>);
23+
BENCHMARK(BM_Visit<1, 9>);
24+
BENCHMARK(BM_Visit<1, 10>);
25+
BENCHMARK(BM_Visit<1, 20>);
26+
BENCHMARK(BM_Visit<1, 30>);
27+
BENCHMARK(BM_Visit<1, 40>);
28+
BENCHMARK(BM_Visit<1, 50>);
29+
BENCHMARK(BM_Visit<1, 60>);
30+
BENCHMARK(BM_Visit<1, 70>);
31+
BENCHMARK(BM_Visit<1, 80>);
32+
BENCHMARK(BM_Visit<1, 90>);
33+
BENCHMARK(BM_Visit<1, 100>);
3434

3535
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/variant_visit_2.bench.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212

1313
using namespace VariantBenchmarks;
1414

15-
BENCHMARK_TEMPLATE(BM_Visit, 2, 1);
16-
BENCHMARK_TEMPLATE(BM_Visit, 2, 2);
17-
BENCHMARK_TEMPLATE(BM_Visit, 2, 3);
18-
BENCHMARK_TEMPLATE(BM_Visit, 2, 4);
19-
BENCHMARK_TEMPLATE(BM_Visit, 2, 5);
20-
BENCHMARK_TEMPLATE(BM_Visit, 2, 6);
21-
BENCHMARK_TEMPLATE(BM_Visit, 2, 7);
22-
BENCHMARK_TEMPLATE(BM_Visit, 2, 8);
23-
BENCHMARK_TEMPLATE(BM_Visit, 2, 9);
24-
BENCHMARK_TEMPLATE(BM_Visit, 2, 10);
25-
BENCHMARK_TEMPLATE(BM_Visit, 2, 20);
26-
BENCHMARK_TEMPLATE(BM_Visit, 2, 30);
27-
BENCHMARK_TEMPLATE(BM_Visit, 2, 40);
28-
BENCHMARK_TEMPLATE(BM_Visit, 2, 50);
15+
BENCHMARK(BM_Visit<2, 1>);
16+
BENCHMARK(BM_Visit<2, 2>);
17+
BENCHMARK(BM_Visit<2, 3>);
18+
BENCHMARK(BM_Visit<2, 4>);
19+
BENCHMARK(BM_Visit<2, 5>);
20+
BENCHMARK(BM_Visit<2, 6>);
21+
BENCHMARK(BM_Visit<2, 7>);
22+
BENCHMARK(BM_Visit<2, 8>);
23+
BENCHMARK(BM_Visit<2, 9>);
24+
BENCHMARK(BM_Visit<2, 10>);
25+
BENCHMARK(BM_Visit<2, 20>);
26+
BENCHMARK(BM_Visit<2, 30>);
27+
BENCHMARK(BM_Visit<2, 40>);
28+
BENCHMARK(BM_Visit<2, 50>);
2929

3030
BENCHMARK_MAIN();

‎libcxx/test/benchmarks/variant_visit_3.bench.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212

1313
using namespace VariantBenchmarks;
1414

15-
BENCHMARK_TEMPLATE(BM_Visit, 3, 1);
16-
BENCHMARK_TEMPLATE(BM_Visit, 3, 2);
17-
BENCHMARK_TEMPLATE(BM_Visit, 3, 3);
18-
BENCHMARK_TEMPLATE(BM_Visit, 3, 4);
19-
BENCHMARK_TEMPLATE(BM_Visit, 3, 5);
20-
BENCHMARK_TEMPLATE(BM_Visit, 3, 6);
21-
BENCHMARK_TEMPLATE(BM_Visit, 3, 7);
22-
BENCHMARK_TEMPLATE(BM_Visit, 3, 8);
23-
BENCHMARK_TEMPLATE(BM_Visit, 3, 9);
24-
BENCHMARK_TEMPLATE(BM_Visit, 3, 10);
25-
BENCHMARK_TEMPLATE(BM_Visit, 3, 15);
26-
BENCHMARK_TEMPLATE(BM_Visit, 3, 20);
15+
BENCHMARK(BM_Visit<3, 1>);
16+
BENCHMARK(BM_Visit<3, 2>);
17+
BENCHMARK(BM_Visit<3, 3>);
18+
BENCHMARK(BM_Visit<3, 4>);
19+
BENCHMARK(BM_Visit<3, 5>);
20+
BENCHMARK(BM_Visit<3, 6>);
21+
BENCHMARK(BM_Visit<3, 7>);
22+
BENCHMARK(BM_Visit<3, 8>);
23+
BENCHMARK(BM_Visit<3, 9>);
24+
BENCHMARK(BM_Visit<3, 10>);
25+
BENCHMARK(BM_Visit<3, 15>);
26+
BENCHMARK(BM_Visit<3, 20>);
2727

2828
BENCHMARK_MAIN();

0 commit comments

Comments
 (0)