Skip to content

Commit 8a74859

Browse files
spacey-sootyspacey-sooty
committed
fix
1 parent eb9d8ea commit 8a74859

File tree

179 files changed

+15749
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+15749
-4
lines changed

‎thirdparty/catch2/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,23 @@ set_target_properties(catch2 PROPERTIES DEBUG_POSTFIX "d")
1313
set_property(TARGET catch2 PROPERTY FOLDER "libraries")
1414
target_compile_features(catch2 PUBLIC cxx_std_20)
1515

16+
set(CATCH_CONFIG_DEFAULT_REPORTER "console" CACHE STRING "Read docs/configuration.md for details. The name of the reporter should be without quotes.")
17+
set(CATCH_CONFIG_CONSOLE_WIDTH "80" CACHE STRING "Read docs/configuration.md for details. Must form a valid integer literal.")
18+
1619
include_directories(
1720
"${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include"
1821
)
1922

23+
configure_file(
24+
"src/main/native/include/catch2/catch_user_config.hpp.in"
25+
"${CMAKE_CURRENT_BINARY_DIR}/generated-includes/catch2/catch_user_config.hpp"
26+
)
27+
2028
target_include_directories(
2129
catch2
2230
PUBLIC
2331
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/main/native/include>
32+
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/generated-includes>
2433
)
2534

2635
wpilib_target_warnings(catch2)

‎thirdparty/catch2/src/main/native/include/catch2/benchmark/catch_benchmark.hpp

