From patchwork Tue Jul 11 19:07:22 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: 72513 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 DD6CD385696A for ; Tue, 11 Jul 2023 19:09:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DD6CD385696A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689102563; bh=aHvJVcWPaEmpiOKjsp68YvtgDXu66szVIw9Zh/HJujI=; 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=CLWPR6mMTsQOM/ASG1Z5dXI90pQ8/v4BqC57oMAU7DKMeWZ6csvZBdRSprS2jAfnx ZPXsZfRbdK7yKYw5SjPCQho6ZdV2v1WhMWEcgn64DPvoz0DzqiKa4PUNxVcR8dqLN4 JXeGnkkepHL4xD+Y39bR6B0xsrg+9apWXadIf5aY= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oa1-x31.google.com (mail-oa1-x31.google.com [IPv6:2001:4860:4864:20::31]) by sourceware.org (Postfix) with ESMTPS id A78C8385781F for ; Tue, 11 Jul 2023 19:07:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A78C8385781F Received: by mail-oa1-x31.google.com with SMTP id 586e51a60fabf-1b730eb017bso1912061fac.1 for ; Tue, 11 Jul 2023 12:07:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689102455; x=1691694455; 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=aHvJVcWPaEmpiOKjsp68YvtgDXu66szVIw9Zh/HJujI=; b=P4vrLYXPIKkBNtWpCTOCfVMN4vcR3WVpLSFy/4P9TW1jd5ypxluWqWyUuVTb+Sgi55 dzVsBlBocmaDa1crl1aK0VZ0RdK1hRmocksC1dedtwTpjkeewV58dT8p/Q7StkzmuOiT HnJwwDsamdn09xaAhBREc48yI+ITzJ639n4gh1sjrUSqGeiscj8/jZra3iUGhxI/fw8Z 5oqdj3RczQet8r4x9xCLZgnPCIv6BQ6sgrqB1cZq7pvFt6235HTWatG0gxRwlzWUZapo eoTE0hFGYiAIpq+vQJ+HsKZk49VgNj/wDgg+00CIRS55KBXLtP6SZal63b2s5dFB3v+r gbiw== X-Gm-Message-State: ABy/qLbEB2Y8q/dkZjJLZ1stgLYpL7SW8eDDYYx+L3S0qj4cHWnPmRSd jeBvt/W64CV0EGfE1rKnrum5hJrdtLWNXFgSzWZ4Wg== X-Google-Smtp-Source: APBJJlHgxU/K1MdzrSTSIP0Q3ERleLI+NYGUn7OKBFJMf0/ONhkmvHvkZKRMdvvUMgwASS3A/kW9fw== X-Received: by 2002:a05:6870:f6a2:b0:1a9:e938:e192 with SMTP id el34-20020a056870f6a200b001a9e938e192mr16138114oab.25.1689102455479; Tue, 11 Jul 2023 12:07:35 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:e0c8:30b2:9ea1:dcf5:7755]) by smtp.gmail.com with ESMTPSA id du9-20020a0568703a0900b001b3d67934e9sm1286128oab.26.2023.07.11.12.07.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 12:07:35 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v4 6/6] stdlib: Add more qsort{_r} coverage Date: Tue, 11 Jul 2023 16:07:22 -0300 Message-Id: <20230711190722.4028821-7-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230711190722.4028821-1-adhemerval.zanella@linaro.org> References: <20230711190722.4028821-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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" This patch adds a qsort and qsort_r (which glibc current lacks coverage). The test is done with random input, dfferent internal types (uint8_t, uint16_t, uint32_t, and uint64_t), and with different set of element numbers. Checked on x86_64-linux-gnu. --- stdlib/Makefile | 1 + stdlib/tst-qsort3.c | 298 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+) create mode 100644 stdlib/tst-qsort3.c diff --git a/stdlib/Makefile b/stdlib/Makefile index 095518eef4..6af606136e 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -214,6 +214,7 @@ tests := \ tst-on_exit \ tst-qsort \ tst-qsort2 \ + tst-qsort3 \ tst-quick_exit \ tst-rand48 \ tst-rand48-2 \ diff --git a/stdlib/tst-qsort3.c b/stdlib/tst-qsort3.c new file mode 100644 index 0000000000..86d054ff38 --- /dev/null +++ b/stdlib/tst-qsort3.c @@ -0,0 +1,298 @@ +/* qsort(_r) generic tests. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +typedef enum +{ + Sorted, + Random, + Repeated, + Bitonic +} arraytype_t; + +/* Ratio of total of elements which will be repeated. */ +static const double RepeatedRatio = 0.2; + +struct array_t +{ + arraytype_t type; + const char *name; +} static const arraytypes[] = +{ + { Sorted, "Sorted" }, + { Random, "Random" }, + { Repeated, "Repeated" }, + { Bitonic, "Bitonic" }, +}; + +/* Return the index of BASE as interpreted as an array of elements + of size SIZE. */ +static inline void * +arr (void *base, size_t idx, size_t size) +{ + return (void*)((uintptr_t)base + (idx * size)); +} + +/* Functions used to check qsort. */ +static int +uint8_t_cmp (const void *a, const void *b) +{ + uint8_t ia = *(uint8_t*)a; + uint8_t ib = *(uint8_t*)b; + return (ia > ib) - (ia < ib); +} + +static int +uint16_t_cmp (const void *a, const void *b) +{ + uint16_t ia = *(uint16_t*)a; + uint16_t ib = *(uint16_t*)b; + return (ia > ib) - (ia < ib); +} + +static int +uint32_t_cmp (const void *a, const void *b) +{ + uint32_t ia = *(uint32_t*)a; + uint32_t ib = *(uint32_t*)b; + return (ia > ib) - (ia < ib); +} + +static int +uint64_t_cmp (const void *a, const void *b) +{ + uint64_t ia = *(uint64_t*)a; + uint64_t ib = *(uint64_t*)b; + return (ia > ib) - (ia < ib); +} + +#define LARGE_SIZE 48 + +static int +large_cmp (const void *a, const void *b) +{ + return memcmp (a, b, LARGE_SIZE); +} + +/* Function used to check qsort_r. */ +typedef enum +{ + UINT8_CMP_T, + UINT16_CMP_T, + UINT32_CMP_T, + UINT64_CMP_T, + LARGE_CMP_T +} type_cmp_t; + +static type_cmp_t +uint_t_cmp_type (size_t sz) +{ + switch (sz) + { + case sizeof (uint8_t): return UINT8_CMP_T; + case sizeof (uint16_t): return UINT16_CMP_T; + case sizeof (uint64_t): return UINT64_CMP_T; + case sizeof (uint32_t): return UINT32_CMP_T; + default: return LARGE_CMP_T; + } +} + +static int +uint_t_cmp (const void *a, const void *b, void *arg) +{ + type_cmp_t type = *(type_cmp_t*) arg; + switch (type) + { + case UINT8_CMP_T: return uint8_t_cmp (a, b); + case UINT32_CMP_T: return uint32_t_cmp (a, b); + case UINT16_CMP_T: return uint16_t_cmp (a, b); + case UINT64_CMP_T: return uint64_t_cmp (a, b); + default: return large_cmp (a, b); + } +} + +static void +seq (void *elem, size_t type_size, int value) +{ + if (type_size == sizeof (uint8_t)) + *(uint8_t*)elem = value; + else if (type_size == sizeof (uint16_t)) + *(uint16_t*)elem = value; + else if (type_size == sizeof (uint32_t)) + *(uint32_t*)elem = value; + else if (type_size == sizeof (uint64_t)) + *(uint64_t*)elem = value; + else + memset (elem, value, type_size); +} + +static void * +create_array (size_t nmemb, size_t type_size, arraytype_t type) +{ + size_t size = nmemb * type_size; + void *array = xmalloc (size); + + switch (type) + { + case Sorted: + for (size_t i = 0; i < nmemb; i++) + seq (arr (array, i, type_size), type_size, i); + break; + + case Random: + arc4random_buf (array, size); + break; + + case Repeated: + { + arc4random_buf (array, size); + + void *randelem = xmalloc (type_size); + arc4random_buf (randelem, type_size); + + /* Repeat REPEATED elements (based on RepeatRatio ratio) in the random + array. */ + size_t repeated = (size_t)(nmemb * RepeatedRatio); + for (size_t i = 0; i < repeated; i++) + { + size_t pos = arc4random_uniform (nmemb - 1); + memcpy (arr (array, pos, type_size), randelem, type_size); + } + free (randelem); + } + break; + + case Bitonic: + { + size_t i; + for (i = 0; i < nmemb / 2; i++) + seq (arr (array, i, type_size), type_size, i); + for ( ; i < nmemb; i++) + seq (arr (array, i, type_size), type_size, (nmemb - 1) - i); + } + break; + } + + return array; +} + +typedef int (*cmpfunc_t)(const void *, const void *); + +/* Check if ARRAY of total NMEMB element of size SIZE is sorted + based on CMPFUNC. */ +static void +check_array (void *array, size_t nmemb, size_t type_size, + cmpfunc_t cmpfunc) +{ + for (size_t i = 1; i < nmemb; i++) + { + int ret = cmpfunc (arr (array, i, type_size), + arr (array, i-1, type_size)); + TEST_VERIFY_EXIT (ret >= 0); + } +} + +static void +check_qsort (size_t nelem, size_t type_size, arraytype_t type, + cmpfunc_t cmpfunc) +{ + void *array = create_array (nelem, type_size, type); + + qsort (array, nelem, type_size, cmpfunc); + + check_array (array, nelem, type_size, cmpfunc); + + free (array); +} + +static void +check_qsort_r (size_t nelem, size_t type_size, arraytype_t type, + cmpfunc_t cmpfunc) +{ + void *array = create_array (nelem, type_size, type); + + type_cmp_t typecmp = uint_t_cmp_type (type_size); + qsort_r (array, nelem, type_size, uint_t_cmp, &typecmp); + + check_array (array, nelem, type_size, cmpfunc); + + free (array); +} + +static int +do_test (void) +{ + /* Some random sizes. */ + const size_t nelems[] = { 0, 1, 7, 20, 32, 100, 256, 1024, 8560, 17384 }; + + struct test_t + { + size_t type_size; + cmpfunc_t cmpfunc; + } + const tests[] = + { + { sizeof (uint8_t), uint8_t_cmp }, + { sizeof (uint16_t), uint16_t_cmp }, + { sizeof (uint32_t), uint32_t_cmp }, + { sizeof (uint64_t), uint64_t_cmp }, + /* Test swap with large elements. */ + { LARGE_SIZE, large_cmp }, + }; + + for (const struct test_t *test = tests; test < array_end (tests); ++test) + { + if (test_verbose > 0) + printf ("info: testing qsort with type_size=%zu\n", test->type_size); + for (const struct array_t *arraytype = arraytypes; + arraytype < array_end (arraytypes); + ++arraytype) + { + if (test_verbose > 0) + printf (" distribution=%s\n", arraytype->name); + for (const size_t *nelem = nelems; + nelem < array_end (nelems); + ++nelem) + { + if (test_verbose > 0) + printf (" i nelem=%zu, total size=%zu\n", *nelem, + *nelem * test->type_size); + + check_qsort (*nelem, test->type_size, arraytype->type, + test->cmpfunc); + check_qsort_r (*nelem, test->type_size, arraytype->type, + test->cmpfunc); + } + } + } + + return 0; +} + +#include