mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-29 14:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1056 (#4870)

Browse Source 
Problem:    Don't know why finding spell suggestions is slow.
Solution:   Add some code to gather profiling information.

ca1fe98517
This commit is contained in:
Shota
2016-06-05 17:00:58 +09:00
committed by Justin M. Keyes
parent 6ed9d47a6e
commit 78c6f5c06d
2 changed files with 108 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
src/nvim/spell.c
View File

@@ -9319,7 +9319,56 @@ static void suggest_try_special(suginfo_T *su)
} }
} }
// Measure how much time is spent in each state.
// Output is dumped in "suggestprof".
#ifdef SUGGEST_PROFILE
proftime_T current;
proftime_T total;
proftime_T times[STATE_FINAL + 1];
long counts[STATE_FINAL + 1];
static void
prof_init(void)
{
for (int i = 0; i <= STATE_FINAL; i++) {
profile_zero(&times[i]);
counts[i] = 0;
}
profile_start(&current);
profile_start(&total);
}
// call before changing state
static void
prof_store(state_T state)
{
profile_end(&current);
profile_add(&times[state], &current);
counts[state]++;
profile_start(&current);
}
# define PROF_STORE(state) prof_store(state);
static void
prof_report(char *name)
{
FILE *fd = fopen("suggestprof", "a");
profile_end(&total);
fprintf(fd, "-----------------------\n");
fprintf(fd, "%s: %s\n", name, profile_msg(&total));
for (int i = 0; i <= STATE_FINAL; i++) {
fprintf(fd, "%d: %s ("%" PRId64)\n", i, profile_msg(&times[i]), counts[i]);
}
fclose(fd);
}
#else
# define PROF_STORE(state)
#endif
// Try finding suggestions by adding/removing/swapping letters. // Try finding suggestions by adding/removing/swapping letters.
static void suggest_try_change(suginfo_T *su) static void suggest_try_change(suginfo_T *su)
{ {
char_u fword[MAXWLEN]; // copy of the bad word, case-folded char_u fword[MAXWLEN]; // copy of the bad word, case-folded
@@ -9344,7 +9393,14 @@ static void suggest_try_change(suginfo_T *su)
continue; continue;
// Try it for this language. Will add possible suggestions. // Try it for this language. Will add possible suggestions.
//
#ifdef SUGGEST_PROFILE
prof_init();
#endif
suggest_trie_walk(su, lp, fword, false); suggest_trie_walk(su, lp, fword, false);
#ifdef SUGGEST_PROFILE
prof_report("try_change");
#endif
} }
} }
@@ -9478,6 +9534,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// Always past NUL bytes now. // Always past NUL bytes now.
n = (int)sp->ts_state; n = (int)sp->ts_state;
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_ENDNUL; sp->ts_state = STATE_ENDNUL;
sp->ts_save_badflags = su->su_badflags; sp->ts_save_badflags = su->su_badflags;
@@ -9517,6 +9574,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (sp->ts_curi > len || byts[arridx] != 0) { if (sp->ts_curi > len || byts[arridx] != 0) {
// Past bytes in node and/or past NUL bytes. // Past bytes in node and/or past NUL bytes.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_ENDNUL; sp->ts_state = STATE_ENDNUL;
sp->ts_save_badflags = su->su_badflags; sp->ts_save_badflags = su->su_badflags;
break; break;
@@ -9870,6 +9928,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
#endif #endif
// Save things to be restored at STATE_SPLITUNDO. // Save things to be restored at STATE_SPLITUNDO.
sp->ts_save_badflags = su->su_badflags; sp->ts_save_badflags = su->su_badflags;
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_SPLITUNDO; sp->ts_state = STATE_SPLITUNDO;
++depth; ++depth;
@@ -9936,6 +9995,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
byts = pbyts; byts = pbyts;
idxs = pidxs; idxs = pidxs;
sp->ts_prefixdepth = PFD_PREFIXTREE; sp->ts_prefixdepth = PFD_PREFIXTREE;
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_NOPREFIX; sp->ts_state = STATE_NOPREFIX;
} }
} }
@@ -9948,6 +10008,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
su->su_badflags = sp->ts_save_badflags; su->su_badflags = sp->ts_save_badflags;
// Continue looking for NUL bytes. // Continue looking for NUL bytes.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_START; sp->ts_state = STATE_START;
// In case we went into the prefix tree. // In case we went into the prefix tree.
@@ -9962,9 +10023,11 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
&& sp->ts_tcharlen == 0 && sp->ts_tcharlen == 0
) { ) {
// The badword ends, can't use STATE_PLAIN. // The badword ends, can't use STATE_PLAIN.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_DEL; sp->ts_state = STATE_DEL;
break; break;
} }
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_PLAIN; sp->ts_state = STATE_PLAIN;
// FALLTHROUGH // FALLTHROUGH
@@ -9975,10 +10038,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (sp->ts_curi > byts[arridx]) { if (sp->ts_curi > byts[arridx]) {
// Done all bytes at this node, do next state. When still at // Done all bytes at this node, do next state. When still at
// already changed bytes skip the other tricks. // already changed bytes skip the other tricks.
if (sp->ts_fidx >= sp->ts_fidxtry) PROF_STORE(sp->ts_state)
if (sp->ts_fidx >= sp->ts_fidxtry) {
sp->ts_state = STATE_DEL; sp->ts_state = STATE_DEL;
else } else {
sp->ts_state = STATE_FINAL; sp->ts_state = STATE_FINAL;
}
} else { } else {
arridx += sp->ts_curi++; arridx += sp->ts_curi++;
c = byts[arridx]; c = byts[arridx];
@@ -10110,10 +10175,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// When past the first byte of a multi-byte char don't try // When past the first byte of a multi-byte char don't try
// delete/insert/swap a character. // delete/insert/swap a character.
if (has_mbyte && sp->ts_tcharlen > 0) { if (has_mbyte && sp->ts_tcharlen > 0) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_FINAL; sp->ts_state = STATE_FINAL;
break; break;
} }
// Try skipping one character in the bad word (delete it). // Try skipping one character in the bad word (delete it).
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_INS_PREP; sp->ts_state = STATE_INS_PREP;
sp->ts_curi = 1; sp->ts_curi = 1;
if (soundfold && sp->ts_fidx == 0 && fword[sp->ts_fidx] == '*') if (soundfold && sp->ts_fidx == 0 && fword[sp->ts_fidx] == '*')
@@ -10161,6 +10228,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (sp->ts_flags & TSF_DIDDEL) { if (sp->ts_flags & TSF_DIDDEL) {
// If we just deleted a byte then inserting won't make sense, // If we just deleted a byte then inserting won't make sense,
// a substitute is always cheaper. // a substitute is always cheaper.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_SWAP; sp->ts_state = STATE_SWAP;
break; break;
} }
@@ -10170,11 +10238,13 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
for (;; ) { for (;; ) {
if (sp->ts_curi > byts[n]) { if (sp->ts_curi > byts[n]) {
// Only NUL bytes at this node, go to next state. // Only NUL bytes at this node, go to next state.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_SWAP; sp->ts_state = STATE_SWAP;
break; break;
} }
if (byts[n + sp->ts_curi] != NUL) { if (byts[n + sp->ts_curi] != NUL) {
// Found a byte to insert. // Found a byte to insert.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_INS; sp->ts_state = STATE_INS;
break; break;
} }
@@ -10190,6 +10260,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
n = sp->ts_arridx; n = sp->ts_arridx;
if (sp->ts_curi > byts[n]) { if (sp->ts_curi > byts[n]) {
// Done all bytes at this node, go to next state. // Done all bytes at this node, go to next state.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_SWAP; sp->ts_state = STATE_SWAP;
break; break;
} }
@@ -10250,6 +10321,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
c = *p; c = *p;
if (c == NUL) { if (c == NUL) {
// End of word, can't swap or replace. // End of word, can't swap or replace.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_FINAL; sp->ts_state = STATE_FINAL;
break; break;
} }
@@ -10257,6 +10329,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// Don't swap if the first character is not a word character. // Don't swap if the first character is not a word character.
// SWAP3 etc. also don't make sense then. // SWAP3 etc. also don't make sense then.
if (!soundfold && !spell_iswordp(p, curwin)) { if (!soundfold && !spell_iswordp(p, curwin)) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
break; break;
} }
@@ -10281,6 +10354,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// When the second character is NUL we can't swap. // When the second character is NUL we can't swap.
if (c2 == NUL) { if (c2 == NUL) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
break; break;
} }
@@ -10288,6 +10362,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// When characters are identical, swap won't do anything. // When characters are identical, swap won't do anything.
// Also get here if the second char is not a word character. // Also get here if the second char is not a word character.
if (c == c2) { if (c == c2) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_SWAP3; sp->ts_state = STATE_SWAP3;
break; break;
} }
@@ -10298,6 +10373,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
sp->ts_twordlen, tword, fword + sp->ts_fidx, sp->ts_twordlen, tword, fword + sp->ts_fidx,
c, c2); c, c2);
#endif #endif
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_UNSWAP; sp->ts_state = STATE_UNSWAP;
++depth; ++depth;
if (has_mbyte) { if (has_mbyte) {
@@ -10312,6 +10388,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
} }
} else } else
// If this swap doesn't work then SWAP3 won't either. // If this swap doesn't work then SWAP3 won't either.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
break; break;
@@ -10359,6 +10436,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
// Also get here when the third character is not a word character. // Also get here when the third character is not a word character.
// Second character may any char: "a.b" -> "b.a" // Second character may any char: "a.b" -> "b.a"
if (c == c3 || c3 == NUL) { if (c == c3 || c3 == NUL) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
break; break;
} }
@@ -10369,6 +10447,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
sp->ts_twordlen, tword, fword + sp->ts_fidx, sp->ts_twordlen, tword, fword + sp->ts_fidx,
c, c3); c, c3);
#endif #endif
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_UNSWAP3; sp->ts_state = STATE_UNSWAP3;
++depth; ++depth;
if (has_mbyte) { if (has_mbyte) {
@@ -10382,8 +10461,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
p[2] = c; p[2] = c;
stack[depth].ts_fidxtry = sp->ts_fidx + 3; stack[depth].ts_fidxtry = sp->ts_fidx + 3;
} }
} else } else {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
}
break; break;
case STATE_UNSWAP3: case STATE_UNSWAP3:
@@ -10409,6 +10490,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (!soundfold && !spell_iswordp(p, curwin)) { if (!soundfold && !spell_iswordp(p, curwin)) {
// Middle char is not a word char, skip the rotate. First and // Middle char is not a word char, skip the rotate. First and
// third char were already checked at swap and swap3. // third char were already checked at swap and swap3.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
break; break;
} }
@@ -10423,6 +10505,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
sp->ts_twordlen, tword, fword + sp->ts_fidx, sp->ts_twordlen, tword, fword + sp->ts_fidx,
p[0], p[1], p[2]); p[0], p[1], p[2]);
#endif #endif
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_UNROT3L; sp->ts_state = STATE_UNROT3L;
++depth; ++depth;
p = fword + sp->ts_fidx; p = fword + sp->ts_fidx;
@@ -10441,8 +10524,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
p[2] = c; p[2] = c;
stack[depth].ts_fidxtry = sp->ts_fidx + 3; stack[depth].ts_fidxtry = sp->ts_fidx + 3;
} }
} else } else {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
}
break; break;
case STATE_UNROT3L: case STATE_UNROT3L:
@@ -10472,6 +10557,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
sp->ts_twordlen, tword, fword + sp->ts_fidx, sp->ts_twordlen, tword, fword + sp->ts_fidx,
p[0], p[1], p[2]); p[0], p[1], p[2]);
#endif #endif
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_UNROT3R; sp->ts_state = STATE_UNROT3R;
++depth; ++depth;
p = fword + sp->ts_fidx; p = fword + sp->ts_fidx;
@@ -10490,8 +10576,10 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
*p = c; *p = c;
stack[depth].ts_fidxtry = sp->ts_fidx + 3; stack[depth].ts_fidxtry = sp->ts_fidx + 3;
} }
} else } else {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_INI; sp->ts_state = STATE_REP_INI;
}
break; break;
case STATE_UNROT3R: case STATE_UNROT3R:
@@ -10521,6 +10609,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if ((lp->lp_replang == NULL && !soundfold) if ((lp->lp_replang == NULL && !soundfold)
|| sp->ts_score + SCORE_REP >= su->su_maxscore || sp->ts_score + SCORE_REP >= su->su_maxscore
|| sp->ts_fidx < sp->ts_fidxtry) { || sp->ts_fidx < sp->ts_fidxtry) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_FINAL; sp->ts_state = STATE_FINAL;
break; break;
} }
@@ -10533,10 +10622,12 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
sp->ts_curi = lp->lp_replang->sl_rep_first[fword[sp->ts_fidx]]; sp->ts_curi = lp->lp_replang->sl_rep_first[fword[sp->ts_fidx]];
if (sp->ts_curi < 0) { if (sp->ts_curi < 0) {
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_FINAL; sp->ts_state = STATE_FINAL;
break; break;
} }
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP; sp->ts_state = STATE_REP;
// FALLTHROUGH // FALLTHROUGH
@@ -10566,6 +10657,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
ftp->ft_from, ftp->ft_to); ftp->ft_from, ftp->ft_to);
#endif #endif
// Need to undo this afterwards. // Need to undo this afterwards.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP_UNDO; sp->ts_state = STATE_REP_UNDO;
// Change the "from" to the "to" string. // Change the "from" to the "to" string.
@@ -10585,6 +10677,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
if (sp->ts_curi >= gap->ga_len && sp->ts_state == STATE_REP) if (sp->ts_curi >= gap->ga_len && sp->ts_state == STATE_REP)
// No (more) matches. // No (more) matches.
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_FINAL; sp->ts_state = STATE_FINAL;
break; break;
@@ -10604,6 +10697,7 @@ static void suggest_trie_walk(suginfo_T *su, langp_T *lp, char_u *fword, bool so
repextra -= tl - fl; repextra -= tl - fl;
} }
memmove(p, ftp->ft_from, fl); memmove(p, ftp->ft_from, fl);
PROF_STORE(sp->ts_state)
sp->ts_state = STATE_REP; sp->ts_state = STATE_REP;
break; break;
@@ -11014,7 +11108,13 @@ static void suggest_try_soundalike(suginfo_T *su)
// try all kinds of inserts/deletes/swaps/etc. // try all kinds of inserts/deletes/swaps/etc.
// TODO: also soundfold the next words, so that we can try joining // TODO: also soundfold the next words, so that we can try joining
// and splitting // and splitting
#ifdef SUGGEST_PROFILE
prof_init();
#endif
suggest_trie_walk(su, lp, salword, true); suggest_trie_walk(su, lp, salword, true);
#ifdef SUGGEST_PROFILE
prof_report("soundalike");
#endif
} }
} }
} }
@@ -13364,3 +13464,4 @@ int expand_spelling(linenr_T lnum, char_u *pat, char_u ***matchp)
return ga.ga_len; return ga.ga_len;
} }

3
src/nvim/version.c
View File

@@ -637,7 +637,7 @@ static int included_patches[] = {
1059, 1059,
// 1058, // 1058,
1057, 1057,
// 1056, 1056,
1055, 1055,
1054, 1054,
1053, 1053,
@@ -2020,3 +2020,4 @@ void ex_intro(exarg_T *eap)
intro_message(TRUE); intro_message(TRUE);
wait_return(TRUE); wait_return(TRUE);
} }