wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Extend the liveness of nodes produced outside loops.

Browse Source 
Otherwise, it is possible that the register used by the temp is
overridden by a subsequent instruction within the same loop.
This commit is contained in:
Francisco Casas 2023-05-10 12:30:39 -04:00 committed by Alexandre Julliard
parent fbd2df2ad5
commit e060773c19
Notes: Alexandre Julliard 2023-05-24 22:33:32 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/208
3 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libs/vkd3d-shader/hlsl_codegen.c
View File

@ -2587,9 +2587,9 @@ static void allocate_register_reservations(struct hlsl_ctx *ctx)
/* Compute the earliest and latest liveness for each variable. In the case that /* Compute the earliest and latest liveness for each variable. In the case that
* a variable is accessed inside of a loop, we promote its liveness to extend * a variable is accessed inside of a loop, we promote its liveness to extend
* to at least the range of the entire loop. Note that we don't need to do this * to at least the range of the entire loop. We also do this for nodes, so that
* for anonymous nodes, since there's currently no way to use a node which was * nodes produced before the loop have their temp register protected from being
* calculated in an earlier iteration of the loop. */ * overridden after the last read within an iteration. */
static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop_first, unsigned int loop_last) static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop_first, unsigned int loop_last)
{ {
struct hlsl_ir_node *instr; struct hlsl_ir_node *instr;
@ -2597,7 +2597,7 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry) LIST_FOR_EACH_ENTRY(instr, &block->instrs, struct hlsl_ir_node, entry)
{ {
const unsigned int var_last_read = loop_last ? max(instr->index, loop_last) : instr->index; const unsigned int last_read = loop_last ? max(instr->index, loop_last) : instr->index;
switch (instr->type) switch (instr->type)
{ {
@ -2612,9 +2612,9 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
var = store->lhs.var; var = store->lhs.var;
if (!var->first_write) if (!var->first_write)
var->first_write = loop_first ? min(instr->index, loop_first) : instr->index; var->first_write = loop_first ? min(instr->index, loop_first) : instr->index;
store->rhs.node->last_read = instr->index; store->rhs.node->last_read = last_read;
if (store->lhs.offset.node) if (store->lhs.offset.node)
store->lhs.offset.node->last_read = instr->index; store->lhs.offset.node->last_read = last_read;
break; break;
} }
case HLSL_IR_EXPR: case HLSL_IR_EXPR:
@ -2623,7 +2623,7 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i) for (i = 0; i < ARRAY_SIZE(expr->operands) && expr->operands[i].node; ++i)
expr->operands[i].node->last_read = instr->index; expr->operands[i].node->last_read = last_read;
break; break;
} }
case HLSL_IR_IF: case HLSL_IR_IF:
@ -2632,7 +2632,7 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
compute_liveness_recurse(&iff->then_block, loop_first, loop_last); compute_liveness_recurse(&iff->then_block, loop_first, loop_last);
compute_liveness_recurse(&iff->else_block, loop_first, loop_last); compute_liveness_recurse(&iff->else_block, loop_first, loop_last);
iff->condition.node->last_read = instr->index; iff->condition.node->last_read = last_read;
break; break;
} }
case HLSL_IR_LOAD: case HLSL_IR_LOAD:
@ -2640,9 +2640,9 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
struct hlsl_ir_load *load = hlsl_ir_load(instr); struct hlsl_ir_load *load = hlsl_ir_load(instr);
var = load->src.var; var = load->src.var;
var->last_read = max(var->last_read, var_last_read); var->last_read = max(var->last_read, last_read);
if (load->src.offset.node) if (load->src.offset.node)
load->src.offset.node->last_read = instr->index; load->src.offset.node->last_read = last_read;
break; break;
} }
case HLSL_IR_LOOP: case HLSL_IR_LOOP:
@ -2658,28 +2658,28 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(instr); struct hlsl_ir_resource_load *load = hlsl_ir_resource_load(instr);
var = load->resource.var; var = load->resource.var;
var->last_read = max(var->last_read, var_last_read); var->last_read = max(var->last_read, last_read);
if (load->resource.offset.node) if (load->resource.offset.node)
load->resource.offset.node->last_read = instr->index; load->resource.offset.node->last_read = last_read;
if ((var = load->sampler.var)) if ((var = load->sampler.var))
{ {
var->last_read = max(var->last_read, var_last_read); var->last_read = max(var->last_read, last_read);
if (load->sampler.offset.node) if (load->sampler.offset.node)
load->sampler.offset.node->last_read = instr->index; load->sampler.offset.node->last_read = last_read;
} }
load->coords.node->last_read = instr->index; load->coords.node->last_read = last_read;
if (load->texel_offset.node) if (load->texel_offset.node)
load->texel_offset.node->last_read = instr->index; load->texel_offset.node->last_read = last_read;
if (load->lod.node) if (load->lod.node)
load->lod.node->last_read = instr->index; load->lod.node->last_read = last_read;
if (load->ddx.node) if (load->ddx.node)
load->ddx.node->last_read = instr->index; load->ddx.node->last_read = last_read;
if (load->ddy.node) if (load->ddy.node)
load->ddy.node->last_read = instr->index; load->ddy.node->last_read = last_read;
if (load->sample_index.node) if (load->sample_index.node)
load->sample_index.node->last_read = instr->index; load->sample_index.node->last_read = last_read;
break; break;
} }
case HLSL_IR_RESOURCE_STORE: case HLSL_IR_RESOURCE_STORE:
@ -2687,26 +2687,26 @@ static void compute_liveness_recurse(struct hlsl_block *block, unsigned int loop
struct hlsl_ir_resource_store *store = hlsl_ir_resource_store(instr); struct hlsl_ir_resource_store *store = hlsl_ir_resource_store(instr);
var = store->resource.var; var = store->resource.var;
var->last_read = max(var->last_read, var_last_read); var->last_read = max(var->last_read, last_read);
if (store->resource.offset.node) if (store->resource.offset.node)
store->resource.offset.node->last_read = instr->index; store->resource.offset.node->last_read = last_read;
store->coords.node->last_read = instr->index; store->coords.node->last_read = last_read;
store->value.node->last_read = instr->index; store->value.node->last_read = last_read;
break; break;
} }
case HLSL_IR_SWIZZLE: case HLSL_IR_SWIZZLE:
{ {
struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(instr); struct hlsl_ir_swizzle *swizzle = hlsl_ir_swizzle(instr);
swizzle->val.node->last_read = instr->index; swizzle->val.node->last_read = last_read;
break; break;
} }
case HLSL_IR_INDEX: case HLSL_IR_INDEX:
{ {
struct hlsl_ir_index *index = hlsl_ir_index(instr); struct hlsl_ir_index *index = hlsl_ir_index(instr);
index->val.node->last_read = instr->index; index->val.node->last_read = last_read;
index->idx.node->last_read = instr->index; index->idx.node->last_read = last_read;
break; break;
} }
case HLSL_IR_CONSTANT: case HLSL_IR_CONSTANT:

