Skip to content

Commit bd0271a

Browse files
PatKaminPatKamin
authored
[Benches] Fix too long bench names in charts legends (#21417)
1 parent ea899a8 commit bd0271a

File tree

3 files changed

+69
-39
lines changed

3 files changed

+69
-39
lines changed

‎devops/scripts/benchmarks/benches/compute/compute.py‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,15 @@ def createTorchSingleQueueBench(variant_name: str, **kwargs):
317317
runtime,
318318
variant_name,
319319
profiler_type,
320-
**{
321-
**kwargs,
320+
fixed_args={
322321
"KernelBatchSize": 512,
323322
"KernelName": "Add",
324323
"KernelParamsNum": 5,
325324
"KernelSubmitPattern": "Single",
326325
"Profiling": 0,
327326
"UseEvents": 0,
328327
},
328+
**kwargs,
329329
)
330330

331331
benches += [
@@ -378,28 +378,30 @@ def createTorchMultiQueueBench(variant_name: str, **kwargs):
378378
variant_name,
379379
profiler_type,
380380
measure_completion,
381-
**{
382-
**kwargs,
381+
fixed_args={
383382
"KernelWGCount": 512,
384383
"KernelWGSize": 256,
385-
"MeasureCompletionTime": measure_completion,
386384
"Profiling": 0,
387385
"UseEvents": 0,
388386
},
387+
**kwargs,
389388
)
390389

391390
benches += [
392391
createTorchMultiQueueBench(
393392
"large",
394393
KernelsPerQueue=20,
394+
MeasureCompletionTime=measure_completion,
395395
),
396396
createTorchMultiQueueBench(
397397
"medium",
398398
KernelsPerQueue=10,
399+
MeasureCompletionTime=measure_completion,
399400
),
400401
createTorchMultiQueueBench(
401402
"small",
402403
KernelsPerQueue=4,
404+
MeasureCompletionTime=measure_completion,
403405
),
404406
]
405407

@@ -414,26 +416,28 @@ def createTorchSlmSizeBench(variant_name: str, **kwargs):
414416
variant_name,
415417
profiler_type,
416418
measure_completion,
417-
**{
418-
**kwargs,
419+
fixed_args={
419420
"KernelBatchSize": 512,
420-
"MeasureCompletionTime": measure_completion,
421421
"Profiling": 0,
422422
},
423+
**kwargs,
423424
)
424425

425426
benches += [
426427
createTorchSlmSizeBench(
427428
"small",
428429
SlmNum=1,
430+
MeasureCompletionTime=measure_completion,
429431
),
430432
createTorchSlmSizeBench(
431433
"medium",
432434
SlmNum=1024,
435+
MeasureCompletionTime=measure_completion,
433436
),
434437
createTorchSlmSizeBench(
435438
"large",
436439
SlmNum=16384,
440+
MeasureCompletionTime=measure_completion,
437441
),
438442
]
439443

@@ -491,11 +495,11 @@ def createTorchLinearKernelSizeBench(variant_name: str, **kwargs):
491495
runtime,
492496
variant_name,
493497
profiler_type,
494-
**{
495-
**kwargs,
498+
fixed_args={
496499
"KernelBatchSize": 512,
497500
"Profiling": 0,
498501
},
502+
**kwargs,
499503
)
500504

501505
benches += [
@@ -536,29 +540,31 @@ def createTorchGraphSingleQueueBench(variant_name: str, **kwargs):
536540
runtime,
537541
variant_name,
538542
profiler_type,
539-
**{
540-
**kwargs,
541-
"KernelName": kernel_name.value,
543+
fixed_args={
542544
"KernelWGCount": 512,
543545
"KernelWGSize": 256,
544546
"Profiling": 0,
545547
"UseEvents": 0,
546548
},
549+
**kwargs,
547550
)
548551

549552
benches += [
550553
createTorchGraphSingleQueueBench(
551554
"small",
555+
KernelName=kernel_name.value,
552556
KernelsPerQueue=10,
553557
KernelBatchSize=10,
554558
),
555559
createTorchGraphSingleQueueBench(
556560
"medium",
561+
KernelName=kernel_name.value,
557562
KernelsPerQueue=32,
558563
KernelBatchSize=32,
559564
),
560565
createTorchGraphSingleQueueBench(
561566
"large",
567+
KernelName=kernel_name.value,
562568
KernelsPerQueue=64,
563569
KernelBatchSize=64,
564570
),
@@ -574,13 +580,13 @@ def createTorchGraphMultiQueueBench(variant_name: str, **kwargs):
574580
runtime,
575581
variant_name,
576582
profiler_type,
577-
**{
578-
**kwargs,
583+
fixed_args={
579584
"workgroupCount": 512,
580585
"workgroupSize": 256,
581586
"Profiling": 0,
582587
"UseEvents": 0,
583588
},
589+
**kwargs,
584590
)
585591

586592
benches += [

‎devops/scripts/benchmarks/benches/compute/compute_torch.py‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,15 @@ def __init__(
1818
variant_name: str,
1919
profiler_type: PROFILERS,
2020
measure_completion: int = 0,
21+
fixed_args: dict | None = None,
2122
**kwargs,
2223
):
2324
self._variant_name = variant_name
2425
self._measure_completion_str = (
2526
" with measure completion" if measure_completion else ""
2627
)
27-
self._torch_params = kwargs
28+
self._torch_params: dict = kwargs
29+
self._fixed_args: dict | None = fixed_args # args used for charts legends
2830
self._iterations_regular = 1000
2931
self._iterations_trace = 10
3032
super().__init__(
@@ -63,10 +65,14 @@ def _supported_runtimes(self) -> list[RUNTIMES]:
6365

6466
def _bin_args(self, run_trace: TracingType = TracingType.NONE) -> list[str]:
6567
iters = self._get_iters(run_trace)
68+
if self._fixed_args is not None:
69+
params = dict(self._fixed_args | self._torch_params)
70+
else:
71+
params = self._torch_params
6672
return (
6773
[f"--iterations={iters}"]
6874
+ [f"--profilerType={self._profiler_type.value}"]
69-
+ [f"--{k}={v}" for k, v in self._torch_params.items()]
75+
+ [f"--{k}={v}" for k, v in params.items()]
7076
)
7177

7278

@@ -78,6 +84,7 @@ def __init__(
7884
runtime: RUNTIMES,
7985
variant_name: str,
8086
profiler_type: PROFILERS,
87+
fixed_args: dict | None = None,
8188
**kwargs,
8289
):
8390
super().__init__(
@@ -86,6 +93,7 @@ def __init__(
8693
"KernelSubmitSingleQueue",
8794
variant_name,
8895
profiler_type,
96+
fixed_args=fixed_args,
8997
**kwargs,
9098
)
9199

@@ -99,6 +107,7 @@ def __init__(
99107
variant_name: str,
100108
profiler_type: PROFILERS,
101109
measure_completion: int = 0,
110+
fixed_args: dict | None = None,
102111
**kwargs,
103112
):
104113
super().__init__(
@@ -108,6 +117,7 @@ def __init__(
108117
variant_name,
109118
profiler_type,
110119
measure_completion=measure_completion,
120+
fixed_args=fixed_args,
111121
**kwargs,
112122
)
113123

@@ -121,6 +131,7 @@ def __init__(
121131
variant_name: str,
122132
profiler_type: PROFILERS,
123133
measure_completion: int = 0,
134+
fixed_args: dict | None = None,
124135
**kwargs,
125136
):
126137
super().__init__(
@@ -130,6 +141,7 @@ def __init__(
130141
variant_name,
131142
profiler_type,
132143
measure_completion=measure_completion,
144+
fixed_args=fixed_args,
133145
**kwargs,
134146
)
135147

@@ -142,6 +154,7 @@ def __init__(
142154
runtime: RUNTIMES,
143155
variant_name: str,
144156
profiler_type: PROFILERS,
157+
fixed_args: dict | None = None,
145158
**kwargs,
146159
):
147160
super().__init__(
@@ -150,6 +163,7 @@ def __init__(
150163
"KernelSubmitLinearKernelSize",
151164
variant_name,
152165
profiler_type,
166+
fixed_args=fixed_args,
153167
**kwargs,
154168
)
155169

@@ -182,6 +196,7 @@ def __init__(
182196
runtime: RUNTIMES,
183197
variant_name: str,
184198
profiler_type: PROFILERS,
199+
fixed_args: dict | None = None,
185200
**kwargs,
186201
):
187202
super().__init__(
@@ -190,17 +205,20 @@ def __init__(
190205
"KernelSubmitGraphSingleQueue",
191206
variant_name,
192207
profiler_type,
208+
fixed_args=fixed_args,
193209
**kwargs,
194210
)
195211

196212

197213
class TorchGraphMultiQueue(TorchBenchmark):
214+
198215
def __init__(
199216
self,
200217
suite,
201218
runtime: RUNTIMES,
202219
variant_name: str,
203220
profiler_type: PROFILERS,
221+
fixed_args: dict | None = None,
204222
**kwargs,
205223
):
206224
super().__init__(
@@ -209,6 +227,7 @@ def __init__(
209227
"KernelSubmitGraphMultiQueue",
210228
variant_name,
211229
profiler_type,
230+
fixed_args=fixed_args,
212231
**kwargs,
213232
)
214233

0 commit comments

Comments
 (0)