Tune KeywordList lookup & avoid allocations for implicit capture group
ClosedPublic
Actions

Authored by cullmann on Sep 2 2018, 11:03 AM.

Details

Reviewers

vkrause
dhaumann

Commits

R216:a492c36d3ca5: Tune KeywordList lookup & avoid allocations for implicit capture group

Summary

No longer any allocations, we use sorted vectors for lookup.
Init sorted vectors lazy, but no longer as lazy that mutable members are needed.

Test Plan

make && make test works
perf looks nicer afterwards

Diff Detail

Repository

R216 Syntax Highlighting

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

cullmann created this revision.Sep 2 2018, 11:03 AM

Restricted Application added projects: Kate, Frameworks. · View Herald TranscriptSep 2 2018, 11:03 AM

Restricted Application added subscribers: kde-frameworks-devel, kwrite-devel. · View Herald Transcript

perf before:

perf.xZfpV.svg154 KBDownload

perf.xZfpV.txt35 KBDownload

perf after the change

perf.2U8ac.svg62 KBDownload

perf.2U8ac.txt14 KBDownload

And yes, the skip offset lookup is still deadly ;=)

8.27%     8.27%  highlighter_ben  libKF5SyntaxHighlighting.so.5.50.0  [.] QHash<KSyntaxHighlighting::Rule*, int>::findNode

Avoid saving the implicit capture group 0 on each regex match.
That avoids allocating the match string each time (and the non-empty list).
One anyways shall only access capture group >= 1

Now the QRegularExpression::match call is the real offender allocation wise.

vkrause accepted this revision.Sep 2 2018, 2:49 PM

This revision is now accepted and ready to land.Sep 2 2018, 2:49 PM

Closed by commit R216:a492c36d3ca5: Tune KeywordList lookup & avoid allocations for implicit capture group (authored by cullmann). · Explain WhySep 2 2018, 3:11 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			data/schema/language.xsd (6 lines)
M			src/lib/definition.cpp (8 lines)
M			src/lib/definition_p.h (2 lines)
M			src/lib/keywordlist.cpp (72 lines)
M			src/lib/keywordlist_p.h (50 lines)
M			src/lib/rule.cpp (57 lines)
M			src/lib/rule_p.h (3 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	40850			Sep 2 2018, 11:02 AM	★	★
Diff 2	40852			Sep 2 2018, 11:33 AM	★	★
Diff 3	40864	eb11b20	R216:a492c36d3ca5d8a5f18d3bed25d51f51750081fe	Sep 2 2018, 3:10 PM	★	★