+148
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
2+
// Copyright Catch2 Authors
3+
// Distributed under the Boost Software License, Version 1.0.
4+
// (See accompanying file LICENSE.txt or copy at
5+
// https://www.boost.org/LICENSE_1_0.txt)
6+
7+
// SPDX-License-Identifier: BSL-1.0
8+
// Adapted from donated nonius code.
9+
10+
#ifndef CATCH_BENCHMARK_HPP_INCLUDED
11+
#define CATCH_BENCHMARK_HPP_INCLUDED
12+
13+
#include <catch2/catch_user_config.hpp>
14+
#include <catch2/internal/catch_compiler_capabilities.hpp>
15+
#include <catch2/internal/catch_context.hpp>
16+
#include <catch2/internal/catch_move_and_forward.hpp>
17+
#include <catch2/internal/catch_test_failure_exception.hpp>
18+
#include <catch2/internal/catch_unique_name.hpp>
19+
#include <catch2/interfaces/catch_interfaces_capture.hpp>
20+
#include <catch2/interfaces/catch_interfaces_config.hpp>
21+
#include <catch2/interfaces/catch_interfaces_registry_hub.hpp>
22+
#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
23+
#include <catch2/benchmark/catch_clock.hpp>
24+
#include <catch2/benchmark/catch_environment.hpp>
25+
#include <catch2/benchmark/catch_execution_plan.hpp>
26+
#include <catch2/benchmark/detail/catch_estimate_clock.hpp>
27+
#include <catch2/benchmark/detail/catch_analyse.hpp>
28+
#include <catch2/benchmark/detail/catch_benchmark_function.hpp>
29+
#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
30+
31+
#include <algorithm>
32+
#include <chrono>
33+
#include <exception>
34+
#include <string>
35+
#include <cmath>
36+
37+
namespace Catch {
38+
namespace Benchmark {
39+
struct Benchmark {
40+
Benchmark(std::string&& benchmarkName)
41+
: name(CATCH_MOVE(benchmarkName)) {}
42+
43+
template <class FUN>
44+
Benchmark(std::string&& benchmarkName , FUN &&func)
45+
: fun(CATCH_MOVE(func)), name(CATCH_MOVE(benchmarkName)) {}
46+
47+
template <typename Clock>
48+
ExecutionPlan prepare(const IConfig &cfg, Environment env) {
49+
auto min_time = env.clock_resolution.mean * Detail::minimum_ticks;
50+
auto run_time = std::max(min_time, std::chrono::duration_cast<decltype(min_time)>(cfg.benchmarkWarmupTime()));
51+
auto&& test = Detail::run_for_at_least<Clock>(std::chrono::duration_cast<IDuration>(run_time), 1, fun);
52+
int new_iters = static_cast<int>(std::ceil(min_time * test.iterations / test.elapsed));
53+
return { new_iters, test.elapsed / test.iterations * new_iters * cfg.benchmarkSamples(), CATCH_MOVE(fun), std::chrono::duration_cast<FDuration>(cfg.benchmarkWarmupTime()), Detail::warmup_iterations };
54+
}
55+
56+
template <typename Clock = default_clock>
57+
void run() {
58+
static_assert( Clock::is_steady,
59+
"Benchmarking clock should be steady" );
60+
auto const* cfg = getCurrentContext().getConfig();
61+
62+
auto env = Detail::measure_environment<Clock>();
63+
64+
getResultCapture().benchmarkPreparing(name);
65+
CATCH_TRY{
66+
auto plan = user_code([&] {
67+
return prepare<Clock>(*cfg, env);
68+
});
69+
70+
BenchmarkInfo info {
71+
CATCH_MOVE(name),
72+
plan.estimated_duration.count(),
73+
plan.iterations_per_sample,
74+
cfg->benchmarkSamples(),
75+
cfg->benchmarkResamples(),
76+
env.clock_resolution.mean.count(),
77+
env.clock_cost.mean.count()
78+
};
79+
80+
getResultCapture().benchmarkStarting(info);
81+
82+
auto samples = user_code([&] {
83+
return plan.template run<Clock>(*cfg, env);
84+
});
85+
86+
auto analysis = Detail::analyse(*cfg, samples.data(), samples.data() + samples.size());
87+
BenchmarkStats<> stats{ CATCH_MOVE(info), CATCH_MOVE(analysis.samples), analysis.mean, analysis.standard_deviation, analysis.outliers, analysis.outlier_variance };
88+
getResultCapture().benchmarkEnded(stats);
89+
} CATCH_CATCH_ANON (TestFailureException const&) {
90+
getResultCapture().benchmarkFailed("Benchmark failed due to failed assertion"_sr);
91+
} CATCH_CATCH_ALL{
92+
getResultCapture().benchmarkFailed(translateActiveException());
93+
// We let the exception go further up so that the
94+
// test case is marked as failed.
95+
std::rethrow_exception(std::current_exception());
96+
}
97+
}
98+
99+
// sets lambda to be used in fun *and* executes benchmark!
100+
template <typename Fun, std::enable_if_t<!Detail::is_related<Fun, Benchmark>::value, int> = 0>
101+
Benchmark & operator=(Fun func) {
102+
auto const* cfg = getCurrentContext().getConfig();
103+
if (!cfg->skipBenchmarks()) {
104+
fun = Detail::BenchmarkFunction(func);
105+
run();
106+
}
107+
return *this;
108+
}
109+
110+
explicit operator bool() {
111+
return true;
112+
}
113+
114+
private:
115+
Detail::BenchmarkFunction fun;
116+
std::string name;
117+
};
118+
}
119+
} // namespace Catch
120+
121+
#define INTERNAL_CATCH_GET_1_ARG(arg1, arg2, ...) arg1
122+
#define INTERNAL_CATCH_GET_2_ARG(arg1, arg2, ...) arg2
123+
124+
#define INTERNAL_CATCH_BENCHMARK(BenchmarkName, name, benchmarkIndex)\
125+
if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
126+
BenchmarkName = [&](int benchmarkIndex)
127+
128+
#define INTERNAL_CATCH_BENCHMARK_ADVANCED(BenchmarkName, name)\
129+
if( Catch::Benchmark::Benchmark BenchmarkName{name} ) \
130+
BenchmarkName = [&]
131+
132+
#if defined(CATCH_CONFIG_PREFIX_ALL)
133+
134+
#define CATCH_BENCHMARK(...) \
135+
INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
136+
#define CATCH_BENCHMARK_ADVANCED(name) \
137+
INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), name)
138+
139+
#else
140+
141+
#define BENCHMARK(...) \
142+
INTERNAL_CATCH_BENCHMARK(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), INTERNAL_CATCH_GET_1_ARG(__VA_ARGS__,,), INTERNAL_CATCH_GET_2_ARG(__VA_ARGS__,,))
143+
#define BENCHMARK_ADVANCED(name) \
144+
INTERNAL_CATCH_BENCHMARK_ADVANCED(INTERNAL_CATCH_UNIQUE_NAME(CATCH2_INTERNAL_BENCHMARK_), name)
145+
146+
#endif
147+
148+
#endif // CATCH_BENCHMARK_HPP_INCLUDED

