[SVE] Fix incorrect offset calculation when rewriting an instruction's frame index.

paulwalker-arm · paulwalker-arm · commit 8b58ad20a0f3 · 2023-10-27T13:22:13.000Z
diff --git a/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp b/llvm/lib/Target/AArch64/AArch64InstrInfo.cpp
@@ -5657,7 +5657,7 @@ int llvm::isAArch64FrameOffsetLegal(const MachineInstr &MI,
     Offset = Remainder;
   else {
     NewOffset = NewOffset < 0 ? MinOff : MaxOff;
-    Offset = Offset - NewOffset * Scale + Remainder;
+    Offset = Offset - NewOffset * Scale;
   }
 
   if (EmittableOffset)
diff --git a/llvm/test/CodeGen/AArch64/framelayout-sve.mir b/llvm/test/CodeGen/AArch64/framelayout-sve.mir
@@ -1295,7 +1295,7 @@ body:             |
 # CHECK:         - { id: 1, name: '', type: variable-sized, offset: -32, alignment: 1,
 # CHECK-NEXT:        stack-id: default
 
-# CHECK:      $x8 = ADDPL_XXI $fp, -20
+# CHECK:      $x8 = ADDPL_XXI $fp, -14
 # CHECK-NEXT: $z0 = LD1W_IMM killed renamable $p0, killed $x8, -8
 
 name:            fp_relative_that_is_not_a_multiple_of_VLx16

Original file line number	Diff line number	Diff line change
`@@ -5657,7 +5657,7 @@ int llvm::isAArch64FrameOffsetLegal(const MachineInstr &MI,`
`5657`	`5657`	`Offset = Remainder;`
`5658`	`5658`	`else {`
`5659`	`5659`	`NewOffset = NewOffset < 0 ? MinOff : MaxOff;`
`5660`		`- Offset = Offset - NewOffset * Scale + Remainder;`
	`5660`	`+ Offset = Offset - NewOffset * Scale;`
`5661`	`5661`	`}`
`5662`	`5662`
`5663`	`5663`	`if (EmittableOffset)`