Skip to content

Commit 9288ce5

Browse files
ritter-x2aritter-x2a
committed
Handle a merge conflict in the now renamed llvm/test/CodeGen/AMDGPU/mai-hazards-gfx940.mir
Incorporates changes from PRs #126132, #126727, #126732
1 parent 4cf681c commit 9288ce5

File tree

1 file changed

+40
-40
lines changed

1 file changed

+40
-40
lines changed

‎llvm/test/CodeGen/AMDGPU/mai-hazards-gfx942.mir

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ body: |
417417
# GCN-LABEL: name: xdl_sgemm16x16_mfma_write_agpr_mfma_srca_read_overlap
418418
# GCN: V_MFMA
419419
# GCN-NEXT: S_NOP 7
420-
# GFX940-NEXT: S_NOP 2
420+
# GFX942-NEXT: S_NOP 2
421421
# GFX950-NEXT: S_NOP 3
422422
# GCN-NEXT: V_MFMA
423423
name: xdl_sgemm16x16_mfma_write_agpr_mfma_srca_read_overlap
@@ -440,7 +440,7 @@ body: |
440440
# GCN-LABEL: name: smfmac32x32_write_agpr_mfma_srca_read_overlap
441441
# GCN: V_SMFMAC
442442
# GCN-NEXT: S_NOP 7
443-
# GFX940-NEXT: S_NOP 2
443+
# GFX942-NEXT: S_NOP 2
444444
# GFX950-NEXT: S_NOP 3
445445
# GCN-NEXT: V_MFMA
446446
name: smfmac32x32_write_agpr_mfma_srca_read_overlap
@@ -452,7 +452,7 @@ body: |
452452
# GCN-LABEL: name: smfmac32x32_write_agpr_smfmac_srcc_read_overlap
453453
# GCN: V_SMFMAC
454454
# GCN-NEXT: S_NOP 7
455-
# GFX940-NEXT: S_NOP 2
455+
# GFX942-NEXT: S_NOP 2
456456
# GFX950-NEXT: S_NOP 3
457457
# GCN-NEXT: V_SMFMAC
458458
name: smfmac32x32_write_agpr_smfmac_srcc_read_overlap
@@ -465,7 +465,7 @@ body: |
465465
# GCN: V_MFMA
466466
# GCN-NEXT: S_NOP 7
467467
# GCN-NEXT: S_NOP 7
468-
# GFX940-NEXT: S_NOP 2
468+
# GFX942-NEXT: S_NOP 2
469469
# GFX950-NEXT: S_NOP 3
470470
# GCN-NEXT: V_MFMA
471471
name: xdl_sgemm32x32_mfma_write_agpr_mfma_srca_read_overlap
@@ -734,7 +734,7 @@ body: |
734734
...
735735
# GCN-LABEL: name: smfmac16x16_write_vgpr_flat_read
736736
# GCN: V_SMFMAC
737-
# GFX940-NEXT: S_NOP 6
737+
# GFX942-NEXT: S_NOP 6
738738
# GFX950-NEXT: S_NOP 7
739739
# GCN-NEXT: FLAT_STORE_DWORD
740740
name: smfmac16x16_write_vgpr_flat_read
@@ -746,7 +746,7 @@ body: |
746746
# GCN-LABEL: name: xdl_smfma16x16_write_vgpr_flat_read
747747
# GCN: V_MFMA
748748
# GCN-NEXT: S_NOP 7
749-
# GFX940-NEXT: S_NOP 2
749+
# GFX942-NEXT: S_NOP 2
750750
# GFX950-NEXT: S_NOP 3
751751
# GCN-NEXT: FLAT_STORE_DWORD
752752
name: xdl_smfma16x16_write_vgpr_flat_read
@@ -758,7 +758,7 @@ body: |
758758
# GCN-LABEL: name: smfmac32x32_write_vgpr_flat_read
759759
# GCN: V_SMFMAC
760760
# GCN-NEXT: S_NOP 7
761-
# GFX940-NEXT: S_NOP 2
761+
# GFX942-NEXT: S_NOP 2
762762
# GFX950-NEXT: S_NOP 3
763763
# GCN-NEXT: FLAT_STORE_DWORD
764764
name: smfmac32x32_write_vgpr_flat_read
@@ -771,7 +771,7 @@ body: |
771771
# GCN: V_MFMA
772772
# GCN-NEXT: S_NOP 7
773773
# GCN-NEXT: S_NOP 7
774-
# GFX940-NEXT: S_NOP 2
774+
# GFX942-NEXT: S_NOP 2
775775
# GFX950-NEXT: S_NOP 3
776776
# GCN-NEXT: FLAT_STORE_DWORD
777777
name: xdl_smfma32x32_write_vgpr_flat_read
@@ -827,7 +827,7 @@ body: |
827827
# GCN-LABEL: name: xdl_smfma16x16_write_vgpr_valu_read
828828
# GCN: V_MFMA
829829
# GCN-NEXT: S_NOP 7
830-
# GFX940-NEXT: S_NOP 2
830+
# GFX942-NEXT: S_NOP 2
831831
# GFX950-NEXT: S_NOP 3
832832
# GCN-NEXT: V_MOV_B32
833833
name: xdl_smfma16x16_write_vgpr_valu_read
@@ -840,7 +840,7 @@ body: |
840840
# GCN: V_MFMA
841841
# GCN-NEXT: S_NOP 7
842842
# GCN-NEXT: S_NOP 7
843-
# GFX940-NEXT: S_NOP 2
843+
# GFX942-NEXT: S_NOP 2
844844
# GFX950-NEXT: S_NOP 3
845845
# GCN-NEXT: V_MOV_B32
846846
name: xdl_smfma32x32_write_vgpr_valu_read
@@ -887,7 +887,7 @@ body: |
887887
# GCN-LABEL: name: xdl_smfma16x16_write_vgpr_accv_read
888888
# GCN: V_MFMA
889889
# GCN-NEXT: S_NOP 7
890-
# GFX940-NEXT: S_NOP 2
890+
# GFX942-NEXT: S_NOP 2
891891
# GFX950-NEXT: S_NOP 3
892892
# GCN-NEXT: V_ACCVGPR_WRITE_B32_e64
893893
name: xdl_smfma16x16_write_vgpr_accv_read
@@ -900,7 +900,7 @@ body: |
900900
# GCN: V_MFMA
901901
# GCN-NEXT: S_NOP 7
902902
# GCN-NEXT: S_NOP 7
903-
# GFX940-NEXT: S_NOP 2
903+
# GFX942-NEXT: S_NOP 2
904904
# GFX950-NEXT: S_NOP 3
905905
# GCN-NEXT: V_ACCVGPR_WRITE_B32_e64
906906
name: xdl_smfma32x32_write_vgpr_accv_read
@@ -958,7 +958,7 @@ body: |
958958
# GCN-LABEL: name: xdl_smfma16x16_write_vgpr_valu_write
959959
# GCN: V_MFMA
960960
# GCN-NEXT: S_NOP 7
961-
# GFX940-NEXT: S_NOP 2
961+
# GFX942-NEXT: S_NOP 2
962962
# GFX950-NEXT: S_NOP 3
963963
# GCN-NEXT: V_MOV_B32
964964
name: xdl_smfma16x16_write_vgpr_valu_write
@@ -971,7 +971,7 @@ body: |
971971
# GCN: V_MFMA
972972
# GCN-NEXT: S_NOP 7
973973
# GCN-NEXT: S_NOP 7
974-
# GFX940-NEXT: S_NOP 2
974+
# GFX942-NEXT: S_NOP 2
975975
# GFX950-NEXT: S_NOP 3
976976
# GCN-NEXT: V_MOV_B32
977977
name: xdl_smfma32x32_write_vgpr_valu_write
@@ -993,7 +993,7 @@ body: |
993993
# GCN-LABEL: name: xdl_smfma16x16_write_vgpr_valu_f16_write
994994
# GCN: V_MFMA
995995
# GCN-NEXT: S_NOP 7
996-
# GFX940-NEXT: S_NOP 2
996+
# GFX942-NEXT: S_NOP 2
997997
# GFX950-NEXT: S_NOP 3
998998
# GCN-NEXT: V_FMA_F16_e64
999999
name: xdl_smfma16x16_write_vgpr_valu_f16_write
@@ -1006,7 +1006,7 @@ body: |
10061006
# GCN: V_MFMA
10071007
# GCN-NEXT: S_NOP 7
10081008
# GCN-NEXT: S_NOP 7
1009-
# GFX940-NEXT: S_NOP 2
1009+
# GFX942-NEXT: S_NOP 2
10101010
# GFX950-NEXT: S_NOP 3
10111011
# GCN-NEXT: V_FMA_F16_e64
10121012
name: xdl_smfma32x32_write_vgpr_valu_f16_write
@@ -1028,7 +1028,7 @@ body: |
10281028
# GCN-LABEL: name: xdl_smfma16x16_write_vgpr_valu_sdwa_write
10291029
# GCN: V_MFMA
10301030
# GCN-NEXT: S_NOP 7
1031-
# GFX940-NEXT: S_NOP 2
1031+
# GFX942-NEXT: S_NOP 2
10321032
# GFX950-NEXT: S_NOP 3
10331033
# GCN-NEXT: V_MOV_B32_sdwa
10341034
name: xdl_smfma16x16_write_vgpr_valu_sdwa_write
@@ -1041,7 +1041,7 @@ body: |
10411041
# GCN: V_MFMA
10421042
# GCN-NEXT: S_NOP 7
10431043
# GCN-NEXT: S_NOP 7
1044-
# GFX940-NEXT: S_NOP 2
1044+
# GFX942-NEXT: S_NOP 2
10451045
# GFX950-NEXT: S_NOP 3
10461046
# GCN-NEXT: V_MOV_B32_sdwa
10471047
name: xdl_smfma32x32_write_vgpr_valu_sdwa_write
@@ -1733,7 +1733,7 @@ body: |
17331733
...
17341734
# GCN-LABEL: name: xdl_sgemm16X16X16_mfma_write_agpr_mfma_srca_read_overlap
17351735
# GCN: V_MFMA
1736-
# GFX940-NEXT: S_NOP 6
1736+
# GFX942-NEXT: S_NOP 6
17371737
# GFX950-NEXT: S_NOP 7
17381738
# GCN-NEXT: V_MFMA
17391739
name: xdl_sgemm16X16X16_mfma_write_agpr_mfma_srca_read_overlap
@@ -1744,7 +1744,7 @@ body: |
17441744
...
17451745
# GCN-LABEL: name: xdl_sgemm16X16X32_mfma_write_agpr_mfma_srcb_read_overlap
17461746
# GCN: V_MFMA
1747-
# GFX940-NEXT: S_NOP 6
1747+
# GFX942-NEXT: S_NOP 6
17481748
# GFX950-NEXT: S_NOP 7
17491749
# GCN-NEXT: V_MFMA
17501750
name: xdl_sgemm16X16X32_mfma_write_agpr_mfma_srcb_read_overlap
@@ -1755,7 +1755,7 @@ body: |
17551755
...
17561756
# GCN-LABEL: name: xdl_sgemm16X16X16_mfma_write_vgpr_dmfma16x16_srca_read_overlap
17571757
# GCN: V_MFMA
1758-
# GFX940-NEXT: S_NOP 6
1758+
# GFX942-NEXT: S_NOP 6
17591759
# GFX950-NEXT: S_NOP 7
17601760
# GCN-NEXT: V_MFMA
17611761
name: xdl_sgemm16X16X16_mfma_write_vgpr_dmfma16x16_srca_read_overlap
@@ -1766,7 +1766,7 @@ body: |
17661766
...
17671767
# GCN-LABEL: name: xdl_sgemm16X16X16_mfma_write_vgpr_valu_write
17681768
# GCN: V_MFMA
1769-
# GFX940-NEXT: S_NOP 6
1769+
# GFX942-NEXT: S_NOP 6
17701770
# GFX950-NEXT: S_NOP 7
17711771
# GCN-NEXT: V_MOV_B32
17721772
name: xdl_sgemm16X16X16_mfma_write_vgpr_valu_write
@@ -1777,7 +1777,7 @@ body: |
17771777
...
17781778
# GCN-LABEL: name: xdl_sgemm16X16X16_mfma_write_vgpr_vm_read
17791779
# GCN: V_MFMA
1780-
# GFX940-NEXT: S_NOP 6
1780+
# GFX942-NEXT: S_NOP 6
17811781
# GFX950-NEXT: S_NOP 7
17821782
# GCN-NEXT: BUFFER_STORE_DWORD
17831783
name: xdl_sgemm16X16X16_mfma_write_vgpr_vm_read
@@ -1788,7 +1788,7 @@ body: |
17881788
...
17891789
# GCN-LABEL: name: xdl_sgemm16X16X16_mfma_write_vgpr_valu_read
17901790
# GCN: V_MFMA
1791-
# GFX940-NEXT: S_NOP 6
1791+
# GFX942-NEXT: S_NOP 6
17921792
# GFX950-NEXT: S_NOP 7
17931793
# GCN-NEXT: V_MOV_B32
17941794
name: xdl_sgemm16X16X16_mfma_write_vgpr_valu_read
@@ -1799,7 +1799,7 @@ body: |
17991799
...
18001800
# GCN-LABEL: name: xdl_sgemm16X16X16_mfma_write_vgpr_dot_read
18011801
# GCN: V_MFMA
1802-
# GFX940-NEXT: S_NOP 6
1802+
# GFX942-NEXT: S_NOP 6
18031803
# GFX950-NEXT: S_NOP 7
18041804
# GCN-NEXT: V_DOT
18051805
name: xdl_sgemm16X16X16_mfma_write_vgpr_dot_read
@@ -1851,7 +1851,7 @@ body: |
18511851
...
18521852
# GCN-LABEL: name: smfmac16x16x32_mfma_write_vgpr_smfmac_read_idx
18531853
# GCN: V_SMFMAC
1854-
# GFX940-NEXT: S_NOP 6
1854+
# GFX942-NEXT: S_NOP 6
18551855
# GFX950-NEXT: S_NOP 7
18561856
# GCN-NEXT: V_SMFMAC
18571857
name: smfmac16x16x32_mfma_write_vgpr_smfmac_read_idx
@@ -2078,7 +2078,7 @@ body: |
20782078
...
20792079
# GCN-LABEL: name: smfmac16x16_read_vgpr_srcc_valu_write
20802080
# GCN: V_SMFMAC
2081-
# GFX940-NEXT: S_NOP 6
2081+
# GFX942-NEXT: S_NOP 6
20822082
# GFX950-NEXT: S_NOP 7
20832083
# GCN-NEXT: V_MOV_B32
20842084
name: smfmac16x16_read_vgpr_srcc_valu_write
@@ -2109,7 +2109,7 @@ body: |
21092109
# GCN-LABEL: name: smfmac32x32_read_vgpr_srcc_valu_write
21102110
# GCN: V_SMFMAC
21112111
# GCN-NEXT: S_NOP 7
2112-
# GFX940-NEXT: S_NOP 2
2112+
# GFX942-NEXT: S_NOP 2
21132113
# GFX950-NEXT: S_NOP 3
21142114
# GCN-NEXT: V_MOV_B32
21152115
name: smfmac32x32_read_vgpr_srcc_valu_write
@@ -2216,7 +2216,7 @@ body: |
22162216
# 4 pass source
22172217
# GCN-LABEL: name: xdl_mfma_4pass_write_vgpr_xdl_mfma_read_overlap_srca
22182218
# GCN: V_MFMA
2219-
# GFX940-NEXT: S_NOP 6
2219+
# GFX942-NEXT: S_NOP 6
22202220
# GFX950-NEXT: S_NOP 7
22212221
# GCN-NEXT: V_MFMA
22222222
name: xdl_mfma_4pass_write_vgpr_xdl_mfma_read_overlap_srca
@@ -2231,7 +2231,7 @@ body: |
22312231
# 4 pass source
22322232
# GCN-LABEL: name: xdl_mfma_4pass_write_vgpr_xdl_mfma_read_overlap_srcb
22332233
# GCN: V_MFMA
2234-
# GFX940-NEXT: S_NOP 6
2234+
# GFX942-NEXT: S_NOP 6
22352235
# GFX950-NEXT: S_NOP 7
22362236
# GCN-NEXT: V_MFMA
22372237
name: xdl_mfma_4pass_write_vgpr_xdl_mfma_read_overlap_srcb
@@ -2306,7 +2306,7 @@ body: |
23062306
# 4 pass source
23072307
# GCN-LABEL: name: xdl_mfma_4pass_write_vgpr_sgemm_mfma_read_overlap_srca
23082308
# GCN: V_MFMA
2309-
# GFX940-NEXT: S_NOP 6
2309+
# GFX942-NEXT: S_NOP 6
23102310
# GFX950-NEXT: S_NOP 7
23112311
# GCN-NEXT: V_MFMA
23122312
name: xdl_mfma_4pass_write_vgpr_sgemm_mfma_read_overlap_srca
@@ -2321,7 +2321,7 @@ body: |
23212321
# 4 pass source
23222322
# GCN-LABEL: name: xdl_mfma_4pass_write_vgpr_sgemm_mfma_read_overlap_srcb
23232323
# GCN: V_MFMA
2324-
# GFX940-NEXT: S_NOP 6
2324+
# GFX942-NEXT: S_NOP 6
23252325
# GFX950-NEXT: S_NOP 7
23262326
# GCN-NEXT: V_MFMA
23272327
name: xdl_mfma_4pass_write_vgpr_sgemm_mfma_read_overlap_srcb
@@ -2353,7 +2353,7 @@ body: |
23532353
# GCN-LABEL: name: xdl_mfma_8pass_write_vgpr_nonxdl_sgemm_mfma_read_overlap_srca
23542354
# GCN: V_MFMA
23552355
# GCN-NEXT: S_NOP 7
2356-
# GFX940-NEXT: S_NOP 2
2356+
# GFX942-NEXT: S_NOP 2
23572357
# GFX950-NEXT: S_NOP 3
23582358
# GCN-NEXT: V_MFMA
23592359
name: xdl_mfma_8pass_write_vgpr_nonxdl_sgemm_mfma_read_overlap_srca
@@ -2369,7 +2369,7 @@ body: |
23692369
# GCN-LABEL: name: xdl_mfma_8pass_write_vgpr_nonxdl_sgemm_mfma_read_overlap_srcb
23702370
# GCN: V_MFMA
23712371
# GCN-NEXT: S_NOP 7
2372-
# GFX940-NEXT: S_NOP 2
2372+
# GFX942-NEXT: S_NOP 2
23732373
# GFX950-NEXT: S_NOP 3
23742374
# GCN-NEXT: V_MFMA
23752375
name: xdl_mfma_8pass_write_vgpr_nonxdl_sgemm_mfma_read_overlap_srcb
@@ -2404,7 +2404,7 @@ body: |
24042404
# GCN: V_MFMA
24052405
# GCN-NEXT: S_NOP 7
24062406
# GCN-NEXT: S_NOP 7
2407-
# GFX940-NEXT: S_NOP 2
2407+
# GFX942-NEXT: S_NOP 2
24082408
# GFX950-NEXT: S_NOP 3
24092409
# GCN-NEXT: V_MFMA
24102410
name: xdl_16pass_write_vgpr_nonxdl_sgemm_mfma_read_overlap_srca
@@ -2421,7 +2421,7 @@ body: |
24212421
# GCN: V_MFMA
24222422
# GCN-NEXT: S_NOP 7
24232423
# GCN-NEXT: S_NOP 7
2424-
# GFX940-NEXT: S_NOP 2
2424+
# GFX942-NEXT: S_NOP 2
24252425
# GFX950-NEXT: S_NOP 3
24262426
# GCN-NEXT: V_MFMA
24272427
name: xdl_16pass_write_vgpr_nonxdl_sgemm_mfma_read_overlap_srcb
@@ -2492,7 +2492,7 @@ body: |
24922492
# GCN-LABEL: name: xdl_mfma_8pass_write_vgpr_xdl_mfma_read_overlap_srca
24932493
# GCN: V_MFMA
24942494
# GCN-NEXT: S_NOP 7
2495-
# GFX940-NEXT: S_NOP 2
2495+
# GFX942-NEXT: S_NOP 2
24962496
# GFX950-NEXT: S_NOP 3
24972497
# GCN-NEXT: V_MFMA
24982498
name: xdl_mfma_8pass_write_vgpr_xdl_mfma_read_overlap_srca
@@ -2507,7 +2507,7 @@ body: |
25072507
# GCN-LABEL: name: xdl_mfma_8pass_write_vgpr_xdl_mfma_read_overlap_srcb
25082508
# GCN: V_MFMA
25092509
# GCN-NEXT: S_NOP 7
2510-
# GFX940-NEXT: S_NOP 2
2510+
# GFX942-NEXT: S_NOP 2
25112511
# GFX950-NEXT: S_NOP 3
25122512
# GCN-NEXT: V_MFMA
25132513
name: xdl_mfma_8pass_write_vgpr_xdl_mfma_read_overlap_srcb
@@ -2540,7 +2540,7 @@ body: |
25402540
# GCN: V_MFMA
25412541
# GCN-NEXT: S_NOP 7
25422542
# GCN-NEXT: S_NOP 7
2543-
# GFX940-NEXT: S_NOP 2
2543+
# GFX942-NEXT: S_NOP 2
25442544
# GFX950-NEXT: S_NOP 3
25452545
# GCN-NEXT: V_MFMA
25462546
name: xdl_16pass_write_vgpr_xdl_mfma_read_overlap_srca
@@ -2558,7 +2558,7 @@ body: |
25582558
# GCN: V_MFMA
25592559
# GCN-NEXT: S_NOP 7
25602560
# GCN-NEXT: S_NOP 7
2561-
# GFX940-NEXT: S_NOP 2
2561+
# GFX942-NEXT: S_NOP 2
25622562
# GFX950-NEXT: S_NOP 3
25632563
# GCN-NEXT: V_MFMA
25642564
name: xdl_16pass_write_vgpr_xdl_mfma_read_overlap_srcb

0 commit comments

Comments
 (0)