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

Re: [PATCH 2/7] builtin/checkout.c: complete parallel checkout support

From
Matheus Tavares Bernardino <matheus.bernardino@usp.br>
Date
Apr 26, 2021, 21:54 UTC
Message-ID
<CAHd-oW6OawTsPNcecWK1cOLJgfBtP0QGPu-vXaRm7_AoZ6+k0Q@mail.gmail.com>
In-Reply-To
<058f6ca4-a575-a463-e29b-9071c35e5bd3@gmail.com>
On Fri, Apr 23, 2021 at 1:19 PM Derrick Stolee <stolee@gmail.com> wrote:
Show 11 quoted lines
>
> On 4/22/2021 11:17 AM, Matheus Tavares wrote:
> > There is one code path in builtin/checkout.c which still doesn't benefit
> > from parallel checkout because it calls checkout_entry() directly,> instead of unpack_trees(). Let's add parallel checkout support for this
> > missing spot as well.
>
> I couldn't tell immediately from the patch what would trigger this
> code path. I had to trace the method calls to discover that it is
> for the case of a pathspec-limited checkout:
>
>         git checkout <ref> -- <pathspec>

Oops, I should have mentioned that in the commit message. Thanks for pointing it out.

Show 12 quoted lines
> I confirmed that this does work with this change, but it might be
> nice to have a test that verifies that parallelism is triggering for
> this case.
>
> Looking ahead to patches 4-6, which add tests, I do not see one for this
> code path. Yes, patch 7 will implicitly test it through optional
> settings, but it would be nice to verify that the code is actually using
> parallel workers. The test_checkout_workers helper in patch 4 should be
> helpful for this effort.
>
> Please point out the test that covers this case, in case I'm just not
> seeing it.

Hmm, there are some tests at t2081 and t2082 that check the pathspec-limited case with parallel workers. For example the collision tests run `test_checkout_workers 2 git checkout .`. We also test direct pathnames in t2082, using `test_checkout_workers 2 git checkout A B`.