‎thirdparty/catch2/src/main/native/include/catch2/benchmark/catch_benchmark_all.hpp

+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
// Copyright Catch2 Authors
3+
// Distributed under the Boost Software License, Version 1.0.
4+
// (See accompanying file LICENSE.txt or copy at
5+
// https://www.boost.org/LICENSE_1_0.txt)
6+
7+
// SPDX-License-Identifier: BSL-1.0
8+
/** \file
9+
* This is a convenience header for Catch2's benchmarking. It includes
10+
* **all** of Catch2 headers related to benchmarking.
11+
*
12+
* Generally the Catch2 users should use specific includes they need,
13+
* but this header can be used instead for ease-of-experimentation, or
14+
* just plain convenience, at the cost of (significantly) increased
15+
* compilation times.
16+
*
17+
* When a new header is added to either the `benchmark` folder, or to
18+
* the corresponding internal (detail) subfolder, it should be added here.
19+
*/
20+
21+
#ifndef CATCH_BENCHMARK_ALL_HPP_INCLUDED
22+
#define CATCH_BENCHMARK_ALL_HPP_INCLUDED
23+
24+
#include <catch2/benchmark/catch_benchmark.hpp>
25+
#include <catch2/benchmark/catch_chronometer.hpp>
26+
#include <catch2/benchmark/catch_clock.hpp>
27+
#include <catch2/benchmark/catch_constructor.hpp>
28+
#include <catch2/benchmark/catch_environment.hpp>
29+
#include <catch2/benchmark/catch_estimate.hpp>
30+
#include <catch2/benchmark/catch_execution_plan.hpp>
31+
#include <catch2/benchmark/catch_optimizer.hpp>
32+
#include <catch2/benchmark/catch_outlier_classification.hpp>
33+
#include <catch2/benchmark/catch_sample_analysis.hpp>
34+
#include <catch2/benchmark/detail/catch_analyse.hpp>
35+
#include <catch2/benchmark/detail/catch_benchmark_function.hpp>
36+
#include <catch2/benchmark/detail/catch_benchmark_stats.hpp>
37+
#include <catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp>
38+
#include <catch2/benchmark/detail/catch_complete_invoke.hpp>
39+
#include <catch2/benchmark/detail/catch_estimate_clock.hpp>
40+
#include <catch2/benchmark/detail/catch_measure.hpp>
41+
#include <catch2/benchmark/detail/catch_repeat.hpp>
42+
#include <catch2/benchmark/detail/catch_run_for_at_least.hpp>
43+
#include <catch2/benchmark/detail/catch_stats.hpp>
44+
#include <catch2/benchmark/detail/catch_timing.hpp>
45+
46+
#endif // CATCH_BENCHMARK_ALL_HPP_INCLUDED

