Skip to content

Commit 92d5c1b

Browse files
Kai Luotstellar
authored andcommitted
[PowerPC] Update alignment for ReuseLoadInfo in LowerFP_TO_INTForReuse
In LowerFP_TO_INTForReuse, when emitting `stfiwx`, alignment of 4 is set for the `MachineMemOperand`, but RLI(ReuseLoadInfo)'s alignment is not updated for following loads. It's related to failed alignment check reported in https://bugs.llvm.org/show_bug.cgi?id=45297 Differential Revision: https://reviews.llvm.org/D77624 Backport b7d5229.
1 parent 6196695 commit 92d5c1b

File tree

2 files changed

+49
-2
lines changed

2 files changed

+49
-2
lines changed

llvm/lib/Target/PowerPC/PPCISelLowering.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7720,15 +7720,17 @@ void PPCTargetLowering::LowerFP_TO_INTForReuse(SDValue Op, ReuseLoadInfo &RLI,
77207720

77217721
// Emit a store to the stack slot.
77227722
SDValue Chain;
7723+
unsigned Alignment = DAG.getEVTAlignment(Tmp.getValueType());
77237724
if (i32Stack) {
77247725
MachineFunction &MF = DAG.getMachineFunction();
7726+
Alignment = 4;
77257727
MachineMemOperand *MMO =
7726-
MF.getMachineMemOperand(MPI, MachineMemOperand::MOStore, 4, 4);
7728+
MF.getMachineMemOperand(MPI, MachineMemOperand::MOStore, 4, Alignment);
77277729
SDValue Ops[] = { DAG.getEntryNode(), Tmp, FIPtr };
77287730
Chain = DAG.getMemIntrinsicNode(PPCISD::STFIWX, dl,
77297731
DAG.getVTList(MVT::Other), Ops, MVT::i32, MMO);
77307732
} else
7731-
Chain = DAG.getStore(DAG.getEntryNode(), dl, Tmp, FIPtr, MPI);
7733+
Chain = DAG.getStore(DAG.getEntryNode(), dl, Tmp, FIPtr, MPI, Alignment);
77327734

77337735
// Result is a load from the stack slot. If loading 4 bytes, make sure to
77347736
// add in a bias on big endian.
@@ -7741,6 +7743,7 @@ void PPCTargetLowering::LowerFP_TO_INTForReuse(SDValue Op, ReuseLoadInfo &RLI,
77417743
RLI.Chain = Chain;
77427744
RLI.Ptr = FIPtr;
77437745
RLI.MPI = MPI;
7746+
RLI.Alignment = Alignment;
77447747
}
77457748

77467749
/// Custom lowers floating point to integer conversions to use
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
; RUN: llc -simplify-mir -verify-machineinstrs -stop-after=finalize-isel \
2+
; RUN: -mtriple=powerpc64le-unknown-unknown -mattr=-vsx < %s | FileCheck %s
3+
; RUN: llc -simplify-mir -verify-machineinstrs -stop-after=finalize-isel \
4+
; RUN: -mtriple=powerpc-unknown-unknown -mcpu=pwr6 -mattr=-vsx < %s | \
5+
; RUN: FileCheck --check-prefix=CHECK-P6 %s
6+
; RUN: llc -simplify-mir -verify-machineinstrs -stop-after=finalize-isel \
7+
; RUN: -mtriple=powerpc64-unknown-unknown -mcpu=pwr6 -mattr=-vsx < %s | \
8+
; RUN: FileCheck --check-prefix=CHECK-P6-64 %s
9+
10+
define float @test(float %a) {
11+
; CHECK: stack:
12+
; CHECK-NEXT: - { id: 0, size: 4, alignment: 4 }
13+
; CHECK: %2:f8rc = FCTIWZ killed %1, implicit $rm
14+
; CHECK: STFIWX killed %2, $zero8, %3
15+
; CHECK-NEXT: %4:f8rc = LFIWAX $zero8, %3 :: (load 4 from %stack.0)
16+
; CHECK-NEXT: %5:f4rc = FCFIDS killed %4, implicit $rm
17+
; CHECK-NEXT: $f1 = COPY %5
18+
; CHECK-NEXT: BLR8 implicit $lr8, implicit $rm, implicit $f1
19+
20+
; CHECK-P6: stack:
21+
; CHECK-P6-NEXT: - { id: 0, size: 4, alignment: 4 }
22+
; CHECK-P6: %2:f8rc = FCTIWZ killed %1, implicit $rm
23+
; CHECK-P6: STFIWX killed %2, $zero, %3
24+
; CHECK-P6-NEXT: %4:f8rc = LFIWAX $zero, %3 :: (load 4 from %stack.0)
25+
; CHECK-P6-NEXT: %5:f8rc = FCFID killed %4, implicit $rm
26+
; CHECK-P6-NEXT: %6:f4rc = FRSP killed %5, implicit $rm
27+
; CHECK-P6-NEXT: $f1 = COPY %6
28+
; CHECK-P6-NEXT: BLR implicit $lr, implicit $rm, implicit $f1
29+
30+
; CHECK-P6-64: stack:
31+
; CHECK-P6-64-NEXT: - { id: 0, size: 4, alignment: 4 }
32+
; CHECK-P6-64: %2:f8rc = FCTIWZ killed %1, implicit $rm
33+
; CHECK-P6-64: STFIWX killed %2, $zero8, %3
34+
; CHECK-P6-64-NEXT: %4:f8rc = LFIWAX $zero8, %3 :: (load 4 from %stack.0)
35+
; CHECK-P6-64-NEXT: %5:f8rc = FCFID killed %4, implicit $rm
36+
; CHECK-P6-64-NEXT: %6:f4rc = FRSP killed %5, implicit $rm
37+
; CHECK-P6-64-NEXT: $f1 = COPY %6
38+
; CHECK-P6-64-NEXT: BLR8 implicit $lr8, implicit $rm, implicit $f1
39+
40+
entry:
41+
%b = fptosi float %a to i32
42+
%c = sitofp i32 %b to float
43+
ret float %c
44+
}

0 commit comments

Comments
 (0)