From da0c459dd420caf4f02ddad383d4c9e38612fcab Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 2 Apr 2025 15:16:44 -0600 Subject: [PATCH 1/3] [ot-font] Use helpers to acquire/release varStore cache --- src/hb-ot-font.cc | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index a0167e696..a40a926a0 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -71,6 +71,17 @@ struct hb_ot_font_t /* h_advance caching */ mutable hb_atomic_t cached_coords_serial; mutable hb_atomic_t advance_cache; + //mutable hb_atomic_t varStore_cache; + + OT::ItemVariationStore::cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const + { + return varStore.create_cache (); + } + + void release_varStore_cache (OT::ItemVariationStore::cache_t *cache) const + { + OT::ItemVariationStore::destroy_cache (cache); + } }; static hb_ot_font_t * @@ -156,7 +167,7 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data, #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) const OT::HVAR &HVAR = *hmtx.var_table; const OT::ItemVariationStore &varStore = &HVAR + HVAR.varStore; - OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? varStore.create_cache () : nullptr; + OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? ot_font->acquire_varStore_cache (varStore) : nullptr; bool use_cache = font->num_coords; #else @@ -230,7 +241,7 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data, } #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) - OT::ItemVariationStore::destroy_cache (varStore_cache); + ot_font->release_varStore_cache (varStore_cache); #endif } @@ -253,7 +264,7 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data, #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) const OT::VVAR &VVAR = *vmtx.var_table; const OT::ItemVariationStore &varStore = &VVAR + VVAR.varStore; - OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? varStore.create_cache () : nullptr; + OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? ot_font->acquire_varStore_cache (varStore) : nullptr; #else OT::ItemVariationStore::cache_t *varStore_cache = nullptr; #endif @@ -266,7 +277,7 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data, } #if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) - OT::ItemVariationStore::destroy_cache (varStore_cache); + ot_font->release_varStore_cache (varStore_cache); #endif } else From 7da049ed429f12afefcad4333fe95f9825b929be Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 2 Apr 2025 15:18:44 -0600 Subject: [PATCH 2/3] [varStore] Add clear_cache() --- src/hb-ot-layout-common.hh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 3a8177137..123843f20 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -3187,16 +3187,23 @@ struct ItemVariationStore #ifdef HB_NO_VAR return nullptr; #endif - auto &r = this+regions; - unsigned count = r.regionCount; + unsigned count = (this+regions).regionCount; float *cache = (float *) hb_malloc (sizeof (float) * count); - if (unlikely (!cache)) return nullptr; + + clear_cache (cache); + + return cache; + } + + void clear_cache (cache_t *cache) const + { + if (unlikely (!cache)) return; + + unsigned count = (this+regions).regionCount; for (unsigned i = 0; i < count; i++) cache[i] = REGION_CACHE_ITEM_CACHE_INVALID; - - return cache; } static void destroy_cache (cache_t *cache) { hb_free (cache); } From 6f5b8d59c715f830cd60ed7936eb8f9401dff02f Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 3 Apr 2025 01:52:03 -0600 Subject: [PATCH 3/3] [ot-font] Streamline advance cache management --- src/hb-config.hh | 1 - src/hb-ot-font.cc | 172 +++++++++++++++++++++++-------------- src/hb-ot-layout-common.hh | 15 +--- 3 files changed, 113 insertions(+), 75 deletions(-) diff --git a/src/hb-config.hh b/src/hb-config.hh index 40fd1f6b4..3956690da 100644 --- a/src/hb-config.hh +++ b/src/hb-config.hh @@ -192,7 +192,6 @@ #ifdef HB_MINIMIZE_MEMORY_USAGE #define HB_NO_GDEF_CACHE #define HB_NO_OT_LAYOUT_LOOKUP_CACHE -#define HB_NO_OT_FONT_ADVANCE_CACHE #define HB_NO_OT_FONT_CMAP_CACHE #endif diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc index a40a926a0..17e56dbc4 100644 --- a/src/hb-ot-font.cc +++ b/src/hb-ot-font.cc @@ -70,17 +70,101 @@ struct hb_ot_font_t /* h_advance caching */ mutable hb_atomic_t cached_coords_serial; - mutable hb_atomic_t advance_cache; - //mutable hb_atomic_t varStore_cache; - - OT::ItemVariationStore::cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const + struct advance_cache_t { - return varStore.create_cache (); - } + mutable hb_atomic_t advance_cache; + mutable hb_atomic_t varStore_cache; - void release_varStore_cache (OT::ItemVariationStore::cache_t *cache) const + ~advance_cache_t () + { + clear (); + } + + hb_ot_font_advance_cache_t *acquire_advance_cache () const + { + retry: + auto *cache = advance_cache.get_acquire (); + if (!cache) + { + cache = (hb_ot_font_advance_cache_t *) hb_malloc (sizeof (hb_ot_font_advance_cache_t)); + if (!cache) + return nullptr; + new (cache) hb_ot_font_advance_cache_t; + return cache; + } + if (advance_cache.cmpexch (cache, nullptr)) + return cache; + else + goto retry; + } + void release_advance_cache (hb_ot_font_advance_cache_t *cache) const + { + if (!cache) + return; + if (!advance_cache.cmpexch (nullptr, cache)) + hb_free (cache); + } + void clear_advance_cache () const + { + retry: + auto *cache = advance_cache.get_acquire (); + if (!cache) + return; + if (advance_cache.cmpexch (cache, nullptr)) + hb_free (cache); + else + goto retry; + } + + OT::ItemVariationStore::cache_t *acquire_varStore_cache (const OT::ItemVariationStore &varStore) const + { + retry: + auto *cache = varStore_cache.get_acquire (); + if (!cache) + return varStore.create_cache (); + if (varStore_cache.cmpexch (cache, nullptr)) + return cache; + else + goto retry; + } + void release_varStore_cache (OT::ItemVariationStore::cache_t *cache) const + { + if (!cache) + return; + if (!varStore_cache.cmpexch (nullptr, cache)) + OT::ItemVariationStore::destroy_cache (cache); + } + void clear_varStore_cache () const + { + retry: + auto *cache = varStore_cache.get_acquire (); + if (!cache) + return; + if (varStore_cache.cmpexch (cache, nullptr)) + OT::ItemVariationStore::destroy_cache (cache); + else + goto retry; + } + + void clear () const + { + clear_advance_cache (); + clear_varStore_cache (); + } + + } h, v; + + void check_serial (hb_font_t *font) const { - OT::ItemVariationStore::destroy_cache (cache); + int font_serial = font->serial_coords.get_acquire (); + + if (cached_coords_serial.get_acquire () == font_serial) + return; + + h.clear (); + v.clear (); + + cached_coords_serial.set_release (font_serial); } }; @@ -101,8 +185,7 @@ _hb_ot_font_destroy (void *font_data) { hb_ot_font_t *ot_font = (hb_ot_font_t *) font_data; - auto *cache = ot_font->advance_cache.get_relaxed (); - hb_free (cache); + ot_font->~hb_ot_font_t (); hb_free (ot_font); } @@ -164,41 +247,20 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data, const hb_ot_face_t *ot_face = ot_font->ot_face; const OT::hmtx_accelerator_t &hmtx = *ot_face->hmtx; -#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) + ot_font->check_serial (font); const OT::HVAR &HVAR = *hmtx.var_table; const OT::ItemVariationStore &varStore = &HVAR + HVAR.varStore; - OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? ot_font->acquire_varStore_cache (varStore) : nullptr; + OT::ItemVariationStore::cache_t *varStore_cache = ot_font->h.acquire_varStore_cache (varStore); + + hb_ot_font_advance_cache_t *advance_cache = nullptr; bool use_cache = font->num_coords; -#else - OT::ItemVariationStore::cache_t *varStore_cache = nullptr; - bool use_cache = false; -#endif - - hb_ot_font_advance_cache_t *cache = nullptr; if (use_cache) { - retry: - cache = ot_font->advance_cache.get_acquire (); - if (unlikely (!cache)) - { - cache = (hb_ot_font_advance_cache_t *) hb_malloc (sizeof (hb_ot_font_advance_cache_t)); - if (unlikely (!cache)) - { - use_cache = false; - goto out; - } - new (cache) hb_ot_font_advance_cache_t; - - if (unlikely (!ot_font->advance_cache.cmpexch (nullptr, cache))) - { - hb_free (cache); - goto retry; - } - ot_font->cached_coords_serial.set_release (font->serial_coords); - } + advance_cache = ot_font->h.acquire_advance_cache (); + if (!advance_cache) + use_cache = false; } - out: if (!use_cache) { @@ -211,38 +273,26 @@ hb_ot_get_glyph_h_advances (hb_font_t* font, void* font_data, } else { /* Use cache. */ - if (ot_font->cached_coords_serial.get_acquire () != (int) font->serial_coords) - { - // Retire advance cache and let it be recreated. - auto *old_cache = ot_font->advance_cache.get_acquire (); - if (ot_font->advance_cache.cmpexch (cache, nullptr)) - { - ot_font->cached_coords_serial.set_release (font->serial_coords); - hb_free (old_cache); - } - goto retry; - } - for (unsigned int i = 0; i < count; i++) { hb_position_t v; unsigned cv; - if (ot_font->advance_cache->get (*first_glyph, &cv)) + if (advance_cache->get (*first_glyph, &cv)) v = cv; else { v = hmtx.get_advance_with_var_unscaled (*first_glyph, font, varStore_cache); - ot_font->advance_cache->set (*first_glyph, v); + advance_cache->set (*first_glyph, v); } *first_advance = font->em_scale_x (v); first_glyph = &StructAtOffsetUnaligned (first_glyph, glyph_stride); first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); } + + ot_font->h.release_advance_cache (advance_cache); } -#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) - ot_font->release_varStore_cache (varStore_cache); -#endif + ot_font->h.release_varStore_cache (varStore_cache); } #ifndef HB_NO_VERTICAL @@ -261,13 +311,11 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data, if (vmtx.has_data ()) { -#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) + ot_font->check_serial (font); const OT::VVAR &VVAR = *vmtx.var_table; const OT::ItemVariationStore &varStore = &VVAR + VVAR.varStore; - OT::ItemVariationStore::cache_t *varStore_cache = font->num_coords * count >= 128 ? ot_font->acquire_varStore_cache (varStore) : nullptr; -#else - OT::ItemVariationStore::cache_t *varStore_cache = nullptr; -#endif + OT::ItemVariationStore::cache_t *varStore_cache = ot_font->v.acquire_varStore_cache (varStore); + // TODO Use advance_cache. for (unsigned int i = 0; i < count; i++) { @@ -276,9 +324,7 @@ hb_ot_get_glyph_v_advances (hb_font_t* font, void* font_data, first_advance = &StructAtOffsetUnaligned (first_advance, advance_stride); } -#if !defined(HB_NO_VAR) && !defined(HB_NO_OT_FONT_ADVANCE_CACHE) - ot_font->release_varStore_cache (varStore_cache); -#endif + ot_font->v.release_varStore_cache (varStore_cache); } else { diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh index 123843f20..0026208f5 100644 --- a/src/hb-ot-layout-common.hh +++ b/src/hb-ot-layout-common.hh @@ -3188,22 +3188,15 @@ struct ItemVariationStore return nullptr; #endif unsigned count = (this+regions).regionCount; + if (!count) return nullptr; float *cache = (float *) hb_malloc (sizeof (float) * count); - - clear_cache (cache); - - return cache; - } - - void clear_cache (cache_t *cache) const - { - if (unlikely (!cache)) return; - - unsigned count = (this+regions).regionCount; + if (unlikely (!cache)) return nullptr; for (unsigned i = 0; i < count; i++) cache[i] = REGION_CACHE_ITEM_CACHE_INVALID; + + return cache; } static void destroy_cache (cache_t *cache) { hb_free (cache); }