From: Elijah Newren <newren@gmail.com> To: Johannes Schindelin <Johannes.Schindelin@gmx.de> Cc: Git Mailing List <git@vger.kernel.org> Subject: Re: Comparing rebase --am with --interactive via p3400 Date: Fri, 1 Feb 2019 01:26:53 -0800 Message-ID: <CABPp-BF=ev03WgODk6TMQmuNoatg2kiEe5DR__gJ0OTVqHSnfQ@mail.gmail.com> (raw) In-Reply-To: <nycvar.QRO.7.76.6.1901312310280.41@tvgsbejvaqbjf.bet> Hi Dscho, On Thu, Jan 31, 2019 at 10:04 PM Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote: > > Hi Elijah, > > as discussed at the Contributors' Summit, I ran p3400 as-is (i.e. with the > --am backend) and then with --keep-empty to force the interactive backend > to be used. Here are the best of 10, on my relatively powerful Windows 10 > laptop, with current `master`. > > With regular rebase --am: > > 3400.2: rebase on top of a lot of unrelated changes 5.32(0.06+0.15) > 3400.4: rebase a lot of unrelated changes without split-index 33.08(0.04+0.18) > 3400.6: rebase a lot of unrelated changes with split-index 30.29(0.03+0.18) > > with --keep-empty to force the interactive backend: > > 3400.2: rebase on top of a lot of unrelated changes 3.92(0.03+0.18) > 3400.4: rebase a lot of unrelated changes without split-index 33.92(0.03+0.22) > 3400.6: rebase a lot of unrelated changes with split-index 38.82(0.03+0.16) Awesome, thanks for checking that out. I ran on both linux and mac and saw similar relative performances. Comparing am-based rebase to an implied-interactive rebase on both linux and mac (with a version of git including en/rebase-merge-on-sequencer so that -m gives the same performance that you'd see with --keep-empty), I saw: On Linux: am-based rebase (without -m): 3400.2: rebase on top of a lot of unrelated changes 1.87(1.64+0.21) 3400.4: rebase a lot of unrelated changes without split-index 7.87(6.24+1.00) 3400.6: rebase a lot of unrelated changes with split-index 5.99(5.05+0.67) interactive-machinery rebase (with -m): 3400.2: rebase on top of a lot of unrelated changes 1.80(1.60+0.19) 3400.4: rebase a lot of unrelated changes without split-index 6.78(5.70+0.91) 3400.6: rebase a lot of unrelated changes with split-index 6.92(5.70+0.89) On Mac: am-based rebase (without -m): Test this tree ------------------------------------------------------------------------------- 3400.2: rebase on top of a lot of unrelated changes 2.68(1.68+0.68) 3400.4: rebase a lot of unrelated changes without split-index 8.89(5.86+2.94) 3400.6: rebase a lot of unrelated changes with split-index 7.87(5.35+2.51) interactive-machinery rebase (with -m): Test this tree ------------------------------------------------------------------------------- 3400.2: rebase on top of a lot of unrelated changes 1.99(1.61+0.77) 3400.4: rebase a lot of unrelated changes without split-index 8.63(5.38+3.38) 3400.6: rebase a lot of unrelated changes with split-index 9.36(5.53+3.95) > I then changed it to -m to test the current scripted version, trying to > let it run overnight, but my laptop eventually went to sleep and the tests > were not even done. I'll let them continue and report back. > > My conclusion after seeing these numbers is: the interactive rebase is > really close to the performance of the --am backend. So to me, it makes a > total lot of sense to switch --merge over to it, and to make --merge the > default. We still should investigate why the split-index performance is so > significantly worse, though. Cool, I'll update my patches to make --merge the default (building on top of en/rebase-merge-on-sequencer) and post it as an RFC. But yeah, we should also check into why the split-index performance becomes a bit worse with such a change. Thanks, Elijah
next prev parent reply other threads:[~2019-02-01 9:27 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-01 6:04 Johannes Schindelin 2019-02-01 7:22 ` Johannes Schindelin 2019-02-01 9:26 ` Elijah Newren [this message] 2019-12-27 21:11 ` Alban Gruin 2019-12-27 22:45 ` Elijah Newren 2019-12-29 17:25 ` Alban Gruin 2020-01-02 20:17 ` Johannes Schindelin 2020-01-31 21:23 ` Johannes Schindelin 2020-04-01 11:33 ` Alban Gruin 2020-04-01 14:00 ` Phillip Wood 2020-04-04 20:33 ` Johannes Schindelin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to='CABPp-BF=ev03WgODk6TMQmuNoatg2kiEe5DR__gJ0OTVqHSnfQ@mail.gmail.com' \ --to=newren@gmail.com \ --cc=Johannes.Schindelin@gmx.de \ --cc=git@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git