Create new Performance Execution Driver (microsoft#626)

New performance driver is custom built specifically for performance, rather then using quicping. Also will be compatible with server mode, and baseline support is part of this commit.
TaffyWrinkle · Jul 29, 2020 · 091633d · 091633d
1 parent 9edde37
commit 091633d
Show file tree

Hide file tree

Showing 31 changed files with 3,164 additions and 353 deletions.
diff --git a/.azure/azure-pipelines.perf.yml b/.azure/azure-pipelines.perf.yml
@@ -40,9 +40,9 @@ stages:
       tls: schannel
       config: Release
       ${{ if eq(parameters.mode, 'PGO') }}:
-        extraBuildArgs: -DisableTest -PGO
+        extraBuildArgs: -DisableTest -DisableTools -PGO 
       ${{ if ne(parameters.mode, 'PGO') }}:
-        extraBuildArgs: -DisableTest
+        extraBuildArgs: -DisableTest -DisableTools
   - template: ./templates/build-config-user.yml
     parameters:
       image: windows-latest
@@ -51,9 +51,9 @@ stages:
       tls: schannel
       config: Release
       ${{ if eq(parameters.mode, 'PGO') }}:
-        extraBuildArgs: -DisableTest -PGO
+        extraBuildArgs: -DisableTest -DisableTools -PGO
       ${{ if ne(parameters.mode, 'PGO') }}:
-        extraBuildArgs: -DisableTest
+        extraBuildArgs: -DisableTest -DisableTools
 
 #
 # Performance Tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -101,6 +101,7 @@ endif()
 
 option(QUIC_BUILD_TOOLS "Builds the tools code" ON)
 option(QUIC_BUILD_TEST "Builds the test code" ON)
+option(QUIC_BUILD_PERF "Builds the perf code" ON)
 option(QUIC_ENABLE_LOGGING "Enables logging" ON)
 option(QUIC_SANITIZE_ADDRESS "Enables address sanitizer" OFF)
 option(QUIC_STATIC_LINK_CRT "Statically links the C runtime" ON)
@@ -359,6 +360,12 @@ if(QUIC_BUILD_TOOLS)
     add_subdirectory(src/tools)
 endif()
 
+# Performance code
+if(QUIC_BUILD_PERF)
+    add_subdirectory(src/perf/lib)
+    add_subdirectory(src/perf/bin)
+endif()
+
 # Test code
 if(QUIC_BUILD_TEST)
     # Build the googletest framework.

diff --git a/msquic.kernel.sln b/msquic.kernel.sln
@@ -18,6 +18,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msquictest.kernel", "src\te
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "manifest.kernel", "src\manifest\manifest.kernel.vcxproj", "{C1ADB76F-7005-4516-BADB-2A60797EF912}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perflib.kernel", "src\perf\lib\perflib.kernel.vcxproj", "{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "performance.kernel", "src\perf\bin\performance.kernel.vcxproj", "{2BE64DBF-60E6-4FE8-96B0-5F2526405096}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -174,6 +178,54 @@ Global
 		{C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x86.ActiveCfg = Release|Win32
 		{C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x86.Build.0 = Release|Win32
 		{C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x86.Deploy.0 = Release|Win32
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM.ActiveCfg = Debug|ARM
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM.Build.0 = Debug|ARM
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM.Deploy.0 = Debug|ARM
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM64.Build.0 = Debug|ARM64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x64.ActiveCfg = Debug|x64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x64.Build.0 = Debug|x64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x64.Deploy.0 = Debug|x64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x86.ActiveCfg = Debug|Win32
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x86.Build.0 = Debug|Win32
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x86.Deploy.0 = Debug|Win32
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM.ActiveCfg = Release|ARM
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM.Build.0 = Release|ARM
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM.Deploy.0 = Release|ARM
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM64.ActiveCfg = Release|ARM64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM64.Build.0 = Release|ARM64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM64.Deploy.0 = Release|ARM64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x64.ActiveCfg = Release|x64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x64.Build.0 = Release|x64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x64.Deploy.0 = Release|x64
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x86.ActiveCfg = Release|Win32
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x86.Build.0 = Release|Win32
+		{11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x86.Deploy.0 = Release|Win32
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM.ActiveCfg = Debug|ARM
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM.Build.0 = Debug|ARM
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM.Deploy.0 = Debug|ARM
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM64.Build.0 = Debug|ARM64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x64.ActiveCfg = Debug|x64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x64.Build.0 = Debug|x64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x64.Deploy.0 = Debug|x64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x86.ActiveCfg = Debug|Win32
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x86.Build.0 = Debug|Win32
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x86.Deploy.0 = Debug|Win32
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM.ActiveCfg = Release|ARM
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM.Build.0 = Release|ARM
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM.Deploy.0 = Release|ARM
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM64.ActiveCfg = Release|ARM64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM64.Build.0 = Release|ARM64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM64.Deploy.0 = Release|ARM64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x64.ActiveCfg = Release|x64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x64.Build.0 = Release|x64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x64.Deploy.0 = Release|x64
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x86.ActiveCfg = Release|Win32
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x86.Build.0 = Release|Win32
+		{2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x86.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/scripts/RemoteTests.json b/scripts/RemoteTests.json
@@ -5,9 +5,9 @@
             "Platform": "Windows",
             "Tls": ["stub", "schannel", "mitls"],
             "Arch": ["x64", "x86", "arm", "arm64"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-listen:* -port:4433 -peer_uni:1 -connections:10",
+                "All": "-TestName:Throughput -ServerMode:1 -listen:* -port:4433 -peer_uni:1 -connections:10",
                 "Loopback": "-selfsign:1",
                 "Remote": "-thumbprint:$Thumbprint -machine_cert:1 -cert_store:My"
             }
@@ -16,26 +16,26 @@
             "Platform": "Windows",
             "Tls": ["stub", "schannel", "mitls"],
             "Arch": ["x64", "x86", "arm", "arm64"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-target:$RemoteAddress -port:4433 -sendbuf:0 -bind:$LocalAddress:4434 -ip:4 -core:0 -uni:1 -length:2000000000",
+                "All": "-TestName:Throughput -target:$RemoteAddress -port:4433 -sendbuf:0 -bind:$LocalAddress:4434 -ip:4 -core:0 -uni:1 -length:2000000000",
                 "Loopback": "",
                 "Remote": ""
             }
         },
         "Iterations": 10,
-        "RemoteReadyMatcher": "Ready For Connections!",
-        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps \\|"
+        "RemoteReadyMatcher": "Started!",
+        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps\\)"
     },
     {
         "TestName": "Throughput",
         "Remote" : {
             "Platform": "Linux",
             "Tls": ["stub", "openssl"],
             "Arch": ["x64", "arm"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-listen:* -port:4433 -selfsign:1 -peer_uni:1 -connections:10",
+                "All": "-TestName:Throughput -ServerMode:1 -listen:* -port:4433 -selfsign:1 -peer_uni:1 -connections:10",
                 "Loopback": "",
                 "Remote": ""
             }
@@ -44,26 +44,26 @@
             "Platform": "linux",
             "Tls": ["stub", "openssl"],
             "Arch": ["x64", "arm"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-target:$RemoteAddress -port:4433 -sendbuf:0 -uni:1 -length:2000000000",
+                "All": "-TestName:Throughput -target:$RemoteAddress -port:4433 -sendbuf:0 -uni:1 -length:2000000000",
                 "Loopback": "",
                 "Remote": ""
             }
         },
         "Iterations": 10,
-        "RemoteReadyMatcher": "Ready For Connections!",
-        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps \\|"
+        "RemoteReadyMatcher": "Started!",
+        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps\\)"
     },
     {
         "TestName": "ThroughputNoEncryption",
         "Remote" : {
             "Platform": "Windows",
             "Tls": ["stub", "schannel", "mitls"],
             "Arch": ["x64", "x86", "arm", "arm64"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-listen:* -port:4433 -peer_uni:1 -connections:10",
+                "All": "-TestName:Throughput -ServerMode:1 -listen:* -port:4433 -peer_uni:1 -connections:10",
                 "Loopback": "-selfsign:1",
                 "Remote": "-thumbprint:$Thumbprint -machine_cert:1 -cert_store:My"
             }
@@ -72,26 +72,26 @@
             "Platform": "Windows",
             "Tls": ["stub", "schannel", "mitls"],
             "Arch": ["x64", "x86", "arm", "arm64"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-target:$RemoteAddress -port:4433 -sendbuf:0 -bind:$LocalAddress:4434 -ip:4 -core:0 -uni:1 -encrypt:0 -length:2000000000",
+                "All": "-TestName:Throughput -target:$RemoteAddress -port:4433 -sendbuf:0 -bind:$LocalAddress:4434 -ip:4 -core:0 -uni:1 -encrypt:0 -length:2000000000",
                 "Loopback": "",
                 "Remote": ""
             }
         },
         "Iterations": 10,
-        "RemoteReadyMatcher": "Ready For Connections!",
-        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps \\|"
+        "RemoteReadyMatcher": "Started!",
+        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps\\)"
     },
     {
         "TestName": "ThroughputNoEncryption",
         "Remote" : {
             "Platform": "Linux",
             "Tls": ["stub", "openssl"],
             "Arch": ["x64", "arm"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-listen:* -port:4433 -selfsign:1 -peer_uni:1 -connections:10",
+                "All": "-TestName:Throughput -ServerMode:1 -listen:* -port:4433 -selfsign:1 -peer_uni:1 -connections:10",
                 "Loopback": "",
                 "Remote": ""
             }
@@ -100,15 +100,15 @@
             "Platform": "linux",
             "Tls": ["stub", "openssl"],
             "Arch": ["x64", "arm"],
-            "Exe": "quicping",
+            "Exe": "quicperf",
             "Arguments": {
-                "All": "-target:$RemoteAddress -port:4433 -sendbuf:0 -uni:1 -encrypt:0 -length:2000000000",
+                "All": "-TestName:Throughput -target:$RemoteAddress -port:4433 -sendbuf:0 -uni:1 -encrypt:0 -length:2000000000",
                 "Loopback": "",
                 "Remote": ""
             }
         },
         "Iterations": 10,
-        "RemoteReadyMatcher": "Ready For Connections!",
-        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps \\|"
+        "RemoteReadyMatcher": "Started!",
+        "ResultsMatcher": "Closed.*\\(TX.*bytes @ (.*) kbps\\)"
     }
 ]
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -30,6 +30,9 @@ This script provides helpers for building msquic.
 .PARAMETER DisableTest
     Don't build the test directory.
 
+.PARAMETER DisablePerf
+    Don't build the perf directory.
+
 .PARAMETER Clean
     Deletes all previous build and configuration.
 
@@ -93,6 +96,9 @@ param (
 
     [Parameter(Mandatory = $false)]
     [switch]$DisableTest = $false,
+
+    [Parameter(Mandatory = $false)]
+    [switch]$DisablePerf = $false,
 
     [Parameter(Mandatory = $false)]
     [switch]$Clean = $false,
@@ -220,6 +226,9 @@ function CMake-Generate {
     if ($DisableTest) {
         $Arguments += " -DQUIC_BUILD_TEST=off"
     }
+    if ($DisablePerf) {
+        $Arguments += " -DQUIC_BUILD_PERF=off"
+    }
     if ($IsLinux) {
         $Arguments += " -DCMAKE_BUILD_TYPE=" + $Config
     }