chore: add CI ScenarioType

Cysharp · Aug 13, 2024 · ba1b04e · ba1b04e
1 parent bfdd339
commit ba1b04e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -21,7 +21,7 @@ jobs:
       benchmark-name: "magiconion-${{ github.event.issue.number || github.run_number }}"
       benchmark-timeout: 20 # 10min (env prepare) + 5min (clone & benchmark) + 5min (spare)
       client-benchmark-script-path: ".github/scripts/run-benchmark-client.sh"
-      client-benchmark-script-args: "--args \"-u http://${BENCHMARK_SERVER_NAME}:5000 -s streaminghub --channels 1 --streams 1\""
+      client-benchmark-script-args: "--args \"-u http://${BENCHMARK_SERVER_NAME}:5000 -s CI --channels 1 --streams 1\""
       server-benchmark-script-path: ".github/scripts/run-benchmark-server.sh"
       server-benchmark-script-args: ""
     secrets: inherit
diff --git a/perf/BenchmarkApp/PerformanceTest.Client/Program.cs b/perf/BenchmarkApp/PerformanceTest.Client/Program.cs
@@ -249,7 +249,8 @@ IEnumerable<ScenarioType> GetRunScenarios(ScenarioType scenario)
 {
     return scenario switch
     {
-        ScenarioType.All => Enum.GetValues<ScenarioType>().Where(x => x != ScenarioType.All),
+        ScenarioType.All => Enum.GetValues<ScenarioType>().Where(x => x != ScenarioType.All && x != ScenarioType.CI),
+        ScenarioType.CI => Enum.GetValues<ScenarioType>().Where(x => x == ScenarioType.Unary || x == ScenarioType.StreamingHub || x == ScenarioType.PingpongStreamingHub),
         _ => [scenario],
     };
 }

diff --git a/perf/BenchmarkApp/PerformanceTest.Client/Properties/launchSettings.json b/perf/BenchmarkApp/PerformanceTest.Client/Properties/launchSettings.json
@@ -1,40 +1,68 @@
 {
   "profiles": {
+    "PerformanceTest.Client (PingpongStreamingHub 1)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s PingpongStreamingHub --channels 28 --streams 1"
+    },
     "PerformanceTest.Client (PingpongStreamingHub 1x1)": {
       "commandName": "Project",
       "commandLineArgs": "-u http://localhost:5000 -s PingpongStreamingHub --channels 1 --streams 1"
     },
     "PerformanceTest.Client (PingpongStreamingHub 70)": {
       "commandName": "Project",
-      "commandLineArgs": "-u http://localhost:5000 -s PingpongStreamingHub --channels 70 --streams 1"
+      "commandLineArgs": "-u http://localhost:5000 -s PingpongStreamingHub --channels 28 --streams 70"
     },
     "PerformanceTest.Client (PingpongStreamingHub 70x1)": {
       "commandName": "Project",
-      "commandLineArgs": "-u http://localhost:5000 -s PingpongStreamingHub --channels 1 --streams 70"
+      "commandLineArgs": "-u http://localhost:5000 -s PingpongStreamingHub --channels 70 --streams 1"
+    },
+    "PerformanceTest.Client (StreamingHub 1)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHub --channels 28 --streams 1"
+    },
+    "PerformanceTest.Client (StreamingHub 1x1)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHub --channels 1 --streams 1"
+    },
+    "PerformanceTest.Client (StreamingHub 70)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHub --channels 28 --streams 70"
+    },
+    "PerformanceTest.Client (StreamingHub 70x1)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHub --channels 70 --streams 1"
+    },
+    "PerformanceTest.Client (StreamingHubValueTask 1)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHubValueTask --channels 28 --streams 1"
     },
     "PerformanceTest.Client (StreamingHubValueTask 1x1)": {
       "commandName": "Project",
       "commandLineArgs": "-u http://localhost:5000 -s StreamingHubValueTask --channels 1 --streams 1"
     },
     "PerformanceTest.Client (StreamingHubValueTask 70)": {
       "commandName": "Project",
-      "commandLineArgs": "-u http://localhost:5000 -s StreamingHubValueTask --channels 70 --streams 1"
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHubValueTask --channels 28 --streams 70"
     },
     "PerformanceTest.Client (StreamingHubValueTask 70x1)": {
       "commandName": "Project",
-      "commandLineArgs": "-u http://localhost:5000 -s StreamingHubValueTask --channels 1 --streams 70"
+      "commandLineArgs": "-u http://localhost:5000 -s StreamingHubValueTask --channels 70 --streams 1"
+    },
+    "PerformanceTest.Client (Unary 1)": {
+      "commandName": "Project",
+      "commandLineArgs": "-u http://localhost:5000 -s Unary --channels 28 --streams 1"
     },
     "PerformanceTest.Client (Unary 1x1)": {
       "commandName": "Project",
       "commandLineArgs": "-u http://localhost:5000 -s Unary --channels 1 --streams 1"
     },
     "PerformanceTest.Client (Unary 70)": {
       "commandName": "Project",
-      "commandLineArgs": "-u http://localhost:5000 -s Unary --channels 70 --streams 1"
+      "commandLineArgs": "-u http://localhost:5000 -s Unary --channels 28 --streams 70"
     },
     "PerformanceTest.Client (Unary 70x1)": {
       "commandName": "Project",
-      "commandLineArgs": "-u http://localhost:5000 -s Unary --channels 1 --streams 70"
+      "commandLineArgs": "-u http://localhost:5000 -s Unary --channels 70 --streams 1"
     }
   }
 }
diff --git a/perf/BenchmarkApp/PerformanceTest.Client/ScenarioType.cs b/perf/BenchmarkApp/PerformanceTest.Client/ScenarioType.cs
@@ -1,7 +1,7 @@
 public enum ScenarioType
 {
     All,
-    // TODO: add CI scenario
+    CI, // Run Unary, StreamingHub, PingpongStreamingHub
 
     Unary,
     UnaryComplex,