From patchwork Fri Nov 17 21:27:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charlie Jenkins X-Patchwork-Id: 166398 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp823620vqn; Fri, 17 Nov 2023 13:29:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHab7jmItYVO9vms6Rsbh3C+pyQOWxWEg8ZD71iM3Nork2NKvYcmtxhDWLOqp+gW9q8njY X-Received: by 2002:a17:903:1c4:b0:1c7:5f03:8562 with SMTP id e4-20020a17090301c400b001c75f038562mr1091161plh.30.1700256590820; Fri, 17 Nov 2023 13:29:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700256590; cv=none; d=google.com; s=arc-20160816; b=x+QGtIktLskcfCrHnCmKB+WUWK6Koc1nN5QjbGq4aWQF33Xh37h8glRZa+eMzjU2yB rEMT2B2NUbfoaLMafw/uR8U5tSJKj8re5+vgfF/U1D1cT96el6FEMZDxvPTlUm7V34TD WBUw3MngAN0ybunQvvTS7StZdasxrIiY7HLU5KYcLFkhEEz6/ykdZPU1SO6Jyk9/1QXQ gg+SqzKyX3fpjE9u8w2M1GPMxw/a5A9+ldgY64BHpitHE/RvCZqNtXfiH/4Eux5cGtMT OeE2FdEPiG6ih/Sch4boNf3VXkUybT2sbc/JCuodixj55WHPryOEOcuDM1AOfXe/IpY4 Z5qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=iQdBfGrxgT0Dp0rMc/ALsHZTaxuvWcxH/0MUqWK8IuU=; fh=WrYWo2NWGfDp1Q0L0IXsGjg4kDrSbEOOvn62+ocLtXY=; b=zVcBDZiqUHPekMylYVTL1AhvXZ5ojRiSFJv0hl58Xe8I/dszkEtlyLyAUcE8MnzRbu 3we0lo6d0JMgFtvqZGKNQAcrPFBcopq7ln5giRtHhNY8FzYk4yukzQULVzzOKbIIwt+4 PGIGXlZX9T9ttMiVPTnnpdTlOG2H8t9JPQAp0NAOFopYrAxm9hmjUkQEJbDdVciLaVos mx0MZ23At9qO2Sq++hfzAByzEWK5nhtdPVp/rozbkekWlKaTlPoN97eC7iZW65ITb4am J6/1tXYvpsh9Wj8IdMsKn0H5a2PskrRHvWcp0N/KlRCNVvozrhRL4rnijtUAs9OyRobl vJGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f70WRS7y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id e16-20020a170902ef5000b001cc2c7a30dasi2710252plx.651.2023.11.17.13.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 13:29:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=f70WRS7y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id F2100821C5FD; Fri, 17 Nov 2023 13:29:36 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235726AbjKQV2p (ORCPT + 29 others); Fri, 17 Nov 2023 16:28:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235857AbjKQV2a (ORCPT ); Fri, 17 Nov 2023 16:28:30 -0500 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF9EBAD for ; Fri, 17 Nov 2023 13:28:10 -0800 (PST) Received: by mail-ot1-x32f.google.com with SMTP id 46e09a7af769-6ce2add34c9so1314406a34.1 for ; Fri, 17 Nov 2023 13:28:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1700256490; x=1700861290; darn=vger.kernel.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=iQdBfGrxgT0Dp0rMc/ALsHZTaxuvWcxH/0MUqWK8IuU=; b=f70WRS7yyv+xBIlfF9WkxxyBns6g68kJl5Zcq9FaMGwv3Nk0XF2LNc2GdRXTAZGF7d r8pQ/bwH57C5ZLNJV1pX5OkNzoFL8YP+5TTDLJVOfZe+hNxgNqoseP05l962ZI5IK2Iw j5WyQ8DXl+zVuzEPtA6uqDMmBrASNBe0IIAiY0lvr5TB93BCGN19V4cqAYpchLQ0Yx70 bLH0rPqxKeMTm7I2SkgVcbXZWpPB12e0HR+moIalyE3QARMyFtfV92/Is82hO6EAl03H C7l76vhulPQv0fKWnG+87DDse1XBgl3JKUjbiXej8dOgLC1tvb53tKII8zxn1Fh9Wd5s HsNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700256490; x=1700861290; 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=iQdBfGrxgT0Dp0rMc/ALsHZTaxuvWcxH/0MUqWK8IuU=; b=h0FbLjvY7DXXnz/KUVsF+XdQlDHfqJ8EWd3A87fO4dYufuQWEf8Q5fdtZYBu/INXlt A5frV/nGFmgZsNdqzaF/PenlfJKfx5GfkXdeid3LkoUj5B3yD4frgvwZmYszC3N+TbX1 lO5PdTuuz7dvpETMaf4gIl7EilCKu1aFwNgxb8wMciDaKEaqVH6zMBGGPLlu4TjbFujZ fQfELjZWNRhdus6M44vhfAa06Yw5IEfU5gs+ZcigfXEyWlPsCeXZH8E3zJcoNsEHrI+8 PT3vi7Z4eDe/5z0c4Q7dWZwC5MseMTOOsUkUGSt5weqUfvUzGB69rRPhiEshrWNIGPVb +ElQ== X-Gm-Message-State: AOJu0Yxaw0SfcqQzDclFISXg19GiNxRvHpdkPvmNUT6hqMUSPs+j/UuA UYvq9OcIxHd4Op73/YXH/l3m1ZSCP0wxQOf19Ao= X-Received: by 2002:a05:6871:3788:b0:1f5:2b0c:706b with SMTP id nq8-20020a056871378800b001f52b0c706bmr394978oac.28.1700256489806; Fri, 17 Nov 2023 13:28:09 -0800 (PST) Received: from charlie.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id e2-20020a05683013c200b006d3127234d7sm365677otq.8.2023.11.17.13.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 13:28:09 -0800 (PST) From: Charlie Jenkins Date: Fri, 17 Nov 2023 13:27:59 -0800 Subject: [PATCH v11 1/5] asm-generic: Improve csum_fold MIME-Version: 1.0 Message-Id: <20231117-optimize_checksum-v11-1-7d9d954fe361@rivosinc.com> References: <20231117-optimize_checksum-v11-0-7d9d954fe361@rivosinc.com> In-Reply-To: <20231117-optimize_checksum-v11-0-7d9d954fe361@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-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 17 Nov 2023 13:29:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782848254652125860 X-GMAIL-MSGID: 1782848254652125860 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 --- 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