diff --git a/core/render/text.cpp b/core/render/text.cpp index f4b07615..e252279a 100644 --- a/core/render/text.cpp +++ b/core/render/text.cpp @@ -19,6 +19,7 @@ #include FT_FREETYPE_H #include +#include #include #include #include @@ -40,6 +41,12 @@ constexpr int kGrayAtlasSize = 2048; constexpr int kColorAtlasSize = 1024; constexpr FT_Int32 kGlyphLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_COLOR | FT_LOAD_NO_SVG | FT_LOAD_TARGET_LIGHT; +struct GlyphAdvance { + unsigned int index = std::numeric_limits::max(); + float advance = 0.0f; + float height = 0.0f; +}; + struct FontFace { std::string path; FT_Face face = nullptr; @@ -49,6 +56,9 @@ struct FontFace { float lineGap = 0.0f; float glyphScale = 1.0f; bool colored = false; + // Direct mapped, 6 KiB per fixed-size face. Collisions replace one slot; + // unusual character sets cannot grow a cache or trigger an eviction scan. + std::array advances; FontFace() = default; FontFace(const FontFace&) = delete; @@ -73,6 +83,7 @@ struct FontFace { lineGap = other.lineGap; glyphScale = other.glyphScale; colored = other.colored; + advances = std::move(other.advances); other.face = nullptr; return *this; } @@ -835,7 +846,7 @@ size_t findEmojiFaceForCodepoint(FontInfoHolder& holder, unsigned int codepoint, return findFaceForCodepoint(holder, codepoint, fontSize); } -float loadGlyphAdvance(const FontFace& face, +float loadGlyphAdvance(FontFace& face, unsigned int glyphIndex, unsigned int codepoint, float fontSize, @@ -846,19 +857,26 @@ float loadGlyphAdvance(const FontFace& face, if (isCombiningMark(codepoint)) { return 0.0f; } - if (FT_Load_Glyph(face.face, glyphIndex, kGlyphLoadFlags) != 0) { - return fontSize * 0.5f; + auto& cached = face.advances[glyphIndex % face.advances.size()]; + if (cached.index != glyphIndex) { + if (FT_Load_Glyph(face.face, glyphIndex, kGlyphLoadFlags) != 0) { + return fontSize * 0.5f; + } + cached.index = glyphIndex; + cached.height = static_cast(face.face->glyph->metrics.height) / 64.0f; + cached.advance = FT_IS_SCALABLE(face.face) + ? static_cast(face.face->glyph->linearHoriAdvance) / 65536.0f + : static_cast(face.face->glyph->advance.x) / 64.0f; } + // Store unscaled metrics: emoji fallback can be capped by the primary + // face's height. Keep that context-dependent scaling outside the cache. float glyphScale = face.glyphScale; - const float glyphHeight = static_cast(face.face->glyph->metrics.height) / 64.0f; + const float glyphHeight = cached.height; if (face.colored && glyphHeight > 0.0f) { glyphScale = std::min(glyphScale, maxGlyphHeight / glyphHeight); } - if (FT_IS_SCALABLE(face.face)) { - return static_cast(face.face->glyph->linearHoriAdvance) / 65536.0f * glyphScale; - } - return static_cast(face.face->glyph->advance.x) / 64.0f * glyphScale; + return cached.advance * glyphScale; } std::vector shapeWithFallback(FontInfoHolder& holder, @@ -874,7 +892,7 @@ std::vector shapeWithFallback(FontInfoHolder& holder const size_t faceIndex = preferEmoji ? findEmojiFaceForCodepoint(holder, codepoint, fontSize) : findFaceForCodepoint(holder, codepoint, fontSize); - const FontFace& face = holder.faces[faceIndex]; + FontFace& face = holder.faces[faceIndex]; const unsigned int glyphIndex = codepoint == '\t' ? 0 : FT_Get_Char_Index(face.face, codepoint); const float advance = loadGlyphAdvance(face, glyphIndex, codepoint, fontSize, maxGlyphHeight); shaped.push_back({glyphIndex == 0 && codepoint == '\t' ? 0 : makeGlyphKey(faceIndex, glyphIndex), diff --git a/docs/data/text-metrics-cache-20261017.jsonl b/docs/data/text-metrics-cache-20261017.jsonl new file mode 100644 index 00000000..922e4ee0 --- /dev/null +++ b/docs/data/text-metrics-cache-20261017.jsonl @@ -0,0 +1,144 @@ +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"latin-short","size":20.272,"p50_ms":0.051544,"p95_ms":0.074232,"digest":11724995740045443795} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"mixed-short","size":20.272,"p50_ms":0.051835,"p95_ms":0.070836,"digest":14358551829422655397} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"emoji-combining","size":20.272,"p50_ms":0.156545,"p95_ms":0.179791,"digest":6200896214137572254} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"mixed-long","size":20.272,"p50_ms":4.96166,"p95_ms":5.47415,"digest":13367797924673020464} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"cjk-diverse","size":20.272,"p50_ms":9.95508,"p95_ms":10.6221,"digest":9294239970059401648} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"latin-long","size":20.272,"p50_ms":8.42407,"p95_ms":8.79043,"digest":7687101498029651418} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"latin-short","size":46.336,"p50_ms":0.052072,"p95_ms":0.073727,"digest":934322042059562947} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"mixed-short","size":46.336,"p50_ms":0.05381,"p95_ms":0.07269,"digest":9216644349813000684} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"emoji-combining","size":46.336,"p50_ms":0.161152,"p95_ms":0.186807,"digest":17723379842551490757} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"mixed-long","size":46.336,"p50_ms":4.97148,"p95_ms":5.33505,"digest":2056553233033751742} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"cjk-diverse","size":46.336,"p50_ms":10.0252,"p95_ms":10.7493,"digest":4049855046755603024} +{"font":"cff","run":0,"version":"before","max_rss_kib":24776,"case":"latin-long","size":46.336,"p50_ms":8.5771,"p95_ms":8.94685,"digest":14251427220777642681} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"latin-short","size":20.272,"p50_ms":0.00255,"p95_ms":0.003369,"digest":11724995740045443795} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"mixed-short","size":20.272,"p50_ms":0.002474,"p95_ms":0.003312,"digest":14358551829422655397} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"emoji-combining","size":20.272,"p50_ms":0.002218,"p95_ms":0.003032,"digest":6200896214137572254} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"mixed-long","size":20.272,"p50_ms":0.183256,"p95_ms":0.195223,"digest":13367797924673020464} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"cjk-diverse","size":20.272,"p50_ms":9.85076,"p95_ms":10.2117,"digest":9294239970059401648} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"latin-long","size":20.272,"p50_ms":0.365246,"p95_ms":1.44366,"digest":7687101498029651418} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"latin-short","size":46.336,"p50_ms":0.002583,"p95_ms":0.003493,"digest":934322042059562947} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"mixed-short","size":46.336,"p50_ms":0.002383,"p95_ms":0.003485,"digest":9216644349813000684} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"emoji-combining","size":46.336,"p50_ms":0.002191,"p95_ms":0.003034,"digest":17723379842551490757} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"mixed-long","size":46.336,"p50_ms":0.127518,"p95_ms":0.139112,"digest":2056553233033751742} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"cjk-diverse","size":46.336,"p50_ms":9.87831,"p95_ms":10.4395,"digest":4049855046755603024} +{"font":"cff","run":0,"version":"after","max_rss_kib":24636,"case":"latin-long","size":46.336,"p50_ms":0.370058,"p95_ms":0.401899,"digest":14251427220777642681} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"latin-short","size":20.272,"p50_ms":0.054245,"p95_ms":0.074038,"digest":11724995740045443795} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"mixed-short","size":20.272,"p50_ms":0.05301,"p95_ms":0.076169,"digest":14358551829422655397} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"emoji-combining","size":20.272,"p50_ms":0.16065,"p95_ms":0.181427,"digest":6200896214137572254} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"mixed-long","size":20.272,"p50_ms":4.91529,"p95_ms":5.20946,"digest":13367797924673020464} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"cjk-diverse","size":20.272,"p50_ms":9.82043,"p95_ms":10.241,"digest":9294239970059401648} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"latin-long","size":20.272,"p50_ms":8.30854,"p95_ms":8.68794,"digest":7687101498029651418} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"latin-short","size":46.336,"p50_ms":0.053218,"p95_ms":0.075085,"digest":934322042059562947} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"mixed-short","size":46.336,"p50_ms":0.050914,"p95_ms":0.072457,"digest":9216644349813000684} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"emoji-combining","size":46.336,"p50_ms":0.160384,"p95_ms":0.180357,"digest":17723379842551490757} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"mixed-long","size":46.336,"p50_ms":4.95757,"p95_ms":5.16589,"digest":2056553233033751742} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"cjk-diverse","size":46.336,"p50_ms":9.80688,"p95_ms":10.2222,"digest":4049855046755603024} +{"font":"cff","run":1,"version":"before","max_rss_kib":24720,"case":"latin-long","size":46.336,"p50_ms":8.25395,"p95_ms":8.62515,"digest":14251427220777642681} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"latin-short","size":20.272,"p50_ms":0.002525,"p95_ms":0.003349,"digest":11724995740045443795} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"mixed-short","size":20.272,"p50_ms":0.00245,"p95_ms":0.003334,"digest":14358551829422655397} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"emoji-combining","size":20.272,"p50_ms":0.001987,"p95_ms":0.002817,"digest":6200896214137572254} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"mixed-long","size":20.272,"p50_ms":0.180264,"p95_ms":0.204005,"digest":13367797924673020464} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"cjk-diverse","size":20.272,"p50_ms":9.79119,"p95_ms":10.2457,"digest":9294239970059401648} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"latin-long","size":20.272,"p50_ms":0.360506,"p95_ms":0.391426,"digest":7687101498029651418} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"latin-short","size":46.336,"p50_ms":0.002492,"p95_ms":0.003319,"digest":934322042059562947} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"mixed-short","size":46.336,"p50_ms":0.002397,"p95_ms":0.003073,"digest":9216644349813000684} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"emoji-combining","size":46.336,"p50_ms":0.002033,"p95_ms":0.002784,"digest":17723379842551490757} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"mixed-long","size":46.336,"p50_ms":0.130826,"p95_ms":0.142322,"digest":2056553233033751742} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"cjk-diverse","size":46.336,"p50_ms":9.81565,"p95_ms":10.2652,"digest":4049855046755603024} +{"font":"cff","run":1,"version":"after","max_rss_kib":24896,"case":"latin-long","size":46.336,"p50_ms":0.384759,"p95_ms":0.420789,"digest":14251427220777642681} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"latin-short","size":20.272,"p50_ms":0.052046,"p95_ms":0.076721,"digest":11724995740045443795} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"mixed-short","size":20.272,"p50_ms":0.053056,"p95_ms":0.071823,"digest":14358551829422655397} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"emoji-combining","size":20.272,"p50_ms":0.167629,"p95_ms":0.188302,"digest":6200896214137572254} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"mixed-long","size":20.272,"p50_ms":4.98826,"p95_ms":7.03247,"digest":13367797924673020464} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"cjk-diverse","size":20.272,"p50_ms":9.87356,"p95_ms":10.3451,"digest":9294239970059401648} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"latin-long","size":20.272,"p50_ms":8.44118,"p95_ms":11.8348,"digest":7687101498029651418} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"latin-short","size":46.336,"p50_ms":0.054239,"p95_ms":0.075463,"digest":934322042059562947} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"mixed-short","size":46.336,"p50_ms":0.05237,"p95_ms":0.078196,"digest":9216644349813000684} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"emoji-combining","size":46.336,"p50_ms":0.165215,"p95_ms":0.194938,"digest":17723379842551490757} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"mixed-long","size":46.336,"p50_ms":4.96386,"p95_ms":5.21089,"digest":2056553233033751742} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"cjk-diverse","size":46.336,"p50_ms":9.81782,"p95_ms":10.2473,"digest":4049855046755603024} +{"font":"cff","run":2,"version":"before","max_rss_kib":24588,"case":"latin-long","size":46.336,"p50_ms":8.40006,"p95_ms":8.74401,"digest":14251427220777642681} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"latin-short","size":20.272,"p50_ms":0.002551,"p95_ms":0.003291,"digest":11724995740045443795} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"mixed-short","size":20.272,"p50_ms":0.002276,"p95_ms":0.003024,"digest":14358551829422655397} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"emoji-combining","size":20.272,"p50_ms":0.002118,"p95_ms":0.002956,"digest":6200896214137572254} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"mixed-long","size":20.272,"p50_ms":0.182614,"p95_ms":0.203129,"digest":13367797924673020464} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"cjk-diverse","size":20.272,"p50_ms":9.75356,"p95_ms":10.5333,"digest":9294239970059401648} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"latin-long","size":20.272,"p50_ms":0.374318,"p95_ms":0.395381,"digest":7687101498029651418} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"latin-short","size":46.336,"p50_ms":0.002711,"p95_ms":0.003374,"digest":934322042059562947} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"mixed-short","size":46.336,"p50_ms":0.002238,"p95_ms":0.003069,"digest":9216644349813000684} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"emoji-combining","size":46.336,"p50_ms":0.002139,"p95_ms":0.002806,"digest":17723379842551490757} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"mixed-long","size":46.336,"p50_ms":0.129371,"p95_ms":0.137696,"digest":2056553233033751742} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"cjk-diverse","size":46.336,"p50_ms":9.77447,"p95_ms":10.2481,"digest":4049855046755603024} +{"font":"cff","run":2,"version":"after","max_rss_kib":24652,"case":"latin-long","size":46.336,"p50_ms":0.366889,"p95_ms":0.412997,"digest":14251427220777642681} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"latin-short","size":20.272,"p50_ms":0.034007,"p95_ms":0.049332,"digest":2290134779490625642} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"mixed-short","size":20.272,"p50_ms":0.068967,"p95_ms":0.081315,"digest":13627797189340420258} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"emoji-combining","size":20.272,"p50_ms":0.157568,"p95_ms":0.170955,"digest":17350510298555579945} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"mixed-long","size":20.272,"p50_ms":5.10121,"p95_ms":5.4207,"digest":34592522217394056} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"cjk-diverse","size":20.272,"p50_ms":16.4699,"p95_ms":17.0445,"digest":3828939570654974964} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"latin-long","size":20.272,"p50_ms":4.15667,"p95_ms":4.28644,"digest":6533438030806323455} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"latin-short","size":46.336,"p50_ms":0.033922,"p95_ms":0.046398,"digest":10910858616009035959} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"mixed-short","size":46.336,"p50_ms":0.065079,"p95_ms":0.073284,"digest":6220803781038322332} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"emoji-combining","size":46.336,"p50_ms":0.153313,"p95_ms":0.16917,"digest":7600288408061651313} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"mixed-long","size":46.336,"p50_ms":4.9168,"p95_ms":5.14141,"digest":5552397169160558139} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"cjk-diverse","size":46.336,"p50_ms":16.0936,"p95_ms":16.7036,"digest":36409408073844668} +{"font":"ttf","run":0,"version":"before","max_rss_kib":23500,"case":"latin-long","size":46.336,"p50_ms":4.18649,"p95_ms":4.3481,"digest":15282225905432420028} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"latin-short","size":20.272,"p50_ms":0.003135,"p95_ms":0.004134,"digest":2290134779490625642} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"mixed-short","size":20.272,"p50_ms":0.002921,"p95_ms":0.003822,"digest":13627797189340420258} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"emoji-combining","size":20.272,"p50_ms":0.002331,"p95_ms":0.003313,"digest":17350510298555579945} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"mixed-long","size":20.272,"p50_ms":0.213949,"p95_ms":0.252993,"digest":34592522217394056} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"cjk-diverse","size":20.272,"p50_ms":15.6933,"p95_ms":16.3904,"digest":3828939570654974964} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"latin-long","size":20.272,"p50_ms":0.407318,"p95_ms":0.448803,"digest":6533438030806323455} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"latin-short","size":46.336,"p50_ms":0.002901,"p95_ms":0.004107,"digest":10910858616009035959} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"mixed-short","size":46.336,"p50_ms":0.002744,"p95_ms":0.00368,"digest":6220803781038322332} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"emoji-combining","size":46.336,"p50_ms":0.002308,"p95_ms":0.003451,"digest":7600288408061651313} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"mixed-long","size":46.336,"p50_ms":0.155484,"p95_ms":0.171773,"digest":5552397169160558139} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"cjk-diverse","size":46.336,"p50_ms":15.3599,"p95_ms":15.8148,"digest":36409408073844668} +{"font":"ttf","run":0,"version":"after","max_rss_kib":23852,"case":"latin-long","size":46.336,"p50_ms":0.410447,"p95_ms":0.444198,"digest":15282225905432420028} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"latin-short","size":20.272,"p50_ms":0.034004,"p95_ms":0.04898,"digest":2290134779490625642} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"mixed-short","size":20.272,"p50_ms":0.068932,"p95_ms":0.079973,"digest":13627797189340420258} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"emoji-combining","size":20.272,"p50_ms":0.15546,"p95_ms":0.168385,"digest":17350510298555579945} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"mixed-long","size":20.272,"p50_ms":5.18288,"p95_ms":5.40353,"digest":34592522217394056} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"cjk-diverse","size":20.272,"p50_ms":16.4197,"p95_ms":17.0186,"digest":3828939570654974964} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"latin-long","size":20.272,"p50_ms":4.11216,"p95_ms":4.276,"digest":6533438030806323455} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"latin-short","size":46.336,"p50_ms":0.033965,"p95_ms":0.04825,"digest":10910858616009035959} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"mixed-short","size":46.336,"p50_ms":0.066511,"p95_ms":0.08127,"digest":6220803781038322332} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"emoji-combining","size":46.336,"p50_ms":0.152383,"p95_ms":0.163392,"digest":7600288408061651313} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"mixed-long","size":46.336,"p50_ms":4.94858,"p95_ms":5.1372,"digest":5552397169160558139} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"cjk-diverse","size":46.336,"p50_ms":15.9113,"p95_ms":16.4697,"digest":36409408073844668} +{"font":"ttf","run":1,"version":"before","max_rss_kib":23548,"case":"latin-long","size":46.336,"p50_ms":4.13313,"p95_ms":7.13999,"digest":15282225905432420028} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"latin-short","size":20.272,"p50_ms":0.003241,"p95_ms":0.004094,"digest":2290134779490625642} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"mixed-short","size":20.272,"p50_ms":0.002587,"p95_ms":0.003544,"digest":13627797189340420258} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"emoji-combining","size":20.272,"p50_ms":0.002222,"p95_ms":0.003216,"digest":17350510298555579945} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"mixed-long","size":20.272,"p50_ms":0.200443,"p95_ms":0.212781,"digest":34592522217394056} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"cjk-diverse","size":20.272,"p50_ms":15.8031,"p95_ms":16.307,"digest":3828939570654974964} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"latin-long","size":20.272,"p50_ms":0.422936,"p95_ms":0.467929,"digest":6533438030806323455} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"latin-short","size":46.336,"p50_ms":0.002971,"p95_ms":0.003817,"digest":10910858616009035959} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"mixed-short","size":46.336,"p50_ms":0.002522,"p95_ms":0.003432,"digest":6220803781038322332} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"emoji-combining","size":46.336,"p50_ms":0.002277,"p95_ms":0.00312,"digest":7600288408061651313} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"mixed-long","size":46.336,"p50_ms":0.153332,"p95_ms":0.168693,"digest":5552397169160558139} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"cjk-diverse","size":46.336,"p50_ms":15.3204,"p95_ms":15.7834,"digest":36409408073844668} +{"font":"ttf","run":1,"version":"after","max_rss_kib":23824,"case":"latin-long","size":46.336,"p50_ms":0.4151,"p95_ms":0.450214,"digest":15282225905432420028} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"latin-short","size":20.272,"p50_ms":0.036238,"p95_ms":0.047084,"digest":2290134779490625642} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"mixed-short","size":20.272,"p50_ms":0.064924,"p95_ms":0.07425,"digest":13627797189340420258} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"emoji-combining","size":20.272,"p50_ms":0.15521,"p95_ms":0.167498,"digest":17350510298555579945} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"mixed-long","size":20.272,"p50_ms":5.19713,"p95_ms":5.4153,"digest":34592522217394056} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"cjk-diverse","size":20.272,"p50_ms":16.8574,"p95_ms":17.4635,"digest":3828939570654974964} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"latin-long","size":20.272,"p50_ms":4.25741,"p95_ms":4.30124,"digest":6533438030806323455} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"latin-short","size":46.336,"p50_ms":0.036401,"p95_ms":0.04908,"digest":10910858616009035959} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"mixed-short","size":46.336,"p50_ms":0.068493,"p95_ms":0.081029,"digest":6220803781038322332} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"emoji-combining","size":46.336,"p50_ms":0.157678,"p95_ms":0.16806,"digest":7600288408061651313} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"mixed-long","size":46.336,"p50_ms":5.14793,"p95_ms":5.18109,"digest":5552397169160558139} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"cjk-diverse","size":46.336,"p50_ms":16.5343,"p95_ms":16.7341,"digest":36409408073844668} +{"font":"ttf","run":2,"version":"before","max_rss_kib":23556,"case":"latin-long","size":46.336,"p50_ms":4.06898,"p95_ms":4.30647,"digest":15282225905432420028} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"latin-short","size":20.272,"p50_ms":0.003381,"p95_ms":0.004795,"digest":2290134779490625642} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"mixed-short","size":20.272,"p50_ms":0.002709,"p95_ms":0.003569,"digest":13627797189340420258} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"emoji-combining","size":20.272,"p50_ms":0.002262,"p95_ms":0.003479,"digest":17350510298555579945} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"mixed-long","size":20.272,"p50_ms":0.204998,"p95_ms":0.22203,"digest":34592522217394056} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"cjk-diverse","size":20.272,"p50_ms":15.7673,"p95_ms":16.3333,"digest":3828939570654974964} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"latin-long","size":20.272,"p50_ms":0.413608,"p95_ms":0.466285,"digest":6533438030806323455} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"latin-short","size":46.336,"p50_ms":0.00292,"p95_ms":0.003681,"digest":10910858616009035959} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"mixed-short","size":46.336,"p50_ms":0.002541,"p95_ms":0.003463,"digest":6220803781038322332} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"emoji-combining","size":46.336,"p50_ms":0.002353,"p95_ms":0.003181,"digest":7600288408061651313} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"mixed-long","size":46.336,"p50_ms":0.161886,"p95_ms":0.173802,"digest":5552397169160558139} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"cjk-diverse","size":46.336,"p50_ms":15.3555,"p95_ms":15.8625,"digest":36409408073844668} +{"font":"ttf","run":2,"version":"after","max_rss_kib":23660,"case":"latin-long","size":46.336,"p50_ms":0.434047,"p95_ms":0.468231,"digest":15282225905432420028} diff --git a/docs/text-measurement-performance.md b/docs/text-measurement-performance.md new file mode 100644 index 00000000..d37e7d55 --- /dev/null +++ b/docs/text-measurement-performance.md @@ -0,0 +1,87 @@ +# Bounded glyph advance cache + +Upstream report: [EUI-NEO #113](https://github.com/sudoevolve/EUI-NEO/issues/113). + +Text measurement and editable text repeatedly query advances from the same fixed-size +FreeType faces. Previously every occurrence called `FT_Load_Glyph`, including repeated +characters in a paragraph or unchanged characters during an edit. CFF fonts interpret +outlines on that path. The rendered bitmap atlas does not supply these metrics. + +Each `FontFace` now holds 512 direct-mapped entries containing the glyph index, raw +advance and height (6 KiB on the supported 32/64-bit targets). A collision replaces one +entry in constant time. Storage is fixed even for random Unicode text. Entries move +with their face and are destroyed with it; changing fonts or physical sizes creates a +separate face. Existing font-stack ownership and cache eviction remain unchanged. + +Only successful loads are cached. Tabs and combining marks retain their existing early +returns. Colored fallback glyphs retain per-call height limiting: the cache stores raw +metrics before `glyphScale` and the primary face's height cap. The rendering path still +loads a glyph before reading/rasterizing its current FreeType slot. No public API, +font resource, shaping rule, task, thread or dependency was added. + +## Reproduce + +Configure the normal Release fixture build, then run: + +```bash +cmake --build build-contrib-glfw-opengl --target text_metrics_cache +./build-contrib-glfw-opengl/text_metrics_cache +./build-contrib-glfw-opengl/text_metrics_cache --benchmark +EUI_TEXT_TEST_FONT=/absolute/path/to/NotoSansSC-Regular.otf \ + ./build-contrib-glfw-opengl/text_metrics_cache --benchmark +``` + +The default test uses the already shipped Chinese TTF. The optional font path supplies +a CFF comparison without adding a resource. The test checks public metrics against +independent FreeType loads over 3000 distinct CJK glyphs, reverse traversal, repeated +calls and 12/20.272/40px size changes. Benchmark cases include short Latin/mixed text, +emoji + combining marks + tabs, ~8 KiB mixed text, 3000 different CJK characters and +8 KiB Latin text, at 20.272 and 46.336 physical pixels. Every sample changes its suffix; +`measureTextMetrics` does not use the whole-string size cache. + +Each case has five warmup edits and sixty timed edits, measured with `steady_clock`. +JSON lines report p50/p95 milliseconds plus a fingerprint over all caret coordinates +and UTF-8 byte indices, including warmup. Compare those fingerprints between builds. +Run old/new binaries alternately on one machine without parallel compilation; report +multiple paired runs rather than selecting a single fastest result. A full UI test is +still needed to cover layout, event dispatch, drawing and presentation. + +## Validation + +Baseline: upstream dev `ad7e9e7`; candidate changes only the advance cache and this test. +Ubuntu 24.04.5 x86_64, Linux 7.0.0-38, Intel Core Ultra 5 225H (14 cores), 30 GiB RAM, +GCC 13.3.0, CMake 3.28.3, bundled FreeType, Release `-O3`. UI/backend checks use private +Xvfb with Mesa 25.2.8 llvmpipe (LLVM 20.1.2), not a hardware-GPU frame-rate test. + +Three paired runs alternate before/after, after/before, before/after without concurrent +builds. Below is the median of each run's p50, in milliseconds at 20.272 physical px: + +| Case | CFF before | CFF after | Shipped TTF before | TTF after | +| --- | ---: | ---: | ---: | ---: | +| Short Latin | 0.0520 | 0.0026 | 0.0340 | 0.0032 | +| Short mixed | 0.0530 | 0.0024 | 0.0689 | 0.0027 | +| Emoji / combining / tab | 0.1606 | 0.0021 | 0.1555 | 0.0023 | +| Long mixed | 4.9617 | 0.1826 | 5.1829 | 0.2050 | +| 3000 distinct CJK | 9.8736 | 9.7912 | 16.4699 | 15.7673 | +| Long Latin | 8.4241 | 0.3652 | 4.1567 | 0.4136 | + +The 46.336px cases show the same pattern: common text improves, while a working set +larger than the fixed table remains effectively unchanged. All 72 paired fingerprints +match bit for bit. The independent FreeType oracle passes for both fonts. The raw +p50/p95 values, size, fingerprints and per-invocation peak RSS are in +[data/text-metrics-cache-20261017.jsonl](data/text-metrics-cache-20261017.jsonl). +Peak RSS ranges: CFF 24588–24776 -> 24636–24896 KiB; TTF 23500–23556 -> 23660–23852 KiB. +These are whole-process samples, not proof of a global memory ceiling; storage added +by this cache is bounded per live face. There is no claim that caching removes the +cost of arbitrary unique glyphs or an application's entire page composition. + +All four independent Release builds (GLFW/SDL2 x OpenGL/Vulkan) pass **36/36** unit and +backend probe tests, and each installed SDK's consumer passes **1/1**. Tests ran with +separate TMPDIR/XDG directories: an initial concurrent run shared the image-cache +fixture's deterministic temporary filenames, causing one `image_cache` failure; all +four isolated full reruns pass. The fixture was not changed in this patch. + +A downstream native input suite passes Release 5/5, ASAN 4/4 and UBSAN 4/4. Four +normal/minimum, light/dark view captures are byte-identical to before. Those UI checks +include selection, scrolling, previews, input editing and physical font-size layout. +This CPU measurement does not establish a desktop frame-rate guarantee. diff --git a/tests/unit/text_metrics_cache.cpp b/tests/unit/text_metrics_cache.cpp new file mode 100644 index 00000000..176169b0 --- /dev/null +++ b/tests/unit/text_metrics_cache.cpp @@ -0,0 +1,130 @@ +#include "core/render/text.h" +#include +#include FT_FREETYPE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +namespace { +void appendUtf8(std::string &text, unsigned int code) { + if (code < 0x80) + text += static_cast(code); + else if (code < 0x800) { + text += static_cast(0xc0 | (code >> 6)); + text += static_cast(0x80 | (code & 63)); + } else { + text += static_cast(0xe0 | (code >> 12)); + text += static_cast(0x80 | ((code >> 6) & 63)); + text += static_cast(0x80 | (code & 63)); + } +} +std::uint64_t fingerprint(const core::TextPrimitive::TextMetrics &metrics) { + std::uint64_t hash = 1469598103934665603ULL; + for (std::size_t i = 0; i < metrics.caretX.size(); ++i) { + std::uint32_t bits = 0; + std::memcpy(&bits, &metrics.caretX[i], sizeof(bits)); + hash = (hash ^ bits) * 1099511628211ULL; + hash = (hash ^ static_cast(metrics.byteIndices[i])) * 1099511628211ULL; + } + return hash; +} +} // namespace + +int main(int argc, char **argv) { + const bool benchmark = argc > 1 && std::string(argv[1]) == "--benchmark"; + const char *customFont = std::getenv("EUI_TEXT_TEST_FONT"); + const auto root = std::filesystem::path(__FILE__).parent_path().parent_path().parent_path(); + const std::string font = + customFont ? customFont + : (root / "assets/JingNanJunJunTi-JinNanJunJunTi-Bold-2.ttf").string(); + core::TextPrimitive::setDefaultFontFiles(font, {}); + FT_Library library = nullptr; + FT_Face face = nullptr; + if (FT_Init_FreeType(&library) || FT_New_Face(library, font.c_str(), 0, &face)) + return 1; + if (!FT_IS_SCALABLE(face)) + return 1; + const auto flags = FT_LOAD_DEFAULT | FT_LOAD_COLOR | FT_LOAD_NO_SVG | FT_LOAD_TARGET_LIGHT; + int checks = 0; + // Independent FreeType oracle: many unique glyphs, size churn, then the + // same glyphs in reverse order exercise eviction, collisions and face moves. + for (const float size : {12.f, 20.272f, 40.f, 20.272f}) { + const float scaled = + std::max(1.f, size * face->units_per_EM / (face->ascender - face->descender)); + if (FT_Set_Char_Size(face, 0, static_cast(std::lround(scaled * 64)), 72, 72)) + return 1; + for (int pass = 0; pass < 2; ++pass) { + std::string text; + float expected = 0; + for (unsigned int i = 0; i < 3000; ++i) { + const auto code = 0x4e00 + (pass ? 2999 - i : i); + const auto glyph = FT_Get_Char_Index(face, code); + if (!glyph) + continue; + appendUtf8(text, code); + if (FT_Load_Glyph(face, glyph, flags)) + return 1; + expected += static_cast(face->glyph->linearHoriAdvance) / 65536.f; + } + for (int repeat = 0; repeat < 2; ++repeat) { + const auto actual = core::TextPrimitive::measureTextMetrics(text, font, size); + if (std::fabs(actual.width - expected) > .01f) { + std::cerr << "FreeType advance mismatch: " << actual.width << " != " << expected + << '\n'; + return 1; + } + ++checks; + } + } + } + FT_Done_Face(face); + FT_Done_FreeType(library); + if (!benchmark) { + std::cout << checks << " FreeType oracle checks passed\n"; + return 0; + } + using Clock = std::chrono::steady_clock; + std::string diverse; + for (unsigned int i = 0; i < 3000; ++i) + appendUtf8(diverse, 0x4e00 + i); + std::string mixed; + while (mixed.size() < 8192) + mixed += "中文输入 English 123,标点。"; + const std::vector> cases = { + {"latin-short", "A quick brown fox 0123456789"}, + {"mixed-short", "中文输入 English 123,标点。"}, + {"emoji-combining", "A e\xcc\x81 \xf0\x9f\x98\x80 \xf0\x9f\x9a\x80 \t中"}, + {"mixed-long", mixed}, + {"cjk-diverse", diverse}, + {"latin-long", std::string(8192, 'W')}}; + for (const float size : {20.272f, 46.336f}) { + for (auto scenario : cases) { + // No whole-string metric cache: changing the suffix models typing. + std::vector samples; + std::uint64_t digest = 0; + for (int i = 0; i < 65; ++i) { + scenario.second += 'x'; + const auto start = Clock::now(); + const auto metrics = + core::TextPrimitive::measureTextMetrics(scenario.second, font, size); + const auto duration = + std::chrono::duration(Clock::now() - start).count(); + digest ^= fingerprint(metrics); + if (i >= 5) + samples.push_back(duration); + } + std::sort(samples.begin(), samples.end()); + std::cout << "{\"case\":\"" << scenario.first << "\",\"size\":" << size + << ",\"p50_ms\":" << samples[30] << ",\"p95_ms\":" << samples[57] + << ",\"digest\":" << digest << "}\n"; + } + } + return 0; +}