Skip to content

Commit ee16f37

Browse files
DigitalInBlueDigitalInBlue
committed
Merge branch 'develop'
2 parents 4d96b25 + 577adb6 commit ee16f37

File tree

14 files changed

+150
-155
lines changed

14 files changed

+150
-155
lines changed

‎experiments/DemoTransform/DemoTransform.cpp

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,11 @@ constexpr int Multiple = 2112;
4141
class DemoTransformFixture : public celero::TestFixture
4242
{
4343
public:
44-
4544
DemoTransformFixture()
4645
{
4746
}
4847

49-
virtual std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
48+
std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
5049
{
5150
std::vector<celero::TestFixture::ExperimentValue> problemSpaceValues;
5251

@@ -68,7 +67,7 @@ class DemoTransformFixture : public celero::TestFixture
6867
}
6968

7069
/// Before each run, build a vector of random integers.
71-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
70+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
7271
{
7372
this->arraySize = static_cast<int>(experimentValue.Value);
7473

@@ -81,7 +80,7 @@ class DemoTransformFixture : public celero::TestFixture
8180
}
8281

8382
/// After each run, clear the vector of random integers.
84-
virtual void tearDown() override
83+
void tearDown() override
8584
{
8685
this->arrayIn.clear();
8786
this->arrayOut.clear();
@@ -102,18 +101,17 @@ BASELINE_F(DemoTransform, ForLoop, DemoTransformFixture, 30, 10000)
102101
}
103102

104103
BASELINE_FIXED_F(DemoTransform, FixedTime, DemoTransformFixture, 1, 100)
105-
{ }
104+
{
105+
}
106106

107107
BENCHMARK_F(DemoTransform, StdTransform, DemoTransformFixture, 30, 10000)
108108
{
109-
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayOut.begin(),
110-
std::bind1st(std::multiplies<int>(), Multiple));
109+
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayOut.begin(), std::bind1st(std::multiplies<int>(), Multiple));
111110
}
112111

113112
BENCHMARK_F(DemoTransform, StdTransformLambda, DemoTransformFixture, 30, 10000)
114113
{
115-
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayOut.begin(),
116-
[](int in) -> int { return in * Multiple; });
114+
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayOut.begin(), [](int in) -> int { return in * Multiple; });
117115
}
118116

119117
BENCHMARK_F(DemoTransform, SelfForLoop, DemoTransformFixture, 30, 10000)
@@ -126,12 +124,10 @@ BENCHMARK_F(DemoTransform, SelfForLoop, DemoTransformFixture, 30, 10000)
126124

127125
BENCHMARK_F(DemoTransform, SelfStdTransform, DemoTransformFixture, 30, 10000)
128126
{
129-
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayIn.begin(),
130-
std::bind1st(std::multiplies<int>(), Multiple));
127+
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayIn.begin(), std::bind1st(std::multiplies<int>(), Multiple));
131128
}
132129

133130
BENCHMARK_F(DemoTransform, SelfStdTransformLambda, DemoTransformFixture, 30, 10000)
134131
{
135-
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayIn.begin(),
136-
[](int in) -> int { return in * Multiple; });
132+
std::transform(this->arrayIn.begin(), this->arrayIn.end(), this->arrayIn.begin(), [](int in) -> int { return in * Multiple; });
137133
}

‎experiments/ExperimentCompressBools/ExperimentCompressBools.cpp

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
// Original code at: https://github.com/fenbf/benchmarkLibsTest
22

