Skip to content

Commit 956ab5d

Browse files
LoopedBard3LoopedBard3
committed
Add Perflin machines to benchmarks_ci.json and to the blazor scenario. Also improved the scheduler to better handle role-priority based profile selection.
1 parent a9d28b0 commit 956ab5d

File tree

6 files changed

+235
-190
lines changed

6 files changed

+235
-190
lines changed

‎build/benchmarks-ci-01.yml‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
connection: ASPNET Benchmarks Service Bus
5959
serviceBusQueueName: citrine2
6060
serviceBusNamespace: aspnetbenchmarks
61-
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-load2-db "
61+
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db "
6262

6363
- job: Grpc_Gold_Win
6464
displayName: 1- Grpc Gold Win
@@ -86,7 +86,7 @@ jobs:
8686
connection: ASPNET Benchmarks Service Bus
8787
serviceBusQueueName: mono
8888
serviceBusNamespace: aspnetbenchmarks
89-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-db-load "
89+
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load "
9090

9191
# GROUP 2
9292

@@ -116,7 +116,7 @@ jobs:
116116
connection: ASPNET Benchmarks Service Bus
117117
serviceBusQueueName: citrine2
118118
serviceBusNamespace: aspnetbenchmarks
119-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load --profile intel-load-db "
119+
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load --profile intel-db-db "
120120

121121
- job: Grpc_Gold_Lin
122122
displayName: 2- Grpc Gold Lin
@@ -144,7 +144,7 @@ jobs:
144144
connection: ASPNET Benchmarks Service Bus
145145
serviceBusQueueName: mono
146146
serviceBusNamespace: aspnetbenchmarks
147-
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-db-load "
147+
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load "
148148

149149
# GROUP 3
150150

@@ -190,27 +190,27 @@ jobs:
190190
serviceBusNamespace: aspnetbenchmarks
191191
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load "
192192

193-
- job: MVC_Intel_Win
194-
displayName: 3- MVC Intel Win
193+
- job: SignalR_Intel_Win
194+
displayName: 3- SignalR Intel Win
195195
pool: server
196196
timeoutInMinutes: 120
197197
dependsOn: [PGO_Gold_Win, PGO_Intel_Win, Grpc_Gold_Lin, Grpc_Intel_Lin]
198198
condition: succeededOrFailed()
199199
steps:
200-
- template: mvc-scenarios.yml
200+
- template: signalr-scenarios.yml
201201
parameters:
202202
connection: ASPNET Benchmarks Service Bus
203203
serviceBusQueueName: mono
204204
serviceBusNamespace: aspnetbenchmarks
205-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load --profile intel-db-db "
205+
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load "
206206

207207
# GROUP 4
208208

209209
- job: Baselines_Gold_Lin
210210
displayName: 4- Baselines Gold Lin
211211
pool: server
212212
timeoutInMinutes: 120
213-
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, MVC_Intel_Win]
213+
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, SignalR_Intel_Win]
214214
condition: succeededOrFailed()
215215
steps:
216216
- template: baselines-scenarios.yml
@@ -224,7 +224,7 @@ jobs:
224224
displayName: 4- Baselines Intel Lin
225225
pool: server
226226
timeoutInMinutes: 120
227-
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, MVC_Intel_Win]
227+
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, SignalR_Intel_Win]
228228
condition: succeededOrFailed()
229229
steps:
230230
- template: baselines-scenarios.yml
@@ -238,7 +238,7 @@ jobs:
238238
displayName: 4- Frameworks Database Amd Lin2
239239
pool: server
240240
timeoutInMinutes: 120
241-
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, MVC_Intel_Win]
241+
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, SignalR_Intel_Win]
242242
condition: succeededOrFailed()
243243
steps:
244244
- template: frameworks-database-scenarios.yml
@@ -248,27 +248,27 @@ jobs:
248248
serviceBusNamespace: aspnetbenchmarks
249249
arguments: "$(ciProfile) --profile amd-lin2-app --profile gold-load2-load --profile gold-db-db "
250250

