From 331794495ed0e8bbd87cafedfa9ef334bb43b0b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 7 Apr 2020 12:20:52 +0100 Subject: [PATCH] aco: rename aco_lower_bool_phis() -> aco_lower_phis() We also lower subdword phis, now. Reviewed-by: Rhys Perry Part-of: --- src/amd/Makefile.sources | 2 +- src/amd/compiler/aco_interface.cpp | 6 +++--- src/amd/compiler/aco_ir.h | 2 +- .../{aco_lower_bool_phis.cpp => aco_lower_phis.cpp} | 2 +- src/amd/compiler/meson.build | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/amd/compiler/{aco_lower_bool_phis.cpp => aco_lower_phis.cpp} (99%) diff --git a/src/amd/Makefile.sources b/src/amd/Makefile.sources index a30619641be..04d4d7dd848 100644 --- a/src/amd/Makefile.sources +++ b/src/amd/Makefile.sources @@ -86,7 +86,7 @@ ACO_FILES = \ compiler/aco_reduce_assign.cpp \ compiler/aco_register_allocation.cpp \ compiler/aco_live_var_analysis.cpp \ - compiler/aco_lower_bool_phis.cpp \ + compiler/aco_lower_phis.cpp \ compiler/aco_lower_to_cssa.cpp \ compiler/aco_lower_to_hw_instr.cpp \ compiler/aco_optimizer.cpp \ diff --git a/src/amd/compiler/aco_interface.cpp b/src/amd/compiler/aco_interface.cpp index 8991d616eed..3031bb43f7a 100644 --- a/src/amd/compiler/aco_interface.cpp +++ b/src/amd/compiler/aco_interface.cpp @@ -93,9 +93,9 @@ void aco_compile_shader(unsigned shader_count, } aco::validate(program.get(), stderr); - /* Boolean phi lowering */ - aco::lower_bool_phis(program.get()); - //std::cerr << "After Boolean Phi Lowering:\n"; + /* Phi lowering */ + aco::lower_phis(program.get()); + //std::cerr << "After Phi Lowering:\n"; //aco_print_program(program.get(), stderr); aco::dominator_tree(program.get()); diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h index 8ff5a9e220a..fb0c9beb208 100644 --- a/src/amd/compiler/aco_ir.h +++ b/src/amd/compiler/aco_ir.h @@ -1468,7 +1468,7 @@ void select_gs_copy_shader(Program *program, struct nir_shader *gs_shader, void lower_wqm(Program* program, live& live_vars, const struct radv_nir_compiler_options *options); -void lower_bool_phis(Program* program); +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); diff --git a/src/amd/compiler/aco_lower_bool_phis.cpp b/src/amd/compiler/aco_lower_phis.cpp similarity index 99% rename from src/amd/compiler/aco_lower_bool_phis.cpp rename to src/amd/compiler/aco_lower_phis.cpp index 1613e4be94a..c47f59e7cc6 100644 --- a/src/amd/compiler/aco_lower_bool_phis.cpp +++ b/src/amd/compiler/aco_lower_phis.cpp @@ -213,7 +213,7 @@ void lower_subdword_phis(Program *program, Block *block, aco_ptr& p return; } -void lower_bool_phis(Program* program) +void lower_phis(Program* program) { for (Block& block : program->blocks) { for (aco_ptr& phi : block.instructions) { diff --git a/src/amd/compiler/meson.build b/src/amd/compiler/meson.build index 44b56baab4c..778cf8ee3ee 100644 --- a/src/amd/compiler/meson.build +++ b/src/amd/compiler/meson.build @@ -68,7 +68,7 @@ libaco_files = files( 'aco_reduce_assign.cpp', 'aco_register_allocation.cpp', 'aco_live_var_analysis.cpp', - 'aco_lower_bool_phis.cpp', + 'aco_lower_phis.cpp', 'aco_lower_to_cssa.cpp', 'aco_lower_to_hw_instr.cpp', 'aco_optimizer.cpp', -- 2.30.2