From patchwork Tue Jul 18 14:15:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 72882 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 04ECC3853D2E for ; Tue, 18 Jul 2023 14:16:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 04ECC3853D2E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689689784; bh=q9e+eAPpgtb4YGtW9SuJM8RXGmVNTGNbIt+1l2o5IbI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=oqXu7eXg4IvyPphLA0BfpoX/Ww/Ygy7l2Xg1QFdV84U4AC9anSIUqOYlZBsRdw77L MqDxLj+mcHkBFq5JDzxeGs8KOcsYMeZpxOYGETBIdEc0t1H+4pA0dmCTm6uSS5RRY5 K0mI6co4iZFGShchSkpMrtHnIAPKoRvq4ND90kVk= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by sourceware.org (Postfix) with ESMTPS id D623B385AF8E for ; Tue, 18 Jul 2023 14:15:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D623B385AF8E Received: by mail-oi1-x233.google.com with SMTP id 5614622812f47-3a41da34780so3514458b6e.0 for ; Tue, 18 Jul 2023 07:15:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689689755; x=1690294555; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q9e+eAPpgtb4YGtW9SuJM8RXGmVNTGNbIt+1l2o5IbI=; b=IYhtIx/j7OYAhnZVC8Eczwc/BYDFmVdYsyDnc34TbcFpHhfY+zDy1P2aMoKYgBFEQX FBwBM2H7Fn9manFwrxsmUJRUBiSugWmuPJmqBL+bS56SS4gvgr4pWyc+rOjDkGMO9lFC vyA6Y8pT/IrbvKPKL3cnJ3wZQ3aX77tZl0gSVvP5QurudzkPFoRtXPo0ZF6wixVXKury qSFAluzLA4VU6UVD0yJ6+I3ijHIIX0AmAvGG2bI3yaHzjQSh8FjXvSff/55h/eO5hGpN 0Pv5pmR6NtN/BJ7V+V89G3LEu5QZKoJRhkL15wLDe2WpwFm86hhs4x5DdyoYD/xnbcfO DOhQ== X-Gm-Message-State: ABy/qLaLN3Gzr9C/oPTK3fON+Vk0cGsL92GJVPypodaRR8CSLJt7W8QS /3IqNDfm8oyBsyw0oWoG13LVnLvUZ5YP/2A9kyK4OQ== X-Google-Smtp-Source: APBJJlGEJ/ZS3TrBRJN944xvGhGJlT30nOlGh0VxC35JlP6HlqyRMX2DeuMdlYe0sxZNiBjKgF0Jkw== X-Received: by 2002:a05:6808:1914:b0:3a1:bced:9e83 with SMTP id bf20-20020a056808191400b003a1bced9e83mr10173312oib.5.1689689755572; Tue, 18 Jul 2023 07:15:55 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:5656:745f:3154:510d:b668]) by smtp.gmail.com with ESMTPSA id 188-20020a4a11c5000000b00565fcfabab8sm847843ooc.21.2023.07.18.07.15.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 07:15:54 -0700 (PDT) To: libc-alpha@sourceware.org, Paul Eggert , Alexander Monakov Subject: [PATCH v6 3/6] stdlib: qsort: Move some macros to inline function Date: Tue, 18 Jul 2023 11:15:40 -0300 Message-Id: <20230718141543.3925254-4-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230718141543.3925254-1-adhemerval.zanella@linaro.org> References: <20230718141543.3925254-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" --- stdlib/qsort.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/stdlib/qsort.c b/stdlib/qsort.c index 77630951df..640896a598 100644 --- a/stdlib/qsort.c +++ b/stdlib/qsort.c @@ -121,15 +121,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; +} /* Order size using quicksort. This implementation incorporates @@ -233,11 +246,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; @@ -302,7 +313,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; @@ -313,13 +324,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; } }