251-
- job: Trends_Intel_Win
252-
displayName: 4- Trends Intel Win
251+
- job: NativeAOT_Intel_Win
252+
displayName: 4- NativeAOT Intel Win
253253
pool: server
254254
timeoutInMinutes: 120
255-
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, MVC_Intel_Win]
255+
dependsOn: [Baselines_Database_Amd_Lin2, HttpClient_Gold_Lin, HttpClient_Intel_Lin, SignalR_Intel_Win]
256256
condition: succeededOrFailed()
257257
steps:
258-
- template: trend-scenarios.yml
258+
- template: nativeaot-scenarios.yml
259259
parameters:
260260
connection: ASPNET Benchmarks Service Bus
261261
serviceBusQueueName: mono
262262
serviceBusNamespace: aspnetbenchmarks
263-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load "
263+
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load --profile intel-db-db "
264264

265265
# GROUP 5
266266

267267
- job: SignalR_Gold_Lin
268268
displayName: 5- SignalR Gold Lin
269269
pool: server
270270
timeoutInMinutes: 120
271-
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, Trends_Intel_Win]
271+
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, NativeAOT_Intel_Win]
272272
condition: succeededOrFailed()
273273
steps:
274274
- template: signalr-scenarios.yml
@@ -282,7 +282,7 @@ jobs:
282282
displayName: 5- SignalR Intel Lin
283283
pool: server
284284
timeoutInMinutes: 120
285-
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, Trends_Intel_Win]
285+
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, NativeAOT_Intel_Win]
286286
condition: succeededOrFailed()
287287
steps:
288288
- template: signalr-scenarios.yml
@@ -296,7 +296,7 @@ jobs:
296296
displayName: 5- MVC Gold Win
297297
pool: server
298298
timeoutInMinutes: 120
299-
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, Trends_Intel_Win]
299+
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, NativeAOT_Intel_Win]
300300
condition: succeededOrFailed()
301301
steps:
302302
- template: mvc-scenarios.yml
@@ -306,14 +306,14 @@ jobs:
306306
serviceBusNamespace: aspnetbenchmarks
307307
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load --profile gold-db-db "
308308

309-
- job: EF_Core_Intel_Win
310-
displayName: 5- EF Core Intel Win
309+
- job: Trends_Intel_Win
310+
displayName: 5- Trends Intel Win
311311
pool: server
312312
timeoutInMinutes: 120
313-
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, Trends_Intel_Win]
313+
dependsOn: [Baselines_Gold_Lin, Baselines_Intel_Lin, Frameworks_Database_Amd_Lin2, NativeAOT_Intel_Win]
314314
condition: succeededOrFailed()
315315
steps:
316-
- template: efcore-scenarios.yml
316+
- template: trend-scenarios.yml
317317
parameters:
318318
connection: ASPNET Benchmarks Service Bus
319319
serviceBusQueueName: mono
@@ -326,7 +326,7 @@ jobs:
326326
displayName: 6- NativeAOT Gold Lin
327327
pool: server
328328
timeoutInMinutes: 120
329-
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, EF_Core_Intel_Win]
329+
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, Trends_Intel_Win]
330330
condition: succeededOrFailed()
331331
steps:
332332
- template: nativeaot-scenarios.yml
@@ -340,21 +340,21 @@ jobs:
340340
displayName: 6- NativeAOT Intel Lin
341341
pool: server
342342
timeoutInMinutes: 120
343-
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, EF_Core_Intel_Win]
343+
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, Trends_Intel_Win]
344344
condition: succeededOrFailed()
345345
steps:
346346
- template: nativeaot-scenarios.yml
347347
parameters:
348348
connection: ASPNET Benchmarks Service Bus
349349
serviceBusQueueName: citrine2
350350
serviceBusNamespace: aspnetbenchmarks
351-
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-load2-db "
351+
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db "
352352

353353
- job: EF_Core_Gold_Win
354354
displayName: 6- EF Core Gold Win
355355
pool: server
356356
timeoutInMinutes: 120
357-
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, EF_Core_Intel_Win]
357+
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, Trends_Intel_Win]
358358
condition: succeededOrFailed()
359359
steps:
360360
- template: efcore-scenarios.yml
@@ -364,27 +364,27 @@ jobs:
364364
serviceBusNamespace: aspnetbenchmarks
365365
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load "
366366

