From: Dylan Reid <dgreid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@drmicha.warpmail.net, git@vger.kernel.org
Subject: Re: [PATCH] xdiff: optimise for no whitespace difference when ignoring whitespace.
Date: Mon, 5 Jul 2010 23:04:09 -0400 [thread overview]
Message-ID: <AANLkTilkML1edHz6JSj7w3u60oFt3Va-5Z2ZBWVphxVI@mail.gmail.com> (raw)
In-Reply-To: <7vsk3x72wb.fsf@alter.siamese.dyndns.org>
On Mon, Jul 5, 2010 at 10:36 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Dylan Reid <dgreid@gmail.com> writes:
>
>> In xdl_recmatch, do the memcmp to check if the two lines are equal before
>> checking if whitespace flags are set. If the lines are identicle, then
>
> "identical"?
That's exaclty what I meant. Correct patch sent.
>
>> there is no need to check if they differ only in whitespace.
>> This makes the common case (there is no whitespace difference) faster.
>> It costs the case where lines are the same length and contain
>> whitespace differences, but the common case is more than 20% faster.
>
> "more than 20% faster" based on what dataset and benchmark?
>
I benchmarked it with some of the bigger files from Linux. The
results were consistenly > 20% faster
across different file sizes. I tested it by simply running the
command a few times then running it with
my local build a few times to see if I had achieved any speedup.
~/linux-2.6(119)$ time git blame --incremental -w
./sound/pci/hda/patch_realtek.c > /dev/null
real 0m8.166s
user 0m8.063s
sys 0m0.090s
~/linux-2.6(120)$ time git blame --incremental -w
./sound/pci/hda/patch_realtek.c > /dev/null
real 0m8.010s
user 0m7.866s
sys 0m0.137s
~/linux-2.6(121)$ time ~/work/git/git blame --incremental -w
./sound/pci/hda/patch_realtek.c > /dev/null
real 0m6.115s
user 0m5.986s
sys 0m0.123s
~/linux-2.6(122)$ time ~/work/git/git blame --incremental -w
./sound/pci/hda/patch_realtek.c > /dev/null
real 0m6.119s
user 0m5.986s
sys 0m0.127s
Thanks for taking the time to read the patch.
Dylan
next prev parent reply other threads:[~2010-07-06 3:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-05 6:06 [PATCH] xdiff: optimise for no whitespace difference when ignoring whitespace Dylan Reid
2010-07-05 8:34 ` Michael J Gruber
2010-07-05 12:34 ` Dylan Reid
2010-07-05 13:00 ` Dylan Reid
2010-07-06 2:36 ` Junio C Hamano
2010-07-06 3:04 ` Dylan Reid [this message]
2010-07-06 3:11 ` Dylan Reid
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTilkML1edHz6JSj7w3u60oFt3Va-5Z2ZBWVphxVI@mail.gmail.com \
--to=dgreid@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).