4
tests/loop.shader_test
View File

@ -17,7 +17,7 @@ float4 main() : sv_target
[test] [test]
uniform 0 float 5.0 uniform 0 float 5.0
draw quad draw quad
todo probe all rgba (50.0, 50.0, 50.0, 50.0) probe all rgba (50.0, 50.0, 50.0, 50.0)
[pixel shader] [pixel shader]
@ -40,4 +40,4 @@ float4 main() : sv_target
[test] [test]
uniform 0 float 4.0 uniform 0 float 4.0
draw quad draw quad
todo probe all rgba (20.0, 20.0, 20.0, 20.0) probe all rgba (20.0, 20.0, 20.0, 20.0)

6
tests/return.shader_test
View File

@ -175,15 +175,15 @@ probe all rgba (0.2, 0.2, 0.2, 0.2) 1
uniform 0 float 0.3 uniform 0 float 0.3
draw quad draw quad
todo probe all rgba (0.4, 0.4, 0.4, 0.4) 1 probe all rgba (0.4, 0.4, 0.4, 0.4) 1
uniform 0 float 0.7 uniform 0 float 0.7
draw quad draw quad
todo probe all rgba (0.8, 0.8, 0.8, 0.8) 1 probe all rgba (0.8, 0.8, 0.8, 0.8) 1
uniform 0 float 0.9 uniform 0 float 0.9
draw quad draw quad
todo probe all rgba (0.9, 0.9, 0.9, 0.9) 1 probe all rgba (0.9, 0.9, 0.9, 0.9) 1
[pixel shader] [pixel shader]