367-
- job: Single_File_Intel_Win
368-
displayName: 6- Single File Intel Win
367+
- job: GC_Intel_Win
368+
displayName: 6- GC Intel Win
369369
pool: server
370370
timeoutInMinutes: 120
371-
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, EF_Core_Intel_Win]
371+
dependsOn: [SignalR_Gold_Lin, SignalR_Intel_Lin, MVC_Gold_Win, Trends_Intel_Win]
372372
condition: succeededOrFailed()
373373
steps:
374-
- template: singlefile-scenarios.yml
374+
- template: gc-scenarios.yml
375375
parameters:
376376
connection: ASPNET Benchmarks Service Bus
377377
serviceBusQueueName: mono
378378
serviceBusNamespace: aspnetbenchmarks
379-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-db-load "
379+
arguments: "$(ciProfile) --profile intel-win-app "
380380

381381
# GROUP 7
382382

383383
- job: Frameworks_Gold_Lin
384384
displayName: 7- Frameworks Gold Lin
385385
pool: server
386386
timeoutInMinutes: 120
387-
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, Single_File_Intel_Win]
387+
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, GC_Intel_Win]
388388
condition: succeededOrFailed()
389389
steps:
390390
- template: frameworks-scenarios.yml
@@ -398,21 +398,21 @@ jobs:
398398
displayName: 7- Frameworks Intel Lin
399399
pool: server
400400
timeoutInMinutes: 120
401-
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, Single_File_Intel_Win]
401+
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, GC_Intel_Win]
402402
condition: succeededOrFailed()
403403
steps:
404404
- template: frameworks-scenarios.yml
405405
parameters:
406406
connection: ASPNET Benchmarks Service Bus
407407
serviceBusQueueName: citrine2
408408
serviceBusNamespace: aspnetbenchmarks
409-
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-load2-db "
409+
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db "
410410

411411
- job: Single_File_Gold_Win
412412
displayName: 7- Single File Gold Win
413413
pool: server
414414
timeoutInMinutes: 120
415-
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, Single_File_Intel_Win]
415+
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, GC_Intel_Win]
416416
condition: succeededOrFailed()
417417
steps:
418418
- template: singlefile-scenarios.yml
@@ -422,27 +422,27 @@ jobs:
422422
serviceBusNamespace: aspnetbenchmarks
423423
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load "
424424

425-
- job: WebSockets_Intel_Win
426-
displayName: 7- WebSockets Intel Win
425+
- job: Single_File_Intel_Win
426+
displayName: 7- Single File Intel Win
427427
pool: server
428428
timeoutInMinutes: 120
429-
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, Single_File_Intel_Win]
429+
dependsOn: [NativeAOT_Gold_Lin, NativeAOT_Intel_Lin, EF_Core_Gold_Win, GC_Intel_Win]
430430
condition: succeededOrFailed()
431431
steps:
432-
- template: websocket-scenarios.yml
432+
- template: singlefile-scenarios.yml
433433
parameters:
434434
connection: ASPNET Benchmarks Service Bus
435435
serviceBusQueueName: mono
436436
serviceBusNamespace: aspnetbenchmarks
437-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-db-load "
437+
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load "
438438

439439
# GROUP 8
440440

441441
- job: Trends_Database_Gold_Lin
442442
displayName: 8- Trends Database Gold Lin
443443
pool: server
444444
timeoutInMinutes: 120
445-
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, WebSockets_Intel_Win]
445+
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, Single_File_Intel_Win]
446446
condition: succeededOrFailed()
447447
steps:
448448
- template: trend-database-scenarios.yml
@@ -456,51 +456,51 @@ jobs:
456456
displayName: 8- Trends Database Intel Lin
457457
pool: server
458458
timeoutInMinutes: 120
459-
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, WebSockets_Intel_Win]
459+
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, Single_File_Intel_Win]
460460
condition: succeededOrFailed()
461461
steps:
462462
- template: trend-database-scenarios.yml
463463
parameters:
464464
connection: ASPNET Benchmarks Service Bus
465465
serviceBusQueueName: citrine2
466466
serviceBusNamespace: aspnetbenchmarks
467-
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-load2-db "
467+
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db "
468468

