git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Can we just get rid of kwset & obstack in favor of optimistically using PCRE v2 JIT?

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jun 14, 2019, 23:19 UTC
Message-ID
<87tvcr92m2.fsf@evledraar.gmail.com>
In-Reply-To
<87v9x793qi.fsf@evledraar.gmail.com>
On Sat, Jun 15 2019, Ævar Arnfjörð Bjarmason wrote:
Show 84 quoted lines
> On Thu, Jun 13 2019, Johannes Schindelin via GitGitGadget wrote:
>
>> The kwset functionality makes use of the obstack code, which expects to
>> be handed a function that can allocate large chunks of data. It expects
>> that function to accept a `size` parameter of type `long`.
>>
>> This upsets GCC 8 on Windows, because `long` does not have the same
>> bit size as `size_t` there.
>>
>> Now, the proper thing to do would be to switch to `size_t`. But this
>> would make us deviate from the "upstream" code even further, making it
>> hard to synchronize with newer versions, and also it would be quite
>> involved because that `long` type is so invasive in that code.
>>
>> Let's punt, and instead provide a super small wrapper around
>> `xmalloc()`.
>
> I have a WIP patches from 2017 that do $subject that I can dig up, but
> thought I'd gauge interest first.
>
> Right now the grep code & pickaxe machinery will detect fixed strings
> and use kwset() as an optimization.
>
> Back when kwset was added in 9eceddeec6 ("Use kwset in grep",
> 2011-08-21) this helped, but now doing this for grep with a PCRE pattern
> is actually counterproductive for performance. On top of current
> `master`:
>
>     @@ -368 +368 @@ static int is_fixed(const char *s, size_t len)
>     -       return 1;
>     +       return 0;
>
> And running p7821-grep-engines-fixed.sh[1] (which is in git.git, and is
> as far as I got with this) we get:
>
>     Test                             HEAD~             HEAD
>     -------------------------------------------------------------------------
>     7821.1: fixed grep int           0.48(1.59+0.63)   0.48(1.53+0.68) +0.0%
>     7821.2: basic grep int           0.55(1.64+0.51)   0.72(2.97+0.54) +30.9%
>     7821.3: extended grep int        0.65(1.63+0.54)   0.77(2.92+0.60) +18.5%
>     7821.4: perl grep int            1.01(1.62+0.55)   0.36(0.97+0.58) -64.4%
>     7821.6: fixed grep uncommon      0.18(0.51+0.45)   0.18(0.51+0.46) +0.0%
>     7821.7: basic grep uncommon      0.18(0.50+0.46)   0.30(1.36+0.33) +66.7%
>     7821.8: extended grep uncommon   0.18(0.45+0.52)   0.28(1.37+0.37) +55.6%
>     7821.9: perl grep uncommon       0.18(0.52+0.45)   0.16(0.28+0.54) -11.1%
>     7821.11: fixed grep æ            0.31(1.28+0.39)   0.31(1.24+0.43) +0.0%
>     7821.12: basic grep æ            0.30(1.29+0.38)   0.22(0.85+0.36) -26.7%
>     7821.13: extended grep æ         0.30(1.26+0.40)   0.22(0.78+0.45) -26.7%
>     7821.14: perl grep æ             0.30(1.33+0.34)   0.16(0.25+0.56) -46.7%
>
> So what this means on my Debian box is that when we use PCRE with JIT
> and just get out of its way and let it do its own fixed string matching
> it's up to ~65% faster than the kwset() path.
>
> The usual case of just feeding the fixed pattern to glibc's regex
> function is slower, although as seen there when you grep for a
> rarely-occurring non-ASCII string glibc does better now (the perils of
> using ancient last-version-to-use-GPLv2 snapshots...).
>
> So my plan for this (which I partially implemented) was to have a series
> where if we have a fixed string and have PCRE v2 we'd use it instead of
> kwset() for fixed strings.
>
> It seems most packagers build with PCRE v2 now (CC:
> git-packagers@). I.e. we'd keep something like compile_fixed_regexp()
> (and as an aside just use PCRE's \Q...\E instead of our own escaping).
>
> We'd have performance regression for platforms that use kwset() now but
> don't build pcre2, or where pcre2 jit doesn't work. Does anyone care?
>
> This would allow us to just "git rm" kwset.[ch] compat/obstack.[ch],
> which is ~2k lines of tricky code, 1/2 of which we're currently doomed
> to maintain a bitrotting version of due to license incompatibilities
> with upstream[2].
>
> As an aside there's other code in grep.c that we could similarly remove
> in favor of optimistic PCRE v2 use, e.g. the -w case can be replaced by
> \b<word>\b, but I found that less promising[3]. We can also get a huge
> performance win for BRE and ERE patterns by using PCRE v2 with a
> translation layer for those under the hood[4], but various solvable
> backwards compatible headaches[5] related to that are why I got lost in
> the weeds back in 2017 and didn't finish this.
>
> But just the s/kwset/pcre2/ case is easy enough.

...small correction, we currently hard-rely on kwset() for any pattern containing a \0 for "git-grep" (these can only by supplied via the -f <pattern-from-file> option), this means that any pattern containing a \0 is implicitly fixed, unless kwset() doesn't like it (-i and non-ASCII), what a mess.

Since we hard depend on REG_STARTEND since 2f8952250a ("regex: add regexec_buf() that can work on a non NUL-terminated string", 2016-09-21) we should just fix that while we're at it. It's a backwards-incompatible change, but I doubt anyone is relying on our undocumented behavior of implicitly considering grep patterns with \0 in them always fixed.

Show 7 quoted lines
> 1. Via:
>
>     GIT_PERF_REPEAT_COUNT=10 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_7821_GREP_OPTS='' GIT_PERF_MAKE_OPTS='-j8 CFLAGS=-O3 USE_LIBPCRE2=YesPlease' ./run HEAD~ HEAD -- p7821-grep-engines-fixed.sh
> 2. https://public-inbox.org/git/87wohn95vb.fsf@evledraar.gmail.com/
> 3. https://github.com/avar/git/commit/49ca92e799
> 4. https://github.com/avar/git/commit/a3cc090344
> 5. https://github.com/avar/git/commit/7dd367eb37
Previous: Ævar Arnfjörð BjarmasonNext: Jeff King
Message 34 of 90 in “Support building with GCC v8.x/v9.x”
  1. 0/4 Support building with GCC v8.x/v9.xJohannes Schindelin via GitGitGadget, Jun 13, 2019
  2. 4/4 config: avoid calling `labs()` on too-large data typeJohannes Schindelin via GitGitGadget, Jun 13, 2019
  3. Junio C HamanoJun 13, 2019
  4. René ScharfeJun 16, 2019
  5. René ScharfeJun 16, 2019
  6. René ScharfeJun 16, 2019
  7. Junio C HamanoJun 16, 2019
  8. René ScharfeJun 20, 2019
  9. Junio C HamanoJun 20, 2019
  10. Johannes SchindelinJun 21, 2019
  11. René ScharfeJun 22, 2019
  12. 1/3 config: use unsigned_mult_overflows to check for overflowsRené Scharfe, Jun 22, 2019
  13. 2/3 config: don't multiply in parse_unit_factor()René Scharfe, Jun 22, 2019
  14. 3/3 config: simplify parsing of unit factorsRené Scharfe, Jun 22, 2019
  15. 3/4 winansi: simplify loading the GetCurrentConsoleFontEx() functionJohannes Schindelin via GitGitGadget, Jun 13, 2019
  16. 1/4 poll (mingw): allow compiling with GCC 8 and DEVELOPER=1Johannes Schindelin via GitGitGadget, Jun 13, 2019
  17. 2/4 kwset: allow building with GCC 8Johannes Schindelin via GitGitGadget, Jun 13, 2019
  18. Junio C HamanoJun 13, 2019
  19. SZEDER GáborJun 14, 2019
  20. 0/4 compat/obstack: update from upstreamSZEDER Gábor, Jun 14, 2019
  21. 2/4 SQUASH??? compat/obstack: fix portability issuesSZEDER Gábor, Jun 14, 2019
  22. 4/4 compat/obstack: fix some sparse warningsSZEDER Gábor, Jun 14, 2019
  23. 3/4 SQUASH??? compat/obstack: fix build errors with ClangSZEDER Gábor, Jun 14, 2019
  24. 1/4 compat/obstack: update from upstreamSZEDER Gábor, Jun 14, 2019
  25. Jeff KingJun 14, 2019
  26. Junio C HamanoJun 14, 2019
  27. Ramsay JonesJun 14, 2019
  28. Ramsay JonesJun 14, 2019
  29. SZEDER GáborJun 17, 2019
  30. Junio C HamanoJun 14, 2019
  31. SZEDER GáborJun 17, 2019
  32. Ævar Arnfjörð BjarmasonJun 14, 2019
  33. Can we just get rid of kwset & obstack in favor of optimistically using PCRE v2 JIT?Ævar Arnfjörð Bjarmason, Jun 14, 2019
  34. Ævar Arnfjörð BjarmasonJun 14, 2019
  35. Jeff KingJun 20, 2019
  36. Carlo ArenasJun 15, 2019
  37. brian m. carlsonJun 15, 2019
  38. Ævar Arnfjörð BjarmasonJun 15, 2019
  39. 0/7 grep: move from kwset to optional PCRE v2Ævar Arnfjörð Bjarmason, Jun 26, 2019
  40. Johannes SchindelinJun 26, 2019
  41. Johannes SchindelinJun 27, 2019
  42. Ævar Arnfjörð BjarmasonJun 27, 2019
  43. Johannes SchindelinJun 27, 2019
  44. 1/9 log tests: test regex backends in "--encode=<enc>" testsÆvar Arnfjörð Bjarmason, Jun 27, 2019
  45. 0/9 grep: move from kwset to optional PCRE v2Ævar Arnfjörð Bjarmason, Jun 27, 2019
  46. Ævar Arnfjörð BjarmasonJun 28, 2019
  47. Junio C HamanoJun 28, 2019
  48. 00/10 grep: move from kwset to optional PCRE v2Ævar Arnfjörð Bjarmason, Jul 1, 2019
  49. Junio C HamanoJul 1, 2019
  50. Ævar Arnfjörð BjarmasonJul 2, 2019
  51. Johannes SchindelinJul 2, 2019
  52. Junio C HamanoJul 2, 2019
  53. Johannes SchindelinJul 3, 2019
  54. Johannes SchindelinJul 3, 2019
  55. Johannes SchindelinJul 3, 2019
  56. 01/10 log tests: test regex backends in "--encode=<enc>" testsÆvar Arnfjörð Bjarmason, Jul 1, 2019
  57. 02/10 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"Ævar Arnfjörð Bjarmason, Jul 1, 2019
  58. 03/10 t4210: skip more command-line encoding tests on MinGWÆvar Arnfjörð Bjarmason, Jul 1, 2019
  59. 04/10 grep: inline the return value of a function call used only onceÆvar Arnfjörð Bjarmason, Jul 1, 2019
  60. 05/10 grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason, Jul 1, 2019
  61. 08/10 grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason, Jul 1, 2019
  62. 07/10 grep: make the behavior for NUL-byte in patterns saneÆvar Arnfjörð Bjarmason, Jul 1, 2019
  63. 06/10 grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason, Jul 1, 2019
  64. 09/10 grep: remove the kwset optimizationÆvar Arnfjörð Bjarmason, Jul 1, 2019
  65. 10/10 grep: use PCRE v2 for optimized fixed-string searchÆvar Arnfjörð Bjarmason, Jul 1, 2019
  66. 2/9 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"Ævar Arnfjörð Bjarmason, Jun 27, 2019
  67. 3/9 grep: inline the return value of a function call used only onceÆvar Arnfjörð Bjarmason, Jun 27, 2019
  68. 4/9 grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason, Jun 27, 2019
  69. 5/9 grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason, Jun 27, 2019
  70. 6/9 grep: make the behavior for NUL-byte in patterns saneÆvar Arnfjörð Bjarmason, Jun 27, 2019
  71. 7/9 grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason, Jun 27, 2019
  72. 8/9 grep: remove the kwset optimizationÆvar Arnfjörð Bjarmason, Jun 27, 2019
  73. 9/9 grep: use PCRE v2 for optimized fixed-string searchÆvar Arnfjörð Bjarmason, Jun 27, 2019
  74. 1/7 grep: inline the return value of a function call used only onceÆvar Arnfjörð Bjarmason, Jun 26, 2019
  75. 2/7 grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason, Jun 26, 2019
  76. Johannes SchindelinJun 26, 2019
  77. Junio C HamanoJun 26, 2019
  78. 4/7 grep: make the behavior for \0 in patterns saneÆvar Arnfjörð Bjarmason, Jun 26, 2019
  79. brian m. carlsonJun 27, 2019
  80. 3/7 grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason, Jun 26, 2019
  81. 5/7 grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason, Jun 26, 2019
  82. Junio C HamanoJun 26, 2019
  83. 6/7 grep: remove the kwset optimizationÆvar Arnfjörð Bjarmason, Jun 26, 2019
  84. 7/7 grep: use PCRE v2 for optimized fixed-string searchÆvar Arnfjörð Bjarmason, Jun 26, 2019
  85. Johannes SchindelinJun 26, 2019
  86. Junio C HamanoJun 26, 2019
  87. Johannes SchindelinJun 27, 2019
  88. Johannes SchindelinJun 27, 2019
  89. Junio C HamanoJun 27, 2019
  90. Johannes SchindelinJun 28, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.