[AIE2P] fix fifo spill ordering

Xilinx · Feb 13, 2025 · fb8933c · fb8933c
1 parent 5a06035
commit fb8933c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/llvm/lib/Target/AIE/aie2p/AIE2PInstrInfo.cpp b/llvm/lib/Target/AIE/aie2p/AIE2PInstrInfo.cpp
@@ -1020,8 +1020,8 @@ AIE2PInstrInfo::getSpillPseudoExpandInfo(const MachineInstr &MI) const {
             {AIE2P::VST_dmx_sts_fifohl_spill, AIE2P::sub_hi_fifo}};
   case AIE2P::VST_PLFR_SPILL:
     return {{AIE2P::VST_FIFO_SPILL, AIE2P::sub_fifo},
-            {AIE2P::ST_dms_sts_spill, AIE2P::sub_ptr},
-            {AIE2P::ST_dms_sts_spill, AIE2P::sub_avail}};
+            {AIE2P::ST_dms_sts_spill, AIE2P::sub_avail},
+            {AIE2P::ST_dms_sts_spill, AIE2P::sub_ptr}};
 
   case AIE2P::VST_DM_SPILL:
     return {{AIE2P::VST_CM_SPILL, AIE2P::sub_1024_acc_lo},

diff --git a/llvm/test/CodeGen/AIE/aie2p/eliminate-frame-index.mir b/llvm/test/CodeGen/AIE/aie2p/eliminate-frame-index.mir
@@ -280,8 +280,8 @@ body:             |
     ; CHECK-NEXT: $p0 = LDA_dms_lda_spill -60, implicit $sp
     ; CHECK-NEXT: VST_dmx_sts_fifohl_spill $lfl0, -192, implicit $sp
     ; CHECK-NEXT: VST_dmx_sts_fifohl_spill $lfh0, -128, implicit $sp
-    ; CHECK-NEXT: ST_dms_sts_spill $p0, -64, implicit $sp
-    ; CHECK-NEXT: ST_dms_sts_spill $r24, -60, implicit $sp
+    ; CHECK-NEXT: ST_dms_sts_spill $r24, -64, implicit $sp
+    ; CHECK-NEXT: ST_dms_sts_spill $p0, -60, implicit $sp
     $plfr0 = VLDA_PLFR_SPILL %stack.0, implicit $sp
     VST_PLFR_SPILL $plfr0, %stack.0, implicit $sp
 ...
@@ -480,9 +480,9 @@ body:             |
     ; CHECK-NEXT: $dj0 = MOVXM -2176
     ; CHECK-NEXT: VST_dmx_sts_fifohl_idx $lfh0, $p1, killed $dj0
     ; CHECK-NEXT: $dj0 = MOVXM -2112
-    ; CHECK-NEXT: ST_dms_sts_idx $p0, $p1, killed $dj0
+    ; CHECK-NEXT: ST_dms_sts_idx $r24, $p1, killed $dj0
     ; CHECK-NEXT: $dj0 = MOVXM -2108
-    ; CHECK-NEXT: ST_dms_sts_idx $r24, killed $p1, killed $dj0
+    ; CHECK-NEXT: ST_dms_sts_idx $p0, killed $p1, killed $dj0
     renamable $p0 = PseudoFI %stack.0, implicit $sp
     ADJCALLSTACKUP 0, 0, implicit-def $sp, implicit $sp
     $plfr0 = VLDA_PLFR_SPILL %stack.0, implicit $sp