Attachment 79304 Details for Bug 64193 – Possible Fix - Patch 1

[patch] Possible Fix - Patch 1

0001-R600-Pass-MCSubtargetInfo-referebce-to-R600CodeEmitt.patch (text/plain), 3.15 KB, created by Tom Stellard on 2013-05-14 15:05:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2013-05-14 15:05:09 UTC

Size: 3.15 KB

patch

obsolete

>From 78bbebf4d42ef2855a24fc46a8981abe44269ca1 Mon Sep 17 00:00:00 2001
>From: Tom Stellard <thomas.stellard@amd.com>
>Date: Tue, 14 May 2013 08:02:03 -0700
>Subject: [PATCH 1/2] R600: Pass MCSubtargetInfo referebce to R600CodeEmitter
>
>---
> lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp |  2 +-
> lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h   |  3 ++-
> lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp  | 11 +++++++----
> 3 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
>index 6f66aa8..61d70bb 100644
>--- a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
>+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
>@@ -78,7 +78,7 @@ static MCCodeEmitter *createAMDGPUMCCodeEmitter(const MCInstrInfo &MCII,
>   if (STI.getFeatureBits() & AMDGPU::Feature64BitPtr) {
>     return createSIMCCodeEmitter(MCII, MRI, STI, Ctx);
>   } else {
>-    return createR600MCCodeEmitter(MCII, MRI);
>+    return createR600MCCodeEmitter(MCII, MRI, STI);
>   }
> }
> 
>diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
>index 95c572c..abb0320 100644
>--- a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
>+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
>@@ -32,7 +32,8 @@ class raw_ostream;
> extern Target TheAMDGPUTarget;
> 
> MCCodeEmitter *createR600MCCodeEmitter(const MCInstrInfo &MCII,
>-                                       const MCRegisterInfo &MRI);
>+                                       const MCRegisterInfo &MRI,
>+                                       const MCSubtargetInfo &STI);
> 
> MCCodeEmitter *createSIMCCodeEmitter(const MCInstrInfo &MCII,
>                                      const MCRegisterInfo &MRI,
>diff --git a/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp b/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
>index 3404844..c5bd01a 100644
>--- a/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
>+++ b/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
>@@ -35,11 +35,13 @@ class R600MCCodeEmitter : public AMDGPUMCCodeEmitter {
>   void operator=(const R600MCCodeEmitter &) LLVM_DELETED_FUNCTION;
>   const MCInstrInfo &MCII;
>   const MCRegisterInfo &MRI;
>+  const MCSubtargetInfo &STI;
> 
> public:
> 
>-  R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri)
>-    : MCII(mcii), MRI(mri) { }
>+  R600MCCodeEmitter(const MCInstrInfo &mcii, const MCRegisterInfo &mri,
>+                    const MCSubtargetInfo &sti)
>+    : MCII(mcii), MRI(mri), STI(sti) { }
> 
>   /// \brief Encode the instruction and write it to the OS.
>   virtual void EncodeInstruction(const MCInst &MI, raw_ostream &OS,
>@@ -95,8 +97,9 @@ enum TextureTypes {
> };
> 
> MCCodeEmitter *llvm::createR600MCCodeEmitter(const MCInstrInfo &MCII,
>-                                           const MCRegisterInfo &MRI) {
>-  return new R600MCCodeEmitter(MCII, MRI);
>+                                           const MCRegisterInfo &MRI,
>+                                           const MCSubtargetInfo &STI) {
>+  return new R600MCCodeEmitter(MCII, MRI, STI);
> }
> 
> void R600MCCodeEmitter::EncodeInstruction(const MCInst &MI, raw_ostream &OS,
>-- 
>1.7.11.4
>

Actions: View | Splinter Review

Attachments on bug 64193: 78827 | 78828 | 78854 | 78855 | 79304 | 79305 | 79339 | 79340

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.