Skip to content

Commit

Permalink
Merge pull request #877 from Cysharp/feature/perf_package
Browse files Browse the repository at this point in the history
chore: fix Benchmark package version when UseNuGetClient or UseNuGetServer is enabled
  • Loading branch information
guitarrapc authored Dec 10, 2024
2 parents 469fba6 + 824203d commit 06e7deb
Show file tree
Hide file tree
Showing 6 changed files with 201 additions and 240 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
<ManagePackageVersionsCentrally>false</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup Condition="'$(UseNuGetClient)' != ''">
<PackageReference Include="ConsoleAppFramework" Version="$(ConsoleAppFrameworkVersion)" />
<!-- Follow to the Directory.Packages.props version -->
<PackageReference Include="ConsoleAppFramework" Version="4.2.3" />
<PackageReference Include="MagicOnion.Client" Version="$(UseNuGetClient)" />
<PackageReference Include="MagicOnion.Serialization.MemoryPack" Version="$(UseNuGetClient)-preview" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
</PropertyGroup>
<ItemGroup Condition="'$(UseNuGetServer)' != ''">
<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcVersion)"/>
<PackageReference Include="JetBrains.Profiler.Api" Version="$(JetBrainsProfilerApiVersion)"/>
<!-- Follow to the Directory.Packages.props version -->
<PackageReference Include="JetBrains.Profiler.Api" Version="1.4.3"/>
<PackageReference Include="MagicOnion.Serialization.MemoryPack" Version="$(UseNuGetServer)-preview" />
<PackageReference Include="MagicOnion.Server" Version="$(UseNuGetServer)" />
<PackageReference Include="Multicaster" Version="$(MulticasterVersion)" />
Expand Down
13 changes: 11 additions & 2 deletions perf/BenchmarkApp/configs/schedule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,19 @@ type: loader
branch-configs:
- suffix: "" # suffix should be unique with others
branch: main
config: ./perf/BenchmarkApp/configs/schedule_ci.yaml
config: ./perf/BenchmarkApp/configs/schedule_messagepack.yaml
- suffix: "-1"
branch: main
config: ./perf/BenchmarkApp/configs/schedule_serverstreaming.yaml
config: ./perf/BenchmarkApp/configs/schedule_memorypack.yaml
- suffix: "-2"
branch: main
config: ./perf/BenchmarkApp/configs/schedule_serverstreaming.yaml
- suffix: "-3"
branch: feature/ImprovePerformance
config: ./perf/BenchmarkApp/configs/workflow_dispatch_messagepack_h2c.yaml
- suffix: "-4"
branch: main
config: ./perf/BenchmarkApp/configs/workflow_dispatch_messagepack_h2c_nugetclient.yaml
- suffix: "-5"
branch: main
config: ./perf/BenchmarkApp/configs/workflow_dispatch_messagepack_h2c_nugetserver.yaml
236 changes: 0 additions & 236 deletions perf/BenchmarkApp/configs/schedule_ci.yaml

This file was deleted.

93 changes: 93 additions & 0 deletions perf/BenchmarkApp/configs/schedule_memorypack.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
# template: https://github.com/Cysharp/Actions/tree/main/.github/scripts/_template_benchmark_config.yaml
# config2args script: https://github.com/Cysharp/Actions/tree/main/.github/scripts/benchmark_config2args.sh
apt-tools: "libmsquic"
dotnet-version: 9.0
benchmark-expire-min: 15
#benchmark-location: "japaneast"
benchmark-location: "eastus"
benchmark-timeout-min: 10
benchmark-client-run-script-path: ".github/scripts/benchmark-client-run.sh"
benchmark-client-run-script-args: '--run-args "-u http://${BENCHMARK_SERVER_NAME}:5000 --protocol {{ protocol }} -s CI --rounds 3 --channels {{ channels }} --streams {{ streams }} --serialization {{ serialization }} --validate true --tags {{ tags }}" --build-args "{{ buildArgsClient }}"'
benchmark-server-run-script-path: ".github/scripts/benchmark-server-run.sh"
benchmark-server-run-script-args: '--run-args "-u http://0.0.0.0:5000 --protocol {{ protocol }} --serialization {{ serialization }} --validate true --tags {{ tags }}" --build-args "{{ buildArgsServer }}"'
benchmark-server-stop-script-path: ".github/scripts/benchmark-server-stop.sh"
jobs:
##### MemoryPack #####
# h2c
- tags: legend:memorypack-h2c-linux,streams:1x1,protocol:h2c,serialization:memorypack
protocol: h2c
channels: 1
streams: 1
serialization: memorypack
- tags: legend:memorypack-h2c-linux,streams:1x28,protocol:h2c,serialization:memorypack
protocol: h2c
channels: 28
streams: 1
serialization: memorypack
- tags: legend:memorypack-h2c-linux,streams:28x1,protocol:h2c,serialization:memorypack
protocol: h2c
channels: 1
streams: 28
serialization: memorypack
- tags: legend:memorypack-h2c-linux,streams:70x1,protocol:h2c,serialization:memorypack
protocol: h2c
channels: 1
streams: 70
serialization: memorypack
- tags: legend:memorypack-h2c-linux,streams:70x28,protocol:h2c,serialization:memorypack
protocol: h2c
channels: 28
streams: 70
serialization: memorypack
# h2
- tags: legend:memorypack-h2-linux,streams:1x1,protocol:h2,serialization:memorypack
protocol: h2
channels: 1
streams: 1
serialization: memorypack
- tags: legend:memorypack-h2-linux,streams:1x28,protocol:h2,serialization:memorypack
protocol: h2
channels: 28
streams: 1
serialization: memorypack
- tags: legend:memorypack-h2-linux,streams:28x1,protocol:h2,serialization:memorypack
protocol: h2
channels: 1
streams: 28
serialization: memorypack
- tags: legend:memorypack-h2-linux,streams:70x1,protocol:h2,serialization:memorypack
protocol: h2
channels: 1
streams: 70
serialization: memorypack
- tags: legend:memorypack-h2-linux,streams:70x28,protocol:h2,serialization:memorypack
protocol: h2
channels: 28
streams: 70
serialization: memorypack
# h3
- tags: legend:memorypack-h3-linux,streams:1x1,protocol:h3,serialization:memorypack
protocol: h3
channels: 1
streams: 1
serialization: memorypack
- tags: legend:memorypack-h3-linux,streams:1x28,protocol:h3,serialization:memorypack
protocol: h3
channels: 28
streams: 1
serialization: memorypack
- tags: legend:memorypack-h3-linux,streams:28x1,protocol:h3,serialization:memorypack
protocol: h3
channels: 1
streams: 28
serialization: memorypack
- tags: legend:memorypack-h3-linux,streams:70x1,protocol:h3,serialization:memorypack
protocol: h3
channels: 1
streams: 70
serialization: memorypack
- tags: legend:memorypack-h3-linux,streams:70x28,protocol:h3,serialization:memorypack
protocol: h3
channels: 28
streams: 70
serialization: memorypack
Loading

0 comments on commit 06e7deb

Please sign in to comment.