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

[PATCH 6/9] test-mergesort: add unriffle_skewed mode

From
René Scharfe <l.s.r@web.de>
Date
Oct 1, 2021, 09:17 UTC
Message-ID
<8763ebde-772c-500c-20fc-cbde43dcefeb@web.de>
In-Reply-To
<943b1e01-465e-5def-a766-0adf667690de@web.de>

Add a mode that turns a sorted list into adversarial input for a bottom-up mergesort implementation that doubles the length of sorted sublists at each level -- like our llist_mergesort().

While unriffle mode splits the list in half at each recursion step, unriffle_skewed splits it into 2^l items and the rest, with 2^l being the highest power of two smaller than the number of items and thus 2^l >= rest. The rest is unriffled with the tail of the first half to require a merge to compare the maximum number of elements.

It complements the unriffle mode, which targets balanced merges. If the number of elements is a power of two then both actually produce the same result, as 2^l == rest == n/2 at each recursion step in that case.

Here are the results:
   $ t/helper/test-tool mergesort test | awk '
      $7 > max[$3] {max[$3] = $7; line[$3] = $0}
      END {for (n in line) print line[n]}
   '

distribut mode n m get_next set_next compare verdict sawtooth unriffle_skewed 100 128 1184 700 589 OK sawtooth unriffle_skewed 1023 1024 16373 10230 9207 OK sawtooth unriffle 1024 1024 16384 10240 9217 OK sawtooth unriffle_skewed 1025 2048 18454 11275 10241 OK

The sawtooth distribution with m>=n produces a sorted list and unriffle_skewed mode turns it into adversarial input for unbalanced merges, which it wins in all cases except for n=1024 -- the resulting list is the same, but unriffle is tested before unriffle_skewed, so its result is selected by the AWK script.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 t/helper/test-mergesort.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c
index d71ef568f3..43ec74e2d3 100644
--- a/t/helper/test-mergesort.c
+++ b/t/helper/test-mergesort.c
@@ -178,6 +178,33 @@ static void mode_unriffle(int *arr, int n)
 	free(tmp);
 }

+static unsigned int prev_pow2(unsigned int n)
+{
+	unsigned int pow2 = 1;
+	while (pow2 * 2 < n)
+		pow2 *= 2;
+	return pow2;
+}
+
+static void unriffle_recursively_skewed(int *arr, int n, int *tmp)
+{
+	if (n > 1) {
+		int pow2 = prev_pow2(n);
+		int rest = n - pow2;
+		unriffle(arr + pow2 - rest, rest * 2, tmp);
+		unriffle_recursively_skewed(arr, pow2, tmp);
+		unriffle_recursively_skewed(arr + pow2, rest, tmp);
+	}
+}
+
+static void mode_unriffle_skewed(int *arr, int n)
+{
+	int *tmp;
+	ALLOC_ARRAY(tmp, n);
+	unriffle_recursively_skewed(arr, n, tmp);
+	free(tmp);
+}
+
 #define MODE(name) { #name, mode_##name }

 static struct mode {
@@ -191,6 +218,7 @@ static struct mode {
 	MODE(sort),
 	MODE(dither),
 	MODE(unriffle),
+	MODE(unriffle_skewed),
 };

 static const struct mode *get_mode_by_name(const char *name)
--
2.33.0
Previous: René ScharfeNext: René Scharfe
Message 21 of 29 in “mergesort: improve tests and performance”
  1. 0/9 mergesort: improve tests and performanceRené Scharfe, Oct 1, 2021
  2. 1/9 test-mergesort: use strbuf_getline()René Scharfe, Oct 1, 2021
  3. Ævar Arnfjörð BjarmasonOct 2, 2021
  4. René ScharfeOct 2, 2021
  5. 2/9 test-mergesort: add sort subcommandRené Scharfe, Oct 1, 2021
  6. Junio C HamanoOct 1, 2021
  7. 3/9 test-mergesort: add test subcommandRené Scharfe, Oct 1, 2021
  8. Junio C HamanoOct 1, 2021
  9. Ævar Arnfjörð BjarmasonOct 2, 2021
  10. René ScharfeOct 3, 2021
  11. René ScharfeOct 3, 2021
  12. Junio C HamanoOct 3, 2021
  13. René ScharfeOct 7, 2021
  14. 10/9 test-mergesort: use repeatable random numbersRené Scharfe, Oct 8, 2021
  15. Jeff KingOct 8, 2021
  16. Ævar Arnfjörð BjarmasonOct 8, 2021
  17. René ScharfeOct 8, 2021
  18. Ævar Arnfjörð BjarmasonOct 8, 2021
  19. 4/9 test-mergesort: add generate subcommandRené Scharfe, Oct 1, 2021
  20. 5/9 test-mergesort: add unriffle modeRené Scharfe, Oct 1, 2021
  21. 6/9 test-mergesort: add unriffle_skewed modeRené Scharfe, Oct 1, 2021
  22. 7/9 p0071: measure sorting of already sorted and reversed filesRené Scharfe, Oct 1, 2021
  23. 8/9 p0071: test performance of llist_mergesort()René Scharfe, Oct 1, 2021
  24. 9/9 mergesort: use ranks stackRené Scharfe, Oct 1, 2021
  25. Ævar Arnfjörð BjarmasonJan 17, 2022
  26. René ScharfeJan 17, 2022
  27. René ScharfeJan 18, 2022
  28. Ævar Arnfjörð BjarmasonJan 18, 2022
  29. René ScharfeJan 18, 2022

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.