From ac982d4a93871b69f0089c176e36d4a7413585a8 Mon Sep 17 00:00:00 2001
From: Chen Hui <cedriccchen@tencent.com>
Date: Wed, 14 Sep 2022 10:44:22 +0800
Subject: [PATCH] benchmarks: add more threads arguments for sysbench benchmark

Signed-off-by: Chen Hui <cedriccchen@tencent.com>
---
 test/benchmarks/base/sysbench_test.go | 42 +++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/test/benchmarks/base/sysbench_test.go b/test/benchmarks/base/sysbench_test.go
index d0f3f9261..38a3e48aa 100644
--- a/test/benchmarks/base/sysbench_test.go
+++ b/test/benchmarks/base/sysbench_test.go
@@ -16,6 +16,7 @@ package sysbench_test
 
 import (
 	"context"
+	"fmt"
 	"testing"
 
 	"gvisor.dev/gvisor/pkg/test/dockerutil"
@@ -24,8 +25,9 @@ import (
 )
 
 type testCase struct {
-	name string
-	test tools.Sysbench
+	name    string
+	threads int
+	test    tools.Sysbench
 }
 
 // BenchmarSysbench runs sysbench on the runtime.
@@ -39,6 +41,15 @@ func BenchmarkSysbench(b *testing.B) {
 				},
 			},
 		},
+		{
+			name:    "CPU",
+			threads: 16,
+			test: &tools.SysbenchCPU{
+				SysbenchBase: tools.SysbenchBase{
+					Threads: 16,
+				},
+			},
+		},
 		{
 			name: "Memory",
 			test: &tools.SysbenchMemory{
@@ -47,6 +58,15 @@ func BenchmarkSysbench(b *testing.B) {
 				},
 			},
 		},
+		{
+			name:    "Memory",
+			threads: 16,
+			test: &tools.SysbenchMemory{
+				SysbenchBase: tools.SysbenchBase{
+					Threads: 16,
+				},
+			},
+		},
 		{
 			name: "Mutex",
 			test: &tools.SysbenchMutex{
@@ -68,9 +88,21 @@ func BenchmarkSysbench(b *testing.B) {
 			Name:  "testname",
 			Value: tc.name,
 		}
-		name, err := tools.ParametersToName(param)
-		if err != nil {
-			b.Fatalf("Failed to parse params: %v", err)
+		var name string
+		if tc.threads != 0 {
+			threads := tools.Parameter{
+				Name:  "threads",
+				Value: fmt.Sprintf("%d", tc.threads),
+			}
+			name, err = tools.ParametersToName(param, threads)
+			if err != nil {
+				b.Fatalf("Failed to parse params: %v", err)
+			}
+		} else {
+			name, err = tools.ParametersToName(param)
+			if err != nil {
+				b.Fatalf("Failed to parse params: %v", err)
+			}
 		}
 		b.Run(name, func(b *testing.B) {
 			ctx := context.Background()