diff --git a/perf/benchmark-font.cc b/perf/benchmark-font.cc index bdcace3fe..923651100 100644 --- a/perf/benchmark-font.cc +++ b/perf/benchmark-font.cc @@ -1,5 +1,7 @@ #include "hb-benchmark.hh" +#include + #define SUBSET_FONT_BASE_PATH "test/subset/data/fonts/" static hb_variation_t default_variations[] = { @@ -8,6 +10,7 @@ static hb_variation_t default_variations[] = { }; static unsigned max_num_glyphs = 0; +static const char *text = " "; static struct test_input_t { @@ -237,9 +240,6 @@ static void BM_Font (benchmark::State &state, } case load_face_and_shape: { - const char *text = getenv ("HB_BENCHMARK_TEXT"); - if (!text || !*text) - text = " "; for (auto _ : state) { hb_face_t *face = hb_benchmark_face_create_from_file_or_fail (test_input.font_path, 0); @@ -309,33 +309,113 @@ static void test_operation (operation_t op, } } +static const char *font_file = nullptr; +static const char *variations_str = nullptr; + +static GOptionEntry entries[] = +{ + {"font-file", 0, 0, G_OPTION_ARG_STRING, &font_file, "Font file-path to benchmark", "FONTFILE"}, + {"variations", 0, 0, G_OPTION_ARG_STRING, &variations_str, "Variations to apply", "VAR"}, + {"max-glyphs", 0, 0, G_OPTION_ARG_INT, &max_num_glyphs, "Maximum number of glyphs to process", "NUM"}, + {"text", 0, 0, G_OPTION_ARG_STRING, &text, "Text to use for load_face_and_shape test", "TEXT"}, + {nullptr} +}; + +static void print_usage (const char *prgname) +{ + g_print ("Usage: %s [OPTIONS] [FONTFILE]\n", prgname); +} + int main(int argc, char** argv) { - benchmark::Initialize(&argc, argv); + const char *prgname = g_path_get_basename (argv[0]); - if (argc > 1 && strcmp (argv[1], "--max-glyphs") == 0) + GOptionContext *context = g_option_context_new (""); + g_option_context_set_summary (context, "Benchmark font operations"); + g_option_context_set_description (context, "Benchmark Options:"); + g_option_context_add_main_entries (context, entries, nullptr); + + bool show_help = false; + for (int i = 1; i < argc; i++) { - if (argc < 3) + if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) { - fprintf (stderr, "Usage: %s [--max-glyphs ] [ ...]\n", argv[0]); - return 1; + argv[i] = (char *) "--help"; // Ensure it is recognized by both google-benchmark + show_help = true; + break; } - max_num_glyphs = atoi (argv[2]); - argc -= 2; - argv += 2; + } + if (show_help) + { + print_usage (prgname); + + gchar *help_text = g_option_context_get_help (context, false, nullptr); + help_text = strstr (help_text, "\n\n"); + g_print ("%s", help_text); + + benchmark::Initialize(&argc, argv); // This shows the help for google-benchmark } - if (argc > 1) + benchmark::Initialize(&argc, argv); + g_option_context_parse (context, &argc, &argv, nullptr); + g_option_context_free (context); + + argc--; + argv++; + if (!font_file && argc) { - unsigned num_variations = argc - 2; + font_file = *argv; + argc--; + argv++; + } + + if (argc) + { + g_printerr ("Unexpected arguments: "); + for (int i = 0; i < argc; i++) + g_printerr ("%s ", argv[i]); + g_printerr ("\n\n"); + print_usage (prgname); + return 1; + } + + if (font_file) + { + unsigned num_variations = 0; + if (variations_str) + { + const char *p = variations_str; + while (p && *p) + { + num_variations++; + p = strchr (p, ','); + if (p) p++; + } + } hb_variation_t *variations = num_variations ? (hb_variation_t *) calloc (num_variations, sizeof (hb_variation_t)) : nullptr; - for (unsigned i = 0; i < num_variations; i++) - hb_variation_from_string (argv[i + 2], -1, &variations[i]); + if (variations_str) + { + const char *p = variations_str; + for (unsigned i = 0; i < num_variations; i++) + { + const char *end = strchr (p, ','); + if (end) + { + hb_variation_from_string (p, end - p, &variations[i]); + p = end + 1; + } + else + { + hb_variation_from_string (p, -1, &variations[i]); + p = nullptr; + } + } + } num_tests = 1; tests = (test_input_t *) calloc (num_tests, sizeof (test_input_t)); tests[0].variations = num_variations ? variations : default_variations; - tests[0].font_path = argv[1]; + tests[0].font_path = font_file; } #define TEST_OPERATION(op, time_unit) test_operation (op, #op, time_unit) @@ -361,3 +441,4 @@ int main(int argc, char** argv) free (tests); } } + diff --git a/perf/benchmark-shape.cc b/perf/benchmark-shape.cc index 5394da43c..44cbeaca7 100644 --- a/perf/benchmark-shape.cc +++ b/perf/benchmark-shape.cc @@ -1,5 +1,7 @@ #include "hb-benchmark.hh" +#include + #define SUBSET_FONT_BASE_PATH "test/subset/data/fonts/" struct test_input_t @@ -126,22 +128,94 @@ static void test_shaper (const char *shaper, ->Unit(benchmark::kMillisecond); } +static const char *font_file = nullptr; +static const char *text_file = nullptr; + +static GOptionEntry entries[] = +{ + {"font-file", 0, 0, G_OPTION_ARG_STRING, &font_file, "Font file-path to benchmark", "FONTFILE"}, + {"text-file", 0, 0, G_OPTION_ARG_STRING, &text_file, "Text file-path to benchmark", "TEXTFILE"}, + {"variations", 0, 0, G_OPTION_ARG_STRING, &variation, "Variations to apply during shaping", "VARIATIONS"}, + {"direction", 0, 0, G_OPTION_ARG_STRING, &direction, "Direction to apply during shaping", "DIRECTION"}, + {nullptr} +}; + +static void print_usage (const char *prgname) +{ + g_print ("Usage: %s [OPTIONS] [FONTFILE]\n", prgname); +} + int main(int argc, char** argv) { + const char *prgname = g_path_get_basename (argv[0]); + + GOptionContext *context = g_option_context_new (""); + g_option_context_set_summary (context, "Benchmark text shaping with different shapers"); + g_option_context_set_description (context, "Benchmark Options:"); + g_option_context_add_main_entries (context, entries, nullptr); + + // if --help is provided, we need to write help for both option parsers. + bool show_help = false; + for (int i = 1; i < argc; i++) + { + if (strcmp(argv[i], "--help") == 0 || strcmp(argv[i], "-h") == 0) + { + argv[i] = (char *) "--help"; // Ensure it is recognized by both google-benchmark + show_help = true; + break; + } + } + if (show_help) + { + print_usage (prgname); + + gchar *help_text = g_option_context_get_help (context, false, nullptr); + help_text = strstr (help_text, "\n\n"); + g_print ("%s", help_text); + + benchmark::Initialize(&argc, argv); // This shows the help for google-benchmark + } + benchmark::Initialize(&argc, argv); + g_option_context_parse (context, &argc, &argv, nullptr); + g_option_context_free (context); + + argc--; + argv++; + if (!font_file && argc) + { + font_file = *argv; + argv++; + argc--; + } + if (!text_file && argc) + { + text_file = *argv; + argv++; + argc--; + } + + if (argc) + { + g_printerr ("Unexpected arguments: "); + for (int i = 0; i < argc; i++) + g_printerr ("%s ", argv[i]); + g_printerr ("\n\n"); + print_usage (prgname); + return 1; + } test_input_t static_test = {}; - if (argc > 2) + if (font_file && text_file) { - static_test.font_path = argv[1]; - static_test.text_path = argv[2]; - tests = &static_test; - num_tests = 1; + if (font_file && text_file) + { + static_test.font_path = font_file; + static_test.text_path = text_file; + tests = &static_test; + num_tests = 1; + } } - if (argc > 3) - variation = argv[3]; - if (argc > 4) - direction = argv[4]; for (unsigned i = 0; i < num_tests; i++) { diff --git a/perf/hb-benchmark.hh b/perf/hb-benchmark.hh index c976831c0..48ab1b020 100644 --- a/perf/hb-benchmark.hh +++ b/perf/hb-benchmark.hh @@ -32,17 +32,6 @@ #include #include -#include -#ifdef HAVE_FREETYPE -#include -#endif -#ifdef HAVE_FONTATIONS -#include -#endif -#ifdef HAVE_CORETEXT -#include -#endif - #include #include diff --git a/perf/meson.build b/perf/meson.build index 605b8e9a4..b8bdbb70d 100644 --- a/perf/meson.build +++ b/perf/meson.build @@ -1,3 +1,8 @@ +if conf.get('HAVE_GLIB', 0) == 0 + message('You need to have glib support enabled to build perf benchmarks.') + subdir_done() +endif + google_benchmark = subproject('google-benchmark') google_benchmark_dep = google_benchmark.get_variable('google_benchmark_dep') @@ -13,11 +18,10 @@ foreach source : benchmarks benchmark_name = source.split('.')[0] benchmark(benchmark_name, executable(benchmark_name, source, dependencies: [ - google_benchmark_dep, freetype_dep, coretext_deps, + google_benchmark_dep, libharfbuzz_dep ], cpp_args: [], include_directories: [incconfig, incsrc], - link_with: [libharfbuzz], install: false, ), workdir: meson.current_source_dir() / '..', timeout: 100) endforeach @@ -30,11 +34,10 @@ foreach source : benchmarks_subset benchmark_name = source.split('.')[0] benchmark(benchmark_name, executable(benchmark_name, source, dependencies: [ - google_benchmark_dep, freetype_dep, coretext_deps, + google_benchmark_dep, libharfbuzz_dep, libharfbuzz_subset_dep ], cpp_args: [], include_directories: [incconfig, incsrc], - link_with: [libharfbuzz, libharfbuzz_subset], install: false, ), workdir: meson.current_source_dir() / '..', timeout: 100) endforeach