Add multiGRPC benchmark and ecdsa on GRPC and impove the plots

Signed-off-by: Said Altury <Said.Altury@ibm.com>

Author: SaidAltury-ibm

.gitignore

@@ -3,7 +3,7 @@
 .vscode
 .build
 *.iml
-
+.venv
 # ignoring all generated artifacts in integration tests
 integration/**/out/
 

integration/benchmark/README.md

@@ -36,7 +36,7 @@ If we want to study the impact of different GC settings we can run the following
 
 ```bash
 GOGC=100 go test -bench=. -benchmem -count=10 -timeout=20m -cpu=1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,48,64 -run=^$ ./... > plots/benchmark_gc_100.txt
-GOGC=off go test -bench=. -benchmem -count=10 -timeout=20m -cpu=1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,48,64 -run=^$ ./... > plots/benchmark_gc_100.txt
+GOGC=off go test -bench=. -benchmem -count=10 -timeout=20m -cpu=1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,48,64 -run=^$ ./... > plots/benchmark_gc_off.txt
 GOGC=8000 go test -bench=. -benchmem -count=10 -timeout=20m -cpu=1,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,48,64 -run=^$ ./... > plots/benchmark_gc_8000.txt
 ```
 

integration/benchmark/grpc/grpc_bench_test.go

@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"testing"
 	"time"
+	"flag"
 
 	"github.com/hyperledger-labs/fabric-smart-client/integration/benchmark"
 	benchviews "github.com/hyperledger-labs/fabric-smart-client/integration/benchmark/views"
@@ -23,6 +24,8 @@ import (
 	"go.opentelemetry.io/otel/trace/noop"
 )
 
