diff options
Diffstat (limited to 'absl/random')
| -rw-r--r-- | absl/random/BUILD.bazel | 4 | ||||
| -rw-r--r-- | absl/random/benchmarks.cc | 12 | ||||
| -rw-r--r-- | absl/random/distributions.h | 2 | ||||
| -rw-r--r-- | absl/random/internal/seed_material_test.cc | 3 | ||||
| -rw-r--r-- | absl/random/zipf_distribution.h | 2 |
5 files changed, 12 insertions, 11 deletions
diff --git a/absl/random/BUILD.bazel b/absl/random/BUILD.bazel index 00d42c9..f7587bf 100644 --- a/absl/random/BUILD.bazel +++ b/absl/random/BUILD.bazel @@ -368,9 +368,9 @@ BENCHMARK_TAGS = [ ] # Benchmarks for various methods / test utilities -cc_test( +cc_binary( name = "benchmarks", - size = "small", + testonly = 1, srcs = [ "benchmarks.cc", ], diff --git a/absl/random/benchmarks.cc b/absl/random/benchmarks.cc index 265d54d..87bbb98 100644 --- a/absl/random/benchmarks.cc +++ b/absl/random/benchmarks.cc @@ -25,7 +25,6 @@ #include <type_traits> #include <vector> -#include "benchmark/benchmark.h" #include "absl/base/macros.h" #include "absl/meta/type_traits.h" #include "absl/random/bernoulli_distribution.h" @@ -40,6 +39,7 @@ #include "absl/random/uniform_int_distribution.h" #include "absl/random/uniform_real_distribution.h" #include "absl/random/zipf_distribution.h" +#include "benchmark/benchmark.h" namespace { @@ -221,12 +221,12 @@ void BM_Poisson(benchmark::State& state) { BM_Dist<Engine, Dist>(state, a); } -template <typename Engine, typename Dist, int V = 1, int Q = 2> +template <typename Engine, typename Dist, int Q = 2, int V = 1> void BM_Zipf(benchmark::State& state) { using value_type = typename Dist::result_type; - volatile double v = V; volatile double q = Q; - BM_Dist<Engine, Dist>(state, std::numeric_limits<value_type>::max(), v, q); + volatile double v = V; + BM_Dist<Engine, Dist>(state, std::numeric_limits<value_type>::max(), q, v); } template <typename Engine, typename Dist> @@ -333,8 +333,8 @@ void BM_Thread(benchmark::State& state) { absl::log_uniform_int_distribution<int64_t>); \ BENCHMARK_TEMPLATE(BM_Dist, Engine, std::geometric_distribution<int64_t>); \ BENCHMARK_TEMPLATE(BM_Zipf, Engine, absl::zipf_distribution<uint64_t>); \ - BENCHMARK_TEMPLATE(BM_Zipf, Engine, absl::zipf_distribution<uint64_t>, 3, \ - 2); \ + BENCHMARK_TEMPLATE(BM_Zipf, Engine, absl::zipf_distribution<uint64_t>, 2, \ + 3); \ BENCHMARK_TEMPLATE(BM_Bernoulli, Engine, std::bernoulli_distribution, \ 257305); \ BENCHMARK_TEMPLATE(BM_Bernoulli, Engine, absl::bernoulli_distribution, \ diff --git a/absl/random/distributions.h b/absl/random/distributions.h index c37b734..d8ba3cd 100644 --- a/absl/random/distributions.h +++ b/absl/random/distributions.h @@ -437,6 +437,6 @@ IntType Zipf(URBG&& urbg, // NOLINT(runtime/references) distribution_t, format_t>(&urbg, hi, q, v); } -} // namespace absl. +} // namespace absl #endif // ABSL_RANDOM_DISTRIBUTIONS_H_ diff --git a/absl/random/internal/seed_material_test.cc b/absl/random/internal/seed_material_test.cc index 0de6c4c..6db2820 100644 --- a/absl/random/internal/seed_material_test.cc +++ b/absl/random/internal/seed_material_test.cc @@ -28,7 +28,8 @@ #define ABSL_EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ EXPECT_DEATH_IF_SUPPORTED(statement, ".*") #else -#define ABSL_EXPECT_DEATH_IF_SUPPORTED EXPECT_DEATH_IF_SUPPORTED +#define ABSL_EXPECT_DEATH_IF_SUPPORTED(statement, regex) \ + EXPECT_DEATH_IF_SUPPORTED(statement, regex) #endif namespace { diff --git a/absl/random/zipf_distribution.h b/absl/random/zipf_distribution.h index 1e4dba8..d7b4ac3 100644 --- a/absl/random/zipf_distribution.h +++ b/absl/random/zipf_distribution.h @@ -264,6 +264,6 @@ std::basic_istream<CharT, Traits>& operator>>( return is; } -} // namespace absl. +} // namespace absl #endif // ABSL_RANDOM_ZIPF_DISTRIBUTION_H_ |