Reland "[gn build] (manually) port 1ee32055ea1d (benchmark move)"

This reverts commit bbccf4992219222c5b905e9965ec26b35e2c6af8.
1ee32055ea1d relanded in 5dda2efde57.

diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
index 879d5a2..9489f68 100644 (file)
--- a/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/scudo/standalone/benchmarks/BUILD.gn
@@ -3,6 +3,6 @@ executable("ScudoBenchmarks") {
   sources = [ "malloc_benchmark.cpp" ]
   deps = [
     "//compiler-rt/lib/scudo/standalone:sources",
-    "//llvm/utils/benchmark",
+    "//third-party/benchmark",
   ]
 }

diff --git a/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn b/llvm/utils/gn/secondary/third-party/benchmark/BUILD.gn
similarity index 82%
rename from llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
rename to llvm/utils/gn/secondary/third-party/benchmark/BUILD.gn
index 39f5a22..a011976 100644 (file)
--- a/llvm/utils/gn/secondary/llvm/utils/benchmark/BUILD.gn
+++ b/llvm/utils/gn/secondary/third-party/benchmark/BUILD.gn
@@ -1,6 +1,9 @@
 static_library("benchmark") {
   sources = [
     "src/benchmark.cc",
+    "src/benchmark_api_internal.cc",
+    "src/benchmark_name.cc",
+    "src/benchmark_runner.cc",
     "src/benchmark_register.cc",
     "src/colorprint.cc",
     "src/commandlineflags.cc",
@@ -9,6 +12,7 @@ static_library("benchmark") {
     "src/counter.cc",
     "src/csv_reporter.cc",
     "src/json_reporter.cc",
+    "src/perf_counters.cc",
     "src/reporter.cc",
     "src/sleep.cc",
     "src/statistics.cc",