[Mesa-dev] [PATCH] r600/llvm: Allow arbitrary amount of temps in tgsi to llvm

[Tom Stellard]

On Wed, Dec 04, 2013 at 03:11:16PM +0100, Vincent Lejeune wrote:
> ---
>  src/gallium/drivers/radeon/radeon_llvm.h           |  5 +++
>  .../drivers/radeon/radeon_setup_tgsi_llvm.c        | 41 +++++++++++++++++++---
>  2 files changed, 42 insertions(+), 4 deletions(-)
> 
> diff --git a/src/gallium/drivers/radeon/radeon_llvm.h b/src/gallium/drivers/radeon/radeon_llvm.h
> index 2cab6b0..6d84f44 100644
> --- a/src/gallium/drivers/radeon/radeon_llvm.h
> +++ b/src/gallium/drivers/radeon/radeon_llvm.h
> @@ -112,6 +112,11 @@ struct radeon_llvm_context {
>  	LLVMValueRef outputs[RADEON_LLVM_MAX_OUTPUTS][TGSI_NUM_CHANNELS];
>  	unsigned output_reg_count;
>  
> +	/**
> +	 * @brief system_values
> +	 */

This comment is a little confusing, is it meant for the system_values
array?

> +	LLVMValueRef *temps;
> +	unsigned temps_count;
>  	LLVMValueRef system_values[RADEON_LLVM_MAX_SYSTEM_VALUES];
>  
>  	/*=== Private Members ===*/
> diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
> index 3bb01ec..c897b03 100644
> --- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
> +++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
> @@ -184,7 +184,11 @@ emit_fetch(
>  		break;
>  
>  	case TGSI_FILE_TEMPORARY:
> -		ptr = lp_get_temp_ptr_soa(bld, reg->Register.Index, swizzle);
> +		if (false) {
> +			ptr = lp_get_temp_ptr_soa(bld, reg->Register.Index, swizzle);
> +			break;
> +		}

This is dead code.

> +		ptr = ctx->temps[reg->Register.Index * TGSI_NUM_CHANNELS + swizzle];
>  		result = LLVMBuildLoad(builder, ptr, "");
>  		break;
>  
> @@ -200,6 +204,13 @@ emit_fetch(
>  	return bitcast(bld_base, type, result);
>  }
>  
> +static bool uses_temp_indirect_addressing(
> +	struct lp_build_tgsi_context *bld_base)
> +{
> +	struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base);
> +	return !(bld->indirect_files & (1 << TGSI_FILE_TEMPORARY));
> +}
> +
>  static LLVMValueRef fetch_system_value(
>  	struct lp_build_tgsi_context * bld_base,
>  	const struct tgsi_full_src_register *reg,
> @@ -234,7 +245,22 @@ static void emit_declaration(
>  	case TGSI_FILE_TEMPORARY:
>  		if (decl->Declaration.Array && decl->Array.ArrayID <= RADEON_LLVM_MAX_ARRAYS)
>  			ctx->arrays[decl->Array.ArrayID - 1] = decl->Range;
> -		lp_emit_declaration_soa(bld_base, decl);
> +		if (uses_temp_indirect_addressing(bld_base)) {
> +			lp_emit_declaration_soa(bld_base, decl);
> +			break;
> +		}
> +		unsigned first = decl->Range.First, last = decl->Range.Last;

You are mixing declarations and code here.

> +		if (!ctx->temps_count) {
> +			ctx->temps_count = bld_base->info->file_max[TGSI_FILE_TEMPORARY] + 1;
> +			ctx->temps = MALLOC(TGSI_NUM_CHANNELS * ctx->temps_count * sizeof(LLVMValueRef));
> +		}
> +		for (unsigned idx = first; idx <= last; idx++) {
> +			for (unsigned i = 0; i < TGSI_NUM_CHANNELS; i++) {
> +				ctx->temps[idx * TGSI_NUM_CHANNELS + i] =
> +					lp_build_alloca(bld_base->base.gallivm, bld_base->base.vec_type,
> +						"temp");
> +			}
> +		}
>  		break;
>  
>  	case TGSI_FILE_INPUT:
> @@ -284,6 +310,7 @@ emit_store(
>  	const struct tgsi_opcode_info * info,
>  	LLVMValueRef dst[4])
>  {
> +	struct radeon_llvm_context * ctx = radeon_llvm_context(bld_base);
>  	struct lp_build_tgsi_soa_context *bld = lp_soa_context(bld_base);
>  	struct gallivm_state *gallivm = bld->bld_base.base.gallivm;
>  	struct lp_build_context base = bld->bld_base.base;
> @@ -359,7 +386,10 @@ emit_store(
>  					break;
>  
>  				case TGSI_FILE_TEMPORARY:
> -					temp_ptr = lp_get_temp_ptr_soa(bld, i + range.First, chan_index);
> +					if (uses_temp_indirect_addressing(bld_base))
> +						temp_ptr = lp_get_temp_ptr_soa(bld, i + range.First, chan_index);
> +					else
> +						temp_ptr = ctx->temps[(i + range.First) * TGSI_NUM_CHANNELS + chan_index];
>  					break;
>  
>  				default:
> @@ -377,7 +407,9 @@ emit_store(
>  				break;
>  
>  			case TGSI_FILE_TEMPORARY:
> -				temp_ptr = lp_get_temp_ptr_soa(bld, reg->Register.Index, chan_index);
> +				if (uses_temp_indirect_addressing(bld_base))
> +					break;
> +				temp_ptr = ctx->temps[ TGSI_NUM_CHANNELS * reg->Register.Index + chan_index];
>  				break;
>  
>  			default:
> @@ -1392,4 +1424,5 @@ void radeon_llvm_dispose(struct radeon_llvm_context * ctx)
>  {
>  	LLVMDisposeModule(ctx->soa.bld_base.base.gallivm->module);
>  	LLVMContextDispose(ctx->soa.bld_base.base.gallivm->context);
> +	FREE(ctx->temps);
>  }
> -- 
> 1.8.4.2
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev