[Mesa-dev] [PATCH 05/23] radeonsi: simplify setting the DONE bit for PS exports

[Marek Olšák]

From: Marek Olšák 

First find out what the last export is and simply set the DONE bit there.
---
 src/gallium/drivers/radeonsi/si_shader.c| 126 ++--
 src/gallium/drivers/radeonsi/si_state_shaders.c |   2 +-
 2 files changed, 55 insertions(+), 73 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 85113c0..8441fb4 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2109,10 +2109,36 @@ static void si_llvm_emit_fs_epilogue(struct 
lp_build_tgsi_context * bld_base)
struct tgsi_shader_info *info = >selector->info;
LLVMBuilderRef builder = base->gallivm->builder;
LLVMValueRef args[9];
-   LLVMValueRef last_args[9] = { 0 };
int depth_index = -1, stencil_index = -1, samplemask_index = -1;
+   int last_color_export = -1;
int i;
 
+   /* If there are no outputs, add a dummy export. */
+   if (!info->num_outputs) {
+   args[0] = lp_build_const_int32(base->gallivm, 0x0); /* enabled 
channels */
+   args[1] = uint->one; /* whether the EXEC mask is valid */
+   args[2] = uint->one; /* DONE bit */
+   args[3] = lp_build_const_int32(base->gallivm, 
V_008DFC_SQ_EXP_MRT);
+   args[4] = uint->zero; /* COMPR flag (0 = 32-bit export) */
+   args[5] = uint->zero; /* R */
+   args[6] = uint->zero; /* G */
+   args[7] = uint->zero; /* B */
+   args[8] = uint->zero; /* A */
+
+   lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+  
LLVMVoidTypeInContext(base->gallivm->context),
+  args, 9, 0);
+   return;
+   }
+
+   /* Determine the last export. If MRTZ is present, it's always last.
+* Otherwise, find the last color export.
+*/
+   if (!info->writes_z && !info->writes_stencil && 
!info->writes_samplemask)
+   for (i = 0; i < info->num_outputs; i++)
+   if (info->output_semantic_name[i] == 
TGSI_SEMANTIC_COLOR)
+   last_color_export = i;
+
for (i = 0; i < info->num_outputs; i++) {
unsigned semantic_name = info->output_semantic_name[i];
unsigned semantic_index = info->output_semantic_index[i];
@@ -2157,56 +2183,48 @@ static void si_llvm_emit_fs_epilogue(struct 
lp_build_tgsi_context * bld_base)
 
break;
default:
-   target = 0;
fprintf(stderr,
"Warning: SI unhandled fs output type:%d\n",
semantic_name);
+   continue;
}
 
