Module: Mesa Branch: master Commit: 408195ec53055d6ef0f4f735da60af9a8451b9c4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=408195ec53055d6ef0f4f735da60af9a8451b9c4
Author: Samuel Pitoiset <[email protected]> Date: Thu Oct 8 10:12:58 2020 +0200 aco: remove useless occurences of radv_nir_compiler_options Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Rhys Perry <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7061> --- src/amd/compiler/aco_interface.cpp | 6 +++--- src/amd/compiler/aco_ir.h | 9 ++++----- src/amd/compiler/aco_live_var_analysis.cpp | 3 +-- src/amd/compiler/aco_lower_to_cssa.cpp | 4 ++-- src/amd/compiler/aco_scheduler.cpp | 4 +--- src/amd/compiler/aco_spill.cpp | 6 +++--- src/amd/compiler/aco_validate.cpp | 4 ++-- 7 files changed, 16 insertions(+), 20 deletions(-) diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp index 4e748cc9010..0edecbcff80 100644 --- a/src/amd/compiler/aco_interface.cpp +++ b/src/amd/compiler/aco_interface.cpp @@ -102,8 +102,8 @@ void aco_compile_shader(unsigned shader_count, validate(program.get()); /* spilling and scheduling */ - live_vars = aco::live_var_analysis(program.get(), args->options); - aco::spill(program.get(), live_vars, args->options); + live_vars = aco::live_var_analysis(program.get()); + aco::spill(program.get(), live_vars); } std::string llvm_ir; @@ -137,7 +137,7 @@ void aco_compile_shader(unsigned shader_count, aco_print_program(program.get(), stderr); } - if (aco::validate_ra(program.get(), args->options)) { + if (aco::validate_ra(program.get())) { std::cerr << "Program after RA validation failure:\n"; aco_print_program(program.get(), stderr); abort(); diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h index f95ca7749ad..2e3b59c50b9 100644 --- a/src/amd/compiler/aco_ir.h +++ b/src/amd/compiler/aco_ir.h @@ -39,7 +39,6 @@ #include "vulkan/radv_shader.h" -struct radv_nir_compiler_options; struct radv_shader_args; struct radv_shader_info; @@ -1677,26 +1676,26 @@ void select_trap_handler_shader(Program *program, struct nir_shader *shader, void lower_phis(Program* program); void calc_min_waves(Program* program); void update_vgpr_sgpr_demand(Program* program, const RegisterDemand new_demand); -live live_var_analysis(Program* program, const struct radv_nir_compiler_options *options); +live live_var_analysis(Program* program); std::vector<uint16_t> dead_code_analysis(Program *program); void dominator_tree(Program* program); void insert_exec_mask(Program *program); void value_numbering(Program* program); void optimize(Program* program); void setup_reduce_temp(Program* program); -void lower_to_cssa(Program* program, live& live_vars, const struct radv_nir_compiler_options *options); +void lower_to_cssa(Program* program, live& live_vars); void register_allocation(Program *program, std::vector<IDSet>& live_out_per_block); void ssa_elimination(Program* program); void lower_to_hw_instr(Program* program); void schedule_program(Program* program, live& live_vars); -void spill(Program* program, live& live_vars, const struct radv_nir_compiler_options *options); +void spill(Program* program, live& live_vars); void insert_wait_states(Program* program); void insert_NOPs(Program* program); unsigned emit_program(Program* program, std::vector<uint32_t>& code); bool print_asm(Program *program, std::vector<uint32_t>& binary, unsigned exec_size, std::ostream& out); bool validate_ir(Program* program); -bool validate_ra(Program* program, const struct radv_nir_compiler_options *options); +bool validate_ra(Program* program); #ifndef NDEBUG void perfwarn(Program *program, bool cond, const char *msg, Instruction *instr=NULL); #else diff --git a/src/amd/compiler/aco_live_var_analysis.cpp b/src/amd/compiler/aco_live_var_analysis.cpp index 467fc631ac5..bb3cf332aa6 100644 --- a/src/amd/compiler/aco_live_var_analysis.cpp +++ b/src/amd/compiler/aco_live_var_analysis.cpp @@ -377,8 +377,7 @@ void update_vgpr_sgpr_demand(Program* program, const RegisterDemand new_demand) } } -live live_var_analysis(Program* program, - const struct radv_nir_compiler_options *options) +live live_var_analysis(Program* program) { live result; result.live_out.resize(program->blocks.size()); diff --git a/src/amd/compiler/aco_lower_to_cssa.cpp b/src/amd/compiler/aco_lower_to_cssa.cpp index 8d35e17ff36..661429b3e64 100644 --- a/src/amd/compiler/aco_lower_to_cssa.cpp +++ b/src/amd/compiler/aco_lower_to_cssa.cpp @@ -194,7 +194,7 @@ void insert_parallelcopies(cssa_ctx& ctx) } /* end namespace */ -void lower_to_cssa(Program* program, live& live_vars, const struct radv_nir_compiler_options *options) +void lower_to_cssa(Program* program, live& live_vars) { cssa_ctx ctx = {program, live_vars}; /* collect information about all interfering phi operands */ @@ -206,7 +206,7 @@ void lower_to_cssa(Program* program, live& live_vars, const struct radv_nir_comp insert_parallelcopies(ctx); /* update live variable information */ - live_vars = live_var_analysis(program, options); + live_vars = live_var_analysis(program); } } diff --git a/src/amd/compiler/aco_scheduler.cpp b/src/amd/compiler/aco_scheduler.cpp index 9d6810672b5..c89bdbc59ff 100644 --- a/src/amd/compiler/aco_scheduler.cpp +++ b/src/amd/compiler/aco_scheduler.cpp @@ -936,9 +936,7 @@ void schedule_program(Program *program, live& live_vars) demands[j] = program->blocks[j].register_demand; } - struct radv_nir_compiler_options options; - options.chip_class = program->chip_class; - live live_vars2 = aco::live_var_analysis(program, &options); + live live_vars2 = aco::live_var_analysis(program); for (unsigned j = 0; j < program->blocks.size(); j++) { Block &b = program->blocks[j]; diff --git a/src/amd/compiler/aco_spill.cpp b/src/amd/compiler/aco_spill.cpp index b76805abb89..4196b652405 100644 --- a/src/amd/compiler/aco_spill.cpp +++ b/src/amd/compiler/aco_spill.cpp @@ -1766,7 +1766,7 @@ void assign_spill_slots(spill_ctx& ctx, unsigned spills_to_vgpr) { } /* end namespace */ -void spill(Program* program, live& live_vars, const struct radv_nir_compiler_options *options) +void spill(Program* program, live& live_vars) { program->config->spilled_vgprs = 0; program->config->spilled_sgprs = 0; @@ -1776,7 +1776,7 @@ void spill(Program* program, live& live_vars, const struct radv_nir_compiler_opt return; /* lower to CSSA before spilling to ensure correctness w.r.t. phis */ - lower_to_cssa(program, live_vars, options); + lower_to_cssa(program, live_vars); /* calculate target register demand */ RegisterDemand register_target = program->max_reg_demand; @@ -1802,7 +1802,7 @@ void spill(Program* program, live& live_vars, const struct radv_nir_compiler_opt assign_spill_slots(ctx, spills_to_vgpr); /* update live variable information */ - live_vars = live_var_analysis(program, options); + live_vars = live_var_analysis(program); assert(program->num_waves > 0); } diff --git a/src/amd/compiler/aco_validate.cpp b/src/amd/compiler/aco_validate.cpp index 4a22dac3cd4..cc7a6a69193 100644 --- a/src/amd/compiler/aco_validate.cpp +++ b/src/amd/compiler/aco_validate.cpp @@ -664,12 +664,12 @@ unsigned get_subdword_bytes_written(Program *program, const aco_ptr<Instruction> } /* end namespace */ -bool validate_ra(Program *program, const struct radv_nir_compiler_options *options) { +bool validate_ra(Program *program) { if (!(debug_flags & DEBUG_VALIDATE_RA)) return false; bool err = false; - aco::live live_vars = aco::live_var_analysis(program, options); + aco::live live_vars = aco::live_var_analysis(program); std::vector<std::vector<Temp>> phi_sgpr_ops(program->blocks.size()); std::map<unsigned, Assignment> assignments; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
