undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-mergesort: use DEFINE_LIST_SORT_DEBUG

Browse Source 
Define a typed sort function using DEFINE_LIST_SORT_DEBUG for the
mergesort sanity check instead of using llist_mergesort().  This gets
rid of the next pointer accessor functions and improves the performance
at the cost of slightly bigger object text.

Before:
Benchmark 1: t/helper/test-tool mergesort test
  Time (mean ± σ):     108.4 ms ±   0.2 ms    [User: 106.7 ms, System: 1.2 ms]
  Range (min … max):   108.0 ms … 108.8 ms    27 runs

__TEXT	__DATA	__OBJC	others	dec	hex
6251	276	0	23172	29699	7403	t/helper/test-mergesort.o

With this patch:
Benchmark 1: t/helper/test-tool mergesort test
  Time (mean ± σ):      94.0 ms ±   0.2 ms    [User: 92.4 ms, System: 1.1 ms]
  Range (min … max):    93.7 ms …  94.5 ms    31 runs

__TEXT	__DATA	__OBJC	others	dec	hex
6407	276	0	24701	31384	7a98	t/helper/test-mergesort.o

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2022-07-16 18:56:32 +02:00 committed by Junio C Hamano
parent 318051eaeb
commit f00a039839
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
t/helper/test-mergesort.c
View File

@ -273,21 +273,11 @@ struct number {
struct number *next; struct number *next;
}; };
static void *get_next_number(const void *a) DEFINE_LIST_SORT_DEBUG(static, sort_numbers, struct number, next,
{ stats.get_next++, stats.set_next++);
stats.get_next++;
return ((const struct number *)a)->next;
}
static void set_next_number(void *a, void *b) static int compare_numbers(const struct number *an, const struct number *bn)
{ {
stats.set_next++;
((struct number *)a)->next = b;
}
static int compare_numbers(const void *av, const void *bv)
{
const struct number *an = av, *bn = bv;
int a = an->value, b = bn->value; int a = an->value, b = bn->value;
stats.compare++; stats.compare++;
return (a > b) - (a < b); return (a > b) - (a < b);
@ -325,8 +315,7 @@ static int test(const struct dist *dist, const struct mode *mode, int n, int m)
*tail = NULL; *tail = NULL;
stats.get_next = stats.set_next = stats.compare = 0; stats.get_next = stats.set_next = stats.compare = 0;
list = llist_mergesort(list, get_next_number, set_next_number, sort_numbers(&list, compare_numbers);
compare_numbers);
QSORT(arr, n, compare_ints); QSORT(arr, n, compare_ints);
for (i = 0, curr = list; i < n && curr; i++, curr = curr->next) { for (i = 0, curr = list; i < n && curr; i++, curr = curr->next) {

2
t/t0071-sort.sh
View File

@ -5,7 +5,7 @@ test_description='verify sort functions'
TEST_PASSES_SANITIZE_LEAK=true TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'llist_mergesort()' ' test_expect_success 'DEFINE_LIST_SORT_DEBUG' '
test-tool mergesort test test-tool mergesort test
' '