+var workload = flag.String("workload", "ecdsa", "workload type: cpu or ecdsa") // ecdsa is the Default workload
+
 func BenchmarkGRPC(b *testing.B) {
 	srvEndpoint := setupServer(b)
 
@@ -80,10 +83,21 @@ func setupServer(tb testing.TB) string {
 	require.NoError(tb, err)
 	require.NotNil(tb, srv)
 
-	parms := &benchviews.CPUParams{N: 200000}
-	input, _ := json.Marshal(parms)
-	factory := &benchviews.CPUViewFactory{}
-	v, _ := factory.NewView(input)
+	var v view.View
+    switch *workload {
+    case "cpu":
+        parms := &benchviews.CPUParams{N: 200000}
+        input, _ := json.Marshal(parms)
+        factory := &benchviews.CPUViewFactory{}
+        v, _ = factory.NewView(input)
+    case "ecdsa":
+        parms := &benchviews.ECDSASignParams{}
+        input, _ := json.Marshal(parms)
+        factory := &benchviews.ECDSASignViewFactory{}
+        v, _ = factory.NewView(input)
+    default:
+        tb.Fatalf("unknown workload type: %s", *workload)
+    }
 
 	// our view manager
 	vm := &benchmark.MockViewManager{Constructor: func() view.View {

integration/benchmark/grpc/grpc_multi_connection_bench_test.go

@@ -0,0 +1,32 @@
+/*
+Copyright IBM Corp All Rights Reserved.
+
+SPDX-License-Identifier: Apache-2.0
+*/
+
+package test
+
+import (
+	"testing"
+
+	"github.com/hyperledger-labs/fabric-smart-client/integration/benchmark"
+	"github.com/stretchr/testify/require"
+)
+
+func BenchmarkGRPCMultiConnection(b *testing.B) {
+    srvEndpoint := setupServer(b)
+
+    b.RunParallel(func(pb *testing.PB) {
+        // each goroutine gets its own client + connection
+        cli, closeF := setupClient(b, srvEndpoint)
+        defer closeF()
+
+        for pb.Next() {
+            resp, err := cli.CallViewWithContext(b.Context(), "fid", nil)
+            require.NoError(b, err)
+            require.NotNil(b, resp)
+        }
+    })
+
+    benchmark.ReportTPS(b)
+}

integration/benchmark/plots/plot.py

@@ -16,27 +16,42 @@
 INPUT_FILE = sys.argv[1]
 OUTPUT_PDF = sys.argv[2]
 
+# ----------------------------
+#  EXTRACT GOGC FROM FILENAME
+# ----------------------------
+#
+# Expected filenames:
+#   benchmark_gc_100.txt
+#   benchmark_gc_off.txt
+#
+# ----------------------------
+
+gc_match = re.search(r"benchmark_gc_([^./]+)", INPUT_FILE)
+if gc_match:
+    GOGC_LABEL = f"GOGC={gc_match.group(1)}"
+else:
+    GOGC_LABEL = "GOGC=unknown"
+
 # ----------------------------
 #  PARSING LOGIC
 # ----------------------------
 #
-# We need to extract:
-#   - benchmark group name (e.g. "BenchmarkSimple/parallel")
+# We extract:
+#   - benchmark group name
 #   - worker count (default = 1)
-#   - TPS value
+#   - TPS values
 #
 # ----------------------------
 
-# dictionary:
 # group_name → { worker → [tps runs] }
 groups = defaultdict(lambda: defaultdict(list))
 
-# Matches all forms:
-#   BenchmarkSimple/parallel-4    ... 140240 TPS
-#   BenchmarkParallelWork-12      ... 13246 TPS
-pattern = re.compile(r"(Benchmark[^\s/-]+(?:/[^\s/-]+)?)"      # group name
-                     r"(?:-(\d+))?"                           # optional worker/cpu suffix
-                     r".*?([\d.]+)\s+TPS", re.IGNORECASE)
+pattern = re.compile(
+    r"(Benchmark(?:[^\s/-]+)?(?:/[^\s/-]+)*)" # group name
+    r"(?:-(\d+))?"                        # optional worker suffix
+    r".*?([\d.]+)\s+TPS",
+    re.IGNORECASE,
+)
 
 with open(INPUT_FILE, "r") as f:
     for line in f:
@@ -49,14 +64,15 @@
         tps = float(m.group(3))
 
         worker = int(worker_str) if worker_str else 1
-
         groups[group][worker].append(tps)
 
-with PdfPages(OUTPUT_PDF) as pdf:
+# ----------------------------
+#  PLOTTING
+# ----------------------------
 
+with PdfPages(OUTPUT_PDF) as pdf:
     for group_name, worker_dict in sorted(groups.items()):
 
-        # Sort and compute stats
         worker_counts = sorted(worker_dict.keys())
         tps_means = [np.mean(worker_dict[c]) for c in worker_counts]
         tps_stddev = [np.std(worker_dict[c]) for c in worker_counts]
@@ -65,18 +81,26 @@
         print(" Worker counts:", worker_counts)
         print(" TPS means:", tps_means)
 
-        # -------------
-        # Plot 1: TPS
-        # -------------
-
         plt.figure(figsize=(10, 6))
-        plt.errorbar(worker_counts, tps_means, yerr=tps_stddev, fmt="o-", capsize=6)
+        plt.errorbar(
+            worker_counts,
+            tps_means,
+            yerr=tps_stddev,
+            fmt="o-",
+            capsize=6,
+        )
+
         plt.xlabel("Worker Count")
         plt.ylabel("Average TPS")
-        plt.title(f"{group_name}")
+
+        # Benchmark name + GC config in header
+        plt.title(group_name)
+        plt.suptitle(GOGC_LABEL, fontsize=12, fontweight="bold", y=0.98)
+
         plt.grid(True)
-        plt.tight_layout()
+        plt.tight_layout(rect=[0, 0, 1, 0.95])
+
         pdf.savefig()
         plt.close()
 
-print(f"\nSaved multi-benchmark PDF to: {OUTPUT_PDF}")
+print(f"\nSaved multi-benchmark PDF to: {OUTPUT_PDF}")

integration/benchmark/plots/plot_all.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PLOT_SCRIPT="plot.py"
+
+for txt in benchmark_gc_*.txt; do
+  # Strip .txt extension
+  base="${txt%.txt}"
+  pdf="${base}.pdf"
+
+  echo "Generating ${pdf} from ${txt}"
+
+  python3 "${PLOT_SCRIPT}" "${txt}" "${pdf}"
+done
+
+echo "All plots generated ✔"