X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fradeonsi%2Fsi_shader.h;h=633f59d2620d3b82df91ebbb2d05b87abd4dc3c9;hb=f4ba457e1e6c4c8bd232e3c99f301964b9a1cb4a;hp=2dc4bc7e78705b6a097b66ce947968042b17f0ff;hpb=86b52d42368ac496fe24bc6674e754c323381635;p=mesa.git diff --git a/src/gallium/drivers/radeonsi/si_shader.h b/src/gallium/drivers/radeonsi/si_shader.h index 2dc4bc7e787..633f59d2620 100644 --- a/src/gallium/drivers/radeonsi/si_shader.h +++ b/src/gallium/drivers/radeonsi/si_shader.h @@ -133,9 +133,9 @@ #include /* LLVMModuleRef */ #include -#include "tgsi/tgsi_scan.h" #include "util/u_inlines.h" #include "util/u_queue.h" +#include "util/simple_mtx.h" #include "ac_binary.h" #include "ac_llvm_build.h" @@ -143,6 +143,10 @@ #include +// Use LDS symbols when supported by LLVM. Can be disabled for testing the old +// path on newer LLVM for now. Should be removed in the long term. +#define USE_LDS_SYMBOLS (true) + struct nir_shader; struct si_shader; struct si_context; @@ -153,26 +157,14 @@ struct si_context; /* Shader IO unique indices are supported for TGSI_SEMANTIC_GENERIC with an * index smaller than this. */ -#define SI_MAX_IO_GENERIC 43 +#define SI_MAX_IO_GENERIC 32 /* SGPR user data indices */ enum { SI_SGPR_RW_BUFFERS, /* rings (& stream-out, VS only) */ -#if !HAVE_32BIT_POINTERS - SI_SGPR_RW_BUFFERS_HI, -#endif SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES, -#if !HAVE_32BIT_POINTERS - SI_SGPR_BINDLESS_SAMPLERS_AND_IMAGES_HI, -#endif SI_SGPR_CONST_AND_SHADER_BUFFERS, /* or just a constant buffer 0 pointer */ -#if !HAVE_32BIT_POINTERS - SI_SGPR_CONST_AND_SHADER_BUFFERS_HI, -#endif SI_SGPR_SAMPLERS_AND_IMAGES, -#if !HAVE_32BIT_POINTERS - SI_SGPR_SAMPLERS_AND_IMAGES_HI, -#endif SI_NUM_RESOURCE_SGPRS, /* API VS, TES without GS, GS copy shader */ @@ -200,40 +192,30 @@ enum { GFX6_TCS_NUM_USER_SGPR, /* GFX9: Merged shaders. */ -#if HAVE_32BIT_POINTERS /* 2ND_CONST_AND_SHADER_BUFFERS is set in USER_DATA_ADDR_LO (SGPR0). */ /* 2ND_SAMPLERS_AND_IMAGES is set in USER_DATA_ADDR_HI (SGPR1). */ GFX9_MERGED_NUM_USER_SGPR = SI_VS_NUM_USER_SGPR, -#else - /* 2ND_CONST_AND_SHADER_BUFFERS is set in USER_DATA_ADDR_LO/HI (SGPR[0:1]). */ - GFX9_SGPR_2ND_SAMPLERS_AND_IMAGES = SI_VS_NUM_USER_SGPR, - GFX9_SGPR_2ND_SAMPLERS_AND_IMAGES_HI, - GFX9_MERGED_NUM_USER_SGPR, -#endif /* GFX9: Merged LS-HS (VS-TCS) only. */ GFX9_SGPR_TCS_OFFCHIP_LAYOUT = GFX9_MERGED_NUM_USER_SGPR, GFX9_SGPR_TCS_OUT_OFFSETS, GFX9_SGPR_TCS_OUT_LAYOUT, -#if !HAVE_32BIT_POINTERS - GFX9_SGPR_align_for_vb_pointer, -#endif GFX9_TCS_NUM_USER_SGPR, /* GS limits */ GFX6_GS_NUM_USER_SGPR = SI_NUM_RESOURCE_SGPRS, -#if HAVE_32BIT_POINTERS GFX9_VSGS_NUM_USER_SGPR = SI_VS_NUM_USER_SGPR, GFX9_TESGS_NUM_USER_SGPR = SI_TES_NUM_USER_SGPR, -#else - GFX9_VSGS_NUM_USER_SGPR = GFX9_MERGED_NUM_USER_SGPR, - GFX9_TESGS_NUM_USER_SGPR = GFX9_MERGED_NUM_USER_SGPR, -#endif SI_GSCOPY_NUM_USER_SGPR = SI_NUM_VS_STATE_RESOURCE_SGPRS, /* PS only */ SI_SGPR_ALPHA_REF = SI_NUM_RESOURCE_SGPRS, SI_PS_NUM_USER_SGPR, + + /* The value has to be 12, because the hw requires that descriptors + * are aligned to 4 SGPRs. + */ + SI_SGPR_VS_VB_DESCRIPTOR_FIRST = 12, }; /* LLVM function parameter indices */ @@ -264,56 +246,49 @@ enum { }; /* Fields of driver-defined VS state SGPR. */ -/* Clamp vertex color output (only used in VS as VS). */ #define S_VS_STATE_CLAMP_VERTEX_COLOR(x) (((unsigned)(x) & 0x1) << 0) #define C_VS_STATE_CLAMP_VERTEX_COLOR 0xFFFFFFFE #define S_VS_STATE_INDEXED(x) (((unsigned)(x) & 0x1) << 1) #define C_VS_STATE_INDEXED 0xFFFFFFFD +#define S_VS_STATE_OUTPRIM(x) (((unsigned)(x) & 0x3) << 2) +#define C_VS_STATE_OUTPRIM 0xFFFFFFF3 +#define S_VS_STATE_PROVOKING_VTX_INDEX(x) (((unsigned)(x) & 0x3) << 4) +#define C_VS_STATE_PROVOKING_VTX_INDEX 0xFFFFFFCF +#define S_VS_STATE_STREAMOUT_QUERY_ENABLED(x) (((unsigned)(x) & 0x1) << 6) +#define C_VS_STATE_STREAMOUT_QUERY_ENABLED 0xFFFFFFBF #define S_VS_STATE_LS_OUT_PATCH_SIZE(x) (((unsigned)(x) & 0x1FFF) << 8) #define C_VS_STATE_LS_OUT_PATCH_SIZE 0xFFE000FF #define S_VS_STATE_LS_OUT_VERTEX_SIZE(x) (((unsigned)(x) & 0xFF) << 24) #define C_VS_STATE_LS_OUT_VERTEX_SIZE 0x00FFFFFF -/* SI-specific system values. */ -enum { - TGSI_SEMANTIC_DEFAULT_TESSOUTER_SI = TGSI_SEMANTIC_COUNT, - TGSI_SEMANTIC_DEFAULT_TESSINNER_SI, -}; - enum { /* Use a property enum that CS wouldn't use. */ TGSI_PROPERTY_CS_LOCAL_SIZE = TGSI_PROPERTY_FS_COORD_ORIGIN, - /* Use a property enum that VS wouldn't use. */ - TGSI_PROPERTY_VS_BLIT_SGPRS = TGSI_PROPERTY_FS_COORD_ORIGIN, - /* These represent the number of SGPRs the shader uses. */ SI_VS_BLIT_SGPRS_POS = 3, SI_VS_BLIT_SGPRS_POS_COLOR = 7, SI_VS_BLIT_SGPRS_POS_TEXCOORD = 9, }; -/* For VS shader key fix_fetch. */ -enum { - SI_FIX_FETCH_NONE = 0, - SI_FIX_FETCH_A2_SNORM, - SI_FIX_FETCH_A2_SSCALED, - SI_FIX_FETCH_A2_SINT, - SI_FIX_FETCH_RGBA_32_UNORM, - SI_FIX_FETCH_RGBX_32_UNORM, - SI_FIX_FETCH_RGBA_32_SNORM, - SI_FIX_FETCH_RGBX_32_SNORM, - SI_FIX_FETCH_RGBA_32_USCALED, - SI_FIX_FETCH_RGBA_32_SSCALED, - SI_FIX_FETCH_RGBA_32_FIXED, - SI_FIX_FETCH_RGBX_32_FIXED, - SI_FIX_FETCH_RG_64_FLOAT, - SI_FIX_FETCH_RGB_64_FLOAT, - SI_FIX_FETCH_RGBA_64_FLOAT, - SI_FIX_FETCH_RGB_8, /* A = 1.0 */ - SI_FIX_FETCH_RGB_8_INT, /* A = 1 */ - SI_FIX_FETCH_RGB_16, - SI_FIX_FETCH_RGB_16_INT, +/** + * For VS shader keys, describe any fixups required for vertex fetch. + * + * \ref log_size, \ref format, and the number of channels are interpreted as + * by \ref ac_build_opencoded_load_format. + * + * Note: all bits 0 (size = 1 byte, num channels = 1, format = float) is an + * impossible format and indicates that no fixup is needed (just use + * buffer_load_format_xyzw). + */ +union si_vs_fix_fetch { + struct { + uint8_t log_size : 2; /* 1, 2, 4, 8 or bytes per channel */ + uint8_t num_channels_m1 : 2; /* number of channels minus 1 */ + uint8_t format : 3; /* AC_FETCH_FORMAT_xxx */ + uint8_t reverse : 1; /* reverse XYZ channels */ + } u; + uint8_t bits; }; struct si_shader; @@ -331,8 +306,93 @@ struct si_compiler_ctx_state { bool is_debug_context; }; +struct si_shader_info { + ubyte num_inputs; + ubyte num_outputs; + ubyte input_semantic_name[PIPE_MAX_SHADER_INPUTS]; /**< TGSI_SEMANTIC_x */ + ubyte input_semantic_index[PIPE_MAX_SHADER_INPUTS]; + ubyte input_interpolate[PIPE_MAX_SHADER_INPUTS]; + ubyte input_interpolate_loc[PIPE_MAX_SHADER_INPUTS]; + ubyte input_usage_mask[PIPE_MAX_SHADER_INPUTS]; + ubyte output_semantic_name[PIPE_MAX_SHADER_OUTPUTS]; /**< TGSI_SEMANTIC_x */ + ubyte output_semantic_index[PIPE_MAX_SHADER_OUTPUTS]; + ubyte output_usagemask[PIPE_MAX_SHADER_OUTPUTS]; + ubyte output_streams[PIPE_MAX_SHADER_OUTPUTS]; + + ubyte processor; + + int constbuf0_num_slots; + unsigned const_buffers_declared; /**< bitmask of declared const buffers */ + unsigned samplers_declared; /**< bitmask of declared samplers */ + ubyte num_stream_output_components[4]; + + uint num_memory_instructions; /**< sampler, buffer, and image instructions */ + + /** + * If a tessellation control shader reads outputs, this describes which ones. + */ + bool reads_pervertex_outputs; + bool reads_perpatch_outputs; + bool reads_tessfactor_outputs; + + ubyte colors_read; /**< which color components are read by the FS */ + ubyte colors_written; + bool reads_samplemask; /**< does fragment shader read sample mask? */ + bool reads_tess_factors; /**< If TES reads TESSINNER or TESSOUTER */ + bool writes_z; /**< does fragment shader write Z value? */ + bool writes_stencil; /**< does fragment shader write stencil value? */ + bool writes_samplemask; /**< does fragment shader write sample mask? */ + bool writes_edgeflag; /**< vertex shader outputs edgeflag */ + bool uses_kill; /**< KILL or KILL_IF instruction used? */ + bool uses_persp_center; + bool uses_persp_centroid; + bool uses_persp_sample; + bool uses_linear_center; + bool uses_linear_centroid; + bool uses_linear_sample; + bool uses_persp_opcode_interp_sample; + bool uses_linear_opcode_interp_sample; + bool uses_instanceid; + bool uses_vertexid; + bool uses_vertexid_nobase; + bool uses_basevertex; + bool uses_drawid; + bool uses_primid; + bool uses_frontface; + bool uses_invocationid; + bool uses_thread_id[3]; + bool uses_block_id[3]; + bool uses_block_size; + bool uses_grid_size; + bool uses_subgroup_info; + bool writes_position; + bool writes_psize; + bool writes_clipvertex; + bool writes_primid; + bool writes_viewport_index; + bool writes_layer; + bool writes_memory; /**< contains stores or atomics to buffers or images */ + bool uses_derivatives; + bool uses_bindless_samplers; + bool uses_bindless_images; + bool uses_fbfetch; + unsigned clipdist_writemask; + unsigned culldist_writemask; + unsigned num_written_culldistance; + unsigned num_written_clipdistance; + + unsigned images_declared; /**< bitmask of declared images */ + unsigned msaa_images_declared; /**< bitmask of declared MSAA images */ + unsigned shader_buffers_declared; /**< bitmask of declared shader buffers */ + + unsigned properties[TGSI_PROPERTY_COUNT]; /* index with TGSI_PROPERTY_ */ + + /** Whether all codepaths write tess factors in all invocations. */ + bool tessfactors_are_def_in_all_invocs; +}; + /* A shader selector is a gallium CSO and contains shader variants and - * binaries for one TGSI program. This can be shared by multiple contexts. + * binaries for one NIR program. This can be shared by multiple contexts. */ struct si_shader_selector { struct pipe_reference reference; @@ -340,32 +400,39 @@ struct si_shader_selector { struct util_queue_fence ready; struct si_compiler_ctx_state compiler_ctx_state; - mtx_t mutex; + simple_mtx_t mutex; struct si_shader *first_variant; /* immutable after the first variant */ struct si_shader *last_variant; /* mutable */ - /* The compiled TGSI shader expecting a prolog and/or epilog (not - * uploaded to a buffer). + /* The compiled NIR shader without a prolog and/or epilog (not + * uploaded to a buffer object). */ struct si_shader *main_shader_part; struct si_shader *main_shader_part_ls; /* as_ls is set in the key */ struct si_shader *main_shader_part_es; /* as_es is set in the key */ + struct si_shader *main_shader_part_ngg; /* as_ngg is set in the key */ + struct si_shader *main_shader_part_ngg_es; /* for Wave32 TES before legacy GS */ struct si_shader *gs_copy_shader; - struct tgsi_token *tokens; struct nir_shader *nir; + void *nir_binary; + unsigned nir_size; + struct pipe_stream_output_info so; - struct tgsi_shader_info info; - struct tgsi_tessctrl_info tcs_info; + struct si_shader_info info; /* PIPE_SHADER_[VERTEX|FRAGMENT|...] */ - unsigned type; + enum pipe_shader_type type; bool vs_needs_prolog; bool force_correct_derivs_after_kill; + bool prim_discard_cs_allowed; + unsigned num_vs_inputs; + unsigned num_vbos_in_user_sgprs; unsigned pa_cl_vs_out_cntl; ubyte clipdist_mask; ubyte culldist_mask; + unsigned rast_prim; /* ES parameters. */ unsigned esgs_itemsize; /* vertex stride */ @@ -380,6 +447,7 @@ struct si_shader_selector { unsigned gsvs_vertex_size; unsigned max_gsvs_emit_size; unsigned enabled_streamout_buffer_mask; + bool tess_turns_off_ngg; /* PS parameters. */ unsigned color_attr_index[2]; @@ -402,16 +470,21 @@ struct si_shader_selector { /* Valid shader configurations: * - * API shaders VS | TCS | TES | GS |pass| PS - * are compiled as: | | | |thru| - * | | | | | - * Only VS & PS: VS | | | | | PS - * GFX6 - with GS: ES | | | GS | VS | PS - * - with tess: LS | HS | VS | | | PS - * - with both: LS | HS | ES | GS | VS | PS - * GFX9 - with GS: -> | | | GS | VS | PS - * - with tess: -> | HS | VS | | | PS - * - with both: -> | HS | -> | GS | VS | PS + * API shaders VS | TCS | TES | GS |pass| PS + * are compiled as: | | | |thru| + * | | | | | + * Only VS & PS: VS | | | | | PS + * GFX6 - with GS: ES | | | GS | VS | PS + * - with tess: LS | HS | VS | | | PS + * - with both: LS | HS | ES | GS | VS | PS + * GFX9 - with GS: -> | | | GS | VS | PS + * - with tess: -> | HS | VS | | | PS + * - with both: -> | HS | -> | GS | VS | PS + * | | | | | + * NGG - VS & PS: GS | | | | | PS + * (GFX10+) - with GS: -> | | | GS | | PS + * - with tess: -> | HS | GS | | | PS + * - with both: -> | HS | -> | GS | | PS * * -> = merged with the next stage */ @@ -432,6 +505,7 @@ struct si_vs_prolog_bits { uint16_t instance_divisor_is_one; /* bitmask of inputs */ uint16_t instance_divisor_is_fetched; /* bitmask of inputs */ unsigned ls_vgpr_fix:1; + unsigned unpack_instance_id_from_vertex_id:1; }; /* Common TCS bits between the shader key and the epilog key. */ @@ -478,9 +552,10 @@ union si_shader_part_key { unsigned num_input_sgprs:6; /* For merged stages such as LS-HS, HS input VGPRs are first. */ unsigned num_merged_next_stage_vgprs:3; - unsigned last_input:4; + unsigned num_inputs:5; unsigned as_ls:1; unsigned as_es:1; + unsigned as_ngg:1; /* Prologs for monolithic shaders shouldn't set EXEC. */ unsigned is_monolithic:1; } vs_prolog; @@ -491,6 +566,7 @@ union si_shader_part_key { struct si_gs_prolog_bits states; /* Prologs of monolithic shaders shouldn't set EXEC. */ unsigned is_monolithic:1; + unsigned as_ngg:1; } gs_prolog; struct { struct si_ps_prolog_bits states; @@ -536,16 +612,20 @@ struct si_shader_key { } ps; } part; - /* These two are initially set according to the NEXT_SHADER property, + /* These three are initially set according to the NEXT_SHADER property, * or guessed if the property doesn't seem correct. */ unsigned as_es:1; /* export shader, which precedes GS */ unsigned as_ls:1; /* local shader, which precedes TCS */ + unsigned as_ngg:1; /* VS, TES, or GS compiled as NGG primitive shader */ /* Flags for monolithic compilation only. */ struct { - /* One byte for every input: SI_FIX_FETCH_* enums. */ - uint8_t vs_fix_fetch[SI_MAX_ATTRIBS]; + /* Whether fetch should be opencoded according to vs_fix_fetch. + * Otherwise, if vs_fix_fetch is non-zero, buffer_load_format_xyzw + * with minimal fixups is used. */ + uint16_t vs_fetch_opencode; + union si_vs_fix_fetch vs_fix_fetch[SI_MAX_ATTRIBS]; union { uint64_t ff_tcs_inputs_to_copy; /* for fixed-func TCS */ @@ -553,9 +633,9 @@ struct si_shader_key { unsigned vs_export_prim_id:1; struct { unsigned interpolate_at_sample_force_center:1; - unsigned fbfetch_msaa; - unsigned fbfetch_is_1D; - unsigned fbfetch_layered; + unsigned fbfetch_msaa:1; + unsigned fbfetch_is_1D:1; + unsigned fbfetch_layered:1; } ps; } u; } mono; @@ -573,30 +653,27 @@ struct si_shader_key { * possible, because it's in the "opt" group. */ unsigned prefer_mono:1; + + /* Primitive discard compute shader. */ + unsigned vs_as_prim_discard_cs:1; + unsigned cs_prim_type:4; + unsigned cs_indexed:1; + unsigned cs_instancing:1; + unsigned cs_primitive_restart:1; + unsigned cs_provoking_vertex_first:1; + unsigned cs_need_correct_orientation:1; + unsigned cs_cull_front:1; + unsigned cs_cull_back:1; + unsigned cs_cull_z:1; + unsigned cs_halfz_clip_space:1; } opt; }; /* Restore the pack alignment to default. */ #pragma pack(pop) -struct si_shader_config { - unsigned num_sgprs; - unsigned num_vgprs; - unsigned spilled_sgprs; - unsigned spilled_vgprs; - unsigned private_mem_vgprs; - unsigned lds_size; - unsigned max_simd_waves; - unsigned spi_ps_input_ena; - unsigned spi_ps_input_addr; - unsigned float_mode; - unsigned scratch_bytes_per_wave; - unsigned rsrc1; - unsigned rsrc2; -}; - /* GCN-specific shader info. */ -struct si_shader_info { +struct si_shader_binary_info { ubyte vs_output_param_offset[SI_MAX_VS_OUTPUTS]; ubyte num_input_sgprs; ubyte num_input_vgprs; @@ -605,6 +682,23 @@ struct si_shader_info { bool uses_instanceid; ubyte nr_pos_exports; ubyte nr_param_exports; + unsigned private_mem_vgprs; + unsigned max_simd_waves; +}; + +struct si_shader_binary { + const char *elf_buffer; + size_t elf_size; + + char *llvm_ir_string; +}; + +struct gfx9_gs_info { + unsigned es_verts_per_subgroup; + unsigned gs_prims_per_subgroup; + unsigned gs_inst_prims_in_subgroup; + unsigned max_prims_per_subgroup; + unsigned esgs_ring_size; /* in bytes */ }; struct si_shader { @@ -620,8 +714,8 @@ struct si_shader { struct si_shader_part *epilog; struct si_pm4_state *pm4; - struct r600_resource *bo; - struct r600_resource *scratch_bo; + struct si_resource *bo; + struct si_resource *scratch_bo; struct si_shader_key key; struct util_queue_fence ready; bool compilation_failed; @@ -631,22 +725,92 @@ struct si_shader { bool is_gs_copy_shader; /* The following data is all that's needed for binary shaders. */ - struct ac_shader_binary binary; - struct si_shader_config config; - struct si_shader_info info; + struct si_shader_binary binary; + struct ac_shader_config config; + struct si_shader_binary_info info; + + struct { + uint16_t ngg_emit_size; /* in dwords */ + uint16_t hw_max_esverts; + uint16_t max_gsprims; + uint16_t max_out_verts; + uint16_t prim_amp_factor; + bool max_vert_out_per_gs_instance; + } ngg; /* Shader key + LLVM IR + disassembly + statistics. * Generated for debug contexts only. */ char *shader_log; size_t shader_log_size; + + struct gfx9_gs_info gs_info; + + /* For save precompute context registers values. */ + union { + struct { + unsigned vgt_gsvs_ring_offset_1; + unsigned vgt_gsvs_ring_offset_2; + unsigned vgt_gsvs_ring_offset_3; + unsigned vgt_gsvs_ring_itemsize; + unsigned vgt_gs_max_vert_out; + unsigned vgt_gs_vert_itemsize; + unsigned vgt_gs_vert_itemsize_1; + unsigned vgt_gs_vert_itemsize_2; + unsigned vgt_gs_vert_itemsize_3; + unsigned vgt_gs_instance_cnt; + unsigned vgt_gs_onchip_cntl; + unsigned vgt_gs_max_prims_per_subgroup; + unsigned vgt_esgs_ring_itemsize; + } gs; + + struct { + unsigned ge_max_output_per_subgroup; + unsigned ge_ngg_subgrp_cntl; + unsigned vgt_primitiveid_en; + unsigned vgt_gs_onchip_cntl; + unsigned vgt_gs_instance_cnt; + unsigned vgt_esgs_ring_itemsize; + unsigned spi_vs_out_config; + unsigned spi_shader_idx_format; + unsigned spi_shader_pos_format; + unsigned pa_cl_vte_cntl; + unsigned pa_cl_ngg_cntl; + unsigned vgt_gs_max_vert_out; /* for API GS */ + } ngg; + + struct { + unsigned vgt_gs_mode; + unsigned vgt_primitiveid_en; + unsigned vgt_reuse_off; + unsigned spi_vs_out_config; + unsigned spi_shader_pos_format; + unsigned pa_cl_vte_cntl; + } vs; + + struct { + unsigned spi_ps_input_ena; + unsigned spi_ps_input_addr; + unsigned spi_baryc_cntl; + unsigned spi_ps_in_control; + unsigned spi_shader_z_format; + unsigned spi_shader_col_format; + unsigned cb_shader_mask; + } ps; + } ctx_reg; + + /*For save precompute registers value */ + unsigned vgt_tf_param; /* VGT_TF_PARAM */ + unsigned vgt_vertex_reuse_block_cntl; /* VGT_VERTEX_REUSE_BLOCK_CNTL */ + unsigned pa_cl_vs_out_cntl; + unsigned ge_cntl; }; struct si_shader_part { struct si_shader_part *next; union si_shader_part_key key; - struct ac_shader_binary binary; - struct si_shader_config config; + struct si_shader_binary binary; + struct ac_shader_config config; }; /* si_shader.c */ @@ -655,39 +819,40 @@ si_generate_gs_copy_shader(struct si_screen *sscreen, struct ac_llvm_compiler *compiler, struct si_shader_selector *gs_selector, struct pipe_debug_callback *debug); -int si_compile_tgsi_shader(struct si_screen *sscreen, - struct ac_llvm_compiler *compiler, - struct si_shader *shader, - struct pipe_debug_callback *debug); -int si_shader_create(struct si_screen *sscreen, struct ac_llvm_compiler *compiler, +int si_compile_shader(struct si_screen *sscreen, + struct ac_llvm_compiler *compiler, + struct si_shader *shader, + struct pipe_debug_callback *debug); +bool si_shader_create(struct si_screen *sscreen, struct ac_llvm_compiler *compiler, struct si_shader *shader, struct pipe_debug_callback *debug); void si_shader_destroy(struct si_shader *shader); unsigned si_shader_io_get_unique_index_patch(unsigned semantic_name, unsigned index); unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index, unsigned is_varying); -int si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader); -void si_shader_dump(struct si_screen *sscreen, const struct si_shader *shader, - struct pipe_debug_callback *debug, unsigned processor, +bool si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader, + uint64_t scratch_va); +void si_shader_dump(struct si_screen *sscreen, struct si_shader *shader, + struct pipe_debug_callback *debug, FILE *f, bool check_debug_option); -void si_shader_dump_stats_for_shader_db(const struct si_shader *shader, +void si_shader_dump_stats_for_shader_db(struct si_screen *screen, + struct si_shader *shader, struct pipe_debug_callback *debug); void si_multiwave_lds_size_workaround(struct si_screen *sscreen, unsigned *lds_size); -void si_shader_apply_scratch_relocs(struct si_shader *shader, - uint64_t scratch_va); -void si_shader_binary_read_config(struct ac_shader_binary *binary, - struct si_shader_config *conf, - unsigned symbol_offset); -const char *si_get_shader_name(const struct si_shader *shader, unsigned processor); +const char *si_get_shader_name(const struct si_shader *shader); +void si_shader_binary_clean(struct si_shader_binary *binary); /* si_shader_nir.c */ void si_nir_scan_shader(const struct nir_shader *nir, - struct tgsi_shader_info *info); -void si_nir_scan_tess_ctrl(const struct nir_shader *nir, - const struct tgsi_shader_info *info, - struct tgsi_tessctrl_info *out); -void si_lower_nir(struct si_shader_selector *sel); + struct si_shader_info *info); +void si_nir_adjust_driver_locations(struct nir_shader *nir); +void si_finalize_nir(struct pipe_screen *screen, void *nirptr, bool optimize); + +/* si_state_shaders.c */ +void gfx9_get_gs_info(struct si_shader_selector *es, + struct si_shader_selector *gs, + struct gfx9_gs_info *out); /* Inline helpers. */ @@ -698,11 +863,27 @@ si_get_main_shader_part(struct si_shader_selector *sel, { if (key->as_ls) return &sel->main_shader_part_ls; + if (key->as_es && key->as_ngg) + return &sel->main_shader_part_ngg_es; if (key->as_es) return &sel->main_shader_part_es; + if (key->as_ngg) + return &sel->main_shader_part_ngg; return &sel->main_shader_part; } +static inline bool +gfx10_is_ngg_passthrough(struct si_shader *shader) +{ + struct si_shader_selector *sel = shader->selector; + + return sel->type != PIPE_SHADER_GEOMETRY && + !sel->so.num_outputs && + !sel->info.writes_edgeflag && + (sel->type != PIPE_SHADER_VERTEX || + !shader->key.mono.u.vs_export_prim_id); +} + static inline bool si_shader_uses_bindless_samplers(struct si_shader_selector *selector) {