From patchwork Wed Apr 6 07:26:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 52662 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 0E00C3857C46 for ; Wed, 6 Apr 2022 07:27:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0E00C3857C46 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1649230054; bh=yYVhRc9p8JtC1yzZUCkzusdk8vHbRNjvqYuzjQJUwXQ=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=A2TxUV6Cr5+o8la7ESzHJLZUWg21UJKEMP/eMLUlES6qMfWFV8ikt1AzEct4neQDN c2S3JDzshg8TZ4/14BtqkAZktHIi3WgtDfBzjwdbszwceqNyMfBRqGDvTf92LeWldg fmZodiTEKVoS383bFC/Y0uhq7yWCkgoIG9eiWoEM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from eastern.birch.relay.mailchannels.net (eastern.birch.relay.mailchannels.net [23.83.209.55]) by sourceware.org (Postfix) with ESMTPS id AA1AB3858D1E for ; Wed, 6 Apr 2022 07:27:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AA1AB3858D1E X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 5350C20BE6 for ; Wed, 6 Apr 2022 07:27:10 +0000 (UTC) Received: from pdx1-sub0-mail-a307.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 0577A2154E for ; Wed, 6 Apr 2022 07:27:10 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1649230030; a=rsa-sha256; cv=none; b=mGV/6e4Y3vu2bJ/Wl0hPNoq4Qo4dLrGzs6Oq/UFyMalo2V0qPgTiqO8/DxNpLlcvqFDfpH cvbaklVWg6xEmb/tlCzV3gv/fsw7A+X7Xy8D2D6DNotwhWTYIIwP6qK9fl0/F8fjuGHx/h ZuEeW7jrQDvOEzZno6s/XL3PPVHY4FvAmGt8D3g5/oG4YaffumX1ODxisvxS9pTInn/lB0 t2Jw5rXGaW63+UzodhDSvKKKTXxbNrK/iQHq9Ur33TZsJ9pp9DSBZd5JK/GIK9lhWAR04j xrS4mufrNsdBZHaK8d1C0d1P8eAmxEgGqAnouDb5+cotXwhF3bGmxKMU7YMU3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1649230030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=yYVhRc9p8JtC1yzZUCkzusdk8vHbRNjvqYuzjQJUwXQ=; b=i1R0yREadV/2XYWjWq1tVev49TeKuxnqqnWOefHL71DjNy/0RARgyt+BRyyY4Xou0KTHQ+ STF42XBswoQ+2Bd+OQJ541ty4qO+M9qnF4wjvCUgSgbH2v5TUU2wAiEuAcLYlUQuMXniYP JBb4JuNLVv+cAjj7PSSiiJ5Orn6IcFxnfQxEQ+GqV7fonUZYFKVNz2N4/Hs2EvcfnruD6b r6eijHC29WDfOJ7fR/lEqKrPDNH9P0GlE2eF4Nv2f2YOixVbmhwAdQprvIytwvGoXAT+N5 gVvYD1ezhW+MLorPyFLIGbvHCNjZIhH8v24aMxm8SeM2V1slawGsD6UnEtwgtA== ARC-Authentication-Results: i=1; rspamd-786f77c8d-rzkjs; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a307.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.112.55.202 (trex/6.7.1); Wed, 06 Apr 2022 07:27:10 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Irritate-Lonely: 01a708df1f30c61e_1649230030242_419517252 X-MC-Loop-Signature: 1649230030242:1907235558 X-MC-Ingress-Time: 1649230030242 Received: from rhbox.redhat.com (unknown [49.248.235.144]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a307.dreamhost.com (Postfix) with ESMTPSA id 4KYGL4712Qz1PZ for ; Wed, 6 Apr 2022 00:27:08 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [committed] test-memcpy: Actually reverse source and destination Date: Wed, 6 Apr 2022 12:56:59 +0530 Message-Id: <20220406072659.231474-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1171.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Siddhesh Poyarekar via Libc-alpha From: Siddhesh Poyarekar Reply-To: Siddhesh Poyarekar Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Looks like an oversight in memcpy tests resulted in s2 and s1 not being swapped for the second iteration of the memcpy test. Fix it. Also fix a formatting nit. Signed-off-by: Siddhesh Poyarekar --- string/test-memcpy-support.h | 46 +++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/string/test-memcpy-support.h b/string/test-memcpy-support.h index f1763da895..699c00ce4c 100644 --- a/string/test-memcpy-support.h +++ b/string/test-memcpy-support.h @@ -84,7 +84,7 @@ do_one_test (impl_t *impl, char *dst, const char *src, size_t len) static void do_test (size_t align1, size_t align2, size_t len) { - size_t i, j, repeats; + size_t i, j; char *s1, *s2; align1 &= 4095; @@ -97,13 +97,16 @@ do_test (size_t align1, size_t align2, size_t len) s1 = (char *)(buf1 + align1); s2 = (char *)(buf2 + align2); - for (repeats = 0; repeats < 2; ++repeats) + for (size_t repeats = 0; repeats < 2; ++repeats) { for (i = 0, j = 1; i < len; i++, j += 23) s1[i] = j; FOR_EACH_IMPL (impl, 0) do_one_test (impl, s2, s1, len); + + s1 = (char *) (buf2 + align1); + s2 = (char *) (buf1 + align2); } } @@ -138,30 +141,29 @@ do_test1 (size_t align1, size_t align2, size_t size) unaligned_uint32_t *dest = large_buf + align1; unaligned_uint32_t *src = large_buf + region_size + 2 * page_size + align2; size_t i; - size_t repeats; - for (repeats = 0; repeats < 2; repeats++) + for (size_t repeats = 0; repeats < 2; repeats++) { for (i = 0; i < array_size; i++) src[i] = (uint32_t)i; FOR_EACH_IMPL (impl, 0) - { - memset (dest, -1, size); - CALL (impl, (char *)dest, (char *)src, size); - if (memcmp (src, dest, size)) - { - for (i = 0; i < array_size; i++) - if (dest[i] != src[i]) - { - error (0, 0, - "Wrong result in function %s dst \"%p\" src \"%p\" " - "offset \"%zd\"", - impl->name, dest, src, i); - ret = 1; - munmap ((void *)large_buf, mmap_size); - return; - } - } - } + { + memset (dest, -1, size); + CALL (impl, (char *)dest, (char *)src, size); + if (memcmp (src, dest, size)) + { + for (i = 0; i < array_size; i++) + if (dest[i] != src[i]) + { + error (0, 0, + "Wrong result in function %s dst \"%p\" src \"%p\" " + "offset \"%zd\"", + impl->name, dest, src, i); + ret = 1; + munmap ((void *)large_buf, mmap_size); + return; + } + } + } dest = large_buf + region_size + 2 * page_size + align1; src = large_buf + align2; }