Rebase and a little refactor

Author: winner245

libcxx/test/benchmarks/GenerateInput.h

@@ -108,29 +108,25 @@ std::vector<IntT> getRandomIntegerInputs(std::size_t N) {
   return inputs;
 }
 
-inline std::vector<std::string> getDuplicateStringInputs(std::size_t N) {
-  std::vector<std::string> inputs(N, getRandomString(1024));
-  return inputs;
-}
-
-inline std::vector<std::string> getRandomStringInputs(std::size_t N) {
+inline std::vector<std::string> getRandomStringInputsWithLength(std::size_t N, std::size_t len) { // N-by-len
   std::vector<std::string> inputs;
   inputs.reserve(N);
   for (std::size_t i = 0; i < N; ++i)
-    inputs.push_back(getRandomString(1024));
+    inputs.push_back(getRandomString(len));
   return inputs;
 }
 
-inline std::vector<std::string> getRandomStringInputsWithLength(std::size_t N, std::size_t len) { // N-by-len
-  std::vector<std::string> inputs;
-  inputs.reserve(N);
-  for (std::size_t i = 0; i < N; ++i)
-    inputs.push_back(getRandomString(len));
+inline std::vector<std::string> getDuplicateStringInputs(std::size_t N) {
+  std::vector<std::string> inputs(N, getRandomString(1024));
   return inputs;
 }
 
+inline std::vector<std::string> getRandomStringInputs(std::size_t N) {
+  return getRandomStringInputsWithLength(N, 1024);
+}
+
 template <class IntT>
-inline std::vector<std::vector<IntT>> getRandomIntegerInputsWithLength(std::size_t N, std::size_t len) { // N-by-len
+std::vector<std::vector<IntT>> getRandomIntegerInputsWithLength(std::size_t N, std::size_t len) { // N-by-len
   std::vector<std::vector<IntT>> inputs;
   inputs.reserve(N);
   for (std::size_t i = 0; i < N; ++i)

libcxx/test/benchmarks/vector_operations.bench.cpp

@@ -18,7 +18,6 @@
 #include <vector>
 
 #include "benchmark/benchmark.h"
-
 #include "ContainerBenchmarks.h"
 #include "GenerateInput.h"