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

nico · nico · commit 8720247f60eb · 2021-12-07T20:51:25.000-05:00
This reverts commit bbccf49. 1ee3205 relanded in 5dda2ef.
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
@@ -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/third-party/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",

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ executable("ScudoBenchmarks") {`
`3`	`3`	`sources = [ "malloc_benchmark.cpp" ]`
`4`	`4`	`deps = [`
`5`	`5`	`"//compiler-rt/lib/scudo/standalone:sources",`
`6`		`- "//llvm/utils/benchmark",`
	`6`	`+ "//third-party/benchmark",`
`7`	`7`	`]`
`8`	`8`	`}`