Show 30 quoted lines
> The good news is that I can see a difference. By alternating checkouts
> of the Git repository's "t" directory between v2.20 and v2.31.1, I can
> see these results for varying numbers of workers:
>
> Benchmark #1: 16 workers
>   Time (mean ± σ):     108.6 ms ±   5.2 ms    [User: 146.1 ms, System: 146.1 ms]
>   Range (min … max):    95.5 ms … 124.9 ms    100 runs
>
> Benchmark #2: 8 workers
>   Time (mean ± σ):     104.8 ms ±   4.8 ms    [User: 128.3 ms, System: 131.7 ms]
>   Range (min … max):    94.2 ms … 119.0 ms    100 runs
>
> Benchmark #3: 4 workers
>   Time (mean ± σ):     112.3 ms ±   6.2 ms    [User: 114.6 ms, System: 112.1 ms]
>   Range (min … max):   100.0 ms … 127.4 ms    100 runs
>
> Benchmark #4: 2 workers
>   Time (mean ± σ):     124.2 ms ±   4.2 ms    [User: 106.5 ms, System: 102.0 ms]
>   Range (min … max):   114.8 ms … 136.3 ms    100 runs
>
> Benchmark #5: sequential
>   Time (mean ± σ):     154.6 ms ±   6.7 ms    [User: 83.5 ms, System: 79.4 ms]
>   Range (min … max):   142.1 ms … 176.0 ms    100 runs
>
> Summary
>   '8 workers' ran
>     1.04 ± 0.07 times faster than '16 workers'
>     1.07 ± 0.08 times faster than '4 workers'
>     1.19 ± 0.07 times faster than '2 workers'
>     1.48 ± 0.09 times faster than 'sequential'
Nice! Thanks for the benchmark!
Show 25 quoted lines
> (Note: these time measurements are for the round-trip of two checkout
> commands.)
> > @@ -359,16 +360,22 @@ static int checkout_worktree(const struct checkout_opts *opts,
> >       int nr_checkouts = 0, nr_unmerged = 0;
> >       int errs = 0;
> >       int pos;
> > +     int pc_workers, pc_threshold;
> > +     struct mem_pool ce_mem_pool;
> >
> >       state.force = 1;
> >       state.refresh_cache = 1;
> >       state.istate = &the_index;
> >
> > +     mem_pool_init(&ce_mem_pool, 0);
> > +     get_parallel_checkout_configs(&pc_workers, &pc_threshold);
> >       init_checkout_metadata(&state.meta, info->refname,
> >                              info->commit ? &info->commit->object.oid : &info->oid,
> >                              NULL);
> >
> >       enable_delayed_checkout(&state);
> > +     if (pc_workers > 1)
> > +             init_parallel_checkout();
>
> I'm late to looking at your parallel checkout work, but I find this
> to be a really nice API to get things initialized.
Thanks :)
Previous: Derrick StoleeNext: Matheus Tavares
Message 5 of 50 in “Parallel Checkout (part 3)”
  1. 0/7 Parallel Checkout (part 3)Matheus Tavares, Apr 22, 2021
  2. 1/7 make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares, Apr 22, 2021
  3. 2/7 builtin/checkout.c: complete parallel checkout supportMatheus Tavares, Apr 22, 2021
  4. Derrick StoleeApr 23, 2021
  5. Matheus Tavares BernardinoApr 26, 2021
  6. 3/7 checkout-index: add parallel checkout supportMatheus Tavares, Apr 22, 2021
  7. Derrick StoleeApr 23, 2021
  8. Matheus Tavares BernardinoApr 26, 2021
  9. 4/7 parallel-checkout: add tests for basic operationsMatheus Tavares, Apr 22, 2021
  10. Derrick StoleeApr 23, 2021
  11. Matheus Tavares BernardinoApr 27, 2021
  12. 5/7 parallel-checkout: add tests related to path collisionsMatheus Tavares, Apr 22, 2021
  13. 6/7 parallel-checkout: add tests related to .gitattributesMatheus Tavares, Apr 22, 2021
  14. Derrick StoleeApr 23, 2021
  15. 7/7 ci: run test round with parallel-checkout enabledMatheus Tavares, Apr 22, 2021
  16. Derrick StoleeApr 23, 2021
  17. 0/8 Parallel Checkout (part 3)Matheus Tavares, Apr 30, 2021
  18. 1/8 make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares, Apr 30, 2021
  19. Christian CouderMay 1, 2021
  20. Matheus Tavares BernardinoMay 3, 2021
  21. 2/8 builtin/checkout.c: complete parallel checkout supportMatheus Tavares, Apr 30, 2021
  22. Christian CouderMay 1, 2021
  23. Matheus Tavares BernardinoMay 3, 2021
  24. 3/8 checkout-index: add parallel checkout supportMatheus Tavares, Apr 30, 2021
  25. Christian CouderMay 1, 2021
  26. Matheus Tavares BernardinoMay 3, 2021
  27. 4/8 parallel-checkout: add tests for basic operationsMatheus Tavares, Apr 30, 2021
  28. 5/8 parallel-checkout: add tests related to path collisionsMatheus Tavares, Apr 30, 2021
  29. Torsten BögershausenMay 2, 2021
  30. Matheus Tavares BernardinoMay 3, 2021
  31. 6/8 t0028: extract encoding helpers to lib-encoding.shMatheus Tavares, Apr 30, 2021
  32. 7/8 parallel-checkout: add tests related to .gitattributesMatheus Tavares, Apr 30, 2021
  33. 8/8 ci: run test round with parallel-checkout enabledMatheus Tavares, Apr 30, 2021
  34. Torsten BögershausenMay 2, 2021
  35. Matheus Tavares BernardinoMay 3, 2021
  36. 0/8 Parallel Checkout (part 3)Matheus Tavares, May 4, 2021
  37. 1/8 make_transient_cache_entry(): optionally alloc from mem_poolMatheus Tavares, May 4, 2021
  38. 2/8 builtin/checkout.c: complete parallel checkout supportMatheus Tavares, May 4, 2021
  39. Derrick StoleeMay 5, 2021
  40. 3/8 checkout-index: add parallel checkout supportMatheus Tavares, May 4, 2021
  41. 4/8 parallel-checkout: add tests for basic operationsMatheus Tavares, May 4, 2021
  42. AIX failures on parallel checkout (new in v2.32.0-rc*)Ævar Arnfjörð Bjarmason, May 26, 2021
  43. Matheus Tavares BernardinoMay 26, 2021
  44. Junio C HamanoMay 26, 2021
  45. 5/8 parallel-checkout: add tests related to path collisionsMatheus Tavares, May 4, 2021
  46. 6/8 t0028: extract encoding helpers to lib-encoding.shMatheus Tavares, May 4, 2021
  47. 7/8 parallel-checkout: add tests related to .gitattributesMatheus Tavares, May 4, 2021
  48. 8/8 ci: run test round with parallel-checkout enabledMatheus Tavares, May 4, 2021
  49. Derrick StoleeMay 5, 2021
  50. Junio C HamanoMay 6, 2021

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.