[benchmark] Switch -font and -shape to monster-fonts submodule

perf/Makefile.am

@@ -12,7 +12,6 @@ EXTRA_DIST += \
 	benchmark-set.cc \
 	benchmark-shape.cc \
 	benchmark-subset.cc \
-	fonts \
 	texts \
 	$(NULL)
 

perf/benchmark-font.cc

@@ -13,7 +13,7 @@
 #endif
 
 
-#define SUBSET_FONT_BASE_PATH "test/subset/data/fonts/"
+#define MONSTER_FONTS "harfbuzz-monster-fonts/"
 
 struct test_input_t
 {
@@ -21,14 +21,13 @@ struct test_input_t
   const char *font_path;
 } default_tests[] =
 {
-  {false, SUBSET_FONT_BASE_PATH "Roboto-Regular.ttf"},
-  {true , SUBSET_FONT_BASE_PATH "RobotoFlex-Variable.ttf"},
-  {false, SUBSET_FONT_BASE_PATH "SourceSansPro-Regular.otf"},
-  {true , SUBSET_FONT_BASE_PATH "AdobeVFPrototype.otf"},
-  {true , SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf"},
-  {false, SUBSET_FONT_BASE_PATH "Comfortaa-Regular-new.ttf"},
-  {false, SUBSET_FONT_BASE_PATH "NotoNastaliqUrdu-Regular.ttf"},
-  {false, SUBSET_FONT_BASE_PATH "NotoSerifMyanmar-Regular.otf"},
+  {false, MONSTER_FONTS "Roboto-Regular.ttf"},
+  {true , MONSTER_FONTS "RobotoFlex.ttf"},
+  {false, MONSTER_FONTS "Amiri-Regular.ttf"},
+  {false, MONSTER_FONTS "NotoNastaliqUrdu-Regular.ttf"},
+  {true , MONSTER_FONTS "AdobeVFPrototype.otf"},
+  {false, MONSTER_FONTS "SourceSerif4Variable-Roman.otf"},
+  {true , MONSTER_FONTS "SourceHanSans-VF.otf"},
 };
 
 static test_input_t *tests = default_tests;

perf/benchmark-shape.cc

@@ -13,7 +13,7 @@
 #include "hb-ft.h"
 #endif
 
-#define SUBSET_FONT_BASE_PATH "test/subset/data/fonts/"
+#define MONSTER_FONTS "harfbuzz-monster-fonts/"
 
 struct test_input_t
 {
@@ -23,33 +23,37 @@ struct test_input_t
 } default_tests[] =
 {
 
-  {"perf/fonts/NotoNastaliqUrdu-Regular.ttf",
+  {MONSTER_FONTS "NotoNastaliqUrdu-Regular.ttf",
    "perf/texts/fa-thelittleprince.txt",
    false},
 
-  {"perf/fonts/NotoNastaliqUrdu-Regular.ttf",
+  {MONSTER_FONTS "NotoNastaliqUrdu-Regular.ttf",
    "perf/texts/fa-words.txt",
    false},
 
-  {"perf/fonts/Amiri-Regular.ttf",
+  {MONSTER_FONTS "Amiri-Regular.ttf",
    "perf/texts/fa-thelittleprince.txt",
    false},
 
-  {SUBSET_FONT_BASE_PATH "NotoSansDevanagari-Regular.ttf",
+  {MONSTER_FONTS "NotoSansDevanagari-Regular.ttf",
    "perf/texts/hi-words.txt",
    false},
 
-  {"perf/fonts/Roboto-Regular.ttf",
+  {MONSTER_FONTS "Roboto-Regular.ttf",
    "perf/texts/en-thelittleprince.txt",
    false},
 
-  {"perf/fonts/Roboto-Regular.ttf",
+  {MONSTER_FONTS "Roboto-Regular.ttf",
    "perf/texts/en-words.txt",
    false},
 
-  {SUBSET_FONT_BASE_PATH "SourceSerifVariable-Roman.ttf",
+  {MONSTER_FONTS "SourceSerifVariable-Roman.ttf",
    "perf/texts/en-thelittleprince.txt",
    true},
+
+  {MONSTER_FONTS "Duployan-Regular.ttf",
+   "perf/texts/duployan.txt",
+   false},
 };
 
 static test_input_t *tests = default_tests;