Skip to content

Add AMD GPU monitor profile and some metadata #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yangpanMS merged 5 commits into from
Aug 24, 2023
Merged

Add AMD GPU monitor profile and some metadata #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
44d681a
save
yangpanMS Aug 23, 2023
b5c9315
Merge branch 'main' of https://github.com/microsoft/VirtualClient int…
yangpanMS Aug 23, 2023
bbbfea9
Add AMD GPU monitor profile and some metadata
yangpanMS Aug 24, 2023
b0d24df
version change
yangpanMS Aug 24, 2023
ad09f2b
fix test
yangpanMS Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pipelines/azure-pipelines-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pool:
vmImage: ubuntu-latest

variables:
VcVersion : 1.9.1
VcVersion : 1.9.3
ROOT: $(Build.SourcesDirectory)
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
ENABLE_PRS_DELAYSIGN: 1
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pool:
vmImage: windows-latest

variables:
VcVersion : 1.9.2
VcVersion : 1.9.3
ROOT: $(Build.SourcesDirectory)
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
ENABLE_PRS_DELAYSIGN: 1
Expand Down
3 changes: 2 additions & 1 deletion src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@
NuGet package in the /content/win-x64|win-arm64/profiles folder
-->
<WindowsProfiles Include="profiles\GET-STARTED-OPENSSL.json" />
<WindowsProfiles Include="profiles\DEPENDENCY-AMD-GPU-DRIVER.json" />
<WindowsProfiles Include="profiles\SETUP-AMD-GPU-DRIVER.json" />
<WindowsProfiles Include="profiles\BOOTSTRAP-DEPENDENCIES.json" />
<WindowsProfiles Include="profiles\PERF-ASPNETBENCH.json" />
<WindowsProfiles Include="profiles\PERF-COMPRESSION.json" />
<WindowsProfiles Include="profiles\PERF-CPU-COREMARK.json" />
<WindowsProfiles Include="profiles\PERF-CPU-COREMARKPRO.json" />
<WindowsProfiles Include="profiles\PERF-GPU-3DMARK-AMD.json" />
<WindowsProfiles Include="profiles\PERF-GPU-FURMARK.json" />
<WindowsProfiles Include="profiles\PERF-GPU-FURMARK-AMD.json" />
<WindowsProfiles Include="profiles\PERF-CPU-GEEKBENCH.json" />
Expand Down
33 changes: 0 additions & 33 deletions src/VirtualClient/VirtualClient.Main/profiles/DEPENDENCY-AMD-GPU-DRIVER.json
View file
Open in desktop

This file was deleted.

