[libc] Fix Memory Benchmarks code after rename

[avieira]

Summary

Hey,

This fixes the Memory Benchmarks after https://reviews.llvm.org/D107336

I suspect this would have been OK as a NFC, but I just wanted to make sure I wasn't missing anything.

Kind Regards,
Andre

[gchatelet]

Ha thx a lot, I missed these renames...

libc/benchmarks/LibcMemoryBenchmarkMain.cpp

static cl::opt<std::string> Output("output",
                                    cl::value_desc("filename"), cl::init("-"));
 
 static cl::opt<uint32_t>
     NumTrials("num-trials", cl::desc("The number of benchmarks run to perform"),
               cl::init(1));
 
 #if defined(LIBC_BENCHMARK_FUNCTION_MEMCPY)
 #define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_MEMCPY
-using BenchmarkHarness = CopyHarness;
+using BenchmarkSetup = CopySetup;
 #elif defined(LIBC_BENCHMARK_FUNCTION_MEMSET)
 #define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_MEMSET
-using BenchmarkHarness = SetHarness;
+using BenchmarkSetup = SetSetup;
 #elif defined(LIBC_BENCHMARK_FUNCTION_BZERO)
 #define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_BZERO
-using BenchmarkHarness = SetHarness;
+using BenchmarkSetup = SetSetup;
 #elif defined(LIBC_BENCHMARK_FUNCTION_MEMCMP)
 #define LIBC_BENCHMARK_FUNCTION LIBC_BENCHMARK_FUNCTION_MEMCMP
-using BenchmarkHarness = ComparisonHarness;
+using BenchmarkSetup = ComparisonSetup;
 #else
 #error "Missing LIBC_BENCHMARK_FUNCTION_XXX definition"
 #endif
 
-struct MemfunctionBenchmarkBase : public BenchmarkHarness {
+struct MemfunctionBenchmarkBase : public BenchmarkSetup {
   MemfunctionBenchmarkBase() : ReportProgress(isatty(fileno(stdout))) {}
   virtual ~MemfunctionBenchmarkBase() {}
 
   virtual Study run() = 0;
 
   CircularArrayRef<ParameterBatch::ParameterType>
   generateBatch(size_t Iterations) {
     randomize();
     return cycle(makeArrayRef(Parameters), Iterations);
   }
 
 protected:
   Study createStudy() {
     Study Study;
-    // Harness study.
+    // Setup study.
     Study.StudyName = StudyName;
     Runtime &RI = Study.Runtime;
     RI.Host = HostState::get();
     RI.BufferSize = BufferSize;
     RI.BatchParameterCount = BatchSize;
 
     BenchmarkOptions &BO = RI.BenchmarkOptions;
     BO.MinDuration = std::chrono::milliseconds(1);
if (SweepMode && HasDistributionName)
     report_fatal_error("Select only one of `--" + Twine(SweepMode.ArgStr) +
                        "` or `--" + Twine(SizeDistributionName.ArgStr) + "`");
 
   std::unique_ptr<MemfunctionBenchmarkBase> Benchmark;
   if (SweepMode)
     Benchmark.reset(new MemfunctionBenchmarkSweep());
   else
     Benchmark.reset(new MemfunctionBenchmarkDistribution(getDistributionOrDie(
-        BenchmarkHarness::Distributions, SizeDistributionName)));
+        BenchmarkSetup::getDistributions(), SizeDistributionName)));
   writeStudy(Benchmark->run());
 }
 
 } // namespace libc_benchmarks
 } // namespace llvm
 
 #ifndef NDEBUG
 #error For reproducibility benchmarks should not be compiled in DEBUG mode.
 #endif
 
 int main(int argc, char **argv) {
   llvm::cl::ParseCommandLineOptions(argc, argv);
   llvm::libc_benchmarks::main();
   return EXIT_SUCCESS;
 }