Attachment 109650 Details for Bug 85376 – patch to hopefully fix

[patch] patch to hopefully fix

0001-r600g-cayman-fix-integer-multiplication-output-overw.patch (text/plain), 2.11 KB, created by Dave Airlie on 2014-11-18 00:38:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2014-11-18 00:38:19 UTC

Size: 2.11 KB

patch

obsolete

>From 5ee227b098ebba98a9e699f0131802ca92a31090 Mon Sep 17 00:00:00 2001
>From: Dave Airlie <airlied@redhat.com>
>Date: Tue, 18 Nov 2014 09:54:39 +1000
>Subject: [PATCH] r600g/cayman: fix integer multiplication output overwrite
> (v2)
>
>This fixes tests/spec/glsl-1.10/execution/fs-op-assign-mult-ivec2-ivec2-overwrite.shader_test.
>
>Reported-by: ghallberg on irc
>Signed-off-by: Dave Airlie <airlied@redhat.com>
>---
> src/gallium/drivers/r600/r600_shader.c | 26 +++++++++++++++++++++++---
> 1 file changed, 23 insertions(+), 3 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
>index aab4215..ac26d77 100644
>--- a/src/gallium/drivers/r600/r600_shader.c
>+++ b/src/gallium/drivers/r600/r600_shader.c
>@@ -2728,8 +2728,10 @@ static int cayman_mul_int_instr(struct r600_shader_ctx *ctx)
> 	struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
> 	int i, j, k, r;
> 	struct r600_bytecode_alu alu;
>-	int last_slot = (inst->Dst[0].Register.WriteMask & 0x8) ? 4 : 3;
>-	for (k = 0; k < last_slot; k++) {
>+	int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
>+	int t1 = ctx->temp_reg;
>+
>+	for (k = 0; k <= lasti; k++) {
> 		if (!(inst->Dst[0].Register.WriteMask & (1 << k)))
> 			continue;
> 
>@@ -2739,7 +2741,8 @@ static int cayman_mul_int_instr(struct r600_shader_ctx *ctx)
> 			for (j = 0; j < inst->Instruction.NumSrcRegs; j++) {
> 				r600_bytecode_src(&alu.src[j], &ctx->src[j], k);
> 			}
>-			tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
>+			alu.dst.sel = t1;
>+			alu.dst.chan = i;
> 			alu.dst.write = (i == k);
> 			if (i == 3)
> 				alu.last = 1;
>@@ -2748,6 +2751,23 @@ static int cayman_mul_int_instr(struct r600_shader_ctx *ctx)
> 				return r;
> 		}
> 	}
>+
>+	for (i = 0 ; i <= lasti; i++) {
>+		if (!(inst->Dst[0].Register.WriteMask & (1 << i)))
>+			continue;
>+		memset(&alu, 0, sizeof(struct r600_bytecode_alu));
>+		alu.op = ALU_OP1_MOV;
>+		alu.src[0].sel = t1;
>+		alu.src[0].chan = i;
>+		tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
>+		alu.dst.write = 1;
>+		if (i == lasti)
>+			alu.last = 1;
>+		r = r600_bytecode_add_alu(ctx->bc, &alu);
>+		if (r)
>+			return r;
>+	}
>+
> 	return 0;
> }
> 
>-- 
>1.9.3
>

Actions: View | Splinter Review

Attachments on bug 85376: 108308 | 109230 | 109231 | 109239 | 109245 | 109247 | 109289 | 109303 | 109308 | 109371 | 109650 | 109838 | 109839

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.