Skip to content

Commit aea8ab3

Browse files
committed
Minor edits and updates.
1 parent 570bea4 commit aea8ab3

File tree

22 files changed

+62
-36
lines changed

22 files changed

+62
-36
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Top level makefile for Celero
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

README.md

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### C++ Benchmarking Library
44

5-
Copyright 2017-2021 John Farrier
5+
Copyright 2017-2022 John Farrier
66

77
Apache 2.0 License
88

@@ -25,20 +25,22 @@ A Special Thanks to the following corporations for their support:
2525

2626
Celero has been successfully built on the following platforms during development. See [Travis.CI](https://travis-ci.org/DigitalInBlue/Celero) for more details.
2727

28-
- GCC v6.0.0
29-
- GCC v7.0.0
30-
- GCC v8.0.0
31-
- GCC v9.0.0
32-
- LLVM v3.9.0
33-
- LLVM v5.0.1
34-
- LLVM v7.0.0
35-
- LLVM v8.0.0
36-
- LLVM v9.0.0
37-
- Visual Studio 2019 (16.8.4)
38-
- XCode v10.1
39-
- XCode v10.3
40-
- XCode v11.0
41-
- XCode v12.0
28+
- GCC v6.0.0
29+
- GCC v7.0.0
30+
- GCC v8.0.0
31+
- GCC v9.0.0
32+
- LLVM v3.9.0
33+
- LLVM v5.0.1
34+
- LLVM v7.0.0
35+
- LLVM v8.0.0
36+
- LLVM v9.0.0
37+
- Visual Studio 2019 (16.8.4)
38+
- Visual Studio 2019 (16.11.5)
39+
- Visual Studio 2022 (17.0.5)
40+
- XCode v10.1
41+
- XCode v10.3
42+
- XCode v11.0
43+
- XCode v12.0
4244

4345
As of v2.7, Celero requres the developer to provide GoogleTest in order to build unit tests. We suggest using a package manager such as VCPKG or Conan to provide the latest version of the library.
4446

@@ -339,7 +341,7 @@ BASELINE_FIXED_F(DemoTransform, FixedTime, DemoTransformFixture, 1, 100)
339341
{ /* Nothing to do */ }
340342
```
341343

342-
It is important that if your measurements use a test fixture, that your baseline (even if fixed) should use a test fixture as well. Features such as User-Defined Measurements (UDMs) look to the baseline class to detect if other features are present. If the baseline does not use a test fixuture, Celero will not know that other classes do use a test fixture that offers a UDM.
344+
It is important that if your measurements use a test fixture, that your baseline (even if fixed) should use a test fixture as well. Features such as User-Defined Measurements (UDMs) look to the baseline class to detect if other features are present. If the baseline does not use a test fixture, Celero will not know that other classes do use a test fixture that offers a UDM.
343345

344346
### User-Defined Measurements (UDM)
345347

@@ -705,7 +707,7 @@ SortRandInts,stdSort,2048,2000,2,0,0.0135828,49,20408.2,98,104.369,282,180.859,1
705707
SortRandInts,stdSort,4096,2000,2,0,0.00636808,105.5,9478.67,211,221.056,468,392.122,19.8021,6.47829,52.0453,0.507826,1159168,1.15917e+06,1159168,0,0,-nan(ind),0,0,
706708
```
707709
708-
Note that in this data, there are `T` statistics and there are `R` stastics. `T` represents _Time_ and `R` represents _RAM_.
710+
Note that in this data, there are `T` statistics and there are `R` statistics. `T` represents _Time_ and `R` represents _RAM_.
709711
710712
The point here is not that `std::sort` is better than more elementary sorting methods, but how easily measurable results can be obtained. In making such measurements more accessible and easier to code, they can become part of the way we code just as automated testing has become.
711713

experiments/DemoFileWrite/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/DemoMultithread/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/DemoSimple/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/DemoSimpleJUnit/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/DemoSleep/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/DemoToString/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/DemoTransform/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentCompressBools/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentCostDoNotOptimizeAway/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentCostDoNotOptimizeAway/ExperimentCostOfDoNotOptimizeAway.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ CELERO_MAIN
1515
static const int SamplesCount = 10000;
1616
static const int IterationsCount = 10000;
1717

18+
#ifndef WIN32
1819
#pragma GCC diagnostic push
1920
#pragma GCC diagnostic ignored "-Wunused-volatile-lvalue"
21+
#endif
2022
BASELINE(DNOA, Baseline, SamplesCount, IterationsCount)
2123
{
2224
volatile std::vector<int> x(1024);
2325
x;
2426
}
27+
#ifndef WIN32
2528
#pragma GCC diagnostic pop
29+
#endif
2630

2731
BENCHMARK(DNOA, VarImpl, SamplesCount, IterationsCount)
2832
{
@@ -75,15 +79,19 @@ BENCHMARK(DNOA, VarThreadID2, SamplesCount, IterationsCount)
7579
}
7680
}
7781

