kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t/perf: avoid testing bitmaps without lookup table 

In a previous commit, the setting which controls whether or not the
pack- and MIDX-bitmap machinery writes a lookup table,
'pack.writeBitmapLookupTable' was enabled by default.

As a result, we can clean up many of our bitmap-related performance
tests. Many of the relevant performance tests look something like:

    test_it () {
      test_expect_success 'setup pack.writeBitmapLookupTable' '
        git config pack.writeBitmapLookupTable '"$1"'
      '

      # ...
    }

    test_it true
    test_it false

, where the two invocations of 'test_it' run the tests with and without
bitmap lookup tables enabled.

But now that lookup tables are enabled by default and have proven to be
a performance win, let's avoid benchmarking what is now an uncommon and
non-default scenario.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Taylor Blau 2025-04-17 17:12:20 -04:00 committed by Junio C Hamano
parent 8b0b5c7046
commit c9d41a415f
4 changed files with 92 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
t/perf/p5310-pack-bitmaps.sh
View File

@ -4,37 +4,28 @@ test_description='Tests pack performance using bitmaps'
. ./perf-lib.sh . ./perf-lib.sh
. "${TEST_DIRECTORY}/perf/lib-bitmap.sh" . "${TEST_DIRECTORY}/perf/lib-bitmap.sh"


test_lookup_pack_bitmap () { test_expect_success 'start the test from scratch' '
test_expect_success 'start the test from scratch' '
rm -rf * .git rm -rf * .git
' '


test_perf_large_repo test_perf_large_repo


# note that we do everything through config, # note that we do everything through config,
# since we want to be able to compare bitmap-aware # since we want to be able to compare bitmap-aware
# git versus non-bitmap git # git versus non-bitmap git
# #
# We intentionally use the deprecated pack.writebitmaps # We intentionally use the deprecated pack.writebitmaps
# config so that we can test against older versions of git. # config so that we can test against older versions of git.
test_expect_success 'setup bitmap config' ' test_expect_success 'setup bitmap config' '
git config pack.writebitmaps true git config pack.writebitmaps true
' '


# we need to create the tag up front such that it is covered by the repack and # we need to create the tag up front such that it is covered by the repack and
# thus by generated bitmaps. # thus by generated bitmaps.
test_expect_success 'create tags' ' test_expect_success 'create tags' '
git tag --message="tag pointing to HEAD" perf-tag HEAD git tag --message="tag pointing to HEAD" perf-tag HEAD
' '


test_perf "enable lookup table: $1" ' test_pack_bitmap
git config pack.writeBitmapLookupTable '"$1"'
'

test_pack_bitmap
}

test_lookup_pack_bitmap false
test_lookup_pack_bitmap true


test_done test_done

32
t/perf/p5311-pack-bitmaps-fetch.sh
View File

@ -3,24 +3,22 @@
test_description='performance of fetches from bitmapped packs' test_description='performance of fetches from bitmapped packs'
. ./perf-lib.sh . ./perf-lib.sh


test_fetch_bitmaps () { test_expect_success 'setup test directory' '
test_expect_success 'setup test directory' '
rm -fr * .git rm -fr * .git
' '


test_perf_default_repo test_perf_default_repo


test_expect_success 'create bitmapped server repo' ' test_expect_success 'create bitmapped server repo' '
git config pack.writebitmaps true && git config pack.writebitmaps true &&
git config pack.writeBitmapLookupTable '"$1"' &&
git repack -ad git repack -ad
' '


# simulate a fetch from a repository that last fetched N days ago, for # simulate a fetch from a repository that last fetched N days ago, for
# various values of N. We do so by following the first-parent chain, # various values of N. We do so by following the first-parent chain,
# and assume the first entry in the chain that is N days older than the current # and assume the first entry in the chain that is N days older than the current
# HEAD is where the HEAD would have been then. # HEAD is where the HEAD would have been then.
for days in 1 2 4 8 16 32 64 128; do for days in 1 2 4 8 16 32 64 128; do
title=$(printf '%10s' "($days days)") title=$(printf '%10s' "($days days)")
test_expect_success "setup revs from $days days ago" ' test_expect_success "setup revs from $days days ago" '
now=$(git log -1 --format=%ct HEAD) && now=$(git log -1 --format=%ct HEAD) &&
@ -32,7 +30,7 @@ test_fetch_bitmaps () {
} >revs } >revs
' '


