Attachment 67586 Details for Bug 55217 – Possible fix

[patch] Possible fix

rs880-fix.diff (text/plain), 1.86 KB, created by Tom Stellard on 2012-09-23 17:40:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2012-09-23 17:40:14 UTC

Size: 1.86 KB

patch

obsolete

>diff --git a/src/gallium/drivers/radeon/MCTargetDesc/R600MCCodeEmitter.cpp b/src/gallium/drivers/radeon/MCTargetDesc/R600MCCodeEmitter.cpp
>index 847fcb62..a11f482 100644
>--- a/src/gallium/drivers/radeon/MCTargetDesc/R600MCCodeEmitter.cpp
>+++ b/src/gallium/drivers/radeon/MCTargetDesc/R600MCCodeEmitter.cpp
>@@ -218,8 +218,8 @@ void R600MCCodeEmitter::EmitALUInstr(const MCInst &MI,
> 
>   //older alu have different encoding for instructions with one or two src
>   //parameters.
>-  if (STI.getFeatureBits() & AMDGPU::FeatureR600ALUInst &&
>-      MI.getNumOperands() < 4) {
>+  if ((STI.getFeatureBits() & AMDGPU::FeatureR600ALUInst) &&
>+      !(MCDesc.TSFlags & R600_InstFlag::OP3)) {
>     uint64_t ISAOpCode = InstWord01 & (0x3FFULL << 39);
>     InstWord01 &= ~(0x3FFULL << 39);
>     InstWord01 |= ISAOpCode << 1;
>diff --git a/src/gallium/drivers/radeon/R600Defines.h b/src/gallium/drivers/radeon/R600Defines.h
>index 655b984..9ccf81e 100644
>--- a/src/gallium/drivers/radeon/R600Defines.h
>+++ b/src/gallium/drivers/radeon/R600Defines.h
>@@ -21,3 +21,16 @@
> // operand.
> #define GET_FLAG_OPERAND_IDX(Flags) (((Flags) >> 7) & 0x3)
> 
>+namespace R600_InstFlag {
>+	enum TIF {
>+		TRANS_ONLY = (1 << 0),
>+		TEX = (1 << 1),
>+		REDUCTION = (1 << 2),
>+		FC = (1 << 3),
>+		TRIG = (1 << 4),
>+		OP3 = (1 << 5),
>+		VECTOR = (1 << 6)
>+    //FlagOperand bits 7, 8
>+	};
>+}
>+
>diff --git a/src/gallium/drivers/radeon/R600InstrInfo.h b/src/gallium/drivers/radeon/R600InstrInfo.h
>index bfe8d03..de82542 100644
>--- a/src/gallium/drivers/radeon/R600InstrInfo.h
>+++ b/src/gallium/drivers/radeon/R600InstrInfo.h
>@@ -129,17 +129,4 @@ namespace llvm {
> 
> } // End llvm namespace
> 
>-namespace R600_InstFlag {
>-	enum TIF {
>-		TRANS_ONLY = (1 << 0),
>-		TEX = (1 << 1),
>-		REDUCTION = (1 << 2),
>-		FC = (1 << 3),
>-		TRIG = (1 << 4),
>-		OP3 = (1 << 5),
>-		VECTOR = (1 << 6)
>-    //FlagOperand bits 7, 8
>-	};
>-}
>-
> #endif // R600INSTRINFO_H_

Actions: View | Splinter Review

Attachments on bug 55217: 67541 | 67542 | 67582 | 67583 | 67586

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.