From ae3efc64248f46478fe9ad3863a5dfb0a362fe5f Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 29 Apr 2022 15:37:11 -0600
Subject: [PATCH] [perf] Spawn off benchmark-shape from perf runner

---
 perf/{perf-shaping.hh => benchmark-shape.cc} |  2 ++
 perf/meson.build                             | 10 ++++++++++
 perf/perf.cc                                 |  1 -
 3 files changed, 12 insertions(+), 1 deletion(-)
 rename perf/{perf-shaping.hh => benchmark-shape.cc} (99%)

diff --git a/perf/perf-shaping.hh b/perf/benchmark-shape.cc
similarity index 99%
rename from perf/perf-shaping.hh
rename to perf/benchmark-shape.cc
index 85ee19b77..fa4e55b47 100644
--- a/perf/perf-shaping.hh
+++ b/perf/benchmark-shape.cc
@@ -63,3 +63,5 @@ BENCHMARK_CAPTURE (shape, en-words.txt - Roboto,
 		   "perf/texts/en-words.txt",
 		   HB_DIRECTION_LTR, HB_SCRIPT_LATIN,
 		   "perf/fonts/Roboto-Regular.ttf");
+
+BENCHMARK_MAIN();
diff --git a/perf/meson.build b/perf/meson.build
index e7681bf82..97e8730af 100644
--- a/perf/meson.build
+++ b/perf/meson.build
@@ -21,6 +21,16 @@ benchmark('perf', executable('perf', 'perf.cc',
 ), workdir: meson.current_source_dir() / '..', timeout: 100)
 
 
+benchmark('benchmark-shape', executable('benchmark-shape', 'benchmark-shape.cc',
+  dependencies: [
+    google_benchmark_dep,
+  ],
+  cpp_args: [],
+  include_directories: [incconfig, incsrc],
+  link_with: [libharfbuzz],
+  install: false,
+), workdir: meson.current_source_dir() / '..', timeout: 100)
+
 benchmark('benchmark-set', executable('benchmark-set', 'benchmark-set.cc',
   dependencies: [
     google_benchmark_dep,
diff --git a/perf/perf.cc b/perf/perf.cc
index 2b7a4525d..bfe65d04b 100644
--- a/perf/perf.cc
+++ b/perf/perf.cc
@@ -4,7 +4,6 @@
 #include "config.h"
 #endif
 
-#include "perf-shaping.hh"
 #ifdef HAVE_FREETYPE
 enum backend_t { HARFBUZZ, FREETYPE, TTF_PARSER };
 #include "perf-extents.hh"