Attachment 38942 Details for Bug 30337 – Fix v2

[patch] Fix v2

presub-v2.diff (text/plain), 2.49 KB, created by Tom Stellard on 2010-09-24 17:34:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2010-09-24 17:34:12 UTC

Size: 2.49 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c b/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
>index c15a9b1..9ebd357 100644
>--- a/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
>+++ b/src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
>@@ -492,7 +492,7 @@ static unsigned int src_reads_dst_mask(struct rc_src_register src,
> 	}
> 	mask &= RC_MASK_XYZW;
> 
>-	return mask;
>+	return mask & dst.WriteMask;
> }
> 
> /* Return 1 if the source registers has a constant swizzle (e.g. 0, 0.5, 1.0)
>@@ -563,10 +563,18 @@ 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 rw_mask = src_reads_dst_mask(
>+				inst->U.I.SrcReg[i], s->Inst->U.I.DstReg);
>+			/* 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 != rw_mask) {
>+				if (rw_mask) {
>+					can_remove = 0;
>+					break;
>+				} else {
>+					continue;
>+				}
> 			}
> 			if (cant_sub || !can_use_presub) {
> 				can_remove = 0;
>@@ -626,6 +634,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 +658,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 +725,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;

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.