Author: hev
Date: 2026-11-08T15:42:22+01:00
New Revision: c47d7823685a0e7048795e0cd2d58ad35e454ee9

URL: 
https://github.com/llvm/llvm-project/commit/c47d7823685a0e7048795e0cd2d58ad35e454ee9
DIFF: 
https://github.com/llvm/llvm-project/commit/c47d7823685a0e7048795e0cd2d58ad35e454ee9.diff

LOG: [LoongArch] Fix misaligned frame-index offset for vldrepl.{h,w,d} (#239516)

eliminateFrameIndex did not check that the final offset is a multiple of
the access size for [X]VLDREPL_{H,W,D}, so a byte-aligned stack object
could produce an unencodable immediate. Materialize the address in a
scratch register in that case, as is already done for [X]VSTELM_*.

Assisted-by: LLM

Fixes #239508

(cherry picked from commit 3ade2bcaa2f31acdf4011e965d5ae39c39796671)

Added: 
    

Modified: 
    llvm/lib/Target/LoongArch/LoongArchRegisterInfo.cpp
    llvm/test/CodeGen/LoongArch/lasx/xvldrepl-frame-index.ll
    llvm/test/CodeGen/LoongArch/lsx/vldrepl-frame-index.ll

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/LoongArch/LoongArchRegisterInfo.cpp 
b/llvm/lib/Target/LoongArch/LoongArchRegisterInfo.cpp
index 0161979618412c..8f225ce5d6aaed 100644
--- a/llvm/lib/Target/LoongArch/LoongArchRegisterInfo.cpp
+++ b/llvm/lib/Target/LoongArch/LoongArchRegisterInfo.cpp
@@ -154,6 +154,18 @@ bool 
LoongArchRegisterInfo::eliminateFrameIndex(MachineBasicBlock::iterator II,
 
   // Handle offsets that exceed the immediate range of the instruction.
   switch (MIOpc) {
+  case LoongArch::VLDREPL_H:
+  case LoongArch::XVLDREPL_H:
+    OffsetLegal = isShiftedInt<11, 1>(FixedOffset);
+    break;
+  case LoongArch::VLDREPL_W:
+  case LoongArch::XVLDREPL_W:
+    OffsetLegal = isShiftedInt<10, 2>(FixedOffset);
+    break;
+  case LoongArch::VLDREPL_D:
+  case LoongArch::XVLDREPL_D:
+    OffsetLegal = isShiftedInt<9, 3>(FixedOffset);
+    break;
   case LoongArch::VSTELM_B:
   case LoongArch::XVSTELM_B:
     OffsetLegal = isInt<8>(FixedOffset);

diff  --git a/llvm/test/CodeGen/LoongArch/lasx/xvldrepl-frame-index.ll 
b/llvm/test/CodeGen/LoongArch/lasx/xvldrepl-frame-index.ll
index c8bbb89d8cb5be..efbc7a495708bd 100644
--- a/llvm/test/CodeGen/LoongArch/lasx/xvldrepl-frame-index.ll
+++ b/llvm/test/CodeGen/LoongArch/lasx/xvldrepl-frame-index.ll
@@ -13,7 +13,8 @@ define <16 x i16> @repl_h() noinline nounwind 
"frame-pointer"="all" {
 ; CHECK-NEXT:    addi.d $a0, $fp, -89
 ; CHECK-NEXT:    pcaddu18i $ra, %call36(use)
 ; CHECK-NEXT:    jirl $ra, $ra, 0
-; CHECK-NEXT:    xvldrepl.h $xr0, $fp, -73
+; CHECK-NEXT:    addi.d $a0, $fp, -73
+; CHECK-NEXT:    xvldrepl.h $xr0, $a0, 0
 ; CHECK-NEXT:    ld.d $fp, $sp, 80 # 8-byte Folded Reload
 ; CHECK-NEXT:    ld.d $ra, $sp, 88 # 8-byte Folded Reload
 ; CHECK-NEXT:    addi.d $sp, $sp, 96
@@ -37,7 +38,8 @@ define <8 x i32> @repl_w() noinline nounwind 
"frame-pointer"="all" {
 ; CHECK-NEXT:    addi.d $a0, $fp, -90
 ; CHECK-NEXT:    pcaddu18i $ra, %call36(use)
 ; CHECK-NEXT:    jirl $ra, $ra, 0
-; CHECK-NEXT:    xvldrepl.w $xr0, $fp, -74
+; CHECK-NEXT:    addi.d $a0, $fp, -74
+; CHECK-NEXT:    xvldrepl.w $xr0, $a0, 0
 ; CHECK-NEXT:    ld.d $fp, $sp, 80 # 8-byte Folded Reload
 ; CHECK-NEXT:    ld.d $ra, $sp, 88 # 8-byte Folded Reload
 ; CHECK-NEXT:    addi.d $sp, $sp, 96
@@ -61,7 +63,8 @@ define <4 x i64> @repl_d() noinline nounwind 
"frame-pointer"="all" {
 ; CHECK-NEXT:    addi.d $a0, $fp, -91
 ; CHECK-NEXT:    pcaddu18i $ra, %call36(use)
 ; CHECK-NEXT:    jirl $ra, $ra, 0
-; CHECK-NEXT:    xvldrepl.d $xr0, $fp, -75
+; CHECK-NEXT:    addi.d $a0, $fp, -75
+; CHECK-NEXT:    xvldrepl.d $xr0, $a0, 0
 ; CHECK-NEXT:    ld.d $fp, $sp, 80 # 8-byte Folded Reload
 ; CHECK-NEXT:    ld.d $ra, $sp, 88 # 8-byte Folded Reload
 ; CHECK-NEXT:    addi.d $sp, $sp, 96

diff  --git a/llvm/test/CodeGen/LoongArch/lsx/vldrepl-frame-index.ll 
b/llvm/test/CodeGen/LoongArch/lsx/vldrepl-frame-index.ll
index cc49fb96550be6..d4aecb0ffc95d0 100644
--- a/llvm/test/CodeGen/LoongArch/lsx/vldrepl-frame-index.ll
+++ b/llvm/test/CodeGen/LoongArch/lsx/vldrepl-frame-index.ll
@@ -13,7 +13,8 @@ define <8 x i16> @repl_h() noinline nounwind 
"frame-pointer"="all" {
 ; CHECK-NEXT:    addi.d $a0, $fp, -89
 ; CHECK-NEXT:    pcaddu18i $ra, %call36(use)
 ; CHECK-NEXT:    jirl $ra, $ra, 0
-; CHECK-NEXT:    vldrepl.h $vr0, $fp, -73
+; CHECK-NEXT:    addi.d $a0, $fp, -73
+; CHECK-NEXT:    vldrepl.h $vr0, $a0, 0
 ; CHECK-NEXT:    ld.d $fp, $sp, 80 # 8-byte Folded Reload
 ; CHECK-NEXT:    ld.d $ra, $sp, 88 # 8-byte Folded Reload
 ; CHECK-NEXT:    addi.d $sp, $sp, 96
@@ -37,7 +38,8 @@ define <4 x i32> @repl_w() noinline nounwind 
"frame-pointer"="all" {
 ; CHECK-NEXT:    addi.d $a0, $fp, -90
 ; CHECK-NEXT:    pcaddu18i $ra, %call36(use)
 ; CHECK-NEXT:    jirl $ra, $ra, 0
-; CHECK-NEXT:    vldrepl.w $vr0, $fp, -74
+; CHECK-NEXT:    addi.d $a0, $fp, -74
+; CHECK-NEXT:    vldrepl.w $vr0, $a0, 0
 ; CHECK-NEXT:    ld.d $fp, $sp, 80 # 8-byte Folded Reload
 ; CHECK-NEXT:    ld.d $ra, $sp, 88 # 8-byte Folded Reload
 ; CHECK-NEXT:    addi.d $sp, $sp, 96
@@ -61,7 +63,8 @@ define <2 x i64> @repl_d() noinline nounwind 
"frame-pointer"="all" {
 ; CHECK-NEXT:    addi.d $a0, $fp, -91
 ; CHECK-NEXT:    pcaddu18i $ra, %call36(use)
 ; CHECK-NEXT:    jirl $ra, $ra, 0
-; CHECK-NEXT:    vldrepl.d $vr0, $fp, -75
+; CHECK-NEXT:    addi.d $a0, $fp, -75
+; CHECK-NEXT:    vldrepl.d $vr0, $a0, 0
 ; CHECK-NEXT:    ld.d $fp, $sp, 80 # 8-byte Folded Reload
 ; CHECK-NEXT:    ld.d $ra, $sp, 88 # 8-byte Folded Reload
 ; CHECK-NEXT:    addi.d $sp, $sp, 96


        
_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

Reply via email to