Attachment 108567 Details for Bug 85454 – radeon/llvm: Dynamically allocate branch/loop stack arrays

[patch] radeon/llvm: Dynamically allocate branch/loop stack arrays

radeon-llvm-cf-depth.diff (text/plain), 3.03 KB, created by Michel Dänzer on 2014-10-28 10:08:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2014-10-28 10:08:43 UTC

Size: 3.03 KB

patch

obsolete

>commit 06ad61495897a38ef5188f44d4c37489d7864be7
>Author: Michel DÃ¤nzer <michel.daenzer@amd.com>
>Date:   Tue Oct 28 11:28:29 2014 +0900
>
>    radeon/llvm: Dynamically allocate branch/loop stack arrays
>
>diff --git a/src/gallium/drivers/radeon/radeon_llvm.h b/src/gallium/drivers/radeon/radeon_llvm.h
>index 00714fb..8612ef8 100644
>--- a/src/gallium/drivers/radeon/radeon_llvm.h
>+++ b/src/gallium/drivers/radeon/radeon_llvm.h
>@@ -33,10 +33,10 @@
> 
> #define RADEON_LLVM_MAX_INPUTS 32 * 4
> #define RADEON_LLVM_MAX_OUTPUTS 32 * 4
>-#define RADEON_LLVM_MAX_BRANCH_DEPTH 16
>-#define RADEON_LLVM_MAX_LOOP_DEPTH 16
> #define RADEON_LLVM_MAX_ARRAYS 16
> 
>+#define RADEON_LLVM_INITIAL_CF_DEPTH 4
>+
> #define RADEON_LLVM_MAX_SYSTEM_VALUES 4
> 
> struct radeon_llvm_branch {
>@@ -122,11 +122,13 @@ struct radeon_llvm_context {
> 
> 	/*=== Private Members ===*/
> 
>-	struct radeon_llvm_branch branch[RADEON_LLVM_MAX_BRANCH_DEPTH];
>-	struct radeon_llvm_loop loop[RADEON_LLVM_MAX_LOOP_DEPTH];
>+	struct radeon_llvm_branch *branch;
>+	struct radeon_llvm_loop *loop;
> 
> 	unsigned branch_depth;
>+	unsigned branch_depth_max;
> 	unsigned loop_depth;
>+	unsigned loop_depth_max;
> 
> 	struct tgsi_declaration_range arrays[RADEON_LLVM_MAX_ARRAYS];
> 	unsigned num_arrays;
>diff --git a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
>index 2fa23ed..d58ea81 100644
>--- a/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
>+++ b/src/gallium/drivers/radeon/radeon_setup_tgsi_llvm.c
>@@ -446,7 +446,18 @@ static void bgnloop_emit(
> 						endloop_block, "LOOP");
> 	LLVMBuildBr(gallivm->builder, loop_block);
> 	LLVMPositionBuilderAtEnd(gallivm->builder, loop_block);
>-	ctx->loop_depth++;
>+
>+	if (++ctx->loop_depth > ctx->loop_depth_max) {
>+		unsigned new_max = ctx->loop_depth_max << 1;
>+
>+		if (!new_max)
>+			new_max = RADEON_LLVM_INITIAL_CF_DEPTH;
>+
>+		ctx->loop = realloc(ctx->loop,
>+				    new_max * sizeof(ctx->loop[0]));
>+		ctx->loop_depth_max = new_max;
>+	}
>+
> 	ctx->loop[ctx->loop_depth - 1].loop_block = loop_block;
> 	ctx->loop[ctx->loop_depth - 1].endloop_block = endloop_block;
> }
>@@ -577,7 +588,17 @@ static void if_cond_emit(
> 	LLVMBuildCondBr(gallivm->builder, cond, if_block, else_block);
> 	LLVMPositionBuilderAtEnd(gallivm->builder, if_block);
> 
>-	ctx->branch_depth++;
>+	if (++ctx->branch_depth > ctx->branch_depth_max) {
>+		unsigned new_max = ctx->branch_depth_max << 1;
>+
>+		if (!new_max)
>+			new_max = RADEON_LLVM_INITIAL_CF_DEPTH;
>+
>+		ctx->branch = realloc(ctx->branch,
>+				      new_max * sizeof(ctx->branch[0]));
>+		ctx->branch_depth_max = new_max;
>+	}
>+
> 	ctx->branch[ctx->branch_depth - 1].endif_block = endif_block;
> 	ctx->branch[ctx->branch_depth - 1].if_block = if_block;
> 	ctx->branch[ctx->branch_depth - 1].else_block = else_block;
>@@ -1440,4 +1461,10 @@ void radeon_llvm_dispose(struct radeon_llvm_context * ctx)
> 	LLVMContextDispose(ctx->soa.bld_base.base.gallivm->context);
> 	FREE(ctx->temps);
> 	ctx->temps = NULL;
>+	FREE(ctx->loop);
>+	ctx->loop = NULL;
>+	ctx->loop_depth_max = 0;
>+	FREE(ctx->branch);
>+	ctx->branch = NULL;
>+	ctx->branch_depth_max = 0;
> }

Actions: View | Splinter Review

Attachments on bug 85454: 108416 | 108512 | 108544 | 108567

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.