From patchwork Wed Dec 13 01:18:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 13490260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E45C8C4167B for ; Wed, 13 Dec 2023 01:18:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DB3/T/t0FM/jPoLM60N26bZS+7GupNpWMkbWoDfAez4=; b=1DtEh/9S+1Wp0D 62WY7mDU7N8bHnOBWllA/sxymPcTJqsiT/EJEtKNavaUTeYOXCoLwDNtPGwzLbOLh5Eh73Qafpd5g zFNQ/bv1o0YYIGhF7DAtS5WzvyAkpu6uJUdRz+k6ZjnupF6pBuC+jfV0gWqjtrqWv/l+b4FUseUDL aM/qeJifNmdyiLmi230y4dQ5uojVuV2KF8/4SH/0jAkF8/8jCzInDT3RObEQvsW1zqVZdu/+O8rMp 5NASBwu8i9btQ1WreRqOqnjV0MkPgBS2Zn0WJ1O6wjKsHL3R83G+cgBZP+Oo7/Eeykj5i19b8E8GC SpMPmvUj1rU7H1d1AqIw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rDDte-00DIEw-2Y; Wed, 13 Dec 2023 01:18:46 +0000 Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rDDtc-00DIEF-00 for linux-riscv@lists.infradead.org; Wed, 13 Dec 2023 01:18:45 +0000 Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1eb39505ba4so3823119fac.0 for ; Tue, 12 Dec 2023 17:18:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1702430323; x=1703035123; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=SjqGV1Kb/P5zbkrU4HZj42U242Y4ucdb6cKzFhJu16E=; b=Y+J97UzUJEalQ0XYUxpxY7QNEJlvjOcPzhAtWgso5SE4jrZdGJ4N8fIhTkOV2Y3lI6 CQ17dc+Y4TKA2iNIwGwAtnKrcaPdGuXZDPi6zyN4NDPOPGKRiH9KkNPpzrI7JM4dytLs ftiWXYI8xZ5RveG0vQR3fmQ4cKg/PPGhJ7/vOiXKhj6LtpdVwqWUPvesVW7qAgWR9Wxg 7ordPluuLUBHdqd+/7xfDWYml6FjSAOL6I/Pz2AMLbpFkqI7R1BepikQYscWYyEGXc5K WnNxR+h9pfjFlUWFElWKZqcT9YYgNhCrbvQXlLXT8Cyc/osO16Y1fPQJI/6NLk5C8N5Y a+gQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702430323; x=1703035123; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SjqGV1Kb/P5zbkrU4HZj42U242Y4ucdb6cKzFhJu16E=; b=URHbpXOc8djRUhVC7gGvEPsVuFDM06VEvMWEXYWbZ/C7lj7y/MdMLKuh/uTKpnGYCI cyrz1n39rtAlesVepo4gu5lQTV2fA0WyBFir7DuZp60WnrFpo6xOVzxGYT2VqxQgB1M8 Rv+urb9F2Wdis/P6s7G/SunACSF3qlj+/cUCHX8X7w804OuFtMzxPVWyPd79uO3mxwr3 y3tN7L5lWExjWVU/FWRBsI6GCXY1YZRM57ryfPXUIzLSPysLZAzhRLVuxnySHL6CNH5B DSmKxEkC8KIR1PRMN8Ra96sSAM8zP9CrKtV5Aqku6tXz5OOwHc4XUC0jV5qN3beZSgBR ZbpQ== X-Gm-Message-State: AOJu0Yx9s9+Itrbn5TnDRA84dzBF2tugEZrowBTj/LB8LtQukwmH9bnR HLjLKC2pNIr/37QvXQiwwrfszg== X-Google-Smtp-Source: AGHT+IGcpXKQDzSepggo4DA6an7sZ49nxOLPtoiybj/deuVMJvtLgMtNqZQ5vl9noZsHlO7zvyyAAA== X-Received: by 2002:a05:6870:7f03:b0:1fa:1f04:e5f1 with SMTP id xa3-20020a0568707f0300b001fa1f04e5f1mr8946584oab.34.1702430322830; Tue, 12 Dec 2023 17:18:42 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id cy26-20020a056830699a00b006d9a339773csm172548otb.27.2023.12.12.17.18.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 17:18:42 -0800 (PST) From: Charlie Jenkins Date: Tue, 12 Dec 2023 17:18:38 -0800 Subject: [PATCH v12 1/5] asm-generic: Improve csum_fold MIME-Version: 1.0 Message-Id: <20231212-optimize_checksum-v12-1-419a4ba6d666@rivosinc.com> References: <20231212-optimize_checksum-v12-0-419a4ba6d666@rivosinc.com> In-Reply-To: <20231212-optimize_checksum-v12-0-419a4ba6d666@rivosinc.com> To: Charlie Jenkins , Palmer Dabbelt , Conor Dooley , Samuel Holland , David Laight , Xiao Wang , Evan Green , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Paul Walmsley , Albert Ou , Arnd Bergmann , David Laight X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1702430319; l=1517; i=charlie@rivosinc.com; s=20231120; h=from:subject:message-id; bh=FtbING0Tg9V1myoJvDDTr8ph0mEbsa+4mbxe/ijBRBI=; b=dJ5wOJMjymK/YpMtfR6jvWWktdU7txotFEvdWb2yuqaSvy9+MkF/Rz3ht0deRKm8zz0sRZ+ph Cz3UO09uQmsCFOG5spy3fV0k06pu9P/54kSRkrQ0X38OTK6yYmeYPna X-Developer-Key: i=charlie@rivosinc.com; a=ed25519; pk=t4RSWpMV1q5lf/NWIeR9z58bcje60/dbtxxmoSfBEcs= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231212_171844_038336_DCD69EF4 X-CRM114-Status: GOOD ( 10.56 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This csum_fold implementation introduced into arch/arc by Vineet Gupta is better than the default implementation on at least arc, x86, and riscv. Using GCC trunk and compiling non-inlined version, this implementation has 41.6667%, 25% fewer instructions on riscv64, x86-64 respectively with -O3 optimization. Most implmentations override this default in asm, but this should be more performant than all of those other implementations except for arm which has barrel shifting and sparc32 which has a carry flag. Signed-off-by: Charlie Jenkins Reviewed-by: David Laight Acked-by: Arnd Bergmann --- include/asm-generic/checksum.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/checksum.h b/include/asm-generic/checksum.h index 43e18db89c14..ad928cce268b 100644 --- a/include/asm-generic/checksum.h +++ b/include/asm-generic/checksum.h @@ -2,6 +2,8 @@ #ifndef __ASM_GENERIC_CHECKSUM_H #define __ASM_GENERIC_CHECKSUM_H +#include + /* * computes the checksum of a memory block at buff, length len, * and adds in "sum" (32-bit) @@ -31,9 +33,7 @@ extern __sum16 ip_fast_csum(const void *iph, unsigned int ihl); static inline __sum16 csum_fold(__wsum csum) { u32 sum = (__force u32)csum; - sum = (sum & 0xffff) + (sum >> 16); - sum = (sum & 0xffff) + (sum >> 16); - return (__force __sum16)~sum; + return (__force __sum16)((~sum - ror32(sum, 16)) >> 16); } #endif