OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/gfx10: simplify some duplicated NGG GS code

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3382>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3382>
This commit is contained in:
Samuel Pitoiset
2020-01-13 09:17:47 +01:00
committed by Marge Bot
parent 53b50be35c
commit fce28a7341
1 changed files with 41 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -2371,6 +2371,30 @@ ngg_gs_emit_vertex_ptr(struct radv_shader_context *ctx, LLVMValueRef gsthread,
return ngg_gs_vertex_ptr(ctx, vertexidx); return ngg_gs_vertex_ptr(ctx, vertexidx);
} }
static LLVMValueRef
ngg_gs_get_emit_output_ptr(struct radv_shader_context *ctx, LLVMValueRef vertexptr,
unsigned out_idx)
{
LLVMValueRef gep_idx[3] = {
ctx->ac.i32_0, /* implied C-style array */
ctx->ac.i32_0, /* first struct entry */
LLVMConstInt(ctx->ac.i32, out_idx, false),
};
return LLVMBuildGEP(ctx->ac.builder, vertexptr, gep_idx, 3, "");
}
static LLVMValueRef
ngg_gs_get_emit_primflag_ptr(struct radv_shader_context *ctx, LLVMValueRef vertexptr,
unsigned stream)
{
LLVMValueRef gep_idx[3] = {
ctx->ac.i32_0, /* implied C-style array */
ctx->ac.i32_1, /* second struct entry */
LLVMConstInt(ctx->ac.i32, stream, false),
};
return LLVMBuildGEP(ctx->ac.builder, vertexptr, gep_idx, 3, "");
}
static struct radv_stream_output * static struct radv_stream_output *
radv_get_stream_output_by_loc(struct radv_streamout_info *so, unsigned location) radv_get_stream_output_by_loc(struct radv_streamout_info *so, unsigned location)
{ {
@@ -3100,13 +3124,8 @@ static void gfx10_ngg_gs_emit_epilogue_1(struct radv_shader_context *ctx)
LLVMBuildStore(builder, tmp, ctx->gs_next_vertex[stream]); LLVMBuildStore(builder, tmp, ctx->gs_next_vertex[stream]);
tmp = ngg_gs_emit_vertex_ptr(ctx, gsthread, vertexidx); tmp = ngg_gs_emit_vertex_ptr(ctx, gsthread, vertexidx);
LLVMValueRef gep_idx[3] = { LLVMBuildStore(builder, i8_0,
ctx->ac.i32_0, /* implied C-style array */ ngg_gs_get_emit_primflag_ptr(ctx, tmp, stream));
ctx->ac.i32_1, /* second entry of struct */
LLVMConstInt(ctx->ac.i32, stream, false),
};
tmp = LLVMBuildGEP(builder, tmp, gep_idx, 3, "");
LLVMBuildStore(builder, i8_0, tmp);
ac_build_endloop(&ctx->ac, 5100); ac_build_endloop(&ctx->ac, 5100);
} }
@@ -3158,13 +3177,8 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
if (!ctx->args->shader_info->gs.num_stream_output_components[stream]) if (!ctx->args->shader_info->gs.num_stream_output_components[stream])
continue; continue;
LLVMValueRef gep_idx[3] = { tmp = LLVMBuildLoad(builder,
ctx->ac.i32_0, /* implicit C-style array */ ngg_gs_get_emit_primflag_ptr(ctx, vertexptr, stream), "");
ctx->ac.i32_1, /* second value of struct */
LLVMConstInt(ctx->ac.i32, stream, false),
};
tmp = LLVMBuildGEP(builder, vertexptr, gep_idx, 3, "");
tmp = LLVMBuildLoad(builder, tmp, "");
tmp = LLVMBuildTrunc(builder, tmp, ctx->ac.i1, ""); tmp = LLVMBuildTrunc(builder, tmp, ctx->ac.i1, "");
tmp2 = LLVMBuildICmp(builder, LLVMIntULT, tid, num_emit_threads, ""); tmp2 = LLVMBuildICmp(builder, LLVMIntULT, tid, num_emit_threads, "");
nggso.prim_enable[stream] = LLVMBuildAnd(builder, tmp, tmp2, ""); nggso.prim_enable[stream] = LLVMBuildAnd(builder, tmp, tmp2, "");
@@ -3200,13 +3214,8 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
/* Load primitive liveness */ /* Load primitive liveness */
tmp = ngg_gs_vertex_ptr(ctx, primidx); tmp = ngg_gs_vertex_ptr(ctx, primidx);
LLVMValueRef gep_idx[3] = { tmp = LLVMBuildLoad(builder,
ctx->ac.i32_0, /* implicit C-style array */ ngg_gs_get_emit_primflag_ptr(ctx, tmp, 0), "");
ctx->ac.i32_1, /* second value of struct */
ctx->ac.i32_0, /* stream 0 */
};
tmp = LLVMBuildGEP(builder, tmp, gep_idx, 3, "");
tmp = LLVMBuildLoad(builder, tmp, "");
const LLVMValueRef primlive = const LLVMValueRef primlive =
LLVMBuildTrunc(builder, tmp, ctx->ac.i1, ""); LLVMBuildTrunc(builder, tmp, ctx->ac.i1, "");
@@ -3261,14 +3270,9 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
ac_build_ifcc(&ctx->ac, vertlive, 5130); ac_build_ifcc(&ctx->ac, vertlive, 5130);
{ {
tmp = ngg_gs_vertex_ptr(ctx, vertlive_scan.result_exclusive); tmp = ngg_gs_vertex_ptr(ctx, vertlive_scan.result_exclusive);
LLVMValueRef gep_idx[3] = {
ctx->ac.i32_0, /* implicit C-style array */
ctx->ac.i32_1, /* second value of struct */
ctx->ac.i32_1, /* stream 1 */
};
tmp = LLVMBuildGEP(builder, tmp, gep_idx, 3, "");
tmp2 = LLVMBuildTrunc(builder, tid, ctx->ac.i8, ""); tmp2 = LLVMBuildTrunc(builder, tid, ctx->ac.i8, "");
LLVMBuildStore(builder, tmp2, tmp); LLVMBuildStore(builder, tmp2,
ngg_gs_get_emit_primflag_ptr(ctx, tmp, 1));
} }
ac_build_endif(&ctx->ac, 5130); ac_build_endif(&ctx->ac, 5130);
@@ -3283,13 +3287,8 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
prim.num_vertices = verts_per_prim; prim.num_vertices = verts_per_prim;
tmp = ngg_gs_vertex_ptr(ctx, tid); tmp = ngg_gs_vertex_ptr(ctx, tid);
LLVMValueRef gep_idx[3] = { flags = LLVMBuildLoad(builder,
ctx->ac.i32_0, /* implicit C-style array */ ngg_gs_get_emit_primflag_ptr(ctx, tmp, 0), "");
ctx->ac.i32_1, /* second value of struct */
ctx->ac.i32_0, /* primflag */
};
tmp = LLVMBuildGEP(builder, tmp, gep_idx, 3, "");
flags = LLVMBuildLoad(builder, tmp, "");
prim.isnull = LLVMBuildNot(builder, LLVMBuildTrunc(builder, flags, ctx->ac.i1, ""), ""); prim.isnull = LLVMBuildNot(builder, LLVMBuildTrunc(builder, flags, ctx->ac.i1, ""), "");
for (unsigned i = 0; i < verts_per_prim; ++i) { for (unsigned i = 0; i < verts_per_prim; ++i) {
@@ -3338,18 +3337,12 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
outinfo->pos_exports = 0; outinfo->pos_exports = 0;
tmp = ngg_gs_vertex_ptr(ctx, tid); tmp = ngg_gs_vertex_ptr(ctx, tid);
LLVMValueRef gep_idx[3] = { tmp = LLVMBuildLoad(builder,
ctx->ac.i32_0, /* implicit C-style array */ ngg_gs_get_emit_primflag_ptr(ctx, tmp, 1), "");
ctx->ac.i32_1, /* second value of struct */
ctx->ac.i32_1, /* stream 1: source data index */
};
tmp = LLVMBuildGEP(builder, tmp, gep_idx, 3, "");
tmp = LLVMBuildLoad(builder, tmp, "");
tmp = LLVMBuildZExt(builder, tmp, ctx->ac.i32, ""); tmp = LLVMBuildZExt(builder, tmp, ctx->ac.i32, "");
const LLVMValueRef vertexptr = ngg_gs_vertex_ptr(ctx, tmp); const LLVMValueRef vertexptr = ngg_gs_vertex_ptr(ctx, tmp);
unsigned out_idx = 0; unsigned out_idx = 0;
gep_idx[1] = ctx->ac.i32_0;
for (unsigned i = 0; i < AC_LLVM_MAX_OUTPUTS; ++i) { for (unsigned i = 0; i < AC_LLVM_MAX_OUTPUTS; ++i) {
unsigned output_usage_mask = unsigned output_usage_mask =
ctx->args->shader_info->gs.output_usage_mask[i]; ctx->args->shader_info->gs.output_usage_mask[i];
@@ -3366,8 +3359,7 @@ static void gfx10_ngg_gs_emit_epilogue_2(struct radv_shader_context *ctx)
if (!(output_usage_mask & (1 << j))) if (!(output_usage_mask & (1 << j)))
continue; continue;
gep_idx[2] = LLVMConstInt(ctx->ac.i32, out_idx, false); tmp = ngg_gs_get_emit_output_ptr(ctx, vertexptr, out_idx);
tmp = LLVMBuildGEP(builder, vertexptr, gep_idx, 3, "");
tmp = LLVMBuildLoad(builder, tmp, ""); tmp = LLVMBuildLoad(builder, tmp, "");
LLVMTypeRef type = LLVMGetAllocatedType(ctx->abi.outputs[ac_llvm_reg_index_soa(i, j)]); LLVMTypeRef type = LLVMGetAllocatedType(ctx->abi.outputs[ac_llvm_reg_index_soa(i, j)]);
@@ -3447,17 +3439,11 @@ static void gfx10_ngg_gs_emit_vertex(struct radv_shader_context *ctx,
LLVMValueRef out_val = LLVMBuildLoad(ctx->ac.builder, LLVMValueRef out_val = LLVMBuildLoad(ctx->ac.builder,
out_ptr[j], ""); out_ptr[j], "");
LLVMValueRef gep_idx[3] = {
ctx->ac.i32_0, /* implied C-style array */
ctx->ac.i32_0, /* first entry of struct */
LLVMConstInt(ctx->ac.i32, out_idx, false),
};
LLVMValueRef ptr = LLVMBuildGEP(builder, vertexptr, gep_idx, 3, "");
out_val = ac_to_integer(&ctx->ac, out_val); out_val = ac_to_integer(&ctx->ac, out_val);
out_val = LLVMBuildZExtOrBitCast(ctx->ac.builder, out_val, ctx->ac.i32, ""); out_val = LLVMBuildZExtOrBitCast(ctx->ac.builder, out_val, ctx->ac.i32, "");
LLVMBuildStore(builder, out_val, ptr); LLVMBuildStore(builder, out_val,
ngg_gs_get_emit_output_ptr(ctx, vertexptr, out_idx));
} }
} }
assert(out_idx * 4 <= ctx->args->shader_info->gs.gsvs_vertex_size); assert(out_idx * 4 <= ctx->args->shader_info->gs.gsvs_vertex_size);
@@ -3483,14 +3469,6 @@ static void gfx10_ngg_gs_emit_vertex(struct radv_shader_context *ctx,
tmp = LLVMBuildAdd(builder, curverts, ctx->ac.i32_1, ""); tmp = LLVMBuildAdd(builder, curverts, ctx->ac.i32_1, "");
LLVMBuildStore(builder, tmp, ctx->gs_curprim_verts[stream]); LLVMBuildStore(builder, tmp, ctx->gs_curprim_verts[stream]);
LLVMValueRef gep_idx[3] = {
ctx->ac.i32_0, /* implied C-style array */
ctx->ac.i32_1, /* second struct entry */
LLVMConstInt(ctx->ac.i32, stream, false),
};
const LLVMValueRef primflagptr =
LLVMBuildGEP(builder, vertexptr, gep_idx, 3, "");
/* The per-vertex primitive flag encoding: /* The per-vertex primitive flag encoding:
* bit 0: whether this vertex finishes a primitive * bit 0: whether this vertex finishes a primitive
* bit 1: whether the primitive is odd (if we are emitting triangle strips) * bit 1: whether the primitive is odd (if we are emitting triangle strips)
@@ -3500,7 +3478,8 @@ static void gfx10_ngg_gs_emit_vertex(struct radv_shader_context *ctx,
LLVMBuildShl(builder, LLVMBuildShl(builder,
LLVMBuildZExt(builder, is_odd, ctx->ac.i8, ""), LLVMBuildZExt(builder, is_odd, ctx->ac.i8, ""),
ctx->ac.i8_1, ""), ""); ctx->ac.i8_1, ""), "");
LLVMBuildStore(builder, tmp, primflagptr); LLVMBuildStore(builder, tmp,
ngg_gs_get_emit_primflag_ptr(ctx, vertexptr, stream));
tmp = LLVMBuildLoad(builder, ctx->gs_generated_prims[stream], ""); tmp = LLVMBuildLoad(builder, ctx->gs_generated_prims[stream], "");
tmp = LLVMBuildAdd(builder, tmp, LLVMBuildZExt(builder, iscompleteprim, ctx->ac.i32, ""), ""); tmp = LLVMBuildAdd(builder, tmp, LLVMBuildZExt(builder, iscompleteprim, ctx->ac.i32, ""), "");