Attachment 38948 Details for Bug 30337 – Fix v3 - This one should work.

[patch] Fix v3 - This one should work.

0001-Temp.patch (text/plain), 2.65 KB, created by Tom Stellard on 2010-09-24 23:32:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2010-09-24 23:32:26 UTC

Size: 2.65 KB

patch

obsolete

>From c2e869d4dda1ca90a8ffe063f97acecc87b87389 Mon Sep 17 00:00:00 2001
>From: Tom Stellard <tstellar@gmail.com>
>Date: Fri, 24 Sep 2010 22:14:43 -0700
>Subject: [PATCH] Temp
>
>Temp
>---
> .../drivers/dri/r300/compiler/radeon_optimize.c    |   42 ++++++++++++++------
> 1 files changed, 30 insertions(+), 12 deletions(-)
>
>diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c b/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
>index c15a9b1..6a2e0f8 100644
>--- a/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
>+++ b/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
>@@ -563,10 +563,19 @@ static int presub_helper(
> 		 * s->Inst->U.I.DstReg, because if it does we must not
> 		 * remove s->Inst. */
> 		for(i = 0; i < info->NumSrcRegs; i++) {
>-			if(s->Inst->U.I.DstReg.WriteMask !=
>-					src_reads_dst_mask(inst->U.I.SrcReg[i],
>-						s->Inst->U.I.DstReg)) {
>-				continue;
>+			unsigned int mask = src_reads_dst_mask(
>+				inst->U.I.SrcReg[i], s->Inst->U.I.DstReg);
>+			fprintf(stderr, "%s rw_mask=%u\n", info->Name, mask);
>+			/* XXX We could be more aggressive here using
>+			 * presubtract.  It is okay if SrcReg[i] only reads
>+			 * from some of rw_mask components. */
>+			if(s->Inst->U.I.DstReg.WriteMask != mask) {
>+				if (s->Inst->U.I.DstReg.WriteMask & mask) {
>+					can_remove = 0;
>+					break;
>+				} else {
>+					continue;
>+				}
> 			}
> 			if (cant_sub || !can_use_presub) {
> 				can_remove = 0;
>@@ -626,6 +635,21 @@ static void presub_replace_add(struct peephole_state *s,
> 	inst->U.I.SrcReg[src_index].Index = presub_opcode;
> }
> 
>+static int is_presub_candidate(struct rc_instruction * inst)
>+{
>+	const struct rc_opcode_info * info = rc_get_opcode_info(inst->U.I.Opcode);
>+	unsigned int i;
>+
>+	if (inst->U.I.PreSub.Opcode != RC_PRESUB_NONE || inst->U.I.SaturateMode)
>+		return 0;
>+
>+	for(i = 0; i < info->NumSrcRegs; i++) {
>+		if (src_reads_dst_mask(inst->U.I.SrcReg[i], inst->U.I.DstReg))
>+			return 0;
>+	}
>+	return 1;
>+}
>+
> static int peephole_add_presub_add(
> 	struct radeon_compiler * c,
> 	struct rc_instruction * inst_add)
>@@ -635,10 +659,7 @@ static int peephole_add_presub_add(
> 	unsigned int i;
> 	struct peephole_state s;
> 
>-	if (inst_add->U.I.PreSub.Opcode != RC_PRESUB_NONE)
>-		return 0;
>-
>-	if (inst_add->U.I.SaturateMode)
>+	if (!is_presub_candidate(inst_add))
> 		return 0;
> 
> 	if (inst_add->U.I.SrcReg[0].Swizzle != inst_add->U.I.SrcReg[1].Swizzle)
>@@ -705,10 +726,7 @@ static int peephole_add_presub_inv(
> 	unsigned int i, swz, mask;
> 	struct peephole_state s;
> 
>-	if (inst_add->U.I.PreSub.Opcode != RC_PRESUB_NONE)
>-		return 0;
>-
>-	if (inst_add->U.I.SaturateMode)
>+	if (!is_presub_candidate(inst_add))
> 		return 0;
> 
> 	mask = inst_add->U.I.DstReg.WriteMask;
>-- 
>1.7.2.2
>

Actions: View | Splinter Review

Attachments on bug 30337: 38895 | 38922 | 38923 | 38924 | 38942 | 38948

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.