29 changes: 29 additions & 0 deletions src/VirtualClient/VirtualClient.Main/profiles/MONITORS-GPU-AMD.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"Description": "Default Monitors for AMD GPU systems.",
"Metadata": {
"SupportedPlatforms": "linux-x64,win-x64",
"SupportedOperatingSystems": "CBL-Mariner,CentOS,Debian,RedHat,Suse,Ubuntu,Windows"
},
"Parameters": {
"MonitorFrequency": "00:01:00",
"MonitorWarmupPeriod": "00:01:00"
},
"Monitors": [
{
"Type": "AmdSmiMonitor",
"Parameters": {
"Scenario": "AmdGpuCounters",
"MonitorFrequency": "$.Parameters.MonitorFrequency",
"MonitorWarmupPeriod": "$.Parameters.MonitorWarmupPeriod"
}
},
{
"Type": "LspciMonitor",
"Parameters": {
"Scenario": "PCIeDevices",
"MonitorFrequency": "12:00:00",
"MonitorWarmupPeriod": "$.Parameters.MonitorWarmupPeriod"
}
}
]
}
8 changes: 6 additions & 2 deletions src/VirtualClient/VirtualClient.Main/profiles/MONITORS-GPU-NVIDIA.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"Description": "Default Monitors for GPU systems.",
"Description": "Default Monitors for Nvidia GPU systems.",
"Metadata": {
"SupportedPlatforms": "linux-x64,win-x64",
"SupportedOperatingSystems": "CBL-Mariner,CentOS,Debian,RedHat,Suse,Ubuntu,Windows"
},
"Parameters": {
"MonitorFrequency": "00:01:00",
"MonitorWarmupPeriod": "00:01:00"
Expand All @@ -16,7 +20,7 @@
{
"Type": "LspciMonitor",
"Parameters": {
"Scenario": "CaptureCounters",
"Scenario": "PCIeDevices",
"MonitorFrequency": "12:00:00",
"MonitorWarmupPeriod": "$.Parameters.MonitorWarmupPeriod"
}
Expand Down
1 change: 0 additions & 1 deletion src/VirtualClient/VirtualClient.Main/profiles/PERF-ASPNETBENCH.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"Description": ".NET benchmarking Workload",
"MinimumExecutionInterval": "00:01:00",
"Metadata": {
"RecommendedMinimumExecutionTime": "00:05:00",
"SupportedPlatforms": "linux-x64,linux-arm64,win-x64,win-arm64",
Expand Down
111 changes: 64 additions & 47 deletions ...Client.Main/profiles/PERF-GPU-3DMARK.json → ...nt.Main/profiles/PERF-GPU-3DMARK-AMD.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,65 @@
{
"Description": "3DMark TimeSpy GPU Performance Workload",
"Actions": [
{
"Type": "ThreeDMarkExecutor",
"Parameters": {
"Scenario": "TimeSpy",
"LisenceKey": "",
"PackageName": "3dmark",
"PsExecPackageName": "pstools",
"PsExecSession": 2,
"Tags": "GPU,3DMark,Gaming"
}
}
],
"Monitors": [
{
"Type": "PerfCounterMonitor",
"Parameters": {
"Scenario": "CaptureCounters",
"MonitorFrequency": "$.Parameters.MonitorFrequency",
"MonitorWarmupPeriod": "$.Parameters.MonitorWarmupPeriod"
}
}
],
"Dependencies": [
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "InstallPsToolsPackage",
"BlobContainer": "packages",
"BlobName": "pstools.2.51.zip",
"PackageName": "pstools",
"Extract": true
}
},
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "Install3DMarkWorkloadPackage",
"BlobContainer": "packages",
"BlobName": "",
"PackageName": "3DMark",
"Extract": true
}
}
]
{
"Description": "3DMark TimeSpy GPU Performance Workload",
"Metadata": {
"RecommendedMinimumExecutionTime": "02:00:00",
"SupportedPlatforms": "win-x64",
"SupportedOperatingSystems": "Windows"
},
"Parameters": {
"GpuModel": "v620",
"LisenceKey": ""
},
"Actions": [
{
"Type": "ThreeDMarkExecutor",
"Parameters": {
"Scenario": "TimeSpy",
"LisenceKey": "$Parameters.LicenseKey",
"PackageName": "3dmark",
"PsExecPackageName": "pstools",
"PsExecSession": 2,
"Tags": "GPU,3DMark,Gaming"
}
}
],
"Dependencies": [
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "InstallAMDGPUDriverPackage",
"BlobContainer": "packages",
"BlobName": "amdgpudriver.zip",
"PackageName": "amdgpudriver",
"Extract": true
}
},
{
"Type": "AMDGPUDriverInstallation",
"Parameters": {
"Scenario": "InstallAMDGPUDriver",
"GpuModel": "$.Parameters.GpuModel",
"PackageName": "amdgpudriver"
}
},
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "InstallPsToolsPackage",
"BlobContainer": "packages",
"BlobName": "pstools.2.51.zip",
"PackageName": "pstools",
"Extract": true
}
},
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "Install3DMarkWorkloadPackage",
"BlobContainer": "packages",
"BlobName": "3DMark.zip",
"PackageName": "3DMark",
"Extract": true
}
}
]
}
96 changes: 52 additions & 44 deletions ...lClient.Main/profiles/PERF-GPU-FLOPS.json → ...ent.Main/profiles/PERF-GPU-FLOPS-AMD.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,53 @@
{
"Description": "FLOPs GPU Performance Workload",
"Actions": [
{
"Type": "DXFLOPSExecutor",
"Parameters": {
"Scenario": "MeasureGPUPerformance",
"ShaderIterations": 100000,
"Precision": "f32",
"PackageName": "DXMicrobenchmarks"
}
}
],
"Monitors": [
{
"Type": "AmdSmiMonitor",
"Parameters": {
"MonitorFrequency": "00:00:05",
"MonitorWarmupPeriod": "00:00:10"
}
}
],
"Dependencies": [
{
"Type": "AMDGPUDriverInstallation",
"Parameters": {
"Scenario": "InstallDriver",
"BlobContainer": "packages",
"BlobName": "",
"PackageName": "",
"Extract": true
}
},
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "InstallDXMicrobenchmarksPackage",
"BlobContainer": "packages",
"BlobName": "DXMicrobenchmarks.zip",
"PackageName": "DXMicrobenchmarks",
"Extract": true
}
}
]
{
"Description": "FLOPs GPU Performance Workload",
"Metadata": {
"RecommendedMinimumExecutionTime": "02:00:00",
"SupportedPlatforms": "win-x64",
"SupportedOperatingSystems": "Windows"
},
"Parameters": {
"GpuModel": "v620",
"LisenceKey": ""
},
"Actions": [
{
"Type": "DXFLOPSExecutor",
"Parameters": {
"Scenario": "MeasureGPUPerformance",
"ShaderIterations": 100000,
"Precision": "f32",
"PackageName": "DXMicrobenchmarks"
}
}
],
"Dependencies": [
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "InstallAMDGPUDriverPackage",
"BlobContainer": "packages",
"BlobName": "amdgpudriver.zip",
"PackageName": "amdgpudriver",
"Extract": true
}
},
{
"Type": "AMDGPUDriverInstallation",
"Parameters": {
"Scenario": "InstallAMDGPUDriver",
"GpuModel": "$.Parameters.GpuModel",
"PackageName": "amdgpudriver"
}
},
{
"Type": "DependencyPackageInstallation",
"Parameters": {
"Scenario": "InstallDXMicrobenchmarksPackage",
"BlobContainer": "packages",
"BlobName": "DXMicrobenchmarks.zip",
"PackageName": "DXMicrobenchmarks",
"Extract": true
}
}
]
}
2 changes: 1 addition & 1 deletion website/docs/workloads/furmark/furmark-profiles.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ Windows
./VirtualClient --profile=PERF-GPU-FURMARK.json --system=Demo --timeout=1440 --packageStore="{BlobConnectionString|SAS Uri}" --parameters=Time=120000

# Run Furmark and AMD GPU Driver installation parallely for running experiments through Juno or automation purposes.
./VirtualClient --profile=PERF-GPU-FURMARK.json --profile=DEPENDENCY-AMD-GPU-DRIVER.json --system=Demo --timeout=1440 --packageStore="{BlobConnectionString|SAS Uri}" --parameters=Time=120000
./VirtualClient --profile=PERF-GPU-FURMARK.json --profile=SETUP-AMD-GPU-DRIVER.json --system=Demo --timeout=1440 --packageStore="{BlobConnectionString|SAS Uri}" --parameters=Time=120000