From 5f9ff04fb0002351f130f13cdb8719d81d1683e0 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Thu, 18 Jun 2020 02:33:05 +0430 Subject: [PATCH] Add comparison against ttf-parser --- .github/workflows/linux-ci.yml | 2 +- perf/meson.build | 14 ++++- perf/perf-draw.hh | 110 +++++++++++++++++++++++---------- perf/perf-extents.hh | 83 +++++++++++++++++-------- perf/perf.cc | 1 + subprojects/ttf-parser.wrap | 5 ++ 6 files changed, 157 insertions(+), 58 deletions(-) create mode 100644 subprojects/ttf-parser.wrap diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index 80572f818..588607aef 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: install dependencies - run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev + run: sudo apt-get install pkg-config gcc ragel gcovr gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python3 python3-setuptools ninja-build gobject-introspection libgirepository1.0-dev rustc - run: sudo pip3 install fonttools - run: sudo pip3 install git+https://github.com/mesonbuild/meson - name: run diff --git a/perf/meson.build b/perf/meson.build index da0ec1969..aec519f68 100644 --- a/perf/meson.build +++ b/perf/meson.build @@ -1,8 +1,20 @@ google_benchmark = subproject('google-benchmark') google_benchmark_dep = google_benchmark.get_variable('google_benchmark_dep') +ttf_parser_dep = dependency('', required: false) +if add_languages('rust', required: false, native: true) + ttf_parser_dep = subproject('ttf-parser').get_variable('ttf_parser_dep') +endif + benchmark('perf', executable('perf', 'perf.cc', - dependencies : [google_benchmark_dep, freetype_dep], + dependencies: [ + google_benchmark_dep, freetype_dep, + + # the last two, thread and dl, aren't nice as ttf-parser isn't no_std yet + # https://github.com/RazrFalcon/ttf-parser/issues/29 + ttf_parser_dep, thread_dep, cpp.find_library('dl'), + ], + cpp_args: ttf_parser_dep.found() ? ['-DHAVE_TTFPARSER'] : [], include_directories: [incconfig, incsrc], link_with: [libharfbuzz], install: false, diff --git a/perf/perf-draw.hh b/perf/perf-draw.hh index a7fb7c653..efca854a2 100644 --- a/perf/perf-draw.hh +++ b/perf/perf-draw.hh @@ -5,6 +5,10 @@ #include "hb-ft.h" #include FT_OUTLINE_H +#ifdef HAVE_TTFPARSER +#include "ttfparser.h" +#endif + #define HB_UNUSED __attribute__((unused)) static void @@ -41,8 +45,15 @@ static void _ft_cubic_to (const FT_Vector* control1 HB_UNUSED, const FT_Vector* control2 HB_UNUSED, const FT_Vector* to HB_UNUSED, void* user HB_UNUSED) {} +#ifdef HAVE_TTFPARSER +static void _tp_move_to (float x HB_UNUSED, float y HB_UNUSED, void *data HB_UNUSED) {} +static void _tp_line_to (float x, float y, void *data) {} +static void _tp_quad_to (float x1, float y1, float x, float y, void *data) {} +static void _tp_curve_to (float x1, float y1, float x2, float y2, float x, float y, void *data) {} +static void _tp_close_path (void *data) {} +#endif -static void draw (benchmark::State &state, const char *font_path, bool is_var, bool is_ft) +static void draw (benchmark::State &state, const char *font_path, bool is_var, backend_t backend) { hb_font_t *font; unsigned num_glyphs; @@ -56,14 +67,33 @@ static void draw (benchmark::State &state, const char *font_path, bool is_var, b hb_face_destroy (face); } - if (is_var) + if (backend == HARFBUZZ) { - hb_variation_t wght = {HB_TAG ('w','g','h','t'), 500}; - hb_font_set_variations (font, &wght, 1); - } + if (is_var) + { + hb_variation_t wght = {HB_TAG ('w','g','h','t'), 500}; + hb_font_set_variations (font, &wght, 1); + } + hb_draw_funcs_t *draw_funcs = hb_draw_funcs_create (); + hb_draw_funcs_set_move_to_func (draw_funcs, _hb_move_to); + hb_draw_funcs_set_line_to_func (draw_funcs, _hb_line_to); + hb_draw_funcs_set_quadratic_to_func (draw_funcs, _hb_quadratic_to); + hb_draw_funcs_set_cubic_to_func (draw_funcs, _hb_cubic_to); + hb_draw_funcs_set_close_path_func (draw_funcs, _hb_close_path); - if (is_ft) + for (auto _ : state) + for (unsigned gid = 0; gid < num_glyphs; ++gid) + hb_font_draw_glyph (font, gid, draw_funcs, nullptr); + + hb_draw_funcs_destroy (draw_funcs); + } + else if (backend == FREETYPE) { + if (is_var) + { + hb_variation_t wght = {HB_TAG ('w','g','h','t'), 500}; + hb_font_set_variations (font, &wght, 1); + } hb_ft_font_set_funcs (font); FT_Face ft_face = hb_ft_font_get_face (font); hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE); @@ -83,47 +113,65 @@ static void draw (benchmark::State &state, const char *font_path, bool is_var, b FT_Outline_Decompose (&ft_face->glyph->outline, &draw_funcs, nullptr); } } - else + else if (backend == TTF_PARSER) { - hb_draw_funcs_t *draw_funcs = hb_draw_funcs_create (); - hb_draw_funcs_set_move_to_func (draw_funcs, _hb_move_to); - hb_draw_funcs_set_line_to_func (draw_funcs, _hb_line_to); - hb_draw_funcs_set_quadratic_to_func (draw_funcs, _hb_quadratic_to); - hb_draw_funcs_set_cubic_to_func (draw_funcs, _hb_cubic_to); - hb_draw_funcs_set_close_path_func (draw_funcs, _hb_close_path); +#ifdef HAVE_TTFPARSER + ttfp_face *tp_font = (ttfp_face *) malloc (ttfp_face_size_of ()); + hb_blob_t *blob = hb_face_reference_blob (hb_font_get_face (font)); + assert (ttfp_face_init (hb_blob_get_data (blob, nullptr), hb_blob_get_length (blob), 0, tp_font)); + if (is_var) ttfp_set_variation (tp_font, TTFP_TAG('w','g','h','t'), 500); + ttfp_outline_builder builder; + builder.move_to = _tp_move_to; + builder.line_to = _tp_line_to; + builder.quad_to = _tp_quad_to; + builder.curve_to = _tp_curve_to; + builder.close_path = _tp_close_path; + + ttfp_rect bbox; for (auto _ : state) for (unsigned gid = 0; gid < num_glyphs; ++gid) - hb_font_draw_glyph (font, gid, draw_funcs, nullptr); + ttfp_outline_glyph (tp_font, builder, &builder, gid, &bbox); - hb_draw_funcs_destroy (draw_funcs); + hb_blob_destroy (blob); + free (tp_font); +#endif } + else abort (); hb_font_destroy (font); } #define FONT_BASE_PATH "test/subset/data/fonts/" -BENCHMARK_CAPTURE (draw, cff - ot - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, false); -BENCHMARK_CAPTURE (draw, cff - ft - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, true); +BENCHMARK_CAPTURE (draw, cff - ot - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, HARFBUZZ); +BENCHMARK_CAPTURE (draw, cff - ft - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, FREETYPE); +BENCHMARK_CAPTURE (draw, cff - tp - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, TTF_PARSER); -BENCHMARK_CAPTURE (draw, cff2 - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, false); -BENCHMARK_CAPTURE (draw, cff2 - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, true); +BENCHMARK_CAPTURE (draw, cff2 - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, HARFBUZZ); +BENCHMARK_CAPTURE (draw, cff2 - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, FREETYPE); +BENCHMARK_CAPTURE (draw, cff2 - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, TTF_PARSER); -BENCHMARK_CAPTURE (draw, cff2/vf - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, false); -BENCHMARK_CAPTURE (draw, cff2/vf - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, true); +BENCHMARK_CAPTURE (draw, cff2/vf - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, HARFBUZZ); +BENCHMARK_CAPTURE (draw, cff2/vf - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, FREETYPE); +BENCHMARK_CAPTURE (draw, cff2/vf - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, TTF_PARSER); -BENCHMARK_CAPTURE (draw, glyf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, false); -BENCHMARK_CAPTURE (draw, glyf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, true); +BENCHMARK_CAPTURE (draw, glyf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, HARFBUZZ); +BENCHMARK_CAPTURE (draw, glyf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, FREETYPE); +BENCHMARK_CAPTURE (draw, glyf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, TTF_PARSER); -BENCHMARK_CAPTURE (draw, glyf/vf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, false); -BENCHMARK_CAPTURE (draw, glyf/vf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, true); +BENCHMARK_CAPTURE (draw, glyf/vf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, HARFBUZZ); +BENCHMARK_CAPTURE (draw, glyf/vf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, FREETYPE); +BENCHMARK_CAPTURE (draw, glyf/vf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, TTF_PARSER); -BENCHMARK_CAPTURE (draw, glyf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, false); -BENCHMARK_CAPTURE (draw, glyf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, true); +BENCHMARK_CAPTURE (draw, glyf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, HARFBUZZ); +BENCHMARK_CAPTURE (draw, glyf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, FREETYPE); +BENCHMARK_CAPTURE (draw, glyf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, TTF_PARSER); -BENCHMARK_CAPTURE (draw, glyf/vf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, false); -BENCHMARK_CAPTURE (draw, glyf/vf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, true); +BENCHMARK_CAPTURE (draw, glyf/vf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, HARFBUZZ); +BENCHMARK_CAPTURE (draw, glyf/vf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, FREETYPE); +BENCHMARK_CAPTURE (draw, glyf/vf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, TTF_PARSER); -BENCHMARK_CAPTURE (draw, glyf - ot - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, false); -BENCHMARK_CAPTURE (draw, glyf - ft - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, true); +BENCHMARK_CAPTURE (draw, glyf - ot - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, HARFBUZZ); +BENCHMARK_CAPTURE (draw, glyf - ft - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, FREETYPE); +BENCHMARK_CAPTURE (draw, glyf - tp - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, TTF_PARSER); diff --git a/perf/perf-extents.hh b/perf/perf-extents.hh index cb4e17d8d..836fefe8f 100644 --- a/perf/perf-extents.hh +++ b/perf/perf-extents.hh @@ -4,7 +4,11 @@ #include "hb-ft.h" #include "hb-ot.h" -static void extents (benchmark::State &state, const char *font_path, bool is_var, bool is_ft) +#ifdef HAVE_TTFPARSER +#include "ttfparser.h" +#endif + +static void extents (benchmark::State &state, const char *font_path, bool is_var, backend_t backend) { hb_font_t *font; unsigned num_glyphs; @@ -24,42 +28,71 @@ static void extents (benchmark::State &state, const char *font_path, bool is_var hb_font_set_variations (font, &wght, 1); } - if (is_ft) + if (backend == HARFBUZZ || backend == FREETYPE) { - hb_ft_font_set_funcs (font); - hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE); - } + if (backend == FREETYPE) + { + hb_ft_font_set_funcs (font); + hb_ft_font_set_load_flags (font, FT_LOAD_NO_HINTING | FT_LOAD_NO_SCALE); + } - hb_glyph_extents_t extents; - for (auto _ : state) - for (unsigned gid = 0; gid < num_glyphs; ++gid) - hb_font_get_glyph_extents (font, gid, &extents); + hb_glyph_extents_t extents; + for (auto _ : state) + for (unsigned gid = 0; gid < num_glyphs; ++gid) + hb_font_get_glyph_extents (font, gid, &extents); + } + else if (backend == TTF_PARSER) + { +#ifdef HAVE_TTFPARSER + ttfp_face *tp_font = (ttfp_face *) malloc (ttfp_face_size_of ()); + hb_blob_t *blob = hb_face_reference_blob (hb_font_get_face (font)); + assert (ttfp_face_init (hb_blob_get_data (blob, nullptr), hb_blob_get_length (blob), 0, tp_font)); + if (is_var) ttfp_set_variation (tp_font, TTFP_TAG('w','g','h','t'), 500); + + ttfp_rect bbox; + for (auto _ : state) + for (unsigned gid = 0; gid < num_glyphs; ++gid) + ttfp_get_glyph_bbox(tp_font, gid, &bbox); + + hb_blob_destroy (blob); + free (tp_font); +#endif + } hb_font_destroy (font); } #define FONT_BASE_PATH "test/subset/data/fonts/" -BENCHMARK_CAPTURE (extents, cff - ot - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, false); -BENCHMARK_CAPTURE (extents, cff - ft - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, true); +BENCHMARK_CAPTURE (extents, cff - ot - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, HARFBUZZ); +BENCHMARK_CAPTURE (extents, cff - ft - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, FREETYPE); +BENCHMARK_CAPTURE (extents, cff - tp - SourceSansPro, FONT_BASE_PATH "SourceSansPro-Regular.otf", false, TTF_PARSER); -BENCHMARK_CAPTURE (extents, cff2 - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, false); -BENCHMARK_CAPTURE (extents, cff2 - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, true); +BENCHMARK_CAPTURE (extents, cff2 - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, HARFBUZZ); +BENCHMARK_CAPTURE (extents, cff2 - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, FREETYPE); +BENCHMARK_CAPTURE (extents, cff2 - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", false, TTF_PARSER); -BENCHMARK_CAPTURE (extents, cff2/vf - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, false); -BENCHMARK_CAPTURE (extents, cff2/vf - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, true); +BENCHMARK_CAPTURE (extents, cff2/vf - ot - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, HARFBUZZ); +BENCHMARK_CAPTURE (extents, cff2/vf - ft - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, FREETYPE); +BENCHMARK_CAPTURE (extents, cff2/vf - tp - AdobeVFPrototype, FONT_BASE_PATH "AdobeVFPrototype.otf", true, TTF_PARSER); -BENCHMARK_CAPTURE (extents, glyf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, false); -BENCHMARK_CAPTURE (extents, glyf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, true); +BENCHMARK_CAPTURE (extents, glyf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, HARFBUZZ); +BENCHMARK_CAPTURE (extents, glyf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, FREETYPE); +BENCHMARK_CAPTURE (extents, glyf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", false, TTF_PARSER); -BENCHMARK_CAPTURE (extents, glyf/vf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, false); -BENCHMARK_CAPTURE (extents, glyf/vf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, true); +BENCHMARK_CAPTURE (extents, glyf/vf - ot - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, HARFBUZZ); +BENCHMARK_CAPTURE (extents, glyf/vf - ft - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, FREETYPE); +BENCHMARK_CAPTURE (extents, glyf/vf - tp - SourceSerifVariable, FONT_BASE_PATH "SourceSerifVariable-Roman.ttf", true, TTF_PARSER); -BENCHMARK_CAPTURE (extents, glyf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, false); -BENCHMARK_CAPTURE (extents, glyf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, true); +BENCHMARK_CAPTURE (extents, glyf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, HARFBUZZ); +BENCHMARK_CAPTURE (extents, glyf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, FREETYPE); +BENCHMARK_CAPTURE (extents, glyf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", false, TTF_PARSER); -BENCHMARK_CAPTURE (extents, glyf/vf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, false); -BENCHMARK_CAPTURE (extents, glyf/vf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, true); +BENCHMARK_CAPTURE (extents, glyf/vf - ot - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, HARFBUZZ); +BENCHMARK_CAPTURE (extents, glyf/vf - ft - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, FREETYPE); +BENCHMARK_CAPTURE (extents, glyf/vf - tp - Comfortaa, FONT_BASE_PATH "Comfortaa-Regular-new.ttf", true, TTF_PARSER); + +BENCHMARK_CAPTURE (extents, glyf - ot - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, HARFBUZZ); +BENCHMARK_CAPTURE (extents, glyf - ft - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, FREETYPE); +BENCHMARK_CAPTURE (extents, glyf - tp - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, TTF_PARSER); -BENCHMARK_CAPTURE (extents, glyf - ot - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, false); -BENCHMARK_CAPTURE (extents, glyf - ft - Roboto, FONT_BASE_PATH "Roboto-Regular.ttf", false, true); diff --git a/perf/perf.cc b/perf/perf.cc index 893fedc0f..a364b910b 100644 --- a/perf/perf.cc +++ b/perf/perf.cc @@ -6,6 +6,7 @@ #include "perf-shaping.hh" #ifdef HAVE_FREETYPE +enum backend_t { HARFBUZZ, FREETYPE, TTF_PARSER }; #include "perf-extents.hh" #ifdef HB_EXPERIMENTAL_API #include "perf-draw.hh" diff --git a/subprojects/ttf-parser.wrap b/subprojects/ttf-parser.wrap new file mode 100644 index 000000000..11cda5457 --- /dev/null +++ b/subprojects/ttf-parser.wrap @@ -0,0 +1,5 @@ +[wrap-git] +directory=ttf-parser +url=https://github.com/RazrFalcon/ttf-parser.git +depth=1 +revision=master