[libc++] [bench] Stop using uniform_int_distribution<char> in benchmarks.
Reviewed as part of D114920.
NOKEYCHECK=True
GitOrigin-RevId: 0e03c62b4c86059fc35b8ce6c087c22a55f43e36
diff --git a/benchmarks/GenerateInput.h b/benchmarks/GenerateInput.h
index e4f131c..3e63f84 100644
--- a/benchmarks/GenerateInput.h
+++ b/benchmarks/GenerateInput.h
@@ -36,10 +36,9 @@
}
template <class IntT>
-inline IntT getRandomInteger(IntT Min = 0,
- IntT Max = std::numeric_limits<IntT>::max()) {
- std::uniform_int_distribution<IntT> dist(Min, Max);
- return dist(getRandomEngine());
+inline IntT getRandomInteger(IntT Min, IntT Max) {
+ std::uniform_int_distribution<unsigned long long> dist(Min, Max);
+ return static_cast<IntT>(dist(getRandomEngine()));
}
inline std::string getRandomString(std::size_t Len) {
@@ -102,7 +101,7 @@
std::vector<IntT> getRandomIntegerInputs(size_t N) {
std::vector<IntT> inputs;
for (size_t i=0; i < N; ++i) {
- inputs.push_back(getRandomInteger<IntT>());
+ inputs.push_back(getRandomInteger<IntT>(0, std::numeric_limits<IntT>::max()));
}
return inputs;
}
diff --git a/benchmarks/algorithms.partition_point.bench.cpp b/benchmarks/algorithms.partition_point.bench.cpp
index 840cf03..8192f97 100644
--- a/benchmarks/algorithms.partition_point.bench.cpp
+++ b/benchmarks/algorithms.partition_point.bench.cpp
@@ -30,7 +30,7 @@
static std::vector<IntT> generateInput(size_t size) {
std::vector<IntT> Res(size);
std::generate(Res.begin(), Res.end(),
- [] { return getRandomInteger<IntT>(); });
+ [] { return getRandomInteger<IntT>(0, std::numeric_limits<IntT>::max()); });
return Res;
}
};
diff --git a/benchmarks/allocation.bench.cpp b/benchmarks/allocation.bench.cpp
index 236e740..ad962de 100644
--- a/benchmarks/allocation.bench.cpp
+++ b/benchmarks/allocation.bench.cpp
@@ -97,7 +97,6 @@
const size_t alloc_size = st.range(0);
const auto NumAllocs = st.max_iterations;
- using PtrT = void*;
std::vector<void*> Pointers(NumAllocs);
for (auto& p : Pointers) {
p = AllocWrapper::Allocate(alloc_size);