‎thirdparty/catch2/src/main/native/include/catch2/benchmark/catch_chronometer.hpp

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
2+
// Copyright Catch2 Authors
3+
// Distributed under the Boost Software License, Version 1.0.
4+
// (See accompanying file LICENSE.txt or copy at
5+
// https://www.boost.org/LICENSE_1_0.txt)
6+
7+
// SPDX-License-Identifier: BSL-1.0
8+
// Adapted from donated nonius code.
9+
10+
#ifndef CATCH_CHRONOMETER_HPP_INCLUDED
11+
#define CATCH_CHRONOMETER_HPP_INCLUDED
12+
13+
#include <catch2/benchmark/catch_clock.hpp>
14+
#include <catch2/benchmark/catch_optimizer.hpp>
15+
#include <catch2/internal/catch_meta.hpp>
16+
#include <catch2/internal/catch_move_and_forward.hpp>
17+
18+
namespace Catch {
19+
namespace Benchmark {
20+
namespace Detail {
21+
struct ChronometerConcept {
22+
virtual void start() = 0;
23+
virtual void finish() = 0;
24+
virtual ~ChronometerConcept(); // = default;
25+
26+
ChronometerConcept() = default;
27+
ChronometerConcept(ChronometerConcept const&) = default;
28+
ChronometerConcept& operator=(ChronometerConcept const&) = default;
29+
};
30+
template <typename Clock>
31+
struct ChronometerModel final : public ChronometerConcept {
32+
void start() override { started = Clock::now(); }
33+
void finish() override { finished = Clock::now(); }
34+
35+
IDuration elapsed() const {
36+
return std::chrono::duration_cast<std::chrono::nanoseconds>(
37+
finished - started );
38+
}
39+
40+
TimePoint<Clock> started;
41+
TimePoint<Clock> finished;
42+
};
43+
} // namespace Detail
44+
45+
struct Chronometer {
46+
public:
47+
template <typename Fun>
48+
void measure(Fun&& fun) { measure(CATCH_FORWARD(fun), is_callable<Fun(int)>()); }
49+
50+
int runs() const { return repeats; }
51+
52+
Chronometer(Detail::ChronometerConcept& meter, int repeats_)
53+
: impl(&meter)
54+
, repeats(repeats_) {}
55+
56+
private:
57+
template <typename Fun>
58+
void measure(Fun&& fun, std::false_type) {
59+
measure([&fun](int) { return fun(); }, std::true_type());
60+
}
61+
62+
template <typename Fun>
63+
void measure(Fun&& fun, std::true_type) {
64+
Detail::optimizer_barrier();
65+
impl->start();
66+
for (int i = 0; i < repeats; ++i) invoke_deoptimized(fun, i);
67+
impl->finish();
68+
Detail::optimizer_barrier();
69+
}
70+
71+
Detail::ChronometerConcept* impl;
72+
int repeats;
73+
};
74+
} // namespace Benchmark
75+
} // namespace Catch
76+
77+
#endif // CATCH_CHRONOMETER_HPP_INCLUDED

‎thirdparty/catch2/src/main/native/include/catch2/benchmark/catch_clock.hpp

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
2+
// Copyright Catch2 Authors
3+
// Distributed under the Boost Software License, Version 1.0.
4+
// (See accompanying file LICENSE.txt or copy at
5+
// https://www.boost.org/LICENSE_1_0.txt)
6+
7+
// SPDX-License-Identifier: BSL-1.0
8+
// Adapted from donated nonius code.
9+
10+
#ifndef CATCH_CLOCK_HPP_INCLUDED
11+
#define CATCH_CLOCK_HPP_INCLUDED
12+
13+
#include <chrono>
14+
15+
namespace Catch {
16+
namespace Benchmark {
17+
using IDuration = std::chrono::nanoseconds;
18+
using FDuration = std::chrono::duration<double, std::nano>;
19+
20+
template <typename Clock>
21+
using TimePoint = typename Clock::time_point;
22+
23+
using default_clock = std::chrono::steady_clock;
24+
} // namespace Benchmark
25+
} // namespace Catch
26+
27+
#endif // CATCH_CLOCK_HPP_INCLUDED

0 commit comments

Comments
 (0)