diff --git a/perf/Makefile.am b/perf/Makefile.am index 1e67b9231..a17e994f1 100644 --- a/perf/Makefile.am +++ b/perf/Makefile.am @@ -12,7 +12,6 @@ EXTRA_DIST += \ benchmark-set.cc \ benchmark-shape.cc \ benchmark-subset.cc \ - fonts \ texts \ $(NULL) diff --git a/perf/benchmark-font.cc b/perf/benchmark-font.cc index dfe1fa27f..7e25a10a2 100644 --- a/perf/benchmark-font.cc +++ b/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; diff --git a/perf/benchmark-shape.cc b/perf/benchmark-shape.cc index f44b3e58f..85a6f35e3 100644 --- a/perf/benchmark-shape.cc +++ b/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; diff --git a/perf/fonts/Amiri-Regular.ttf b/perf/fonts/Amiri-Regular.ttf deleted file mode 100644 index e328e0630..000000000 Binary files a/perf/fonts/Amiri-Regular.ttf and /dev/null differ diff --git a/perf/fonts/NotoNastaliqUrdu-Regular.ttf b/perf/fonts/NotoNastaliqUrdu-Regular.ttf deleted file mode 100644 index 891f633d8..000000000 Binary files a/perf/fonts/NotoNastaliqUrdu-Regular.ttf and /dev/null differ diff --git a/perf/fonts/Roboto-Regular.ttf b/perf/fonts/Roboto-Regular.ttf deleted file mode 100644 index 500b1045b..000000000 Binary files a/perf/fonts/Roboto-Regular.ttf and /dev/null differ