Skip to content

Commit 18e4290

Browse files
yangpanMSyangpanMS
authored
Profile rename to support both AMD and Nvidia (#156)
1 parent ad05ce1 commit 18e4290

File tree

9 files changed

+378
-178
lines changed

9 files changed

+378
-178
lines changed

‎.pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pool:
1313
vmImage: ubuntu-latest
1414

1515
variables:
16-
VcVersion : 1.8.6
16+
VcVersion : 1.9.0
1717
ROOT: $(Build.SourcesDirectory)
1818
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
1919
ENABLE_PRS_DELAYSIGN: 1

‎.pipelines/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pool:
1818
vmImage: windows-latest
1919

2020
variables:
21-
VcVersion : 1.8.6
21+
VcVersion : 1.9.0
2222
ROOT: $(Build.SourcesDirectory)
2323
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2424
ENABLE_PRS_DELAYSIGN: 1

‎src/VirtualClient/VirtualClient.Main/VirtualClient - Backup.Main.csproj

Lines changed: 0 additions & 174 deletions
This file was deleted.

‎src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
<WindowsProfiles Include="profiles\PERF-CPU-COREMARK.json" />
6666
<WindowsProfiles Include="profiles\PERF-CPU-COREMARKPRO.json" />
6767
<WindowsProfiles Include="profiles\PERF-GPU-FURMARK.json" />
68+
<WindowsProfiles Include="profiles\PERF-GPU-FURMARK-AMD.json" />
6869
<WindowsProfiles Include="profiles\PERF-CPU-GEEKBENCH.json" />
6970
<WindowsProfiles Include="profiles\PERF-CPU-LAPACK.json" />
7071
<WindowsProfiles Include="profiles\PERF-CPU-OPENSSL.json" />
@@ -111,7 +112,9 @@
111112
<LinuxProfiles Include="profiles\PERF-CPU-OPENSSL.json" />
112113
<LinuxProfiles Include="profiles\PERF-CPU-PRIME95.json" />
113114
<LinuxProfiles Include="profiles\PERF-GPU-SUPERBENCH.json" />
115+
<LinuxProfiles Include="profiles\PERF-GPU-SUPERBENCH-NVIDIA.json" />
114116
<LinuxProfiles Include="profiles\PERF-GPU-MLPERF.json" />
117+
<LinuxProfiles Include="profiles\PERF-GPU-MLPERF-NVIDIA.json" />
115118
<LinuxProfiles Include="profiles\PERF-GRAPH500.json" />
116119
<LinuxProfiles Include="profiles\PERF-HPC-NASPARALLELBENCH.json" />
117120
<LinuxProfiles Include="profiles\PERF-IO-FIO.json" />

‎src/VirtualClient/VirtualClient.Main/profiles/PERF-GPU-FURMARK-AMD.json

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
{
2+
"Description": "Furmark GPU Performance Workload",
3+
"Metadata": {
4+
"SupportedPlatforms": "win-x64",
5+
"SupportedOperatingSystem": "Windows",
6+
"SupportedGpuModel": "mi25,v620",
7+
"SpecialRequirements": "This is AMD GPU Driver dependency. It can only be installed on the system having an AMD GPU card/chip."
8+
},
9+
"Parameters": {
10+
"GpuModel": "mi25",
11+
"Time": "60000",
12+
"Height": "640",
13+
"Width": "480",
14+
"Antialiasing": "4"
15+
},
16+
"Actions": [
17+
{
18+
"Type": "FurmarkExecutor",
19+
"Parameters": {
20+
"Scenario": "ExecuteFurmarkBenchmark",
21+
"PackageName": "Furmark",
22+
"PsExecPackageName": "pstools",
23+
"Time": "$.Parameters.Time",
24+
"Height": "$.Parameters.Height",
25+
"Width": "$.Parameters.Width",
26+
"Antialiasing": "$.Parameters.Antialiasing"
27+
}
28+
},
29+
{
30+
"Type": "FurmarkExecutor",
31+
"Parameters": {
32+
"Scenario": "Furmmark_640X360_8",
33+
"PackageName": "Furmark",
34+
"PsExecPackageName": "pstools",
35+
"Time": "$.Parameters.Time",
36+
"Height": "360",
37+
"Width": "640",
38+
"Antialiasing": "8"
39+
}
40+
},
41+
42+
{
43+
"Type": "FurmarkExecutor",
44+
"Parameters": {
45+
"Scenario": "Furmmark_2160X11520_2",
46+
"PackageName": "Furmark",
47+
"PsExecPackageName": "pstools",
48+
"Time": "$.Parameters.Time",
49+
"Height": "11520",
50+
"Width": "2160",
51+
"Antialiasing": "2"
52+
}
53+
},
54+
{
55+
"Type": "FurmarkExecutor",
56+
"Parameters": {
57+
"Scenario": "Furmmark_2160X11520_8",
58+
"PackageName": "Furmark",
59+
"PsExecPackageName": "pstools",
60+
"Time": "$.Parameters.Time",
61+
"Height": "11520",
62+
"Width": "2160",
63+
"Antialiasing": "8"
64+
}
65+
},
66+
{
67+
"Type": "FurmarkExecutor",
68+
"Parameters": {
69+
"Scenario": "Furmmark_1440X2560_2",
70+
"PackageName": "Furmark",
71+
"PsExecPackageName": "pstools",
72+
"Time": "$.Parameters.Time",
73+
"Height": "2560",
74+
"Width": "1440",
75+
"Antialiasing": "2"
76+
}
77+
},
78+
{
79+
"Type": "FurmarkExecutor",
80+
"Parameters": {
81+
"Scenario": "Furmmark_1440X2560_4",
82+
"PackageName": "Furmark",
83+
"PsExecPackageName": "pstools",
84+
"Time": "$.Parameters.Time",
85+
"Height": "2560",
86+
"Width": "1440",
87+
"Antialiasing": "4"
88+
}
89+
},
90+
91+
{
92+
"Type": "FurmarkExecutor",
93+
"Parameters": {
94+
"Scenario": "Furmmark_720X1280_4",
95+
"PackageName": "Furmark",
96+
"PsExecPackageName": "pstools",
97+
"Time": "$.Parameters.Time",
98+
"Height": "1280",
99+
"Width": "720",
100+
"Antialiasing": "4"
101+
}
102+
},
103+
104+
{
105+
"Type": "FurmarkExecutor",
106+
"Parameters": {
107+
"Scenario": "Furmmark_720X1280_2",
108+
"PackageName": "Furmark",
109+
"PsExecPackageName": "pstools",
110+
"Time": "$.Parameters.Time",
111+
"Height": "1280",
112+
"Width": "720",
113+
"Antialiasing": "2"
114+
}
115+
},
116+
{
117+
"Type": "FurmarkExecutor",
118+
"Parameters": {
119+
"Scenario": "Furmmark_5120X2880_4",
120+
"PackageName": "Furmark",
121+
"PsExecPackageName": "pstools",
122+
"Time": "$.Parameters.Time",
123+
"Height": "2880",
124+
"Width": "5120",
125+
"Antialiasing": "4"
126+
}
127+
},
128+
{
129+
"Type": "FurmarkExecutor",
130+
"Parameters": {
131+
"Scenario": "Furmmark_5120X2880_2",
132+
"PackageName": "Furmark",
133+
"PsExecPackageName": "pstools",
134+
"Time": "$.Parameters.Time",
135+
"Height": "2880",
136+
"Width": "5120",
137+
"Antialiasing": "2"
138+
}
139+
}
140+
141+
],
142+
"Dependencies": [
143+
{
144+
"Type": "DependencyPackageInstallation",
145+
"Parameters": {
146+
"Scenario": "InstallPsToolsPackage",
147+
"BlobContainer": "packages",
148+
"BlobName": "pstools.2.51.zip",
149+
"PackageName": "pstools",
150+
"Extract": true
151+
}
152+
},
153+
{
154+
"Type": "DependencyPackageInstallation",
155+
"Parameters": {
156+
"Scenario": "InstallFurmarkPackage",
157+
"BlobContainer": "packages",
158+
"BlobName": "Furmark1.34.0.0.zip",
159+
"PackageName": "furmark",
160+
"Extract": true
161+
}
162+
},
163+
{
164+
"Type": "DependencyPackageInstallation",
165+
"Parameters": {
166+
"Scenario": "InstallAMDGPUDriverPackage",
167+
"BlobContainer": "packages",
168+
"BlobName": "amdgpudriver.zip",
169+
"PackageName": "amdgpudriver",
170+
"Extract": true
171+
}
172+
},
173+
{
174+
"Type": "AMDGPUDriverInstallation",
175+
"Parameters": {
176+
"Scenario": "InstallAMDGPUDriver",
177+
"GpuModel": "$.Parameters.GpuModel",
178+
"PackageName": "amdgpudriver"
179+
}
180+
}
181+
]
182+
}

0 commit comments

Comments
 (0)