From 69057e6ec00756eeadae3abade3500ea929f2ede Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 5 Feb 2025 19:50:38 +0000 Subject: [PATCH] [Ligature] Cache coverage the same way as PairPos1 Another 7% down on Roboto-Regular. --- src/OT/Layout/GPOS/PairPosFormat1.hh | 6 ++-- src/OT/Layout/GPOS/PairPosFormat2.hh | 6 ++-- src/OT/Layout/GSUB/LigatureSubstFormat1.hh | 40 ++++++++++++++++++++-- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/OT/Layout/GPOS/PairPosFormat1.hh b/src/OT/Layout/GPOS/PairPosFormat1.hh index c9a3de426..079b90c9c 100644 --- a/src/OT/Layout/GPOS/PairPosFormat1.hh +++ b/src/OT/Layout/GPOS/PairPosFormat1.hh @@ -137,12 +137,10 @@ struct PairPosFormat1_3 { TRACE_APPLY (this); + hb_buffer_t *buffer = c->buffer; + #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr; -#endif - - hb_buffer_t *buffer = c->buffer; -#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint, cache); #else unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint); diff --git a/src/OT/Layout/GPOS/PairPosFormat2.hh b/src/OT/Layout/GPOS/PairPosFormat2.hh index 8855a2a91..6685c804b 100644 --- a/src/OT/Layout/GPOS/PairPosFormat2.hh +++ b/src/OT/Layout/GPOS/PairPosFormat2.hh @@ -168,12 +168,10 @@ struct PairPosFormat2_4 : ValueBase { TRACE_APPLY (this); + hb_buffer_t *buffer = c->buffer; + #ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE pair_pos_cache_t *cache = cached ? (pair_pos_cache_t *) c->lookup_accel->cache : nullptr; -#endif - - hb_buffer_t *buffer = c->buffer; -#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint, cache ? &cache->coverage : nullptr); #else unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint); diff --git a/src/OT/Layout/GSUB/LigatureSubstFormat1.hh b/src/OT/Layout/GSUB/LigatureSubstFormat1.hh index 5c7df97d1..6f06116cd 100644 --- a/src/OT/Layout/GSUB/LigatureSubstFormat1.hh +++ b/src/OT/Layout/GSUB/LigatureSubstFormat1.hh @@ -78,11 +78,47 @@ struct LigatureSubstFormat1_2 return lig_set.would_apply (c); } - bool apply (hb_ot_apply_context_t *c) const + unsigned cache_cost () const + { + return (this+coverage).cost (); + } + static void * cache_func (void *p, hb_ot_lookup_cache_op_t op) + { + switch (op) + { + case hb_ot_lookup_cache_op_t::CREATE: + { + hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) hb_malloc (sizeof (hb_ot_lookup_cache_t)); + if (likely (cache)) + cache->clear (); + return cache; + } + case hb_ot_lookup_cache_op_t::ENTER: + return (void *) true; + case hb_ot_lookup_cache_op_t::LEAVE: + return nullptr; + case hb_ot_lookup_cache_op_t::DESTROY: + { + hb_ot_lookup_cache_t *cache = (hb_ot_lookup_cache_t *) p; + hb_free (cache); + return nullptr; + } + } + } + + bool apply_cached (hb_ot_apply_context_t *c) const { return _apply (c, true); } + bool apply (hb_ot_apply_context_t *c) const { return _apply (c, false); } + bool _apply (hb_ot_apply_context_t *c, bool cached) const { TRACE_APPLY (this); + hb_buffer_t *buffer = c->buffer; - unsigned int index = (this+coverage).get_coverage (c->buffer->cur ().codepoint); +#ifndef HB_NO_OT_LAYOUT_LOOKUP_CACHE + hb_ot_lookup_cache_t *cache = cached ? (hb_ot_lookup_cache_t *) c->lookup_accel->cache : nullptr; + unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint, cache); +#else + unsigned int index = (this+coverage).get_coverage (buffer->cur().codepoint); +#endif if (likely (index == NOT_COVERED)) return_trace (false); const auto &lig_set = this+ligatureSet[index];