469-
- job: Crossgen_Gold_Win
470-
displayName: 8- Crossgen Gold Win
469+
- job: WebSockets_Intel_Win
470+
displayName: 8- WebSockets Intel Win
471471
pool: server
472472
timeoutInMinutes: 120
473-
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, WebSockets_Intel_Win]
473+
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, Single_File_Intel_Win]
474474
condition: succeededOrFailed()
475475
steps:
476-
- template: crossgen2-scenarios.yml
476+
- template: websocket-scenarios.yml
477477
parameters:
478478
connection: ASPNET Benchmarks Service Bus
479479
serviceBusQueueName: citrine3
480480
serviceBusNamespace: aspnetbenchmarks
481-
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load "
481+
arguments: "$(ciProfile) --profile intel-win-app --profile intel-load2-load "
482482

483-
- job: Crossgen_Intel_Win
484-
displayName: 8- Crossgen Intel Win
483+
- job: Crossgen_Gold_Win
484+
displayName: 8- Crossgen Gold Win
485485
pool: server
486486
timeoutInMinutes: 120
487-
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, WebSockets_Intel_Win]
487+
dependsOn: [Frameworks_Gold_Lin, Frameworks_Intel_Lin, Single_File_Gold_Win, Single_File_Intel_Win]
488488
condition: succeededOrFailed()
489489
steps:
490490
- template: crossgen2-scenarios.yml
491491
parameters:
492492
connection: ASPNET Benchmarks Service Bus
493493
serviceBusQueueName: mono
494494
serviceBusNamespace: aspnetbenchmarks
495-
arguments: "$(ciProfile) --profile intel-win-app --profile intel-db-load "
495+
arguments: "$(ciProfile) --profile gold-win-app --profile gold-load2-load "
496496

497497
# GROUP 9
498498

499499
- job: Trends_Database_Amd_Lin2
500500
displayName: 9- Trends Database Amd Lin2
501501
pool: server
502502
timeoutInMinutes: 120
503-
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, Crossgen_Gold_Win, Crossgen_Intel_Win]
503+
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, WebSockets_Intel_Win, Crossgen_Gold_Win]
504504
condition: succeededOrFailed()
505505
steps:
506506
- template: trend-database-scenarios.yml
@@ -514,7 +514,7 @@ jobs:
514514
displayName: 9- WebSockets Gold Lin
515515
pool: server
516516
timeoutInMinutes: 120
517-
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, Crossgen_Gold_Win, Crossgen_Intel_Win]
517+
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, WebSockets_Intel_Win, Crossgen_Gold_Win]
518518
condition: succeededOrFailed()
519519
steps:
520520
- template: websocket-scenarios.yml
@@ -528,7 +528,7 @@ jobs:
528528
displayName: 9- WebSockets Intel Lin
529529
pool: server
530530
timeoutInMinutes: 120
531-
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, Crossgen_Gold_Win, Crossgen_Intel_Win]
531+
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, WebSockets_Intel_Win, Crossgen_Gold_Win]
532532
condition: succeededOrFailed()
533533
steps:
534534
- template: websocket-scenarios.yml
@@ -542,7 +542,7 @@ jobs:
542542
displayName: 9- Build Gold Win
543543
pool: server
544544
timeoutInMinutes: 120
545-
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, Crossgen_Gold_Win, Crossgen_Intel_Win]
545+
dependsOn: [Trends_Database_Gold_Lin, Trends_Database_Intel_Lin, WebSockets_Intel_Win, Crossgen_Gold_Win]
546546
condition: succeededOrFailed()
547547
steps:
548548
- template: build-perf-scenarios.yml
@@ -580,5 +580,5 @@ jobs:
580580
connection: ASPNET Benchmarks Service Bus
581581
serviceBusQueueName: citrine2
582582
serviceBusNamespace: aspnetbenchmarks
583-
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-load2-db "
583+
arguments: "$(ciProfile) --profile intel-lin-app --profile intel-load-load --profile intel-db-db "
584584

0 commit comments

Comments
 (0)