Attachment 87364 Details for Bug 70327 – patch

[patch] patch

0001-r600g-fix-tgsi_op2_s-with-trans-only-instructions.patch (text/plain), 2.71 KB, created by Vadim Girlin on 2013-10-10 01:15:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vadim Girlin

Created: 2013-10-10 01:15:51 UTC

Size: 2.71 KB

patch

obsolete

>From b447fb957203170cd4dbb2cc96c48c4dde3938b8 Mon Sep 17 00:00:00 2001
>From: Vadim Girlin <vadimgirlin@gmail.com>
>Date: Thu, 10 Oct 2013 05:02:18 +0400
>Subject: [PATCH] r600g: fix tgsi_op2_s with trans-only instructions
>
>This fixes the issue when dst and src is the same reg and operation on one
>channel overwrites the source for other channels, e.g.:
>
>UMUL TEMP[2].xyz, TEMP[0].xyzz, TEMP[2].xxxx
>
>In this example the result of the operation on channel x is written in
>TEMP[2].x and then used as a second source operand for channels y and z
>instead of original value in TEMP[2].x.
>
>This patch stores the results in temp reg and moves them to
>dst after performing operation on all channels.
>
>Fixes https://bugs.freedesktop.org/show_bug.cgi?id=70327
>
>Signed-off-by: Vadim Girlin <vadimgirlin@gmail.com>
>---
> src/gallium/drivers/r600/r600_shader.c | 36 +++++++++++++++++++++++++++++-----
> 1 file changed, 31 insertions(+), 5 deletions(-)
>
>diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
>index d17d670..1532874 100644
>--- a/src/gallium/drivers/r600/r600_shader.c
>+++ b/src/gallium/drivers/r600/r600_shader.c
>@@ -1638,15 +1638,22 @@ static int tgsi_op2_s(struct r600_shader_ctx *ctx, int swap, int trans_only)
> {
> 	struct tgsi_full_instruction *inst = &ctx->parse.FullToken.FullInstruction;
> 	struct r600_bytecode_alu alu;
>-	int i, j, r;
>-	int lasti = tgsi_last_instruction(inst->Dst[0].Register.WriteMask);
>+	unsigned write_mask = inst->Dst[0].Register.WriteMask;
>+	int i, j, r, lasti = tgsi_last_instruction(write_mask);
>+	/* use temp register if trans_only and more than one dst component */
>+	int use_tmp = trans_only && (write_mask ^ (1 << lasti));
> 
>-	for (i = 0; i < lasti + 1; i++) {
>-		if (!(inst->Dst[0].Register.WriteMask & (1 << i)))
>+	for (i = 0; i <= lasti; i++) {
>+		if (!(write_mask & (1 << i)))
> 			continue;
> 
> 		memset(&alu, 0, sizeof(struct r600_bytecode_alu));
>-		tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
>+		if (use_tmp) {
>+			alu.dst.sel = ctx->temp_reg;
>+			alu.dst.chan = i;
>+			alu.dst.write = 1;
>+		} else
>+			tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
> 
> 		alu.op = ctx->inst_info->op;
> 		if (!swap) {
>@@ -1675,6 +1682,25 @@ static int tgsi_op2_s(struct r600_shader_ctx *ctx, int swap, int trans_only)
> 		if (r)
> 			return r;
> 	}
>+
>+	if (use_tmp) {
>+		// move result from temp to dst
>+		for (i = 0; i <= lasti; i++) {
>+			if (!(write_mask & (1 << i)))
>+				continue;
>+
>+			memset(&alu, 0, sizeof(struct r600_bytecode_alu));
>+			alu.op = ALU_OP1_MOV;
>+			tgsi_dst(ctx, &inst->Dst[0], i, &alu.dst);
>+			alu.src[0].sel = ctx->temp_reg;
>+			alu.src[0].chan = i;
>+			alu.last = (i == lasti);
>+
>+			r = r600_bytecode_add_alu(ctx->bc, &alu);
>+			if (r)
>+				return r;
>+		}
>+	}
> 	return 0;
> }
> 
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 70327: 87353 | 87355 | 87356 | 87357 | 87359 | 87360 | 87361 | 87362 | 87364

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.