3-
#pragma warning(push)
4-
#pragma warning(disable : 4251) // warning C4251: celero::Result::pimpl': class 'celero::Pimpl<celero::Result::Impl>' needs to have dll-interface to
5-
// be used by clients of class 'celero::Result'
63
#include <celero\Celero.h>
7-
#pragma warning(pop)
8-
94
#include <emmintrin.h>
105
#include <omp.h>
6+
117
#include <array>
128
#include <bitset>
139
#include <iostream>
@@ -53,7 +49,7 @@ class MyExperimentValue : public celero::TestFixture::ExperimentValue
5349
class CompressBoolsFixture : public celero::TestFixture
5450
{
5551
public:
56-
virtual std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
52+
std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
5753
{
5854
std::vector<celero::TestFixture::ExperimentValue> problemSpace;
5955

@@ -75,7 +71,7 @@ class CompressBoolsFixture : public celero::TestFixture
7571
}
7672

7773
/// Before each run, build a vector of random integers.
78-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
74+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
7975
{
8076
this->arrayLength = static_cast<size_t>(experimentValue.Value);
8177
this->inputValues.reset(new int[arrayLength]);
@@ -108,13 +104,13 @@ class CompressBoolsFixture : public celero::TestFixture
108104
class NoPackingFixture : public CompressBoolsFixture
109105
{
110106
public:
111-
virtual void setUp(const celero::TestFixture::ExperimentValue& x) override
107+
void setUp(const celero::TestFixture::ExperimentValue& x) override
112108
{
113109
CompressBoolsFixture::setUp(x);
114110
this->outputValues.reset(new bool[static_cast<unsigned int>(arrayLength)]);
115111
}
116112

117-
virtual void tearDown() override
113+
void tearDown() override
118114
{
119115
for(size_t i = 0; i < arrayLength; ++i)
120116
{
@@ -136,7 +132,7 @@ BASELINE_F(CompressBoolsTest, NoPackingVersion, NoPackingFixture, SamplesCount,
136132
class StdBitsetFixture : public CompressBoolsFixture
137133
{
138134
public:
139-
virtual void tearDown() override
135+
void tearDown() override
140136
{
141137
for(size_t i = 0; i < this->arrayLength; ++i)
142138
{
@@ -160,13 +156,13 @@ BENCHMARK_F(CompressBoolsTest, StdBitset, StdBitsetFixture, SamplesCount, Iterat
160156
class StdVectorFixture : public CompressBoolsFixture
161157
{
162158
public:
163-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
159+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
164160
{
165161
CompressBoolsFixture::setUp(experimentValue);
166162
this->outputVector.resize(static_cast<unsigned int>(experimentValue.Value));
167163
}
168164

169-
virtual void tearDown() override
165+
void tearDown() override
170166
{
171167
for(size_t i = 0; i < arrayLength; ++i)
172168
{
@@ -192,7 +188,7 @@ class ManualVersionFixture : public CompressBoolsFixture
192188
{
193189
}
194190

195-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
191+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
196192
{
197193
CompressBoolsFixture::setUp(experimentValue);
198194

@@ -202,7 +198,7 @@ class ManualVersionFixture : public CompressBoolsFixture
202198
this->outputValues.reset(new uint8_t[this->numBytes]);
203199
}
204200

205-
virtual void tearDown() override
201+
void tearDown() override
206202
{
207203
for(size_t i = 0; i < this->arrayLength; ++i)
208204
{
@@ -311,7 +307,7 @@ struct bool8
311307
class PackedStructFixture : public CompressBoolsFixture
312308
{
313309
public:
314-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
310+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
315311
{
316312
CompressBoolsFixture::setUp(experimentValue);
317313

@@ -320,7 +316,7 @@ class PackedStructFixture : public CompressBoolsFixture
320316
this->outputValues.reset(new bool8[numBytes]);
321317
}
322318

323-
virtual void tearDown() override
319+
void tearDown() override
324320
{
325321
for(size_t i = 0; i < arrayLength; ++i)
326322
{
@@ -467,7 +463,7 @@ BENCHMARK_F(CompressBoolsTest, WithOpenMP, ManualVersionFixture, SamplesCount, I
467463
class SimdVersionFixture : public CompressBoolsFixture
468464
{
469465
public:
470-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
466+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
471467
{
472468
CompressBoolsFixture::setUp(experimentValue);
473469

@@ -482,7 +478,7 @@ class SimdVersionFixture : public CompressBoolsFixture
482478
}
483479
}
484480

485-
virtual void tearDown() override
481+
void tearDown() override
486482
{
487483
for(size_t i = 0; i < this->arrayLength; ++i)
488484
{

‎experiments/ExperimentCostSharedPtr/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,17 @@
2121
#
2222
SET(PROJECT_NAME CeleroExperiment-CostOfSharedPtr)
2323

24-
#
25-
# Add Header Files
26-
#
27-
set(TARGET_H
28-
)
29-
3024
#
3125
# Add Sources
3226
#
3327
set(TARGET_SRC
3428
ExperimentCostOfSharedPtr.cpp
29+
osg_ref_ptr.h
3530
)
3631

3732
# Broiler Plate: Assign the src and headers to the executable.
3833
add_executable(${PROJECT_NAME}
3934
${TARGET_SRC}
40-
${TARGET_H}
4135
)
4236

4337
# Broiler Plate: Celero Project Dependencies

‎experiments/ExperimentCostSharedPtr/ExperimentCostOfSharedPtr.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include <celero/Celero.h>
22
#include <celero/Utilities.h>
33

4-
#include "osg_ref_ptr.h"
5-
64
#include <array>
75
#include <chrono>
86
#include <thread>
97

8+
#include "osg_ref_ptr.h"
9+
1010
///
1111
/// This is the main(int argc, char** argv) for the entire celero program.
1212
/// You can write your own, or use this macro to insert the standard one into the project.

‎experiments/ExperimentParticles/ExperimentParticles.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
// Original code at: https://github.com/fenbf/benchmarkLibsTest
22

33
#include <celero/Celero.h>
4+
45
#include "Particles.h"
56

67
CELERO_MAIN;
78

89
class ParticlesFixture : public celero::TestFixture
910
{
1011
public:
11-
virtual std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
12+
std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
1213
{
1314
std::vector<celero::TestFixture::ExperimentValue> problemSpace;
1415
const auto totalNumberOfTests = 10;
@@ -28,7 +29,7 @@ class ParticlesObjVectorFixture : public ParticlesFixture
2829
{
2930
public:
3031
/// Before each run, build a vector of random integers.
31-
virtual void setUp(const celero::TestFixture::ExperimentValue& x) override
32+
void setUp(const celero::TestFixture::ExperimentValue& x) override
3233
{
3334
this->particles = std::vector<Particle>(x.Value);
3435

@@ -39,7 +40,7 @@ class ParticlesObjVectorFixture : public ParticlesFixture
3940
}
4041

4142
/// After each run, clear the vector
42-
virtual void tearDown() override
43+
void tearDown() override
4344
{
4445
this->particles.clear();
4546
}
@@ -72,7 +73,7 @@ class ParticlesPtrVectorFixture : public ParticlesFixture
7273
}
7374

7475
/// Before each run, build a vector of random integers.
75-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
76+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
7677
{
7778
this->particles = std::vector<std::shared_ptr<Particle>>(experimentValue.Value);
7879

@@ -102,7 +103,7 @@ class ParticlesPtrVectorFixture : public ParticlesFixture
102103
}
103104

104105
/// After each run, clear the vector
105-
virtual void tearDown() override
106+
void tearDown() override
106107
{
107108
this->particles.clear();
108109
}

‎experiments/ExperimentSortingRandomInts/ExperimentSortingRandomInts.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include <celero/Celero.h>
2+
23
#include <algorithm>
34

45
#ifndef _WIN32
@@ -40,7 +41,7 @@ class SortFixture : public celero::TestFixture
4041
{
4142
}
4243

43-
virtual std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
44+
std::vector<celero::TestFixture::ExperimentValue> getExperimentValues() const override
4445
{
4546
std::vector<celero::TestFixture::ExperimentValue> problemSpace;
4647

@@ -55,14 +56,14 @@ class SortFixture : public celero::TestFixture
5556
}
5657

5758
/// Before each sample, build a vector of random integers.
58-
virtual void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
59+
void setUp(const celero::TestFixture::ExperimentValue& experimentValue) override
5960
{
6061
this->arraySize = experimentValue.Value;
6162
this->array.resize(this->arraySize);
6263
}
6364

6465
// Before each iteration
65-
virtual void onExperimentStart(const celero::TestFixture::ExperimentValue&) override
66+
void onExperimentStart(const celero::TestFixture::ExperimentValue&) override
6667
{
6768
for(int i = 0; i < this->arraySize; i++)
6869
{
@@ -71,14 +72,14 @@ class SortFixture : public celero::TestFixture
7172
}
7273

7374
// After each iteration
74-
virtual void onExperimentEnd() override
75+
void onExperimentEnd() override
7576
{
7677
/// After each iteration, clear the vector of random integers.
7778
this->array.clear();
7879
}
7980

8081
// After each sample
81-
virtual void tearDown() override
82+
void tearDown() override
8283
{
8384
}
8485

0 commit comments

Comments
 (0)