Attachment 99186 Details for Bug 75276 – VGPR Spill Work Around v2

[patch] VGPR Spill Work Around v2

0001-emit-Error-when-attempting-to-spill-or-load-a-spille.patch (text/plain), 4.33 KB, created by Tom Stellard on 2014-05-17 03:03:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2014-05-17 03:03:55 UTC

Size: 4.33 KB

patch

obsolete

>From 101f0db2a2e68044bf768cfa75491134079f037d Mon Sep 17 00:00:00 2001
>From: Darren <darren.powell@amd.com>
>Date: Mon, 28 Apr 2014 13:38:14 -0400
>Subject: [PATCH] emit Error when attempting to spill or load a spilled VGPR
>
>---
> lib/Target/R600/SIInstrInfo.cpp | 42 +++++++++++++++++++++++++++++------------
> 1 file changed, 30 insertions(+), 12 deletions(-)
>
>diff --git a/lib/Target/R600/SIInstrInfo.cpp b/lib/Target/R600/SIInstrInfo.cpp
>index 4a9e346..fcf2a04 100644
>--- a/lib/Target/R600/SIInstrInfo.cpp
>+++ b/lib/Target/R600/SIInstrInfo.cpp
>@@ -19,6 +19,7 @@
> #include "SIMachineFunctionInfo.h"
> #include "llvm/CodeGen/MachineInstrBuilder.h"
> #include "llvm/CodeGen/MachineRegisterInfo.h"
>+#include "llvm/IR/Function.h"
> #include "llvm/MC/MCInstrDesc.h"
> 
> using namespace llvm;
>@@ -187,18 +188,26 @@ void SIInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
>                                       int FrameIndex,
>                                       const TargetRegisterClass *RC,
>                                       const TargetRegisterInfo *TRI) const {
>-  SIMachineFunctionInfo *MFI = MBB.getParent()->getInfo<SIMachineFunctionInfo>();
>+  MachineFunction *MF = MBB.getParent();
>+  SIMachineFunctionInfo *MFI = MF->getInfo<SIMachineFunctionInfo>();
>+  MachineRegisterInfo &MRI = MF->getRegInfo();
>   DebugLoc DL = MBB.findDebugLoc(MI);
>   unsigned KillFlag = isKill ? RegState::Kill : 0;
>-  MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
> 
>-  if (TRI->getCommonSubClass(RC, &AMDGPU::SGPR_32RegClass)) {
>-    unsigned Lane = MFI->SpillTracker.reserveLanes(MRI, MBB.getParent());
>+  if (RI.hasVGPRs(RC)) {
>+    LLVMContext &Ctx = MF->getFunction()->getContext();
>+    //const char *name = RC->getName();
>+    Ctx.emitError("SIInstrInfo::storeRegToStackSlot - Can't spill VGPR!");
>+    insertNOPs(MI, 1);
>+
>+  } else if (TRI->getCommonSubClass(RC, &AMDGPU::SGPR_32RegClass)) {
>+    unsigned Lane = MFI->SpillTracker.reserveLanes(MRI, MF);
>+    unsigned TgtReg = MFI->SpillTracker.LaneVGPR;
> 
>-    BuildMI(MBB, MI, DL, get(AMDGPU::V_WRITELANE_B32), MFI->SpillTracker.LaneVGPR)
>+    BuildMI(MBB, MI, DL, get(AMDGPU::V_WRITELANE_B32), TgtReg)
>             .addReg(SrcReg, KillFlag)
>             .addImm(Lane);
>-    MFI->SpillTracker.addSpilledReg(FrameIndex, MFI->SpillTracker.LaneVGPR, Lane);
>+    MFI->SpillTracker.addSpilledReg(FrameIndex, TgtReg, Lane);
>   } else if (RI.isSGPRClass(RC)) {
>     // We are only allowed to create one new instruction when spilling
>     // registers, so we need to use pseudo instruction for vector
>@@ -207,8 +216,7 @@ void SIInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
>     // Reserve a spot in the spill tracker for each sub-register of
>     // the vector register.
>     unsigned NumSubRegs = RC->getSize() / 4;
>-    unsigned FirstLane = MFI->SpillTracker.reserveLanes(MRI, MBB.getParent(),
>-                                                        NumSubRegs);
>+    unsigned FirstLane = MFI->SpillTracker.reserveLanes(MRI, MF, NumSubRegs);
>     MFI->SpillTracker.addSpilledReg(FrameIndex, MFI->SpillTracker.LaneVGPR,
>                                     FirstLane);
> 
>@@ -234,11 +242,21 @@ void SIInstrInfo::loadRegFromStackSlot(MachineBasicBlock &MBB,
>                                        unsigned DestReg, int FrameIndex,
>                                        const TargetRegisterClass *RC,
>                                        const TargetRegisterInfo *TRI) const {
>-  SIMachineFunctionInfo *MFI = MBB.getParent()->getInfo<SIMachineFunctionInfo>();
>+  MachineFunction *MF = MBB.getParent();
>+  SIMachineFunctionInfo *MFI = MF->getInfo<SIMachineFunctionInfo>();
>+  MachineRegisterInfo &MRI = MF->getRegInfo();
>   DebugLoc DL = MBB.findDebugLoc(MI);
>-  if (TRI->getCommonSubClass(RC, &AMDGPU::SReg_32RegClass)) {
>-    SIMachineFunctionInfo::SpilledReg Spill =
>-        MFI->SpillTracker.getSpilledReg(FrameIndex);
>+
>+  if (RI.hasVGPRs(RC)) {
>+    LLVMContext &Ctx = MF->getFunction()->getContext();
>+    //const char *name = RC->getName();
>+    Ctx.emitError("SIInstrInfo::loadRegToStackSlot - Can't retrieve spilled VGPR!");
>+    insertNOPs(MI, 1);
>+
>+  } else if (TRI->getCommonSubClass(RC, &AMDGPU::SReg_32RegClass)) {
>+    SIMachineFunctionInfo::SpilledReg Spill;
>+    Spill = MFI->SpillTracker.getSpilledReg(FrameIndex);
>+
>     assert(Spill.VGPR);
>     BuildMI(MBB, MI, DL, get(AMDGPU::V_READLANE_B32), DestReg)
>             .addReg(Spill.VGPR)
>-- 
>1.8.1.5
>

Actions: View | Splinter Review

Attachments on bug 75276: 94675 | 98982 | 99169 | 99186 | 99187 | 99236 | 99254 | 103583 | 106527 | 106569 | 112178 | 112179

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.