File perf-tests-attr-Add-missing-topdown-metrics-events.patch of Package perf
xxxxxxxxxx1
From: Kan Liang <kan.liang@linux.intel.com>2
Date: Thu, 30 Sep 2021 12:52:46 -07003
Subject: perf tests attr: Add missing topdown metrics events4
Git-commit: 0b6c5371c03c2b17963e1abd7ed0e3f1f950cba95
Patch-mainline: v5.15-rc56
References: git-fixes7
8
The Topdown metrics events were added as 'perf stat' default events9
since commit 42641d6f4d15e6db ("perf stat: Add Topdown metrics events as10
default events").11
12
However, the perf attr tests were not updated13
accordingly.14
15
The perf attr test fails on the platform which supports Topdown metrics.16
17
# perf test 1718
19
17: Setup struct perf_event_attr :FAILED!20
21
Add Topdown metrics events into perf attr test cases. Make them optional22
since they are only available on newer platforms.23
24
Fixes: 42641d6f4d15e6db ("perf stat: Add Topdown metrics events as default events")25
Reported-by: kernel test robot <oliver.sang@intel.com>26
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>27
Cc: Andi Kleen <ak@linux.intel.com>28
Cc: Jiri Olsa <jolsa@redhat.com>29
Link: http://lore.kernel.org/lkml/1633031566-176517-1-git-send-email-kan.liang@linux.intel.com30
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>31
Signed-off-by: Tony Jones <tonyj@suse.de>32
---33
tools/perf/tests/attr/test-stat-default | 97 +++++++++++++++++++34
tools/perf/tests/attr/test-stat-detailed-1 | 113 ++++++++++++++++++++--35
tools/perf/tests/attr/test-stat-detailed-2 | 137 +++++++++++++++++++++++----36
tools/perf/tests/attr/test-stat-detailed-3 | 145 ++++++++++++++++++++++++-----37
4 files changed, 440 insertions(+), 52 deletions(-)38
39
diff --git a/tools/perf/tests/attr/test-stat-default b/tools/perf/tests/attr/test-stat-default40
index d9e99b3f77e6..d8ea6a88163f 10064441
--- a/tools/perf/tests/attr/test-stat-default42
+++ b/tools/perf/tests/attr/test-stat-default43
44
type=045
config=546
optional=147
+48
+# PERF_TYPE_RAW / slots (0x400)49
+[event11:base-stat]50
+fd=1151
+group_fd=-152
+type=453
+config=102454
+read_format=1555
+optional=156
+57
+# PERF_TYPE_RAW / topdown-retiring (0x8000)58
+[event12:base-stat]59
+fd=1260
+group_fd=1161
+type=462
+config=3276863
+disabled=064
+enable_on_exec=065
+read_format=1566
+optional=167
+68
+# PERF_TYPE_RAW / topdown-bad-spec (0x8100)69
+[event13:base-stat]70
+fd=1371
+group_fd=1172
+type=473
+config=3302474
+disabled=075
+enable_on_exec=076
+read_format=1577
+optional=178
+79
+# PERF_TYPE_RAW / topdown-fe-bound (0x8200)80
+[event14:base-stat]81
+fd=1482
+group_fd=1183
+type=484
+config=3328085
+disabled=086
+enable_on_exec=087
+read_format=1588
+optional=189
+90
+# PERF_TYPE_RAW / topdown-be-bound (0x8300)91
+[event15:base-stat]92
+fd=1593
+group_fd=1194
+type=495
+config=3353696
+disabled=097
+enable_on_exec=098
+read_format=1599
+optional=1100
+101
+# PERF_TYPE_RAW / topdown-heavy-ops (0x8400)102
+[event16:base-stat]103
+fd=16104
+group_fd=11105
+type=4106
+config=33792107
+disabled=0108
+enable_on_exec=0109
+read_format=15110
+optional=1111
+112
+# PERF_TYPE_RAW / topdown-br-mispredict (0x8500)113
+[event17:base-stat]114
+fd=17115
+group_fd=11116
+type=4117
+config=34048118
+disabled=0119
+enable_on_exec=0120
+read_format=15121
+optional=1122
+123
+# PERF_TYPE_RAW / topdown-fetch-lat (0x8600)124
+[event18:base-stat]125
+fd=18126
+group_fd=11127
+type=4128
+config=34304129
+disabled=0130
+enable_on_exec=0131
+read_format=15132
+optional=1133
+134
+# PERF_TYPE_RAW / topdown-mem-bound (0x8700)135
+[event19:base-stat]136
+fd=19137
+group_fd=11138
+type=4139
+config=34560140
+disabled=0141
+enable_on_exec=0142
+read_format=15143
+optional=1144
diff --git a/tools/perf/tests/attr/test-stat-detailed-1 b/tools/perf/tests/attr/test-stat-detailed-1145
index 8b04a055d154..b656ab93c5bf 100644146
--- a/tools/perf/tests/attr/test-stat-detailed-1147
+++ b/tools/perf/tests/attr/test-stat-detailed-1148
149
config=5150
optional=1151
152
+# PERF_TYPE_RAW / slots (0x400)153
+[event11:base-stat]154
+fd=11155
+group_fd=-1156
+type=4157
+config=1024158
+read_format=15159
+optional=1160
+161
+# PERF_TYPE_RAW / topdown-retiring (0x8000)162
+[event12:base-stat]163
+fd=12164
+group_fd=11165
+type=4166
+config=32768167
+disabled=0168
+enable_on_exec=0169
+read_format=15170
+optional=1171
+172
+# PERF_TYPE_RAW / topdown-bad-spec (0x8100)173
+[event13:base-stat]174
+fd=13175
+group_fd=11176
+type=4177
+config=33024178
+disabled=0179
+enable_on_exec=0180
+read_format=15181
+optional=1182
+183
+# PERF_TYPE_RAW / topdown-fe-bound (0x8200)184
+[event14:base-stat]185
+fd=14186
+group_fd=11187
+type=4188
+config=33280189
+disabled=0190
+enable_on_exec=0191
+read_format=15192
+optional=1193
+194
+# PERF_TYPE_RAW / topdown-be-bound (0x8300)195
+[event15:base-stat]196
+fd=15197
+group_fd=11198
+type=4199
+config=33536200
+disabled=0201
+enable_on_exec=0202
+read_format=15203
+optional=1204
+205
+# PERF_TYPE_RAW / topdown-heavy-ops (0x8400)206
+[event16:base-stat]207
+fd=16208
+group_fd=11209
+type=4210
+config=33792211
+disabled=0212
+enable_on_exec=0213
+read_format=15214
+optional=1215
+216
+# PERF_TYPE_RAW / topdown-br-mispredict (0x8500)217
+[event17:base-stat]218
+fd=17219
+group_fd=11220
+type=4221
+config=34048222
+disabled=0223
+enable_on_exec=0224
+read_format=15225
+optional=1226
+227
+# PERF_TYPE_RAW / topdown-fetch-lat (0x8600)228
+[event18:base-stat]229
+fd=18230
+group_fd=11231
+type=4232
+config=34304233
+disabled=0234
+enable_on_exec=0235
+read_format=15236
+optional=1237
+238
+# PERF_TYPE_RAW / topdown-mem-bound (0x8700)239
+[event19:base-stat]240
+fd=19241
+group_fd=11242
+type=4243
+config=34560244
+disabled=0245
+enable_on_exec=0246
+read_format=15247
+optional=1248
+249
# PERF_TYPE_HW_CACHE /250
# PERF_COUNT_HW_CACHE_L1D << 0 |251
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |252
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)253
-[event11:base-stat]254
-fd=11255
+[event20:base-stat]256
+fd=20257
type=3258
config=0259
optional=1260
261
# PERF_COUNT_HW_CACHE_L1D << 0 |262
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |263
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)264
-[event12:base-stat]265
-fd=12266
+[event21:base-stat]267
+fd=21268
type=3269
config=65536270
optional=1271
272
# PERF_COUNT_HW_CACHE_LL << 0 |273
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |274
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)275
-[event13:base-stat]276
-fd=13277
+[event22:base-stat]278
+fd=22279
type=3280
config=2281
optional=1282
283
# PERF_COUNT_HW_CACHE_LL << 0 |284
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |285
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)286
-[event14:base-stat]287
-fd=14288
+[event23:base-stat]289
+fd=23290
type=3291
config=65538292
optional=1293
diff --git a/tools/perf/tests/attr/test-stat-detailed-2 b/tools/perf/tests/attr/test-stat-detailed-2294
index 4fca9f1bfbf8..97625090a1c4 100644295
--- a/tools/perf/tests/attr/test-stat-detailed-2296
+++ b/tools/perf/tests/attr/test-stat-detailed-2297
298
config=5299
optional=1300
301
+# PERF_TYPE_RAW / slots (0x400)302
+[event11:base-stat]303
+fd=11304
+group_fd=-1305
+type=4306
+config=1024307
+read_format=15308
+optional=1309
+310
+# PERF_TYPE_RAW / topdown-retiring (0x8000)311
+[event12:base-stat]312
+fd=12313
+group_fd=11314
+type=4315
+config=32768316
+disabled=0317
+enable_on_exec=0318
+read_format=15319
+optional=1320
+321
+# PERF_TYPE_RAW / topdown-bad-spec (0x8100)322
+[event13:base-stat]323
+fd=13324
+group_fd=11325
+type=4326
+config=33024327
+disabled=0328
+enable_on_exec=0329
+read_format=15330
+optional=1331
+332
+# PERF_TYPE_RAW / topdown-fe-bound (0x8200)333
+[event14:base-stat]334
+fd=14335
+group_fd=11336
+type=4337
+config=33280338
+disabled=0339
+enable_on_exec=0340
+read_format=15341
+optional=1342
+343
+# PERF_TYPE_RAW / topdown-be-bound (0x8300)344
+[event15:base-stat]345
+fd=15346
+group_fd=11347
+type=4348
+config=33536349
+disabled=0350
+enable_on_exec=0351
+read_format=15352
+optional=1353
+354
+# PERF_TYPE_RAW / topdown-heavy-ops (0x8400)355
+[event16:base-stat]356
+fd=16357
+group_fd=11358
+type=4359
+config=33792360
+disabled=0361
+enable_on_exec=0362
+read_format=15363
+optional=1364
+365
+# PERF_TYPE_RAW / topdown-br-mispredict (0x8500)366
+[event17:base-stat]367
+fd=17368
+group_fd=11369
+type=4370
+config=34048371
+disabled=0372
+enable_on_exec=0373
+read_format=15374
+optional=1375
+376
+# PERF_TYPE_RAW / topdown-fetch-lat (0x8600)377
+[event18:base-stat]378
+fd=18379
+group_fd=11380
+type=4381
+config=34304382
+disabled=0383
+enable_on_exec=0384
+read_format=15385
+optional=1386
+387
+# PERF_TYPE_RAW / topdown-mem-bound (0x8700)388
+[event19:base-stat]389
+fd=19390
+group_fd=11391
+type=4392
+config=34560393
+disabled=0394
+enable_on_exec=0395
+read_format=15396
+optional=1397
+398
# PERF_TYPE_HW_CACHE /399
# PERF_COUNT_HW_CACHE_L1D << 0 |400
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |401
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)402
-[event11:base-stat]403
-fd=11404
+[event20:base-stat]405
+fd=20406
type=3407
config=0408
optional=1409
410
# PERF_COUNT_HW_CACHE_L1D << 0 |411
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |412
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)413
-[event12:base-stat]414
-fd=12415
+[event21:base-stat]416
+fd=21417
type=3418
config=65536419
optional=1420
421
# PERF_COUNT_HW_CACHE_LL << 0 |422
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |423
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)424
-[event13:base-stat]425
-fd=13426
+[event22:base-stat]427
+fd=22428
type=3429
config=2430
optional=1431
432
# PERF_COUNT_HW_CACHE_LL << 0 |433
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |434
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)435
-[event14:base-stat]436
-fd=14437
+[event23:base-stat]438
+fd=23439
type=3440
config=65538441
optional=1442
443
# PERF_COUNT_HW_CACHE_L1I << 0 |444
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |445
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)446
-[event15:base-stat]447
-fd=15448
+[event24:base-stat]449
+fd=24450
type=3451
config=1452
optional=1453
454
# PERF_COUNT_HW_CACHE_L1I << 0 |455
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |456
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)457
-[event16:base-stat]458
-fd=16459
+[event25:base-stat]460
+fd=25461
type=3462
config=65537463
optional=1464
465
# PERF_COUNT_HW_CACHE_DTLB << 0 |466
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |467
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)468
-[event17:base-stat]469
-fd=17470
+[event26:base-stat]471
+fd=26472
type=3473
config=3474
optional=1475
476
# PERF_COUNT_HW_CACHE_DTLB << 0 |477
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |478
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)479
-[event18:base-stat]480
-fd=18481
+[event27:base-stat]482
+fd=27483
type=3484
config=65539485
optional=1486
487
# PERF_COUNT_HW_CACHE_ITLB << 0 |488
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |489
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)490
-[event19:base-stat]491
-fd=19492
+[event28:base-stat]493
+fd=28494
type=3495
config=4496
optional=1497
498
# PERF_COUNT_HW_CACHE_ITLB << 0 |499
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |500
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)501
-[event20:base-stat]502
-fd=20503
+[event29:base-stat]504
+fd=29505
type=3506
config=65540507
optional=1508
diff --git a/tools/perf/tests/attr/test-stat-detailed-3 b/tools/perf/tests/attr/test-stat-detailed-3509
index 4bb58e1c82a6..d555042e3fbf 100644510
--- a/tools/perf/tests/attr/test-stat-detailed-3511
+++ b/tools/perf/tests/attr/test-stat-detailed-3512
513
config=5514
optional=1515
516
+# PERF_TYPE_RAW / slots (0x400)517
+[event11:base-stat]518
+fd=11519
+group_fd=-1520
+type=4521
+config=1024522
+read_format=15523
+optional=1524
+525
+# PERF_TYPE_RAW / topdown-retiring (0x8000)526
+[event12:base-stat]527
+fd=12528
+group_fd=11529
+type=4530
+config=32768531
+disabled=0532
+enable_on_exec=0533
+read_format=15534
+optional=1535
+536
+# PERF_TYPE_RAW / topdown-bad-spec (0x8100)537
+[event13:base-stat]538
+fd=13539
+group_fd=11540
+type=4541
+config=33024542
+disabled=0543
+enable_on_exec=0544
+read_format=15545
+optional=1546
+547
+# PERF_TYPE_RAW / topdown-fe-bound (0x8200)548
+[event14:base-stat]549
+fd=14550
+group_fd=11551
+type=4552
+config=33280553
+disabled=0554
+enable_on_exec=0555
+read_format=15556
+optional=1557
+558
+# PERF_TYPE_RAW / topdown-be-bound (0x8300)559
+[event15:base-stat]560
+fd=15561
+group_fd=11562
+type=4563
+config=33536564
+disabled=0565
+enable_on_exec=0566
+read_format=15567
+optional=1568
+569
+# PERF_TYPE_RAW / topdown-heavy-ops (0x8400)570
+[event16:base-stat]571
+fd=16572
+group_fd=11573
+type=4574
+config=33792575
+disabled=0576
+enable_on_exec=0577
+read_format=15578
+optional=1579
+580
+# PERF_TYPE_RAW / topdown-br-mispredict (0x8500)581
+[event17:base-stat]582
+fd=17583
+group_fd=11584
+type=4585
+config=34048586
+disabled=0587
+enable_on_exec=0588
+read_format=15589
+optional=1590
+591
+# PERF_TYPE_RAW / topdown-fetch-lat (0x8600)592
+[event18:base-stat]593
+fd=18594
+group_fd=11595
+type=4596
+config=34304597
+disabled=0598
+enable_on_exec=0599
+read_format=15600
+optional=1601
+602
+# PERF_TYPE_RAW / topdown-mem-bound (0x8700)603
+[event19:base-stat]604
+fd=19605
+group_fd=11606
+type=4607
+config=34560608
+disabled=0609
+enable_on_exec=0610
+read_format=15611
+optional=1612
+613
# PERF_TYPE_HW_CACHE /614
# PERF_COUNT_HW_CACHE_L1D << 0 |615
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |616
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)617
-[event11:base-stat]618
-fd=11619
+[event20:base-stat]620
+fd=20621
type=3622
config=0623
optional=1624
625
# PERF_COUNT_HW_CACHE_L1D << 0 |626
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |627
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)628
-[event12:base-stat]629
-fd=12630
+[event21:base-stat]631
+fd=21632
type=3633
config=65536634
optional=1635
636
# PERF_COUNT_HW_CACHE_LL << 0 |637
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |638
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)639
-[event13:base-stat]640
-fd=13641
+[event22:base-stat]642
+fd=22643
type=3644
config=2645
optional=1646
647
# PERF_COUNT_HW_CACHE_LL << 0 |648
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |649
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)650
-[event14:base-stat]651
-fd=14652
+[event23:base-stat]653
+fd=23654
type=3655
config=65538656
optional=1657
658
# PERF_COUNT_HW_CACHE_L1I << 0 |659
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |660
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)661
-[event15:base-stat]662
-fd=15663
+[event24:base-stat]664
+fd=24665
type=3666
config=1667
optional=1668
669
# PERF_COUNT_HW_CACHE_L1I << 0 |670
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |671
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)672
-[event16:base-stat]673
-fd=16674
+[event25:base-stat]675
+fd=25676
type=3677
config=65537678
optional=1679
680
# PERF_COUNT_HW_CACHE_DTLB << 0 |681
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |682
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)683
-[event17:base-stat]684
-fd=17685
+[event26:base-stat]686
+fd=26687
type=3688
config=3689
optional=1690
691
# PERF_COUNT_HW_CACHE_DTLB << 0 |692
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |693
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)694
-[event18:base-stat]695
-fd=18696
+[event27:base-stat]697
+fd=27698
type=3699
config=65539700
optional=1701
702
# PERF_COUNT_HW_CACHE_ITLB << 0 |703
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |704
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)705
-[event19:base-stat]706
-fd=19707
+[event28:base-stat]708
+fd=28709
type=3710
config=4711
optional=1712
713
# PERF_COUNT_HW_CACHE_ITLB << 0 |714
# (PERF_COUNT_HW_CACHE_OP_READ << 8) |715
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)716
-[event20:base-stat]717
-fd=20718
+[event29:base-stat]719
+fd=29720
type=3721
config=65540722
optional=1723
724
# PERF_COUNT_HW_CACHE_L1D << 0 |725
# (PERF_COUNT_HW_CACHE_OP_PREFETCH << 8) |726
# (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16)727
-[event21:base-stat]728
-fd=21729
+[event30:base-stat]730
+fd=30731
type=3732
config=512733
optional=1734
735
# PERF_COUNT_HW_CACHE_L1D << 0 |736
# (PERF_COUNT_HW_CACHE_OP_PREFETCH << 8) |737
# (PERF_COUNT_HW_CACHE_RESULT_MISS << 16)738
-[event22:base-stat]739
-fd=22740
+[event31:base-stat]741
+fd=31742
type=3743
config=66048744
optional=1745
746