test_perf "server $title (lookup=$1)" ' test_perf "server $title" '
git pack-objects --stdout --revs \ git pack-objects --stdout --revs \
--thin --delta-base-offset \ --thin --delta-base-offset \
<revs >tmp.pack <revs >tmp.pack
@ -42,13 +40,9 @@ test_fetch_bitmaps () {
test_file_size tmp.pack test_file_size tmp.pack
' '


test_perf "client $title (lookup=$1)" ' test_perf "client $title" '
git index-pack --stdin --fix-thin <tmp.pack git index-pack --stdin --fix-thin <tmp.pack
' '
done done
}

test_fetch_bitmaps true
test_fetch_bitmaps false


test_done test_done

45
t/perf/p5326-multi-pack-bitmaps.sh
View File

@ -4,40 +4,33 @@ test_description='Tests performance using midx bitmaps'
. ./perf-lib.sh . ./perf-lib.sh
. "${TEST_DIRECTORY}/perf/lib-bitmap.sh" . "${TEST_DIRECTORY}/perf/lib-bitmap.sh"


test_bitmap () { test_expect_success "remove existing repo" '
local enabled="$1"

test_expect_success "remove existing repo (lookup=$enabled)" '
rm -fr * .git rm -fr * .git
' '


test_perf_large_repo test_perf_large_repo


# we need to create the tag up front such that it is covered by the repack and # we need to create the tag up front such that it is covered by the repack and
# thus by generated bitmaps. # thus by generated bitmaps.
test_expect_success 'create tags' ' test_expect_success 'create tags' '
git tag --message="tag pointing to HEAD" perf-tag HEAD git tag --message="tag pointing to HEAD" perf-tag HEAD
' '


test_expect_success "use lookup table: $enabled" ' test_expect_success "start with bitmapped pack" '
git config pack.writeBitmapLookupTable '"$enabled"'
'

test_expect_success "start with bitmapped pack (lookup=$enabled)" '
git repack -adb git repack -adb
' '


test_perf "setup multi-pack index (lookup=$enabled)" ' test_perf "setup multi-pack index" '
git multi-pack-index write --bitmap git multi-pack-index write --bitmap
' '


test_expect_success "drop pack bitmap (lookup=$enabled)" ' test_expect_success "drop pack bitmap" '
rm -f .git/objects/pack/pack-*.bitmap rm -f .git/objects/pack/pack-*.bitmap
' '


test_full_bitmap test_full_bitmap


test_expect_success "create partial bitmap state (lookup=$enabled)" ' test_expect_success "create partial bitmap state" '
# pick a commit to represent the repo tip in the past # pick a commit to represent the repo tip in the past
cutoff=$(git rev-list HEAD~100 -1) && cutoff=$(git rev-list HEAD~100 -1) &&
orig_tip=$(git rev-parse HEAD) && orig_tip=$(git rev-parse HEAD) &&
@ -56,12 +49,8 @@ test_bitmap () {
# and now restore our original tip, as if the pushes # and now restore our original tip, as if the pushes
# had happened # had happened
git update-ref HEAD $orig_tip git update-ref HEAD $orig_tip
' '


test_partial_bitmap test_partial_bitmap
}

test_bitmap false
test_bitmap true


test_done test_done

1
t/perf/p5333-pseudo-merge-bitmaps.sh
View File

@ -11,7 +11,6 @@ test_expect_success 'setup' '
-c bitmapPseudoMerge.all.threshold=now \ -c bitmapPseudoMerge.all.threshold=now \
-c bitmapPseudoMerge.all.stableThreshold=never \ -c bitmapPseudoMerge.all.stableThreshold=never \
-c bitmapPseudoMerge.all.maxMerges=64 \ -c bitmapPseudoMerge.all.maxMerges=64 \
-c pack.writeBitmapLookupTable=true \
repack -adb repack -adb
' '