From 21190fbd56ec2f12dc5a1bf1d9fc32d507e8f0a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Christian=20K=C3=B6nig?= Date: Thu, 7 Mar 2013 15:02:31 +0100 Subject: [PATCH] tgsi: use separate structure for indirect address v2 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To further improve the optimization of source and destination indirect addressing we need the ability to store a reference to the declaration of the addressed operands. Since most of the fields in tgsi_src_register doesn't apply for an indirect addressing operand replace it with a separate tgsi_ind_register structure and so make room for extra information. v2: rename Declaration to ArrayID, put the ArrayID into () instead of [] Signed-off-by: Christian König --- .../auxiliary/gallivm/lp_bld_tgsi_soa.c | 4 +- src/gallium/auxiliary/tgsi/tgsi_build.c | 109 ++++++++++-------- src/gallium/auxiliary/tgsi/tgsi_dump.c | 28 ++++- src/gallium/auxiliary/tgsi/tgsi_exec.c | 8 +- src/gallium/auxiliary/tgsi/tgsi_parse.c | 35 +----- src/gallium/auxiliary/tgsi/tgsi_parse.h | 8 +- src/gallium/auxiliary/tgsi/tgsi_text.c | 27 +++-- src/gallium/auxiliary/tgsi/tgsi_ureg.c | 36 +++--- src/gallium/auxiliary/tgsi/tgsi_ureg.h | 7 ++ src/gallium/auxiliary/tgsi/tgsi_util.c | 18 +++ src/gallium/auxiliary/tgsi/tgsi_util.h | 3 + src/gallium/drivers/i915/i915_fpc.h | 8 +- src/gallium/drivers/nv30/nvfx_vertprog.c | 2 +- .../nv50/codegen/nv50_ir_from_tgsi.cpp | 6 + src/gallium/drivers/r600/r600_llvm.c | 2 +- src/gallium/include/pipe/p_shader_tokens.h | 24 +++- 16 files changed, 193 insertions(+), 132 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index 9fe87c40b63..f157dc11d26 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -517,12 +517,12 @@ emit_mask_scatter(struct lp_build_tgsi_soa_context *bld, static LLVMValueRef get_indirect_index(struct lp_build_tgsi_soa_context *bld, unsigned reg_file, unsigned reg_index, - const struct tgsi_src_register *indirect_reg) + const struct tgsi_ind_register *indirect_reg) { LLVMBuilderRef builder = bld->bld_base.base.gallivm->builder; struct lp_build_context *uint_bld = &bld->bld_base.uint_bld; /* always use X component of address register */ - unsigned swizzle = indirect_reg->SwizzleX; + unsigned swizzle = indirect_reg->Swizzle; LLVMValueRef base; LLVMValueRef rel; LLVMValueRef max_index; diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c index 33cbbd8ca65..435d94a2103 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_build.c +++ b/src/gallium/auxiliary/tgsi/tgsi_build.c @@ -816,6 +816,43 @@ tgsi_build_src_register( return src_register; } +static struct tgsi_ind_register +tgsi_default_ind_register( void ) +{ + struct tgsi_ind_register ind_register; + + ind_register.File = TGSI_FILE_NULL; + ind_register.Swizzle = TGSI_SWIZZLE_X; + ind_register.ArrayID = 0; + + return ind_register; +} + +static struct tgsi_ind_register +tgsi_build_ind_register( + unsigned file, + unsigned swizzle, + unsigned arrayid, + int index, + struct tgsi_instruction *instruction, + struct tgsi_header *header ) +{ + struct tgsi_ind_register ind_register; + + assert( file < TGSI_FILE_COUNT ); + assert( swizzle <= TGSI_SWIZZLE_W ); + assert( index >= -0x8000 && index <= 0x7FFF ); + + ind_register.File = file; + ind_register.Swizzle = swizzle; + ind_register.Index = index; + ind_register.ArrayID = arrayid; + + instruction_grow( instruction, header ); + + return ind_register; +} + static struct tgsi_dimension tgsi_default_dimension( void ) { @@ -835,9 +872,9 @@ tgsi_default_full_src_register( void ) struct tgsi_full_src_register full_src_register; full_src_register.Register = tgsi_default_src_register(); - full_src_register.Indirect = tgsi_default_src_register(); + full_src_register.Indirect = tgsi_default_ind_register(); full_src_register.Dimension = tgsi_default_dimension(); - full_src_register.DimIndirect = tgsi_default_src_register(); + full_src_register.DimIndirect = tgsi_default_ind_register(); return full_src_register; } @@ -910,9 +947,9 @@ tgsi_default_full_dst_register( void ) struct tgsi_full_dst_register full_dst_register; full_dst_register.Register = tgsi_default_dst_register(); - full_dst_register.Indirect = tgsi_default_src_register(); + full_dst_register.Indirect = tgsi_default_ind_register(); full_dst_register.Dimension = tgsi_default_dimension(); - full_dst_register.DimIndirect = tgsi_default_src_register(); + full_dst_register.DimIndirect = tgsi_default_ind_register(); return full_dst_register; } @@ -1057,24 +1094,18 @@ tgsi_build_full_instruction( header ); if( reg->Register.Indirect ) { - struct tgsi_src_register *ind; + struct tgsi_ind_register *ind; if( maxsize <= size ) return 0; - ind = (struct tgsi_src_register *) &tokens[size]; + ind = (struct tgsi_ind_register *) &tokens[size]; size++; - *ind = tgsi_build_src_register( + *ind = tgsi_build_ind_register( reg->Indirect.File, - reg->Indirect.SwizzleX, - reg->Indirect.SwizzleY, - reg->Indirect.SwizzleZ, - reg->Indirect.SwizzleW, - reg->Indirect.Negate, - reg->Indirect.Absolute, - reg->Indirect.Indirect, - reg->Indirect.Dimension, + reg->Indirect.Swizzle, reg->Indirect.Index, + reg->Indirect.ArrayID, instruction, header ); } @@ -1096,24 +1127,18 @@ tgsi_build_full_instruction( header ); if( reg->Dimension.Indirect ) { - struct tgsi_src_register *ind; + struct tgsi_ind_register *ind; if( maxsize <= size ) return 0; - ind = (struct tgsi_src_register *) &tokens[size]; + ind = (struct tgsi_ind_register *) &tokens[size]; size++; - *ind = tgsi_build_src_register( + *ind = tgsi_build_ind_register( reg->DimIndirect.File, - reg->DimIndirect.SwizzleX, - reg->DimIndirect.SwizzleY, - reg->DimIndirect.SwizzleZ, - reg->DimIndirect.SwizzleW, - reg->DimIndirect.Negate, - reg->DimIndirect.Absolute, - reg->DimIndirect.Indirect, - reg->DimIndirect.Dimension, + reg->DimIndirect.Swizzle, reg->DimIndirect.Index, + reg->DimIndirect.ArrayID, instruction, header ); } @@ -1144,24 +1169,18 @@ tgsi_build_full_instruction( header ); if( reg->Register.Indirect ) { - struct tgsi_src_register *ind; + struct tgsi_ind_register *ind; if( maxsize <= size ) return 0; - ind = (struct tgsi_src_register *) &tokens[size]; + ind = (struct tgsi_ind_register *) &tokens[size]; size++; - *ind = tgsi_build_src_register( + *ind = tgsi_build_ind_register( reg->Indirect.File, - reg->Indirect.SwizzleX, - reg->Indirect.SwizzleY, - reg->Indirect.SwizzleZ, - reg->Indirect.SwizzleW, - reg->Indirect.Negate, - reg->Indirect.Absolute, - reg->Indirect.Indirect, - reg->Indirect.Dimension, + reg->Indirect.Swizzle, reg->Indirect.Index, + reg->Indirect.ArrayID, instruction, header ); } @@ -1183,24 +1202,18 @@ tgsi_build_full_instruction( header ); if( reg->Dimension.Indirect ) { - struct tgsi_src_register *ind; + struct tgsi_ind_register *ind; if( maxsize <= size ) return 0; - ind = (struct tgsi_src_register *) &tokens[size]; + ind = (struct tgsi_ind_register *) &tokens[size]; size++; - *ind = tgsi_build_src_register( + *ind = tgsi_build_ind_register( reg->DimIndirect.File, - reg->DimIndirect.SwizzleX, - reg->DimIndirect.SwizzleY, - reg->DimIndirect.SwizzleZ, - reg->DimIndirect.SwizzleW, - reg->DimIndirect.Negate, - reg->DimIndirect.Absolute, - reg->DimIndirect.Indirect, - reg->DimIndirect.Dimension, + reg->DimIndirect.Swizzle, reg->DimIndirect.Index, + reg->DimIndirect.ArrayID, instruction, header ); } diff --git a/src/gallium/auxiliary/tgsi/tgsi_dump.c b/src/gallium/auxiliary/tgsi/tgsi_dump.c index adca6af2a29..d98f6c49366 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_dump.c +++ b/src/gallium/auxiliary/tgsi/tgsi_dump.c @@ -107,13 +107,18 @@ _dump_register_src( CHR( '[' ); SID( src->DimIndirect.Index ); TXT( "]." ); - ENM( src->DimIndirect.SwizzleX, tgsi_swizzle_names ); + ENM( src->DimIndirect.Swizzle, tgsi_swizzle_names ); if (src->Dimension.Index != 0) { if (src->Dimension.Index > 0) CHR( '+' ); SID( src->Dimension.Index ); } CHR( ']' ); + if (src->DimIndirect.ArrayID) { + CHR( '(' ); + SID( src->DimIndirect.ArrayID ); + CHR( ')' ); + } } else { CHR('['); SID(src->Dimension.Index); @@ -126,13 +131,18 @@ _dump_register_src( CHR( '[' ); SID( src->Indirect.Index ); TXT( "]." ); - ENM( src->Indirect.SwizzleX, tgsi_swizzle_names ); + ENM( src->Indirect.Swizzle, tgsi_swizzle_names ); if (src->Register.Index != 0) { if (src->Register.Index > 0) CHR( '+' ); SID( src->Register.Index ); } CHR( ']' ); + if (src->Indirect.ArrayID) { + CHR( '(' ); + SID( src->Indirect.ArrayID ); + CHR( ')' ); + } } else { CHR( '[' ); SID( src->Register.Index ); @@ -154,13 +164,18 @@ _dump_register_dst( CHR( '[' ); SID( dst->DimIndirect.Index ); TXT( "]." ); - ENM( dst->DimIndirect.SwizzleX, tgsi_swizzle_names ); + ENM( dst->DimIndirect.Swizzle, tgsi_swizzle_names ); if (dst->Dimension.Index != 0) { if (dst->Dimension.Index > 0) CHR( '+' ); SID( dst->Dimension.Index ); } CHR( ']' ); + if (dst->DimIndirect.ArrayID) { + CHR( '(' ); + SID( dst->DimIndirect.ArrayID ); + CHR( ')' ); + } } else { CHR('['); SID(dst->Dimension.Index); @@ -173,13 +188,18 @@ _dump_register_dst( CHR( '[' ); SID( dst->Indirect.Index ); TXT( "]." ); - ENM( dst->Indirect.SwizzleX, tgsi_swizzle_names ); + ENM( dst->Indirect.Swizzle, tgsi_swizzle_names ); if (dst->Register.Index != 0) { if (dst->Register.Index > 0) CHR( '+' ); SID( dst->Register.Index ); } CHR( ']' ); + if (dst->Indirect.ArrayID) { + CHR( '(' ); + SID( dst->Indirect.ArrayID ); + CHR( ')' ); + } } else { CHR( '[' ); SID( dst->Register.Index ); diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.c b/src/gallium/auxiliary/tgsi/tgsi_exec.c index 1af239507d4..8579d8a57eb 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.c +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.c @@ -1193,7 +1193,7 @@ fetch_source(const struct tgsi_exec_machine *mach, index2.i[2] = index2.i[3] = reg->Indirect.Index; /* get current value of address register[swizzle] */ - swizzle = tgsi_util_get_src_register_swizzle( ®->Indirect, TGSI_CHAN_X ); + swizzle = reg->Indirect.Swizzle; fetch_src_file_channel(mach, chan_index, reg->Indirect.File, @@ -1253,7 +1253,7 @@ fetch_source(const struct tgsi_exec_machine *mach, index2.i[2] = index2.i[3] = reg->DimIndirect.Index; - swizzle = tgsi_util_get_src_register_swizzle( ®->DimIndirect, TGSI_CHAN_X ); + swizzle = reg->DimIndirect.Swizzle; fetch_src_file_channel(mach, chan_index, reg->DimIndirect.File, @@ -1357,7 +1357,7 @@ store_dest(struct tgsi_exec_machine *mach, index.i[3] = reg->Indirect.Index; /* get current value of address register[swizzle] */ - swizzle = tgsi_util_get_src_register_swizzle( ®->Indirect, TGSI_CHAN_X ); + swizzle = reg->Indirect.Swizzle; /* fetch values from the address/indirection register */ fetch_src_file_channel(mach, @@ -1409,7 +1409,7 @@ store_dest(struct tgsi_exec_machine *mach, index2.i[2] = index2.i[3] = reg->DimIndirect.Index; - swizzle = tgsi_util_get_src_register_swizzle( ®->DimIndirect, TGSI_CHAN_X ); + swizzle = reg->DimIndirect.Swizzle; fetch_src_file_channel(mach, chan_index, reg->DimIndirect.File, diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.c b/src/gallium/auxiliary/tgsi/tgsi_parse.c index 29079ef2140..70c1cb223ee 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_parse.c +++ b/src/gallium/auxiliary/tgsi/tgsi_parse.c @@ -200,15 +200,9 @@ tgsi_parse_token( next_token( ctx, &inst->Dst[i].Register ); - if( inst->Dst[i].Register.Indirect ) { + if( inst->Dst[i].Register.Indirect ) next_token( ctx, &inst->Dst[i].Indirect ); - /* - * No support for indirect or multi-dimensional addressing. - */ - assert( !inst->Dst[i].Indirect.Dimension ); - assert( !inst->Dst[i].Indirect.Indirect ); - } if( inst->Dst[i].Register.Dimension ) { next_token( ctx, &inst->Dst[i].Dimension ); @@ -217,15 +211,8 @@ tgsi_parse_token( */ assert( !inst->Dst[i].Dimension.Dimension ); - if( inst->Dst[i].Dimension.Indirect ) { + if( inst->Dst[i].Dimension.Indirect ) next_token( ctx, &inst->Dst[i].DimIndirect ); - - /* - * No support for indirect or multi-dimensional addressing. - */ - assert( !inst->Dst[i].Indirect.Indirect ); - assert( !inst->Dst[i].Indirect.Dimension ); - } } } @@ -235,16 +222,9 @@ tgsi_parse_token( next_token( ctx, &inst->Src[i].Register ); - if( inst->Src[i].Register.Indirect ) { + if( inst->Src[i].Register.Indirect ) next_token( ctx, &inst->Src[i].Indirect ); - /* - * No support for indirect or multi-dimensional addressing. - */ - assert( !inst->Src[i].Indirect.Indirect ); - assert( !inst->Src[i].Indirect.Dimension ); - } - if( inst->Src[i].Register.Dimension ) { next_token( ctx, &inst->Src[i].Dimension ); @@ -253,15 +233,8 @@ tgsi_parse_token( */ assert( !inst->Src[i].Dimension.Dimension ); - if( inst->Src[i].Dimension.Indirect ) { + if( inst->Src[i].Dimension.Indirect ) next_token( ctx, &inst->Src[i].DimIndirect ); - - /* - * No support for indirect or multi-dimensional addressing. - */ - assert( !inst->Src[i].Indirect.Indirect ); - assert( !inst->Src[i].Indirect.Dimension ); - } } } diff --git a/src/gallium/auxiliary/tgsi/tgsi_parse.h b/src/gallium/auxiliary/tgsi/tgsi_parse.h index ae40f13affc..808f31bc387 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_parse.h +++ b/src/gallium/auxiliary/tgsi/tgsi_parse.h @@ -44,17 +44,17 @@ struct tgsi_full_header struct tgsi_full_dst_register { struct tgsi_dst_register Register; - struct tgsi_src_register Indirect; + struct tgsi_ind_register Indirect; struct tgsi_dimension Dimension; - struct tgsi_src_register DimIndirect; + struct tgsi_ind_register DimIndirect; }; struct tgsi_full_src_register { struct tgsi_src_register Register; - struct tgsi_src_register Indirect; + struct tgsi_ind_register Indirect; struct tgsi_dimension Dimension; - struct tgsi_src_register DimIndirect; + struct tgsi_ind_register DimIndirect; }; struct tgsi_full_declaration diff --git a/src/gallium/auxiliary/tgsi/tgsi_text.c b/src/gallium/auxiliary/tgsi/tgsi_text.c index 8a2a760ef59..6b97bee8b0f 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_text.c +++ b/src/gallium/auxiliary/tgsi/tgsi_text.c @@ -441,6 +441,7 @@ struct parsed_bracket { uint ind_file; int ind_index; uint ind_comp; + uint ind_array; }; @@ -508,6 +509,20 @@ parse_register_bracket( return FALSE; } ctx->cur++; + if (*ctx->cur == '(') { + ctx->cur++; + eat_opt_white( &ctx->cur ); + if (!parse_uint( &ctx->cur, &brackets->ind_array )) { + report_error( ctx, "Expected literal unsigned integer" ); + return FALSE; + } + eat_opt_white( &ctx->cur ); + if (*ctx->cur != ')') { + report_error( ctx, "Expected `)'" ); + return FALSE; + } + ctx->cur++; + } return TRUE; } @@ -711,10 +726,8 @@ parse_dst_operand( dst->Register.Indirect = 1; dst->Indirect.File = bracket[0].ind_file; dst->Indirect.Index = bracket[0].ind_index; - dst->Indirect.SwizzleX = bracket[0].ind_comp; - dst->Indirect.SwizzleY = bracket[0].ind_comp; - dst->Indirect.SwizzleZ = bracket[0].ind_comp; - dst->Indirect.SwizzleW = bracket[0].ind_comp; + dst->Indirect.Swizzle = bracket[0].ind_comp; + dst->Indirect.ArrayID = bracket[0].ind_array; } return TRUE; } @@ -797,10 +810,8 @@ parse_src_operand( src->Register.Indirect = 1; src->Indirect.File = bracket[0].ind_file; src->Indirect.Index = bracket[0].ind_index; - src->Indirect.SwizzleX = bracket[0].ind_comp; - src->Indirect.SwizzleY = bracket[0].ind_comp; - src->Indirect.SwizzleZ = bracket[0].ind_comp; - src->Indirect.SwizzleW = bracket[0].ind_comp; + src->Indirect.Swizzle = bracket[0].ind_comp; + src->Indirect.ArrayID = bracket[0].ind_array; } /* Parse optional swizzle. diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c index 1e862cb2198..782f4495fa3 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c @@ -59,6 +59,7 @@ union tgsi_any_token { struct tgsi_instruction_texture insn_texture; struct tgsi_texture_offset insn_texture_offset; struct tgsi_src_register src; + struct tgsi_ind_register ind; struct tgsi_dimension dim; struct tgsi_dst_register dst; unsigned value; @@ -267,6 +268,7 @@ ureg_dst_register( unsigned file, dst.PredSwizzleZ = TGSI_SWIZZLE_Z; dst.PredSwizzleW = TGSI_SWIZZLE_W; dst.Index = index; + dst.ArrayID = 0; return dst; } @@ -597,8 +599,10 @@ struct ureg_dst ureg_DECL_array_temporary( struct ureg_program *ureg, /* and also at the end of the array */ util_bitmask_set(ureg->decl_temps, ureg->nr_temps); - if (ureg->nr_array_temps < UREG_MAX_ARRAY_TEMPS) + if (ureg->nr_array_temps < UREG_MAX_ARRAY_TEMPS) { ureg->array_temps[ureg->nr_array_temps++] = i; + dst.ArrayID = ureg->nr_array_temps; + } return dst; } @@ -881,12 +885,10 @@ ureg_emit_src( struct ureg_program *ureg, if (src.Indirect) { out[0].src.Indirect = 1; out[n].value = 0; - out[n].src.File = src.IndirectFile; - out[n].src.SwizzleX = src.IndirectSwizzle; - out[n].src.SwizzleY = src.IndirectSwizzle; - out[n].src.SwizzleZ = src.IndirectSwizzle; - out[n].src.SwizzleW = src.IndirectSwizzle; - out[n].src.Index = src.IndirectIndex; + out[n].ind.File = src.IndirectFile; + out[n].ind.Swizzle = src.IndirectSwizzle; + out[n].ind.Index = src.IndirectIndex; + out[n].ind.ArrayID = src.ArrayID; n++; } @@ -899,12 +901,10 @@ ureg_emit_src( struct ureg_program *ureg, out[n].dim.Index = src.DimensionIndex; n++; out[n].value = 0; - out[n].src.File = src.DimIndFile; - out[n].src.SwizzleX = src.DimIndSwizzle; - out[n].src.SwizzleY = src.DimIndSwizzle; - out[n].src.SwizzleZ = src.DimIndSwizzle; - out[n].src.SwizzleW = src.DimIndSwizzle; - out[n].src.Index = src.DimIndIndex; + out[n].ind.File = src.DimIndFile; + out[n].ind.Swizzle = src.DimIndSwizzle; + out[n].ind.Index = src.DimIndIndex; + out[n].ind.ArrayID = src.ArrayID; } else { out[n].dim.Indirect = 0; out[n].dim.Index = src.DimensionIndex; @@ -943,12 +943,10 @@ ureg_emit_dst( struct ureg_program *ureg, if (dst.Indirect) { out[n].value = 0; - out[n].src.File = TGSI_FILE_ADDRESS; - out[n].src.SwizzleX = dst.IndirectSwizzle; - out[n].src.SwizzleY = dst.IndirectSwizzle; - out[n].src.SwizzleZ = dst.IndirectSwizzle; - out[n].src.SwizzleW = dst.IndirectSwizzle; - out[n].src.Index = dst.IndirectIndex; + out[n].ind.File = TGSI_FILE_ADDRESS; + out[n].ind.Swizzle = dst.IndirectSwizzle; + out[n].ind.Index = dst.IndirectIndex; + out[n].ind.ArrayID = dst.ArrayID; n++; } diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h index cd140de6ba9..be99ae0f048 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h @@ -62,6 +62,7 @@ struct ureg_src int IndirectIndex : 16; /* SINT */ int DimensionIndex : 16; /* SINT */ int DimIndIndex : 16; /* SINT */ + unsigned ArrayID : 10; /* UINT */ }; /* Very similar to a tgsi_dst_register, removing unsupported fields @@ -84,6 +85,7 @@ struct ureg_dst int Index : 16; /* SINT */ int IndirectIndex : 16; /* SINT */ int IndirectSwizzle : 2; /* TGSI_SWIZZLE_ */ + unsigned ArrayID : 10; /* UINT */ }; struct pipe_context; @@ -1129,6 +1131,7 @@ ureg_dst( struct ureg_src src ) dst.PredSwizzleZ = TGSI_SWIZZLE_Z; dst.PredSwizzleW = TGSI_SWIZZLE_W; dst.Index = src.Index; + dst.ArrayID = src.ArrayID; return dst; } @@ -1157,6 +1160,7 @@ ureg_src_register(unsigned file, src.DimIndFile = TGSI_FILE_NULL; src.DimIndIndex = 0; src.DimIndSwizzle = 0; + src.ArrayID = 0; return src; } @@ -1184,6 +1188,7 @@ ureg_src( struct ureg_dst dst ) src.DimIndFile = TGSI_FILE_NULL; src.DimIndIndex = 0; src.DimIndSwizzle = 0; + src.ArrayID = dst.ArrayID; return src; } @@ -1208,6 +1213,7 @@ ureg_dst_undef( void ) dst.PredSwizzleZ = TGSI_SWIZZLE_Z; dst.PredSwizzleW = TGSI_SWIZZLE_W; dst.Index = 0; + dst.ArrayID = 0; return dst; } @@ -1235,6 +1241,7 @@ ureg_src_undef( void ) src.DimIndFile = TGSI_FILE_NULL; src.DimIndIndex = 0; src.DimIndSwizzle = 0; + src.ArrayID = 0; return src; } diff --git a/src/gallium/auxiliary/tgsi/tgsi_util.c b/src/gallium/auxiliary/tgsi/tgsi_util.c index 8a5a8eab5aa..dfd32d7be44 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_util.c +++ b/src/gallium/auxiliary/tgsi/tgsi_util.c @@ -320,3 +320,21 @@ tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst, return usage_mask; } + +/** + * Convert a tgsi_ind_register into a tgsi_src_register + */ +struct tgsi_src_register +tgsi_util_get_src_from_ind(const struct tgsi_ind_register *reg) +{ + struct tgsi_src_register src = {}; + + src.File = reg->File; + src.Index = reg->Index; + src.SwizzleX = reg->Swizzle; + src.SwizzleY = reg->Swizzle; + src.SwizzleZ = reg->Swizzle; + src.SwizzleW = reg->Swizzle; + + return src; +} diff --git a/src/gallium/auxiliary/tgsi/tgsi_util.h b/src/gallium/auxiliary/tgsi/tgsi_util.h index 04702ba9826..d9f8859a353 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_util.h +++ b/src/gallium/auxiliary/tgsi/tgsi_util.h @@ -76,6 +76,9 @@ unsigned tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst, unsigned src_idx); +struct tgsi_src_register +tgsi_util_get_src_from_ind(const struct tgsi_ind_register *reg); + #if defined __cplusplus } #endif diff --git a/src/gallium/drivers/i915/i915_fpc.h b/src/gallium/drivers/i915/i915_fpc.h index 9e4a7ea0e4a..e915822f4a9 100644 --- a/src/gallium/drivers/i915/i915_fpc.h +++ b/src/gallium/drivers/i915/i915_fpc.h @@ -276,9 +276,9 @@ struct i915_full_dst_register { struct i915_dst_register Register; /* - struct tgsi_src_register Indirect; + struct tgsi_ind_register Indirect; struct tgsi_dimension Dimension; - struct tgsi_src_register DimIndirect; + struct tgsi_ind_register DimIndirect; */ }; @@ -286,9 +286,9 @@ struct i915_full_src_register { struct i915_src_register Register; /* - struct tgsi_src_register Indirect; + struct tgsi_ind_register Indirect; struct tgsi_dimension Dimension; - struct tgsi_src_register DimIndirect; + struct tgsi_ind_register DimIndirect; */ }; diff --git a/src/gallium/drivers/nv30/nvfx_vertprog.c b/src/gallium/drivers/nv30/nvfx_vertprog.c index 827d518cb54..74dba38001c 100644 --- a/src/gallium/drivers/nv30/nvfx_vertprog.c +++ b/src/gallium/drivers/nv30/nvfx_vertprog.c @@ -405,7 +405,7 @@ tgsi_src(struct nvfx_vpc *vpc, const struct tgsi_full_src_register *fsrc) { fsrc->Register.File == TGSI_FILE_INPUT)) { src.indirect = 1; src.indirect_reg = fsrc->Indirect.Index; - src.indirect_swz = fsrc->Indirect.SwizzleX; + src.indirect_swz = fsrc->Indirect.Swizzle; } else { src.reg.index = 0; src.reg.type = -1; diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp index a3830ed3c2a..613187c0a12 100644 --- a/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp +++ b/src/gallium/drivers/nv50/codegen/nv50_ir_from_tgsi.cpp @@ -23,6 +23,7 @@ extern "C" { #include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_scan.h" +#include "tgsi/tgsi_util.h" } #include @@ -55,6 +56,11 @@ public: SrcRegister(const struct tgsi_src_register& src) : reg(src), fsr(NULL) { } + SrcRegister(const struct tgsi_ind_register& ind) + : reg(tgsi_util_get_src_from_ind(&ind)), + fsr(NULL) + { } + struct tgsi_src_register offsetToSrc(struct tgsi_texture_offset off) { struct tgsi_src_register reg; diff --git a/src/gallium/drivers/r600/r600_llvm.c b/src/gallium/drivers/r600/r600_llvm.c index 042193c990b..6e6edb77c66 100644 --- a/src/gallium/drivers/r600/r600_llvm.c +++ b/src/gallium/drivers/r600/r600_llvm.c @@ -34,7 +34,7 @@ static LLVMValueRef llvm_fetch_const( }; if (reg->Register.Indirect) { struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base); - LLVMValueRef index = LLVMBuildLoad(bld_base->base.gallivm->builder, bld->addr[reg->Indirect.Index][reg->Indirect.SwizzleX], ""); + LLVMValueRef index = LLVMBuildLoad(bld_base->base.gallivm->builder, bld->addr[reg->Indirect.Index][reg->Indirect.Swizzle], ""); offset[1] = LLVMBuildAdd(bld_base->base.gallivm->builder, offset[1], index, ""); } unsigned ConstantAddressSpace = CONSTANT_BUFFER_0_ADDR_SPACE ; diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index eac75e69e5d..1ca46fd0206 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -563,7 +563,7 @@ struct tgsi_instruction_predicate * * Index specifies the element number of a register in the register file. * - * If Indirect is TRUE, Index should be offset by the X component of a source + * If Indirect is TRUE, Index should be offset by the X component of the indirect * register that follows. The register can be now fetched into local storage * for further processing. * @@ -589,14 +589,26 @@ struct tgsi_src_register }; /** - * If tgsi_src_register::Modifier is TRUE, tgsi_src_register_modifier follows. - * - * Then, if tgsi_src_register::Indirect is TRUE, another tgsi_src_register - * follows. + * If tgsi_src_register::Indirect is TRUE, tgsi_ind_register follows. + * + * File, Index and Swizzle are handled the same as in tgsi_src_register. + * + * If ArrayID is zero the whole register file might be is indirectly addressed, + * if not only the Declaration with this ArrayID is accessed by this operand. * - * Then, if tgsi_src_register::Dimension is TRUE, tgsi_dimension follows. */ +struct tgsi_ind_register +{ + unsigned File : 4; /* TGSI_FILE_ */ + int Index : 16; /* SINT */ + unsigned Swizzle : 2; /* TGSI_SWIZZLE_ */ + unsigned ArrayID : 10; /* UINT */ +}; + +/** + * If tgsi_src_register::Dimension is TRUE, tgsi_dimension follows. + */ struct tgsi_dimension { -- 2.30.2