walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[cmap] Speed up DefaultUVS::copy even more 

Another 14% on SourceHanSerifVF/10 benchmark.
This commit is contained in:
Behdad Esfahbod 2022-12-03 11:18:05 -07:00
parent 4ca6105108
commit 023f595dec
1 changed files with 59 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/hb-ot-cmap-table.hh
View File

@ -925,38 +925,75 @@ struct DefaultUVS : SortedArray32Of<UnicodeValueRange>
if (unlikely (!c->copy<HBUINT32> (len))) return nullptr; if (unlikely (!c->copy<HBUINT32> (len))) return nullptr;
unsigned init_len = c->length (); unsigned init_len = c->length ();
hb_codepoint_t lastCode = HB_MAP_VALUE_INVALID; if (this->len > unicodes->get_population () * hb_bit_storage ((unsigned) this->len))
int count = -1;
for (const UnicodeValueRange& _ : *this)
{ {
hb_codepoint_t curEntry = (hb_codepoint_t) (_.startUnicodeValue - 1); hb_codepoint_t start = HB_SET_VALUE_INVALID;
hb_codepoint_t end = curEntry + _.additionalCount + 2; hb_codepoint_t end = HB_SET_VALUE_INVALID;
for (; unicodes->next (&curEntry) && curEntry < end;) for (hb_codepoint_t u = HB_SET_VALUE_INVALID;
unicodes->next (&u);)
{ {
count += 1; if (!as_array ().bsearch (u))
if (lastCode == HB_MAP_VALUE_INVALID) continue;
lastCode = curEntry; if (start == HB_SET_VALUE_INVALID)
else if (lastCode + count != curEntry)
{ {
start = u;
end = start - 1;
}
if (end + 1 != u || end - start == 255)
{
UnicodeValueRange rec; UnicodeValueRange rec;
rec.startUnicodeValue = lastCode; rec.startUnicodeValue = start;
rec.additionalCount = count - 1; rec.additionalCount = end - start;
c->copy<UnicodeValueRange> (rec); c->copy<UnicodeValueRange> (rec);
start = u;
}
end = u;
}
if (start != HB_SET_VALUE_INVALID)
{
UnicodeValueRange rec;
rec.startUnicodeValue = start;
rec.additionalCount = end - start;
c->copy<UnicodeValueRange> (rec);
}
lastCode = curEntry; }
count = 0; else
{
hb_codepoint_t lastCode = HB_SET_VALUE_INVALID;
int count = -1;
for (const UnicodeValueRange& _ : *this)
{
hb_codepoint_t curEntry = (hb_codepoint_t) (_.startUnicodeValue - 1);
hb_codepoint_t end = curEntry + _.additionalCount + 2;
for (; unicodes->next (&curEntry) && curEntry < end;)
{
count += 1;
if (lastCode == HB_SET_VALUE_INVALID)
lastCode = curEntry;
else if (lastCode + count != curEntry)
{
UnicodeValueRange rec;
rec.startUnicodeValue = lastCode;
rec.additionalCount = count - 1;
c->copy<UnicodeValueRange> (rec);
lastCode = curEntry;
count = 0;
}
} }
} }
}
if (lastCode != HB_MAP_VALUE_INVALID) if (lastCode != HB_MAP_VALUE_INVALID)
{ {
UnicodeValueRange rec; UnicodeValueRange rec;
rec.startUnicodeValue = lastCode; rec.startUnicodeValue = lastCode;
rec.additionalCount = count; rec.additionalCount = count;
c->copy<UnicodeValueRange> (rec); c->copy<UnicodeValueRange> (rec);
}
} }
if (c->length () - init_len == 0) if (c->length () - init_len == 0)