Attachment 52640 Details for Bug 42090 – Possible fix

[patch] Possible fix

sauerbraten.patch (text/plain), 2.69 KB, created by Tom Stellard on 2011-10-22 17:51:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tom Stellard

Created: 2011-10-22 17:51:52 UTC

Size: 2.69 KB

patch

obsolete

>diff --git a/src/gallium/drivers/r300/compiler/radeon_pair_schedule.c b/src/gallium/drivers/r300/compiler/radeon_pair_schedule.c
>index b3b0f6f..6a205ea 100644
>--- a/src/gallium/drivers/r300/compiler/radeon_pair_schedule.c
>+++ b/src/gallium/drivers/r300/compiler/radeon_pair_schedule.c
>@@ -132,6 +132,8 @@ struct remap_reg {
> struct schedule_state {
> 	struct radeon_compiler * C;
> 	struct schedule_instruction * Current;
>+	/* XXX: Comment this */
>+	struct schedule_instruction * PrevWriter[4];
> 
> 	struct register_state Temporary[RC_REGISTER_MAX_INDEX];
> 
>@@ -1137,6 +1139,19 @@ static void emit_one_alu(struct schedule_state *s, struct rc_instruction * befor
> 	presub_nop(before->Prev);
> }
> 
>+static void add_tex_reader(
>+	struct schedule_state * s,
>+	struct schedule_instruction * writer,
>+	struct schedule_instruction * reader)
>+{
>+	if (!writer || writer->Instruction->Type != RC_INSTRUCTION_NORMAL) {
>+		/*Not a TEX instructions */
>+		return;
>+	}
>+	reader->TexReadCount++;
>+	rc_list_add(&writer->TexReaders, rc_list(&s->C->Pool, reader));
>+}
>+
> static void scan_read(void * data, struct rc_instruction * inst,
> 		rc_register_file file, unsigned int index, unsigned int chan)
> {
>@@ -1150,7 +1165,18 @@ static void scan_read(void * data, struct rc_instruction * inst,
> 	if (*v && (*v)->Writer == s->Current) {
> 		/* The instruction reads and writes to a register component.
> 		 * In this case, we only want to increment dependencies by one.
>+		 * Why?
>+		 * Because each instruction depends on the writers of its source
>+		 * registers _and_ the most recent writer of its destination
>+		 * register.  In this case, the current instruction (s->Current)
>+		 * has a dependency that both writes to one of its source
>+		 * registers and was the most recent writer to its destination
>+		 * register.  We have already marked this dependency in
>+		 * scan_write(), so we don't need to do it again.
> 		 */
>+
>+		add_tex_reader(s, s->PrevWriter[chan], s->Current);
>+
> 		return;
> 	}
> 
>@@ -1171,12 +1197,7 @@ static void scan_read(void * data, struct rc_instruction * inst,
> 		/* Only update the current instruction's dependencies if the
> 		 * register it reads from has been written to in this block. */
> 		if ((*v)->Writer) {
>-			if ((*v)->Writer->Instruction->Type ==
>-						RC_INSTRUCTION_NORMAL) {
>-				s->Current->TexReadCount++;
>-				rc_list_add(&((*v)->Writer->TexReaders),
>-					rc_list(&s->C->Pool, s->Current));
>-			}
>+			add_tex_reader(s, (*v)->Writer, s->Current);
> 			s->Current->NumDependencies++;
> 		}
> 	}
>@@ -1209,6 +1230,8 @@ static void scan_write(void * data, struct rc_instruction * inst,
> 	if (*pv) {
> 		(*pv)->Next = newv;
> 		s->Current->NumDependencies++;
>+		/* XXX: Comment this */
>+		s->PrevWriter[chan] = (*pv)->Writer;
> 	}
> 
> 	*pv = newv;

Actions: View | Splinter Review

Attachments on bug 42090: 52640

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.