From: Noah Goldstein <goldstein.w.n@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: libc-alpha@sourceware.org, Paul Eggert <eggert@cs.ucla.edu>,
Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH v8 4/7] stdlib: qsort: Move some macros to inline function
Date: Mon, 30 Oct 2023 14:03:40 -0500 [thread overview]
Message-ID: <CAFUsyfJZkvs0rk7u1z+0z_njWN=YQz+4cPbyebC2eUzr7iPgeg@mail.gmail.com> (raw)
In-Reply-To: <20231003122251.3325435-5-adhemerval.zanella@linaro.org>
On Tue, Oct 3, 2023 at 7:23 AM Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
> ---
> stdlib/qsort.c | 35 +++++++++++++++++++++++------------
> 1 file changed, 23 insertions(+), 12 deletions(-)
>
> diff --git a/stdlib/qsort.c b/stdlib/qsort.c
> index 5691249a9b..80706b3357 100644
> --- a/stdlib/qsort.c
> +++ b/stdlib/qsort.c
> @@ -100,15 +100,28 @@ typedef struct
> char *hi;
> } stack_node;
>
> -/* The next 4 #defines implement a very fast in-line stack abstraction. */
> /* The stack needs log (total_elements) entries (we could even subtract
> log(MAX_THRESH)). Since total_elements has type size_t, we get as
> upper bound for log (total_elements):
> bits per byte (CHAR_BIT) * sizeof(size_t). */
> -#define STACK_SIZE (CHAR_BIT * sizeof (size_t))
> -#define PUSH(low, high) ((void) ((top->lo = (low)), (top->hi = (high)), ++top))
> -#define POP(low, high) ((void) (--top, (low = top->lo), (high = top->hi)))
> -#define STACK_NOT_EMPTY (stack < top)
> +enum { STACK_SIZE = CHAR_BIT * sizeof (size_t) };
> +
> +static inline stack_node *
> +push (stack_node *top, char *lo, char *hi)
> +{
> + top->lo = lo;
> + top->hi = hi;
> + return ++top;
> +}
> +
> +static inline stack_node *
> +pop (stack_node *top, char **lo, char **hi)
> +{
> + --top;
> + *lo = top->lo;
> + *hi = top->hi;
> + return top;
> +}
>
>
> static inline void
> @@ -212,11 +225,9 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
> char *lo = base_ptr;
> char *hi = &lo[size * (total_elems - 1)];
> stack_node stack[STACK_SIZE];
> - stack_node *top = stack;
> -
> - PUSH (NULL, NULL);
> + stack_node *top = stack + 1;
>
> - while (STACK_NOT_EMPTY)
> + while (stack < top)
> {
> char *left_ptr;
> char *right_ptr;
> @@ -281,7 +292,7 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
> {
> if ((size_t) (hi - left_ptr) <= max_thresh)
> /* Ignore both small partitions. */
> - POP (lo, hi);
> + top = pop (top, &lo, &hi);
> else
> /* Ignore small left partition. */
> lo = left_ptr;
> @@ -292,13 +303,13 @@ _quicksort (void *const pbase, size_t total_elems, size_t size,
> else if ((right_ptr - lo) > (hi - left_ptr))
> {
> /* Push larger left partition indices. */
> - PUSH (lo, right_ptr);
> + top = push (top, lo, right_ptr);
> lo = left_ptr;
> }
> else
> {
> /* Push larger right partition indices. */
> - PUSH (left_ptr, hi);
> + top = push (top, left_ptr, hi);
> hi = right_ptr;
> }
> }
> --
> 2.34.1
>
LGTM
Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>
next prev parent reply other threads:[~2023-10-30 19:03 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 12:22 [PATCH v8 0/7] Use introsort for qsort Adhemerval Zanella
2023-10-03 12:22 ` [PATCH v8 1/7] string: Add internal memswap implementation Adhemerval Zanella
2023-10-03 17:42 ` Noah Goldstein
2023-10-27 20:23 ` Adhemerval Zanella Netto
2023-10-27 22:47 ` Gabriel Ravier
2023-10-28 1:30 ` Noah Goldstein
2023-10-30 19:02 ` Noah Goldstein
2023-10-03 12:22 ` [PATCH v8 2/7] stdlib: Optimization qsort{_r} swap implementation Adhemerval Zanella
2023-10-30 19:02 ` Noah Goldstein
2023-10-03 12:22 ` [PATCH v8 3/7] stdlib: Move insertion sort out qsort Adhemerval Zanella
2023-10-30 19:03 ` Noah Goldstein
2023-10-03 12:22 ` [PATCH v8 4/7] stdlib: qsort: Move some macros to inline function Adhemerval Zanella
2023-10-30 19:03 ` Noah Goldstein [this message]
2023-10-03 12:22 ` [PATCH v8 5/7] stdlib: Implement introsort for qsort (BZ 19305) Adhemerval Zanella
2023-10-30 19:03 ` Noah Goldstein
2023-10-03 12:22 ` [PATCH v8 6/7] stdlib: Remove use of mergesort on qsort (BZ 21719) Adhemerval Zanella
2023-10-30 19:04 ` Noah Goldstein
2023-10-03 12:22 ` [PATCH v8 7/7] stdlib: Add more qsort{_r} coverage Adhemerval Zanella
2023-10-30 19:04 ` Noah Goldstein
2023-10-03 18:13 ` [PATCH v8 0/7] Use introsort for qsort Noah Goldstein
2023-10-27 20:24 ` Adhemerval Zanella Netto
2023-10-28 1:31 ` Noah Goldstein
-- strict thread matches above, loose matches on Subject: below --
2023-10-02 19:33 Adhemerval Zanella
2023-10-02 19:33 ` [PATCH v8 4/7] stdlib: qsort: Move some macros to inline function Adhemerval Zanella
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='CAFUsyfJZkvs0rk7u1z+0z_njWN=YQz+4cPbyebC2eUzr7iPgeg@mail.gmail.com' \
--to=goldstein.w.n@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=eggert@cs.ucla.edu \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).