From ea283779be851a9bea60a0a4f2e979706d72230a Mon Sep 17 00:00:00 2001 From: Nicolai Hähnle Date: Mon, 8 Aug 2016 23:52:06 +0200 Subject: gallium/radeon: add radeon_llvm_bound_index for bounds checking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/radeonsi/si_shader.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'src/gallium/drivers/radeonsi') diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 06b5c9c2c48..a5b566e5489 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -565,11 +565,7 @@ static LLVMValueRef get_bounded_indirect_index(struct si_shader_context *ctx, const struct tgsi_ind_register *ind, int rel_index, unsigned num) { - struct gallivm_state *gallivm = &ctx->radeon_bld.gallivm; - LLVMBuilderRef builder = gallivm->builder; LLVMValueRef result = get_indirect_index(ctx, ind, rel_index); - LLVMValueRef c_max = LLVMConstInt(ctx->i32, num - 1, 0); - LLVMValueRef cc; /* LLVM 3.8: If indirect resource indexing is used: * - SI & CIK hang @@ -578,20 +574,7 @@ static LLVMValueRef get_bounded_indirect_index(struct si_shader_context *ctx, if (HAVE_LLVM <= 0x0308) return LLVMGetUndef(ctx->i32); - if (util_is_power_of_two(num)) { - result = LLVMBuildAnd(builder, result, c_max, ""); - } else { - /* In theory, this MAX pattern should result in code that is - * as good as the bit-wise AND above. - * - * In practice, LLVM generates worse code (at the time of - * writing), because its value tracking is not strong enough. - */ - cc = LLVMBuildICmp(builder, LLVMIntULE, result, c_max, ""); - result = LLVMBuildSelect(builder, cc, result, c_max, ""); - } - - return result; + return radeon_llvm_bound_index(&ctx->radeon_bld, result, num); } -- cgit v1.2.3