82+
#ifndef WIN32
7883
#pragma GCC diagnostic push
7984
#pragma GCC diagnostic ignored "-Wunused-volatile-lvalue"
85+
#endif
8086
BENCHMARK(DNOA, VarVolatile, SamplesCount, IterationsCount)
8187
{
8288
std::vector<int> x(1024);
8389
volatile decltype(x) foo = x;
8490
foo;
8591
}
92+
#ifndef WIN32
8693
#pragma GCC diagnostic pop
94+
#endif
8795

8896
BENCHMARK(DNOA, LambdaImpl, SamplesCount, IterationsCount)
8997
{
@@ -93,8 +101,10 @@ BENCHMARK(DNOA, LambdaImpl, SamplesCount, IterationsCount)
93101
});
94102
}
95103

104+
#ifndef WIN32
96105
#pragma GCC diagnostic push
97106
#pragma GCC diagnostic ignored "-Wunused-value"
107+
#endif
98108
BENCHMARK(DNOA, LambdaVoidImpl, SamplesCount, IterationsCount)
99109
{
100110
// Because the lambda does not return, it will be completely optimized away.
@@ -103,7 +113,9 @@ BENCHMARK(DNOA, LambdaVoidImpl, SamplesCount, IterationsCount)
103113
x;
104114
});
105115
}
116+
#ifndef WIN32
106117
#pragma GCC diagnostic pop
118+
#endif
107119

108120
BENCHMARK(DNOA, LambdaChrono, SamplesCount, IterationsCount)
109121
{
@@ -169,8 +181,10 @@ BENCHMARK(DNOA, LambdaThreadID2, SamplesCount, IterationsCount)
169181
}
170182
}
171183

184+
#ifndef WIN32
172185
#pragma GCC diagnostic push
173186
#pragma GCC diagnostic ignored "-Wunused-volatile-lvalue"
187+
#endif
174188
BENCHMARK(DNOA, LambdaVolatile, SamplesCount, IterationsCount)
175189
{
176190
// GCC and Clang Optimize to:
@@ -185,4 +199,6 @@ BENCHMARK(DNOA, LambdaVolatile, SamplesCount, IterationsCount)
185199
volatile auto foo = x();
186200
foo;
187201
}
202+
#ifndef WIN32
188203
#pragma GCC diagnostic pop
204+
#endif

experiments/ExperimentCostOfPimpl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentCostSharedPtr/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentParameterPassing/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentParameterPassing/ExperimentParameterPassing.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,18 @@ BENCHMARK(NonPODPass, ByRRefWithMove, SamplesCount, IterationsCount)
211211
f.setNonPODByRRefWithMove(std::string("bar"));
212212
}
213213

214+
#ifndef WIN32
214215
#pragma GCC diagnostic push
215216
#pragma GCC diagnostic ignored "-Wpessimizing-move"
217+
#endif
216218
BENCHMARK(NonPODPass, ByMoveRRefWithMove, SamplesCount, IterationsCount)
217219
{
218220
Foo f;
219221
f.setNonPODByRRefWithMove(std::move(std::string("bar")));
220222
}
223+
#ifndef WIN32
221224
#pragma GCC diagnostic pop
225+
#endif
222226

223227
BENCHMARK(NonPODPass, ByMoveRRefWithMove2, SamplesCount, IterationsCount)
224228
{
@@ -233,14 +237,18 @@ BENCHMARK(NonPODPass, ByRRefWithSwap, SamplesCount, IterationsCount)
233237
f.setNonPODByRRefWithSwap(std::string("bar"));
234238
}
235239

240+
#ifndef WIN32
236241
#pragma GCC diagnostic push
237242
#pragma GCC diagnostic ignored "-Wpessimizing-move"
243+
#endif
238244
BENCHMARK(NonPODPass, ByMoveRRefWithSwap, SamplesCount, IterationsCount)
239245
{
240246
Foo f;
241247
f.setNonPODByRRefWithSwap(std::move(std::string("bar")));
242248
}
249+
#ifndef WIN32
243250
#pragma GCC diagnostic pop
251+
#endif
244252

245253
// ---------------------------------------------------------------------------------------
246254
// Repeat some of the tests above, but use the varible after the use in the "set" function

experiments/ExperimentParticles/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentSimpleComparison/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentSortingRandomInts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

experiments/ExperimentSortingRandomIntsUDM/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Standard Celero Experiment CMake File
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

include/celero/Callbacks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
///
77
/// \author John Farrier
88
///
9-
/// \copyright Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
9+
/// \copyright Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
1010
///
1111
/// Licensed under the Apache License, Version 2.0 (the "License");
1212
/// you may not use this file except in compliance with the License.

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Top level makefile for Celero
33
#
4-
# Copyright 2015, 2016, 2017, 2018, 2019 John Farrier
4+
# Copyright 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 John Farrier
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)