[llvm] 207cd5f - [AMDGPU] Add the SGPR used for FP copy to block livein lists.
Christudasan Devadasan via llvm-commits
llvm-commits at lists.llvm.org
Thu Apr 23 23:35:45 PDT 2020
Author: Christudasan Devadasan
Date: 2020-04-24T11:47:38+05:30
New Revision: 207cd5f68fabbf760c7e66dc6c49e833f3f6f953
URL: https://github.com/llvm/llvm-project/commit/207cd5f68fabbf760c7e66dc6c49e833f3f6f953
DIFF: https://github.com/llvm/llvm-project/commit/207cd5f68fabbf760c7e66dc6c49e833f3f6f953.diff
LOG: [AMDGPU] Add the SGPR used for FP copy to block livein lists.
The temporary register used for FP copy
should be live throughout the function.
Added:
llvm/test/CodeGen/AMDGPU/fix-frame-ptr-reg-copy-livein.ll
Modified:
llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
index c04eaa89de34..c0edd0e09c74 100644
--- a/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
+++ b/llvm/lib/Target/AMDGPU/SIFrameLowering.cpp
@@ -614,6 +614,9 @@ void SIFrameLowering::emitPrologue(MachineFunction &MF,
BuildMI(MBB, MBBI, DL, TII->get(AMDGPU::COPY), FuncInfo->SGPRForFPSaveRestoreCopy)
.addReg(FramePtrReg)
.setMIFlag(MachineInstr::FrameSetup);
+ // Make the register live throughout the function.
+ for (MachineBasicBlock &MBB : MF)
+ MBB.addLiveIn(FuncInfo->SGPRForFPSaveRestoreCopy);
}
for (const SIMachineFunctionInfo::SGPRSpillVGPRCSR &Reg
diff --git a/llvm/test/CodeGen/AMDGPU/fix-frame-ptr-reg-copy-livein.ll b/llvm/test/CodeGen/AMDGPU/fix-frame-ptr-reg-copy-livein.ll
new file mode 100644
index 000000000000..0f5ad75da555
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/fix-frame-ptr-reg-copy-livein.ll
@@ -0,0 +1,45 @@
+; RUN: llc -march=amdgcn -mcpu=gfx900 -stop-after=prologepilog -verify-machineinstrs < %s | FileCheck -check-prefix=GCN %s
+
+; It is a small loop test that iterates over the array member of the structure argument passed byval to the function.
+; The loop code will keep the prologue and epilogue blocks apart.
+; The test is primarily to check the temp register used to preserve the earlier FP value
+; is live-in at every BB in the function.
+
+%struct.Data = type { [20 x i32] }
+
+define i32 @fp_save_restore_in_temp_sgpr(%struct.Data addrspace(5)* nocapture readonly byval(%struct.Data) align 4 %arg) #0 {
+ ; GCN-LABEL: name: fp_save_restore_in_temp_sgpr
+ ; GCN: bb.0.begin:
+ ; GCN: liveins: $sgpr30_sgpr31, $sgpr7
+ ; GCN: $sgpr7 = frame-setup COPY $sgpr33
+ ; GCN: $sgpr33 = frame-setup COPY $sgpr32
+ ; GCN: bb.1.lp_end:
+ ; GCN: liveins: $sgpr6, $vgpr1, $sgpr4_sgpr5, $sgpr8_sgpr9, $sgpr10_sgpr11, $sgpr30_sgpr31, $sgpr7
+ ; GCN: bb.2.lp_begin:
+ ; GCN: liveins: $sgpr6, $vgpr1, $sgpr4_sgpr5, $sgpr8_sgpr9, $sgpr30_sgpr31, $sgpr7
+ ; GCN: bb.3.Flow:
+ ; GCN: liveins: $sgpr6, $vgpr0, $vgpr1, $sgpr4_sgpr5, $sgpr8_sgpr9, $sgpr10_sgpr11, $sgpr30_sgpr31, $sgpr7
+ ; GCN: bb.4.end:
+ ; GCN: liveins: $vgpr0, $sgpr4_sgpr5, $sgpr30_sgpr31, $sgpr7
+ ; GCN: $sgpr33 = frame-setup COPY $sgpr7
+begin:
+ br label %lp_begin
+
+lp_end: ; preds = %lp_begin
+ %cur_idx = add nuw nsw i32 %idx, 1
+ %lp_term_cond = icmp eq i32 %cur_idx, 20
+ br i1 %lp_term_cond, label %end, label %lp_begin
+
+lp_begin: ; preds = %lp_end, %begin
+ %idx = phi i32 [ 0, %begin ], [ %cur_idx, %lp_end ]
+ %ptr = getelementptr inbounds %struct.Data, %struct.Data addrspace(5)* %arg, i32 0, i32 0, i32 %idx
+ %data = load i32, i32 addrspace(5)* %ptr, align 4
+ %data_cmp = icmp eq i32 %data, %idx
+ br i1 %data_cmp, label %lp_end, label %end
+
+end: ; preds = %lp_end, %lp_begin
+ %ret_val = phi i32 [ 0, %lp_begin ], [ 1, %lp_end ]
+ ret i32 %ret_val
+}
+
+attributes #0 = { norecurse nounwind "frame-pointer"="all" }
More information about the llvm-commits
mailing list