Attachment 97539 Details for Bug 73320 – Work around v2

[patch] Work around v2

0001-emit-Error-when-attempting-to-spill-a-VGPR-to-memory.patch (text/plain), 2.89 KB, created by Tom Stellard on 2014-04-17 21:47:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2014-04-17 21:47:22 UTC

Size: 2.89 KB

patch

obsolete

>From c6c3b963c490e92d25da92004844761e2cd36f73 Mon Sep 17 00:00:00 2001
>From: Darren <darren.powell@amd.com>
>Date: Wed, 16 Apr 2014 18:51:03 -0400
>Subject: [PATCH] emit Error when attempting to spill a VGPR to memory
>
>---
> lib/Target/R600/SIInstrInfo.cpp | 31 +++++++++++++++++++++----------
> 1 file changed, 21 insertions(+), 10 deletions(-)
>
>diff --git a/lib/Target/R600/SIInstrInfo.cpp b/lib/Target/R600/SIInstrInfo.cpp
>index d6f5517..d843928 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,25 +188,35 @@ void SIInstrInfo::storeRegToStackSlot(MachineBasicBlock &MBB,
>                                       int FrameIndex,
>                                       const TargetRegisterClass *RC,
>                                       const TargetRegisterInfo *TRI) const {
>-  MachineRegisterInfo &MRI = MBB.getParent()->getRegInfo();
>-  SIMachineFunctionInfo *MFI = MBB.getParent()->getInfo<SIMachineFunctionInfo>();
>+  MachineFunction *MF = MBB.getParent();
>+  MachineRegisterInfo &MRI = MF->getRegInfo();
>+  SIMachineFunctionInfo *MFI = MF->getInfo<SIMachineFunctionInfo>();
>   DebugLoc DL = MBB.findDebugLoc(MI);
>   unsigned KillFlag = isKill ? RegState::Kill : 0;
> 
>-  if (TRI->getCommonSubClass(RC, &AMDGPU::SGPR_32RegClass)) {
>+  if (RI.hasVGPRs(RC))
>+  {
>+    LLVMContext &Ctx = MF->getFunction()->getContext();
>+    const char *name = RC->getName();
>+    Ctx.emitError("SIInstrInfo::storeRegToStackSlot - Can't spill VGPR!");
>+
>+  } else if (TRI->getCommonSubClass(RC, &AMDGPU::SGPR_32RegClass)) {
>     unsigned Lane = MFI->SpillTracker.getNextLane(MRI);
>-    BuildMI(MBB, MI, DL, get(AMDGPU::V_WRITELANE_B32),
>-            MFI->SpillTracker.LaneVGPR)
>+    unsigned TgtReg = 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 {
>     for (unsigned i = 0, e = RC->getSize() / 4; i != e; ++i) {
>-      unsigned SubReg = MRI.createVirtualRegister(&AMDGPU::SReg_32RegClass);
>-      BuildMI(MBB, MI, MBB.findDebugLoc(MI), get(AMDGPU::COPY), SubReg)
>+      unsigned TgtReg = MRI.createVirtualRegister(&AMDGPU::SReg_32RegClass);
>+
>+      BuildMI(MBB, MI, DL, get(AMDGPU::COPY), TgtReg)
>               .addReg(SrcReg, 0, RI.getSubRegFromChannel(i));
>-      storeRegToStackSlot(MBB, MI, SubReg, isKill, FrameIndex + i,
>+
>+      storeRegToStackSlot(MBB, MI, TgtReg, isKill, FrameIndex + i,
>                           &AMDGPU::SReg_32RegClass, TRI);
>     }
>   }
>-- 
>1.8.1.4
>

Actions: View | Splinter Review

Attachments on bug 73320: 97521 | 97522 | 97539

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.