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

radv: add radv_create_rt_prolog()

Browse Source 
Co-authored-by: Friedrich Vock <friedrich.vock@gmx.de>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21780>
This commit is contained in:
Daniel Schürmann
2023-02-21 14:21:39 +01:00
committed by Marge Bot
parent 6446b79168
commit 4b92a53285
4 changed files with 118 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/amd/compiler/aco_interface.cpp
View File

@@ -252,18 +252,48 @@ aco_compile_shader(const struct aco_compiler_options* options,
if (program->collect_statistics)
stats_size = aco_num_statistics * sizeof(uint32_t);
(*build_binary)(binary,
shaders[shader_count - 1]->info.stage,
&config,
llvm_ir.c_str(),
llvm_ir.size(),
disasm.c_str(),
disasm.size(),
program->statistics,
stats_size,
exec_size,
code.data(),
code.size());
(*build_binary)(binary, shaders[shader_count - 1]->info.stage, &config, llvm_ir.c_str(),
llvm_ir.size(), disasm.c_str(), disasm.size(), program->statistics, stats_size,
exec_size, code.data(), code.size());
}
void
aco_compile_rt_prolog(const struct aco_compiler_options* options,
const struct aco_shader_info* info, const struct ac_shader_args* in_args,
const struct ac_shader_args* out_args, aco_callback* build_prolog,
void** binary)
{
aco::init();
/* create program */
ac_shader_config config = {0};
std::unique_ptr<aco::Program> program{new aco::Program};
program->collect_statistics = false;
program->debug.func = NULL;
program->debug.private_data = NULL;
aco::select_rt_prolog(program.get(), &config, options, info, in_args, out_args);
aco::insert_wait_states(program.get());
aco::insert_NOPs(program.get());
if (program->gfx_level >= GFX10)
aco::form_hard_clauses(program.get());
if (options->dump_shader)
aco_print_program(program.get(), stderr);
/* assembly */
std::vector<uint32_t> code;
code.reserve(align(program->blocks[0].instructions.size() * 2, 16));
unsigned exec_size = aco::emit_program(program.get(), code);
bool get_disasm = options->dump_shader || options->record_ir;
std::string disasm;
if (get_disasm)
disasm = get_disasm_string(program.get(), code, exec_size);
(*build_prolog)(binary, MESA_SHADER_COMPUTE, &config, NULL, 0, disasm.c_str(), disasm.size(),
program->statistics, 0, exec_size, code.data(), code.size());
}
void

5
src/amd/compiler/aco_interface.h
View File

@@ -75,6 +75,11 @@ void aco_compile_shader(const struct aco_compiler_options* options,
aco_callback *build_binary,
void **binary);
void aco_compile_rt_prolog(const struct aco_compiler_options* options,
const struct aco_shader_info* info, const struct ac_shader_args* in_args,
const struct ac_shader_args* out_args, aco_callback* build_prolog,
void** binary);
void aco_compile_vs_prolog(const struct aco_compiler_options* options,
const struct aco_shader_info* info,
const struct aco_vs_prolog_info* prolog_info,

69
src/amd/vulkan/radv_shader.c
View File

@@ -2510,6 +2510,75 @@ static void radv_aco_build_shader_part(void **bin,
*binary = part_binary;
}
struct radv_shader *
radv_create_rt_prolog(struct radv_device *device)
{
struct radv_shader *prolog;
struct radv_shader_args in_args = {0};
struct radv_shader_args out_args = {0};
struct radv_nir_compiler_options options = {0};
radv_fill_nir_compiler_options(&options, device, NULL, false,
device->instance->debug_flags & RADV_DEBUG_DUMP_PROLOGS, false,
device->instance->debug_flags & RADV_DEBUG_HANG, false);
struct radv_shader_info info = {0};
info.loads_push_constants = true;
info.desc_set_used_mask = -1; /* just to force indirection */
info.wave_size = device->physical_device->rt_wave_size;
info.workgroup_size = info.wave_size;
info.cs.is_rt_shader = true;
info.cs.uses_ray_launch_size = true;
info.cs.uses_dynamic_rt_callable_stack = true;
info.cs.block_size[0] = 8;
info.cs.block_size[1] = device->physical_device->rt_wave_size == 64 ? 8 : 4;
info.cs.block_size[2] = 1;
info.cs.uses_thread_id[0] = true;
info.cs.uses_thread_id[1] = true;
for (unsigned i = 0; i < 3; i++)
info.cs.uses_block_id[i] = true;
struct radv_pipeline_key pipeline_key = {0};
in_args.explicit_scratch_args = true;
radv_declare_shader_args(device, &pipeline_key, &info, MESA_SHADER_COMPUTE, false,
MESA_SHADER_NONE, &in_args);
radv_declare_rt_shader_args(options.gfx_level, &out_args);
info.user_sgprs_locs = in_args.user_sgprs_locs;
#ifdef LLVM_AVAILABLE
if (options.dump_shader || options.record_ir)
ac_init_llvm_once();
#endif
struct radv_shader_binary *binary = NULL;
struct aco_shader_info ac_info;
struct aco_compiler_options ac_opts;
radv_aco_convert_shader_info(&ac_info, &info, &in_args);
radv_aco_convert_opts(&ac_opts, &options, &in_args);
aco_compile_rt_prolog(&ac_opts, &ac_info, &in_args.ac, &out_args.ac,
&radv_aco_build_shader_binary, (void **)&binary);
binary->info = info;
prolog = radv_shader_create(device, binary, device->keep_shader_info, false, &in_args);
if (!prolog)
goto fail_create;
if (!radv_shader_binary_upload(device, binary, prolog))
goto fail_alloc;
if (options.dump_shader) {
fprintf(stderr, "Raytracing prolog");
fprintf(stderr, "\ndisasm:\n%s\n", prolog->disasm_string);
}
return prolog;
fail_alloc:
radv_shader_destroy(device, prolog);
fail_create:
free(binary);
return NULL;
}
struct radv_shader_part *
radv_create_vs_prolog(struct radv_device *device, const struct radv_vs_prolog_key *key)
{

2
src/amd/vulkan/radv_shader.h
View File

@@ -590,6 +590,8 @@ radv_create_gs_copy_shader(struct radv_device *device, struct nir_shader *nir,
struct radv_shader *radv_create_trap_handler_shader(struct radv_device *device);
struct radv_shader *radv_create_rt_prolog(struct radv_device *device);
struct radv_shader_part *radv_create_vs_prolog(struct radv_device *device,
const struct radv_vs_prolog_key *key);