diff mbox series

[07/14] bpf/tests: Add more ALU64 BPF_MUL tests

Message ID 20210728170502.351010-8-johan.almbladh@anyfinetworks.com (mailing list archive)
State Superseded
Delegated to: BPF
Headers show
Series bpf/tests: Extend the eBPF test suite | expand

Checks

Context Check Description
netdev/tree_selection success Not a local patch

Commit Message

Johan Almbladh July 28, 2021, 5:04 p.m. UTC
This patch adds BPF_MUL tests for 64x32 and 64x64 multiply. Mainly
testing 32-bit JITs that implement ALU64 operations with two 32-bit
CPU registers per operand.

Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
---
 lib/test_bpf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

Comments

Yonghong Song July 28, 2021, 11:32 p.m. UTC | #1
On 7/28/21 10:04 AM, Johan Almbladh wrote:
> This patch adds BPF_MUL tests for 64x32 and 64x64 multiply. Mainly
> testing 32-bit JITs that implement ALU64 operations with two 32-bit
> CPU registers per operand.
> 
> Signed-off-by: Johan Almbladh <johan.almbladh@anyfinetworks.com>
> ---
>   lib/test_bpf.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 48 insertions(+)
> 
> diff --git a/lib/test_bpf.c b/lib/test_bpf.c
> index b930fa35b9ef..eb61088a674f 100644
> --- a/lib/test_bpf.c
> +++ b/lib/test_bpf.c
> @@ -3051,6 +3051,31 @@ static struct bpf_test tests[] = {
>   		{ },
>   		{ { 0, 2147483647 } },
>   	},
> +	{
> +		"ALU64_MUL_X: 64x64 multiply, low word",
> +		.u.insns_int = {
> +			BPF_LD_IMM64(R0, 0x0fedcba987654321LL),
> +			BPF_LD_IMM64(R1, 0x123456789abcdef0LL),
> +			BPF_ALU64_REG(BPF_MUL, R0, R1),
> +			BPF_EXIT_INSN(),
> +		},
> +		INTERNAL,
> +		{ },
> +		{ { 0, 0xe5618cf0 } }

Same here. Maybe capture the true 64-bit R0 value?

> +	},
> +	{
> +		"ALU64_MUL_X: 64x64 multiply, high word",
> +		.u.insns_int = {
> +			BPF_LD_IMM64(R0, 0x0fedcba987654321LL),
> +			BPF_LD_IMM64(R1, 0x123456789abcdef0LL),
> +			BPF_ALU64_REG(BPF_MUL, R0, R1),
> +			BPF_ALU64_IMM(BPF_RSH, R0, 32),
> +			BPF_EXIT_INSN(),
> +		},
> +		INTERNAL,
> +		{ },
> +		{ { 0, 0x2236d88f } }
> +	},
>   	/* BPF_ALU | BPF_MUL | BPF_K */
>   	{
>   		"ALU_MUL_K: 2 * 3 = 6",
> @@ -3161,6 +3186,29 @@ static struct bpf_test tests[] = {
>   		{ },
>   		{ { 0, 0x1 } },
>   	},
> +	{
> +		"ALU64_MUL_K: 64x32 multiply, low word",
> +		.u.insns_int = {
> +			BPF_LD_IMM64(R0, 0x0123456789abcdefLL),
> +			BPF_ALU64_IMM(BPF_MUL, R0, 0x12345678),
> +			BPF_EXIT_INSN(),
> +		},
> +		INTERNAL,
> +		{ },
> +		{ { 0, 0xe242d208 } }
> +	},
> +	{
> +		"ALU64_MUL_K: 64x32 multiply, high word",
> +		.u.insns_int = {
> +			BPF_LD_IMM64(R0, 0x0123456789abcdefLL),
> +			BPF_ALU64_IMM(BPF_MUL, R0, 0x12345678),
> +			BPF_ALU64_IMM(BPF_RSH, R0, 32),
> +			BPF_EXIT_INSN(),
> +		},
> +		INTERNAL,
> +		{ },
> +		{ { 0, 0xc28f5c28 } }
> +	},
>   	/* BPF_ALU | BPF_DIV | BPF_X */
>   	{
>   		"ALU_DIV_X: 6 / 2 = 3",
>
Johan Almbladh July 29, 2021, 9:21 p.m. UTC | #2
On Thu, Jul 29, 2021 at 1:32 AM Yonghong Song <yhs@fb.com> wrote:
> > @@ -3051,6 +3051,31 @@ static struct bpf_test tests[] = {
> >               { },
> >               { { 0, 2147483647 } },
> >       },
> > +     {
> > +             "ALU64_MUL_X: 64x64 multiply, low word",
> > +             .u.insns_int = {
> > +                     BPF_LD_IMM64(R0, 0x0fedcba987654321LL),
> > +                     BPF_LD_IMM64(R1, 0x123456789abcdef0LL),
> > +                     BPF_ALU64_REG(BPF_MUL, R0, R1),
> > +                     BPF_EXIT_INSN(),
> > +             },
> > +             INTERNAL,
> > +             { },
> > +             { { 0, 0xe5618cf0 } }
>
> Same here. Maybe capture the true 64-bit R0 value?

Same as the LSH/RSH/ARSH tests. Uses 32-bit shift to test high and low
words in two runs.
diff mbox series

Patch

diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index b930fa35b9ef..eb61088a674f 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -3051,6 +3051,31 @@  static struct bpf_test tests[] = {
 		{ },
 		{ { 0, 2147483647 } },
 	},
+	{
+		"ALU64_MUL_X: 64x64 multiply, low word",
+		.u.insns_int = {
+			BPF_LD_IMM64(R0, 0x0fedcba987654321LL),
+			BPF_LD_IMM64(R1, 0x123456789abcdef0LL),
+			BPF_ALU64_REG(BPF_MUL, R0, R1),
+			BPF_EXIT_INSN(),
+		},
+		INTERNAL,
+		{ },
+		{ { 0, 0xe5618cf0 } }
+	},
+	{
+		"ALU64_MUL_X: 64x64 multiply, high word",
+		.u.insns_int = {
+			BPF_LD_IMM64(R0, 0x0fedcba987654321LL),
+			BPF_LD_IMM64(R1, 0x123456789abcdef0LL),
+			BPF_ALU64_REG(BPF_MUL, R0, R1),
+			BPF_ALU64_IMM(BPF_RSH, R0, 32),
+			BPF_EXIT_INSN(),
+		},
+		INTERNAL,
+		{ },
+		{ { 0, 0x2236d88f } }
+	},
 	/* BPF_ALU | BPF_MUL | BPF_K */
 	{
 		"ALU_MUL_K: 2 * 3 = 6",
@@ -3161,6 +3186,29 @@  static struct bpf_test tests[] = {
 		{ },
 		{ { 0, 0x1 } },
 	},
+	{
+		"ALU64_MUL_K: 64x32 multiply, low word",
+		.u.insns_int = {
+			BPF_LD_IMM64(R0, 0x0123456789abcdefLL),
+			BPF_ALU64_IMM(BPF_MUL, R0, 0x12345678),
+			BPF_EXIT_INSN(),
+		},
+		INTERNAL,
+		{ },
+		{ { 0, 0xe242d208 } }
+	},
+	{
+		"ALU64_MUL_K: 64x32 multiply, high word",
+		.u.insns_int = {
+			BPF_LD_IMM64(R0, 0x0123456789abcdefLL),
+			BPF_ALU64_IMM(BPF_MUL, R0, 0x12345678),
+			BPF_ALU64_IMM(BPF_RSH, R0, 32),
+			BPF_EXIT_INSN(),
+		},
+		INTERNAL,
+		{ },
+		{ { 0, 0xc28f5c28 } }
+	},
 	/* BPF_ALU | BPF_DIV | BPF_X */
 	{
 		"ALU_DIV_X: 6 / 2 = 3",