From 645a3d24a1b34fe28f8ea0f319b38324519476fb Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 5 Oct 2022 13:42:12 -0600 Subject: [PATCH] draw: asst. clean-ups in draw_pt_fetch_shade_pipeline_llvm.c Also rename vid_base to vertex_id_offset to match code elsewhere. Signed-off-by: Brian Paul Acked-by: Dave Airlie Part-of: --- .../draw/draw_pt_fetch_shade_pipeline_llvm.c | 226 +++++++++--------- 1 file changed, 110 insertions(+), 116 deletions(-) diff --git a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c index ae9e153d714..e50628f6532 100644 --- a/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c +++ b/src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c @@ -75,15 +75,13 @@ llvm_middle_end_prepare_gs(struct llvm_middle_end *fpme) struct draw_context *draw = fpme->draw; struct draw_llvm *llvm = fpme->llvm; struct draw_geometry_shader *gs = draw->gs.geometry_shader; - struct draw_gs_llvm_variant_key *key; - struct draw_gs_llvm_variant *variant = NULL; struct draw_gs_llvm_variant_list_item *li; struct llvm_geometry_shader *shader = llvm_geometry_shader(gs); char store[DRAW_GS_LLVM_MAX_VARIANT_KEY_SIZE]; - - key = draw_gs_llvm_make_variant_key(llvm, store); + struct draw_gs_llvm_variant_key *key = draw_gs_llvm_make_variant_key(llvm, store); /* Search shader's list of variants for the key */ + struct draw_gs_llvm_variant *variant = NULL; LIST_FOR_EACH_ENTRY(li, &shader->variants.list, list) { if (memcmp(&li->base->key, key, shader->variant_key_size) == 0) { variant = li->base; @@ -94,8 +92,7 @@ llvm_middle_end_prepare_gs(struct llvm_middle_end *fpme) if (variant) { /* found the variant, move to head of global list (for LRU) */ list_move_to(&variant->list_item_global.list, &llvm->gs_variants_list.list); - } - else { + } else { /* Need to create new variant */ /* First check if we've created too many variants. If so, free @@ -136,22 +133,21 @@ llvm_middle_end_prepare_gs(struct llvm_middle_end *fpme) gs->current_variant = variant; } + static void llvm_middle_end_prepare_tcs(struct llvm_middle_end *fpme) { struct draw_context *draw = fpme->draw; struct draw_llvm *llvm = fpme->llvm; struct draw_tess_ctrl_shader *tcs = draw->tcs.tess_ctrl_shader; - struct draw_tcs_llvm_variant_key *key; - struct draw_tcs_llvm_variant *variant = NULL; struct draw_tcs_llvm_variant_list_item *li; struct llvm_tess_ctrl_shader *shader = llvm_tess_ctrl_shader(tcs); char store[DRAW_TCS_LLVM_MAX_VARIANT_KEY_SIZE]; - unsigned i; - - key = draw_tcs_llvm_make_variant_key(llvm, store); + const struct draw_tcs_llvm_variant_key *key = + draw_tcs_llvm_make_variant_key(llvm, store); /* Search shader's list of variants for the key */ + struct draw_tcs_llvm_variant *variant = NULL; LIST_FOR_EACH_ENTRY(li, &shader->variants.list, list) { if (memcmp(&li->base->key, key, shader->variant_key_size) == 0) { variant = li->base; @@ -161,9 +157,9 @@ llvm_middle_end_prepare_tcs(struct llvm_middle_end *fpme) if (variant) { /* found the variant, move to head of global list (for LRU) */ - list_move_to(&variant->list_item_global.list, &llvm->tcs_variants_list.list); - } - else { + list_move_to(&variant->list_item_global.list, + &llvm->tcs_variants_list.list); + } else { /* Need to create new variant */ /* First check if we've created too many variants. If so, free @@ -178,7 +174,7 @@ llvm_middle_end_prepare_tcs(struct llvm_middle_end *fpme) /* * XXX: should we flush here ? */ - for (i = 0; i < DRAW_MAX_SHADER_VARIANTS / 32; i++) { + for (unsigned i = 0; i < DRAW_MAX_SHADER_VARIANTS / 32; i++) { struct draw_tcs_llvm_variant_list_item *item; if (list_is_empty(&llvm->tcs_variants_list.list)) { break; @@ -204,20 +200,19 @@ llvm_middle_end_prepare_tcs(struct llvm_middle_end *fpme) tcs->current_variant = variant; } + static void llvm_middle_end_prepare_tes(struct llvm_middle_end *fpme) { struct draw_context *draw = fpme->draw; struct draw_llvm *llvm = fpme->llvm; struct draw_tess_eval_shader *tes = draw->tes.tess_eval_shader; - struct draw_tes_llvm_variant_key *key; struct draw_tes_llvm_variant *variant = NULL; struct draw_tes_llvm_variant_list_item *li; struct llvm_tess_eval_shader *shader = llvm_tess_eval_shader(tes); char store[DRAW_TES_LLVM_MAX_VARIANT_KEY_SIZE]; - unsigned i; - - key = draw_tes_llvm_make_variant_key(llvm, store); + const struct draw_tes_llvm_variant_key *key = + draw_tes_llvm_make_variant_key(llvm, store); /* Search shader's list of variants for the key */ LIST_FOR_EACH_ENTRY(li, &shader->variants.list, list) { @@ -229,9 +224,9 @@ llvm_middle_end_prepare_tes(struct llvm_middle_end *fpme) if (variant) { /* found the variant, move to head of global list (for LRU) */ - list_move_to(&variant->list_item_global.list, &llvm->tes_variants_list.list); - } - else { + list_move_to(&variant->list_item_global.list, + &llvm->tes_variants_list.list); + } else { /* Need to create new variant */ /* First check if we've created too many variants. If so, free @@ -246,7 +241,7 @@ llvm_middle_end_prepare_tes(struct llvm_middle_end *fpme) /* * XXX: should we flush here ? */ - for (i = 0; i < DRAW_MAX_SHADER_VARIANTS / 32; i++) { + for (unsigned i = 0; i < DRAW_MAX_SHADER_VARIANTS / 32; i++) { struct draw_tes_llvm_variant_list_item *item; if (list_is_empty(&llvm->tes_variants_list.list)) { break; @@ -272,16 +267,17 @@ llvm_middle_end_prepare_tes(struct llvm_middle_end *fpme) tes->current_variant = variant; } + /** * Prepare/validate middle part of the vertex pipeline. * NOTE: if you change this function, also look at the non-LLVM * function fetch_pipeline_prepare() for similar changes. */ static void -llvm_middle_end_prepare( struct draw_pt_middle_end *middle, - enum pipe_prim_type in_prim, - unsigned opt, - unsigned *max_vertices ) +llvm_middle_end_prepare(struct draw_pt_middle_end *middle, + enum pipe_prim_type in_prim, + unsigned opt, + unsigned *max_vertices) { struct llvm_middle_end *fpme = llvm_middle_end(middle); struct draw_context *draw = fpme->draw; @@ -295,30 +291,27 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, u_assembled_prim(in_prim); unsigned point_clip = draw->rasterizer->fill_front == PIPE_POLYGON_MODE_POINT || out_prim == PIPE_PRIM_POINTS; - unsigned nr; fpme->input_prim = in_prim; fpme->opt = opt; - draw_pt_post_vs_prepare( fpme->post_vs, - draw->clip_xy, - draw->clip_z, - draw->clip_user, - point_clip ? draw->guard_band_points_xy : - draw->guard_band_xy, - draw->bypass_viewport, - draw->rasterizer->clip_halfz, - (draw->vs.edgeflag_output ? TRUE : FALSE) ); + draw_pt_post_vs_prepare(fpme->post_vs, + draw->clip_xy, + draw->clip_z, + draw->clip_user, + point_clip ? draw->guard_band_points_xy : + draw->guard_band_xy, + draw->bypass_viewport, + draw->rasterizer->clip_halfz, + (draw->vs.edgeflag_output ? TRUE : FALSE)); - draw_pt_so_emit_prepare( fpme->so_emit, (gs == NULL && tes == NULL)); + draw_pt_so_emit_prepare(fpme->so_emit, (gs == NULL && tes == NULL)); if (!(opt & PT_PIPELINE)) { - draw_pt_emit_prepare( fpme->emit, out_prim, - max_vertices ); + draw_pt_emit_prepare(fpme->emit, out_prim, max_vertices); - *max_vertices = MAX2( *max_vertices, 4096 ); - } - else { + *max_vertices = MAX2(*max_vertices, 4096); + } else { /* limit max fetches by limiting max_vertices */ *max_vertices = 4096; } @@ -327,7 +320,7 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, * Note: this must be done after draw_pt_emit_prepare() since that * can effect the vertex size. */ - nr = MAX2(vs->info.num_inputs, draw_total_vs_outputs(draw)); + unsigned nr = MAX2(vs->info.num_inputs, draw_total_vs_outputs(draw)); /* Always leave room for the vertex header whether we need it or * not. It's hard to get rid of it in particular because of the @@ -340,14 +333,11 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, /* Find/create the vertex shader variant */ { - struct draw_llvm_variant_key *key; struct draw_llvm_variant *variant = NULL; struct draw_llvm_variant_list_item *li; struct llvm_vertex_shader *shader = llvm_vertex_shader(vs); char store[DRAW_LLVM_MAX_VARIANT_KEY_SIZE]; - unsigned i; - - key = draw_llvm_make_variant_key(llvm, store); + struct draw_llvm_variant_key *key = draw_llvm_make_variant_key(llvm, store); /* Search shader's list of variants for the key */ LIST_FOR_EACH_ENTRY(li, &shader->variants.list, list) { @@ -360,8 +350,7 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, if (variant) { /* found the variant, move to head of global list (for LRU) */ list_move_to(&variant->list_item_global.list, &llvm->vs_variants_list.list); - } - else { + } else { /* Need to create new variant */ /* First check if we've created too many variants. If so, free @@ -376,7 +365,7 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, /* * XXX: should we flush here ? */ - for (i = 0; i < DRAW_MAX_SHADER_VARIANTS / 32; i++) { + for (unsigned i = 0; i < DRAW_MAX_SHADER_VARIANTS / 32; i++) { struct draw_llvm_variant_list_item *item; if (list_is_empty(&llvm->vs_variants_list.list)) { break; @@ -413,6 +402,7 @@ llvm_middle_end_prepare( struct draw_pt_middle_end *middle, } } + static unsigned get_num_consts_robust(struct draw_context *draw, unsigned *sizes, unsigned idx) { @@ -424,6 +414,7 @@ get_num_consts_robust(struct draw_context *draw, unsigned *sizes, unsigned idx) return DIV_ROUND_UP(const_bytes, draw->constant_buffer_stride); } + /** * Bind/update constant buffer pointers, clip planes and viewport dims. * These are "light weight" parameters which aren't baked into the @@ -533,13 +524,9 @@ pipeline(struct llvm_middle_end *llvm, const struct draw_prim_info *prim_info) { if (prim_info->linear) - draw_pipeline_run_linear( llvm->draw, - vert_info, - prim_info); + draw_pipeline_run_linear(llvm->draw, vert_info, prim_info); else - draw_pipeline_run( llvm->draw, - vert_info, - prim_info ); + draw_pipeline_run(llvm->draw, vert_info, prim_info); } @@ -548,12 +535,10 @@ emit(struct pt_emit *emit, const struct draw_vertex_info *vert_info, const struct draw_prim_info *prim_info) { - if (prim_info->linear) { + if (prim_info->linear) draw_pt_emit_linear(emit, vert_info, prim_info); - } - else { + else draw_pt_emit(emit, vert_info, prim_info); - } } @@ -573,7 +558,6 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, struct draw_vertex_info llvm_vert_info; struct draw_vertex_info tcs_vert_info; struct draw_vertex_info tes_vert_info; - struct draw_vertex_info gs_vert_info[TGSI_MAX_VERTEX_STREAMS]; struct draw_vertex_info *vert_info; struct draw_prim_info ia_prim_info; struct draw_vertex_info ia_vert_info; @@ -581,12 +565,10 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, boolean free_prim_info = FALSE; unsigned opt = fpme->opt; boolean clipped = 0; - unsigned start_or_maxelt, vid_base; - const unsigned *elts; ushort *tes_elts_out = NULL; - memset(&gs_vert_info, 0, sizeof(struct draw_vertex_info) * TGSI_MAX_VERTEX_STREAMS); assert(fetch_info->count > 0); + llvm_vert_info.count = fetch_info->count; llvm_vert_info.vertex_size = fpme->vertex_size; llvm_vert_info.stride = fpme->vertex_size; @@ -602,40 +584,47 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, if (draw->collect_statistics) { draw->statistics.ia_vertices += prim_info->count; if (prim_info->prim == PIPE_PRIM_PATCHES) - draw->statistics.ia_primitives += prim_info->count / draw->pt.vertices_per_patch; + draw->statistics.ia_primitives += + prim_info->count / draw->pt.vertices_per_patch; else draw->statistics.ia_primitives += u_decomposed_prims_for_vertices(prim_info->prim, prim_info->count); draw->statistics.vs_invocations += fetch_info->count; } - if (fetch_info->linear) { - start_or_maxelt = fetch_info->start; - vid_base = draw->start_index; - elts = NULL; - } - else { - start_or_maxelt = draw->pt.user.eltMax; - vid_base = draw->pt.user.eltBias; - elts = fetch_info->elts; - } - clipped = fpme->current_variant->jit_func(&fpme->llvm->jit_context, - llvm_vert_info.verts, - draw->pt.user.vbuffer, - fetch_info->count, - start_or_maxelt, - fpme->vertex_size, - draw->pt.vertex_buffer, - draw->instance_id, - vid_base, - draw->start_instance, - elts, draw->pt.user.drawid, - draw->pt.user.viewid); + { + unsigned start_or_maxelt, vertex_id_offset; + const unsigned *elts; + + if (fetch_info->linear) { + start_or_maxelt = fetch_info->start; + vertex_id_offset = draw->start_index; + elts = NULL; + } else { + start_or_maxelt = draw->pt.user.eltMax; + vertex_id_offset = draw->pt.user.eltBias; + elts = fetch_info->elts; + } + /* Run vertex fetch shader */ + clipped = fpme->current_variant->jit_func(&fpme->llvm->jit_context, + llvm_vert_info.verts, + draw->pt.user.vbuffer, + fetch_info->count, + start_or_maxelt, + fpme->vertex_size, + draw->pt.vertex_buffer, + draw->instance_id, + vertex_id_offset, + draw->start_instance, + elts, + draw->pt.user.drawid, + draw->pt.user.viewid); + + /* Finished with fetch and vs */ + fetch_info = NULL; + vert_info = &llvm_vert_info; + } - /* Finished with fetch and vs: - */ - fetch_info = NULL; - vert_info = &llvm_vert_info; if (opt & PT_SHADE) { struct draw_vertex_shader *vshader = draw->vs.vertex_shader; @@ -687,6 +676,9 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, } } + struct draw_vertex_info gs_vert_info[TGSI_MAX_VERTEX_STREAMS]; + memset(&gs_vert_info, 0, sizeof(gs_vert_info)); + if ((opt & PT_SHADE) && gshader) { struct draw_vertex_shader *vshader = draw->vs.vertex_shader; draw_geometry_shader_run(gshader, @@ -716,7 +708,8 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, opt |= PT_PIPELINE; } } else { - if (!tes_shader && draw_prim_assembler_is_required(draw, prim_info, vert_info)) { + if (!tes_shader && + draw_prim_assembler_is_required(draw, prim_info, vert_info)) { draw_prim_assembler_run(draw, prim_info, vert_info, &ia_prim_info, &ia_vert_info); @@ -735,7 +728,9 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, } /* stream output needs to be done before clipping */ - draw_pt_so_emit( fpme->so_emit, gshader ? gshader->num_vertex_streams : 1, vert_info, prim_info ); + draw_pt_so_emit(fpme->so_emit, + gshader ? gshader->num_vertex_streams : 1, + vert_info, prim_info); if (prim_info->count == 0) { debug_printf("GS/IA didn't emit any vertices!\n"); @@ -747,22 +742,21 @@ llvm_pipeline_generic(struct draw_pt_middle_end *middle, * will try to access non-existent position output. */ if (draw_current_shader_position_output(draw) != -1) { - if ((opt & PT_SHADE) && (gshader || tes_shader || - draw->vs.vertex_shader->info.writes_viewport_index)) { - clipped = draw_pt_post_vs_run( fpme->post_vs, vert_info, prim_info ); + if ((opt & PT_SHADE) && + (gshader || tes_shader || + draw->vs.vertex_shader->info.writes_viewport_index)) { + clipped = draw_pt_post_vs_run(fpme->post_vs, vert_info, prim_info); } /* "clipped" also includes non-one edgeflag */ if (clipped) { opt |= PT_PIPELINE; } - /* Do we need to run the pipeline? Now will come here if clipped - */ + /* Do we need to run the pipeline? Now will come here if clipped */ if (opt & PT_PIPELINE) { - pipeline( fpme, vert_info, prim_info ); - } - else { - emit( fpme->emit, vert_info, prim_info ); + pipeline(fpme, vert_info, prim_info); + } else { + emit(fpme->emit, vert_info, prim_info); } } } @@ -815,7 +809,7 @@ llvm_middle_end_run(struct draw_pt_middle_end *middle, prim_info.primitive_count = 1; prim_info.primitive_lengths = &draw_count; - llvm_pipeline_generic( middle, &fetch_info, &prim_info ); + llvm_pipeline_generic(middle, &fetch_info, &prim_info); } @@ -843,7 +837,7 @@ llvm_middle_end_linear_run(struct draw_pt_middle_end *middle, prim_info.primitive_count = 1; prim_info.primitive_lengths = &count; - llvm_pipeline_generic( middle, &fetch_info, &prim_info ); + llvm_pipeline_generic(middle, &fetch_info, &prim_info); } @@ -873,7 +867,7 @@ llvm_middle_end_linear_run_elts(struct draw_pt_middle_end *middle, prim_info.primitive_count = 1; prim_info.primitive_lengths = &draw_count; - llvm_pipeline_generic( middle, &fetch_info, &prim_info ); + llvm_pipeline_generic(middle, &fetch_info, &prim_info); return TRUE; } @@ -892,16 +886,16 @@ llvm_middle_end_destroy(struct draw_pt_middle_end *middle) struct llvm_middle_end *fpme = llvm_middle_end(middle); if (fpme->fetch) - draw_pt_fetch_destroy( fpme->fetch ); + draw_pt_fetch_destroy(fpme->fetch); if (fpme->emit) - draw_pt_emit_destroy( fpme->emit ); + draw_pt_emit_destroy(fpme->emit); if (fpme->so_emit) - draw_pt_so_emit_destroy( fpme->so_emit ); + draw_pt_so_emit_destroy(fpme->so_emit); if (fpme->post_vs) - draw_pt_post_vs_destroy( fpme->post_vs ); + draw_pt_post_vs_destroy(fpme->post_vs); FREE(middle); } @@ -915,7 +909,7 @@ draw_pt_fetch_pipeline_or_emit_llvm(struct draw_context *draw) if (!draw->llvm) return NULL; - fpme = CALLOC_STRUCT( llvm_middle_end ); + fpme = CALLOC_STRUCT(llvm_middle_end); if (!fpme) goto fail; @@ -929,19 +923,19 @@ draw_pt_fetch_pipeline_or_emit_llvm(struct draw_context *draw) fpme->draw = draw; - fpme->fetch = draw_pt_fetch_create( draw ); + fpme->fetch = draw_pt_fetch_create(draw); if (!fpme->fetch) goto fail; - fpme->post_vs = draw_pt_post_vs_create( draw ); + fpme->post_vs = draw_pt_post_vs_create(draw); if (!fpme->post_vs) goto fail; - fpme->emit = draw_pt_emit_create( draw ); + fpme->emit = draw_pt_emit_create(draw); if (!fpme->emit) goto fail; - fpme->so_emit = draw_pt_so_emit_create( draw ); + fpme->so_emit = draw_pt_so_emit_create(draw); if (!fpme->so_emit) goto fail; @@ -955,7 +949,7 @@ draw_pt_fetch_pipeline_or_emit_llvm(struct draw_context *draw) fail: if (fpme) - llvm_middle_end_destroy( &fpme->base ); + llvm_middle_end_destroy(&fpme->base); return NULL; }