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

Re: [PATCH 9/9] mergesort: use ranks stack

From
René Scharfe <l.s.r@web.de>
Date
Jan 18, 2022, 05:07 UTC
Message-ID
<cf5053b9-451c-7db6-acff-aae41bfabed3@web.de>
In-Reply-To
<c605ecc2-29d6-9025-152e-1bcb831e7188@web.de>
Am 17.01.22 um 19:22 schrieb René Scharfe:
Show 69 quoted lines
> Am 17.01.22 um 18:43 schrieb Ævar Arnfjörð Bjarmason:
>>
>> On Fri, Oct 01 2021, René Scharfe wrote:
>>
>>
>>> +/*
>>> + * Perform an iterative mergesort using an array of sublists.
>>> + *
>>> + * n is the number of items.
>>> + * ranks[i] is undefined if n & 2^i == 0, and assumed empty.
>>> + * ranks[i] contains a sublist of length 2^i otherwise.
>>> + *
>>> + * The number of bits in a void pointer limits the number of objects
>>> + * that can be created, and thus the number of array elements necessary
>>> + * to be able to sort any valid list.
>>> + *
>>> + * Adding an item to this array is like incrementing a binary number;
>>> + * positional values for set bits correspond to sublist lengths.
>>> + */
>>>  void *llist_mergesort(void *list,
>>>  		      void *(*get_next_fn)(const void *),
>>>  		      void (*set_next_fn)(void *, void *),
>>>  		      int (*compare_fn)(const void *, const void *))
>>>  {
>>> -	unsigned long l;
>>> -
>>> -	if (!list)
>>> -		return NULL;
>>> -	for (l = 1; ; l *= 2) {
>>> -		void *curr;
>>> -		struct mergesort_sublist p, q;
>>> +	void *ranks[bitsizeof(void *)];
>>> +	size_t n = 0;
>>> +	int i;
>>>
>>> -		p.ptr = list;
>>> -		q.ptr = get_nth_next(p.ptr, l, get_next_fn);
>>> -		if (!q.ptr)
>>> -			break;
>>> -		p.len = q.len = l;
>>> +	while (list) {
>>> +		void *next = get_next_fn(list);
>>> +		if (next)
>>> +			set_next_fn(list, NULL);
>>> +		for (i = 0; n & (1 << i); i++)
>>> +			list = llist_merge(ranks[i], list, get_next_fn,
>>> +					   set_next_fn, compare_fn);
>>> +		n++;
>>> +		ranks[i] = list;
>>> +		list = next;
>>> +	}
>>
>> (Commenting on a commit integrated into v2.34.0)
>>
>> The aCC compiler on HP/UX notes:
>>
>>     "mergesort.c", line 67: warning #2549-D: variable "ranks" is used before its value is set
>>                         list = llist_merge(ranks[i], list, get_next_fn,
>>
>> It's commenting on the ranks[i] within the for-loop-within-while-loop
>> above.
>
> That would be a bug.  I think none of the array elements are read before
> they are written -- but of course I'm biased.  Can that compiler show a
> sequence that would lead to reading uninitialized data?  Or anyone else?
>
> Initializing the array would memset(3) 128 bytes on 32-bit systems and
> 512 bytes on 64-bit systems.  Doing that everywhere just to appease a
> confused compiler on a dying platform would be merciful, but still sad.

Does the warning disappear if you add "ranks[0] = NULL;" before the while loop? And if it does, has adding "if (n & 1) ranks[0] = NULL;" instead the same effect?

Show 40 quoted lines
>
>>
>>>
>>> -		if (compare_fn(p.ptr, q.ptr) > 0)
>>> -			list = curr = pop_item(&q, get_next_fn);
>>> +	for (i = 0; n; i++, n >>= 1) {
>>> +		if (!(n & 1))
>>> +			continue;
>>> +		if (list)
>>> +			list = llist_merge(ranks[i], list, get_next_fn,
>>> +					   set_next_fn, compare_fn);
>>>  		else
>>> -			list = curr = pop_item(&p, get_next_fn);
>>> -
>>> -		while (p.ptr) {
>>> -			while (p.len || q.len) {
>>> -				void *prev = curr;
>>> -
>>> -				if (!p.len)
>>> -					curr = pop_item(&q, get_next_fn);
>>> -				else if (!q.len)
>>> -					curr = pop_item(&p, get_next_fn);
>>> -				else if (compare_fn(p.ptr, q.ptr) > 0)
>>> -					curr = pop_item(&q, get_next_fn);
>>> -				else
>>> -					curr = pop_item(&p, get_next_fn);
>>> -				set_next_fn(prev, curr);
>>> -			}
>>> -			p.ptr = q.ptr;
>>> -			p.len = l;
>>> -			q.ptr = get_nth_next(p.ptr, l, get_next_fn);
>>> -			q.len = q.ptr ? l : 0;
>>> -
>>> -		}
>>> -		set_next_fn(curr, NULL);
>>> +			list = ranks[i];
>>>  	}
>>>  	return list;
>>>  }
>>
Previous: René ScharfeNext: Ævar Arnfjörð Bjarmason
Message 27 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.