-   si_llvm_init_export_args_load(bld_base,
- 
si_shader_ctx->radeon_bld.soa.outputs[i],
- target, args);
-
-   if (semantic_name == TGSI_SEMANTIC_COLOR) {
-   /* If there is an export instruction waiting to be 
emitted, do so now. */
-   if (last_args[0]) {
-   lp_build_intrinsic(base->gallivm->builder,
-  "llvm.SI.export",
+   /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
+   if (semantic_index == 0 &&
+   si_shader_ctx->shader->key.ps.last_cbuf > 0) {
+   for (int c = 1; c <= 
si_shader_ctx->shader->key.ps.last_cbuf; c++) {
+   si_llvm_init_export_args_load(bld_base,
+ 
si_shader_ctx->radeon_bld.soa.outputs[i],
+ 
V_008DFC_SQ_EXP_MRT + c, args);
+   lp_build_intrinsic(base->gallivm->builder, 
"llvm.SI.export",
   
LLVMVoidTypeInContext(base->gallivm->context),
-  last_args, 9, 0);
+  args, 9, 0);
}
+   }
 
-   /* This instruction will be emitted at the end of the 
shader. */
-   memcpy(last_args, args, sizeof(args));
-
-   /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is 
true. */
-   if (semantic_index == 0 &&
-   si_shader_ctx->shader->key.ps.last_cbuf > 0) {
-   for (int c = 1; c <= 
si_shader_ctx->shader->key.ps.last_cbuf; c++) {
-   si_llvm_init_export_args_load(bld_base,
- 

Re: [Mesa-dev] [PATCH 05/23] radeonsi: simplify setting the DONE bit for PS exports

[Nicolai Hähnle]

Patches 1-5 are

Reviewed-by: Nicolai Hähnle 

On 06.01.2016 07:41, Marek Olšák wrote:

From: Marek Olšák 

First find out what the last export is and simply set the DONE bit there.
---
  src/gallium/drivers/radeonsi/si_shader.c| 126 ++--
  src/gallium/drivers/radeonsi/si_state_shaders.c |   2 +-
  2 files changed, 55 insertions(+), 73 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 85113c0..8441fb4 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -2109,10 +2109,36 @@ static void si_llvm_emit_fs_epilogue(struct 
lp_build_tgsi_context * bld_base)
struct tgsi_shader_info *info = >selector->info;
LLVMBuilderRef builder = base->gallivm->builder;
LLVMValueRef args[9];
-   LLVMValueRef last_args[9] = { 0 };
int depth_index = -1, stencil_index = -1, samplemask_index = -1;
+   int last_color_export = -1;
int i;

+   /* If there are no outputs, add a dummy export. */
+   if (!info->num_outputs) {
+   args[0] = lp_build_const_int32(base->gallivm, 0x0); /* enabled 
channels */
+   args[1] = uint->one; /* whether the EXEC mask is valid */
+   args[2] = uint->one; /* DONE bit */
+   args[3] = lp_build_const_int32(base->gallivm, 
V_008DFC_SQ_EXP_MRT);
+   args[4] = uint->zero; /* COMPR flag (0 = 32-bit export) */
+   args[5] = uint->zero; /* R */
+   args[6] = uint->zero; /* G */
+   args[7] = uint->zero; /* B */
+   args[8] = uint->zero; /* A */
+
+   lp_build_intrinsic(base->gallivm->builder, "llvm.SI.export",
+  
LLVMVoidTypeInContext(base->gallivm->context),
+  args, 9, 0);
+   return;
+   }
+
+   /* Determine the last export. If MRTZ is present, it's always last.
+* Otherwise, find the last color export.
+*/
+   if (!info->writes_z && !info->writes_stencil && 
!info->writes_samplemask)
+   for (i = 0; i < info->num_outputs; i++)
+   if (info->output_semantic_name[i] == 
TGSI_SEMANTIC_COLOR)
+   last_color_export = i;
+
for (i = 0; i < info->num_outputs; i++) {
unsigned semantic_name = info->output_semantic_name[i];
unsigned semantic_index = info->output_semantic_index[i];
@@ -2157,56 +2183,48 @@ static void si_llvm_emit_fs_epilogue(struct 
lp_build_tgsi_context * bld_base)

break;
default:
-   target = 0;
fprintf(stderr,
"Warning: SI unhandled fs output type:%d\n",
semantic_name);
+   continue;
}

-   si_llvm_init_export_args_load(bld_base,
- 
si_shader_ctx->radeon_bld.soa.outputs[i],
- target, args);
-
-   if (semantic_name == TGSI_SEMANTIC_COLOR) {
-   /* If there is an export instruction waiting to be 
emitted, do so now. */
-   if (last_args[0]) {
-   lp_build_intrinsic(base->gallivm->builder,
-  "llvm.SI.export",
+   /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is true. */
+   if (semantic_index == 0 &&
+   si_shader_ctx->shader->key.ps.last_cbuf > 0) {
+   for (int c = 1; c <= 
si_shader_ctx->shader->key.ps.last_cbuf; c++) {
+   si_llvm_init_export_args_load(bld_base,
+ 
si_shader_ctx->radeon_bld.soa.outputs[i],
+ 
V_008DFC_SQ_EXP_MRT + c, args);
+   lp_build_intrinsic(base->gallivm->builder, 
"llvm.SI.export",
   
LLVMVoidTypeInContext(base->gallivm->context),
-  last_args, 9, 0);
+  args, 9, 0);
}
+   }

-   /* This instruction will be emitted at the end of the 
shader. */
-   memcpy(last_args, args, sizeof(args));
-
-   /* If last_cbuf > 0, FS_COLOR0_WRITES_ALL_CBUFS is 
true. */
-   if (semantic_index == 0 &&
-   si_shader_ctx->shader->key.ps.last_cbuf > 0) {
-   for (int c = 1; c <= 
si_shader_ctx->shader->key.ps.last_cbuf; c++) {
-