From: Charlie Jenkins <charlie@rivosinc.com>
To: Charlie Jenkins <charlie@rivosinc.com>,
Palmer Dabbelt <palmer@dabbelt.com>,
Conor Dooley <conor@kernel.org>,
Samuel Holland <samuel.holland@sifive.com>,
David Laight <David.Laight@aculab.com>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
Albert Ou <aou@eecs.berkeley.edu>
Subject: [PATCH v4 3/5] riscv: Vector checksum header
Date: Mon, 11 Sep 2023 15:57:13 -0700 [thread overview]
Message-ID: <20230911-optimize_checksum-v4-3-77cc2ad9e9d7@rivosinc.com> (raw)
In-Reply-To: <20230911-optimize_checksum-v4-0-77cc2ad9e9d7@rivosinc.com>
Vector code is written in assembly rather than using the GCC vector
instrinsics because they did not provide optimal code. Vector
instrinsic types are still used so the inline assembly can
appropriately select vector registers. However, this code cannot be
merged yet because it is currently not possible to use vector
instrinsics in the kernel because vector support needs to be directly
enabled by assembly.
Signed-off-by: Charlie Jenkins <charlie@rivosinc.com>
---
arch/riscv/include/asm/checksum.h | 75 +++++++++++++++++++++++++++++++++++++++
1 file changed, 75 insertions(+)
diff --git a/arch/riscv/include/asm/checksum.h b/arch/riscv/include/asm/checksum.h
index a09a4053fb87..a99c1f61e795 100644
--- a/arch/riscv/include/asm/checksum.h
+++ b/arch/riscv/include/asm/checksum.h
@@ -10,6 +10,10 @@
#include <linux/in6.h>
#include <linux/uaccess.h>
+#ifdef CONFIG_RISCV_ISA_V
+#include <riscv_vector.h>
+#endif
+
#ifdef CONFIG_32BIT
typedef unsigned int csum_t;
#else
@@ -42,6 +46,77 @@ static inline __sum16 csum_fold(__wsum sum)
*/
static inline __sum16 ip_fast_csum(const void *iph, unsigned int ihl)
{
+#ifdef CONFIG_RISCV_ISA_V
+ if (!has_vector())
+ goto no_vector;
+
+ vuint64m1_t prev_buffer;
+ vuint32m1_t curr_buffer;
+ unsigned int vl;
+
+ if (IS_ENABLED(CONFIG_32BIT)) {
+ csum_t high_result, low_result;
+
+ kernel_vector_begin();
+ asm(".option push \n\
+ .option arch, +v \n\
+ vsetivli x0, 1, e64, ta, ma \n\
+ vmv.v.i %[prev_buffer], 0 \n\
+ 1: \n\
+ vsetvli %[vl], %[ihl], e32, m1, ta, ma \n\
+ vle32.v %[curr_buffer], (%[iph]) \n\
+ vwredsumu.vs %[prev_buffer], %[curr_buffer], %[prev_buffer] \n\
+ sub %[ihl], %[ihl], %[vl] \n\
+ slli %[vl], %[vl], 2 \n\
+ add %[iph], %[vl], %[iph] \n\
+ # If not all of iph could fit into vector reg, do another sum \n\
+ bne %[ihl], zero, 1b \n\
+ vsetivli x0, 1, e64, m1, ta, ma \n\
+ vmv.x.s %[low_result], %[prev_buffer] \n\
+ addi %[vl], x0, 32 \n\
+ vsrl.vx %[prev_buffer], %[prev_buffer], %[vl] \n\
+ vmv.x.s %[high_result], %[prev_buffer] \n\
+ .option pop"
+ : [vl] "=&r" (vl), [prev_buffer] "=&vd" (prev_buffer),
+ [curr_buffer] "=&vd" (curr_buffer),
+ [high_result] "=&r" (high_result),
+ [low_result] "=&r" (low_result)
+ : [iph] "r" (iph), [ihl] "r" (ihl));
+ kernel_vector_end();
+
+ high_result += low_result;
+ high_result += high_result < low_result;
+ } else {
+ csum_t result;
+
+ kernel_vector_begin();
+ asm(".option push \n\
+ .option arch, +v \n\
+ vsetivli x0, 1, e64, ta, ma \n\
+ vmv.v.i %[prev_buffer], 0 \n\
+ 1: \n\
+ # Setup 32-bit sum of iph \n\
+ vsetvli %[vl], %[ihl], e32, m1, ta, ma \n\
+ vle32.v %[curr_buffer], (%[iph]) \n\
+ # Sum each 32-bit segment of iph that can fit into a vector reg \n\
+ vwredsumu.vs %[prev_buffer], %[curr_buffer], %[prev_buffer] \n\
+ subw %[ihl], %[ihl], %[vl] \n\
+ slli %[vl], %[vl], 2 \n\
+ addw %[iph], %[vl], %[iph] \n\
+ # If not all of iph could fit into vector reg, do another sum \n\
+ bne %[ihl], zero, 1b \n\
+ vsetvli x0, x0, e64, m1, ta, ma \n\
+ vmv.x.s %[result], %[prev_buffer] \n\
+ .option pop"
+ : [vl] "=&r" (vl), [prev_buffer] "=&vd" (prev_buffer),
+ [curr_buffer] "=&vd" (curr_buffer),
+ [result] "=&r" (result)
+ : [iph] "r" (iph), [ihl] "r" (ihl));
+ kernel_vector_end();
+ }
+no_vector:
+#endif // !CONFIG_RISCV_ISA_V
+
csum_t csum = 0;
int pos = 0;
--
2.42.0
next prev parent reply other threads:[~2023-09-12 0:32 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 22:57 [PATCH v4 0/5] riscv: Add fine-tuned checksum functions Charlie Jenkins
2023-09-11 22:57 ` [PATCH v4 1/5] riscv: Checksum header Charlie Jenkins
2023-09-12 10:24 ` Emil Renner Berthing
2023-09-13 2:38 ` Charlie Jenkins
2023-09-13 9:19 ` Emil Renner Berthing
2023-09-11 22:57 ` [PATCH v4 2/5] riscv: Add checksum library Charlie Jenkins
2023-09-12 8:45 ` David Laight
2023-09-13 3:09 ` Charlie Jenkins
2023-09-13 8:47 ` David Laight
2023-09-13 23:18 ` Charlie Jenkins
2023-09-14 0:41 ` Charlie Jenkins
2023-09-14 12:25 ` Conor Dooley
2023-09-14 17:58 ` Charlie Jenkins
2023-09-14 18:02 ` Conor Dooley
2023-09-14 23:30 ` Charlie Jenkins
2023-09-11 22:57 ` Charlie Jenkins [this message]
2023-09-11 22:57 ` [PATCH v4 4/5] riscv: Vector " Charlie Jenkins
2023-09-14 12:46 ` Conor Dooley
2023-09-14 16:14 ` Charlie Jenkins
2023-09-14 16:29 ` Conor Dooley
2023-09-14 17:29 ` Charlie Jenkins
2023-09-14 17:36 ` Conor Dooley
2023-09-14 20:59 ` Charlie Jenkins
2023-09-11 22:57 ` [PATCH v4 5/5] riscv: Test checksum functions Charlie Jenkins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230911-optimize_checksum-v4-3-77cc2ad9e9d7@rivosinc.com \
--to=charlie@rivosinc.com \
--cc=David.Laight@aculab.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=samuel.holland@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®