From 25384dccc0defbc44b6c3d2598cd77e4c989864f Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Sun, 29 Dec 2024 10:01:36 -0800 Subject: [PATCH] intel/brw: Remove 'fs' prefix from passes filenames Reviewed-by: Kenneth Graunke Part-of: --- .../{brw_fs_lower.cpp => brw_lower.cpp} | 0 ...w_fs_lower_dpas.cpp => brw_lower_dpas.cpp} | 0 ...p => brw_lower_integer_multiplication.cpp} | 0 ...w_fs_lower_pack.cpp => brw_lower_pack.cpp} | 0 ..._regioning.cpp => brw_lower_regioning.cpp} | 0 ...coreboard.cpp => brw_lower_scoreboard.cpp} | 0 ...imd_width.cpp => brw_lower_simd_width.cpp} | 0 .../compiler/{brw_fs_opt.cpp => brw_opt.cpp} | 0 ...pt_algebraic.cpp => brw_opt_algebraic.cpp} | 0 ...nflicts.cpp => brw_opt_bank_conflicts.cpp} | 0 ...ation.cpp => brw_opt_cmod_propagation.cpp} | 0 ...ants.cpp => brw_opt_combine_constants.cpp} | 0 ...ation.cpp => brw_opt_copy_propagation.cpp} | 0 .../{brw_fs_cse.cpp => brw_opt_cse.cpp} | 0 ...te.cpp => brw_opt_dead_code_eliminate.cpp} | 0 ...esce.cpp => brw_opt_register_coalesce.cpp} | 0 ...n.cpp => brw_opt_saturate_propagation.cpp} | 0 ...tual_grfs.cpp => brw_opt_virtual_grfs.cpp} | 0 ...w_fs_workaround.cpp => brw_workaround.cpp} | 0 src/intel/compiler/meson.build | 50 +++++++++---------- ...oreboard.cpp => test_lower_scoreboard.cpp} | 0 ...tion.cpp => test_opt_cmod_propagation.cpp} | 0 ...nts.cpp => test_opt_combine_constants.cpp} | 0 ...tion.cpp => test_opt_copy_propagation.cpp} | 0 .../{test_fs_cse.cpp => test_opt_cse.cpp} | 0 ....cpp => test_opt_saturate_propagation.cpp} | 0 26 files changed, 25 insertions(+), 25 deletions(-) rename src/intel/compiler/{brw_fs_lower.cpp => brw_lower.cpp} (100%) rename src/intel/compiler/{brw_fs_lower_dpas.cpp => brw_lower_dpas.cpp} (100%) rename src/intel/compiler/{brw_fs_lower_integer_multiplication.cpp => brw_lower_integer_multiplication.cpp} (100%) rename src/intel/compiler/{brw_fs_lower_pack.cpp => brw_lower_pack.cpp} (100%) rename src/intel/compiler/{brw_fs_lower_regioning.cpp => brw_lower_regioning.cpp} (100%) rename src/intel/compiler/{brw_fs_scoreboard.cpp => brw_lower_scoreboard.cpp} (100%) rename src/intel/compiler/{brw_fs_lower_simd_width.cpp => brw_lower_simd_width.cpp} (100%) rename src/intel/compiler/{brw_fs_opt.cpp => brw_opt.cpp} (100%) rename src/intel/compiler/{brw_fs_opt_algebraic.cpp => brw_opt_algebraic.cpp} (100%) rename src/intel/compiler/{brw_fs_bank_conflicts.cpp => brw_opt_bank_conflicts.cpp} (100%) rename src/intel/compiler/{brw_fs_cmod_propagation.cpp => brw_opt_cmod_propagation.cpp} (100%) rename src/intel/compiler/{brw_fs_combine_constants.cpp => brw_opt_combine_constants.cpp} (100%) rename src/intel/compiler/{brw_fs_copy_propagation.cpp => brw_opt_copy_propagation.cpp} (100%) rename src/intel/compiler/{brw_fs_cse.cpp => brw_opt_cse.cpp} (100%) rename src/intel/compiler/{brw_fs_dead_code_eliminate.cpp => brw_opt_dead_code_eliminate.cpp} (100%) rename src/intel/compiler/{brw_fs_register_coalesce.cpp => brw_opt_register_coalesce.cpp} (100%) rename src/intel/compiler/{brw_fs_saturate_propagation.cpp => brw_opt_saturate_propagation.cpp} (100%) rename src/intel/compiler/{brw_fs_opt_virtual_grfs.cpp => brw_opt_virtual_grfs.cpp} (100%) rename src/intel/compiler/{brw_fs_workaround.cpp => brw_workaround.cpp} (100%) rename src/intel/compiler/{test_fs_scoreboard.cpp => test_lower_scoreboard.cpp} (100%) rename src/intel/compiler/{test_fs_cmod_propagation.cpp => test_opt_cmod_propagation.cpp} (100%) rename src/intel/compiler/{test_fs_combine_constants.cpp => test_opt_combine_constants.cpp} (100%) rename src/intel/compiler/{test_fs_copy_propagation.cpp => test_opt_copy_propagation.cpp} (100%) rename src/intel/compiler/{test_fs_cse.cpp => test_opt_cse.cpp} (100%) rename src/intel/compiler/{test_fs_saturate_propagation.cpp => test_opt_saturate_propagation.cpp} (100%) diff --git a/src/intel/compiler/brw_fs_lower.cpp b/src/intel/compiler/brw_lower.cpp similarity index 100% rename from src/intel/compiler/brw_fs_lower.cpp rename to src/intel/compiler/brw_lower.cpp diff --git a/src/intel/compiler/brw_fs_lower_dpas.cpp b/src/intel/compiler/brw_lower_dpas.cpp similarity index 100% rename from src/intel/compiler/brw_fs_lower_dpas.cpp rename to src/intel/compiler/brw_lower_dpas.cpp diff --git a/src/intel/compiler/brw_fs_lower_integer_multiplication.cpp b/src/intel/compiler/brw_lower_integer_multiplication.cpp similarity index 100% rename from src/intel/compiler/brw_fs_lower_integer_multiplication.cpp rename to src/intel/compiler/brw_lower_integer_multiplication.cpp diff --git a/src/intel/compiler/brw_fs_lower_pack.cpp b/src/intel/compiler/brw_lower_pack.cpp similarity index 100% rename from src/intel/compiler/brw_fs_lower_pack.cpp rename to src/intel/compiler/brw_lower_pack.cpp diff --git a/src/intel/compiler/brw_fs_lower_regioning.cpp b/src/intel/compiler/brw_lower_regioning.cpp similarity index 100% rename from src/intel/compiler/brw_fs_lower_regioning.cpp rename to src/intel/compiler/brw_lower_regioning.cpp diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_lower_scoreboard.cpp similarity index 100% rename from src/intel/compiler/brw_fs_scoreboard.cpp rename to src/intel/compiler/brw_lower_scoreboard.cpp diff --git a/src/intel/compiler/brw_fs_lower_simd_width.cpp b/src/intel/compiler/brw_lower_simd_width.cpp similarity index 100% rename from src/intel/compiler/brw_fs_lower_simd_width.cpp rename to src/intel/compiler/brw_lower_simd_width.cpp diff --git a/src/intel/compiler/brw_fs_opt.cpp b/src/intel/compiler/brw_opt.cpp similarity index 100% rename from src/intel/compiler/brw_fs_opt.cpp rename to src/intel/compiler/brw_opt.cpp diff --git a/src/intel/compiler/brw_fs_opt_algebraic.cpp b/src/intel/compiler/brw_opt_algebraic.cpp similarity index 100% rename from src/intel/compiler/brw_fs_opt_algebraic.cpp rename to src/intel/compiler/brw_opt_algebraic.cpp diff --git a/src/intel/compiler/brw_fs_bank_conflicts.cpp b/src/intel/compiler/brw_opt_bank_conflicts.cpp similarity index 100% rename from src/intel/compiler/brw_fs_bank_conflicts.cpp rename to src/intel/compiler/brw_opt_bank_conflicts.cpp diff --git a/src/intel/compiler/brw_fs_cmod_propagation.cpp b/src/intel/compiler/brw_opt_cmod_propagation.cpp similarity index 100% rename from src/intel/compiler/brw_fs_cmod_propagation.cpp rename to src/intel/compiler/brw_opt_cmod_propagation.cpp diff --git a/src/intel/compiler/brw_fs_combine_constants.cpp b/src/intel/compiler/brw_opt_combine_constants.cpp similarity index 100% rename from src/intel/compiler/brw_fs_combine_constants.cpp rename to src/intel/compiler/brw_opt_combine_constants.cpp diff --git a/src/intel/compiler/brw_fs_copy_propagation.cpp b/src/intel/compiler/brw_opt_copy_propagation.cpp similarity index 100% rename from src/intel/compiler/brw_fs_copy_propagation.cpp rename to src/intel/compiler/brw_opt_copy_propagation.cpp diff --git a/src/intel/compiler/brw_fs_cse.cpp b/src/intel/compiler/brw_opt_cse.cpp similarity index 100% rename from src/intel/compiler/brw_fs_cse.cpp rename to src/intel/compiler/brw_opt_cse.cpp diff --git a/src/intel/compiler/brw_fs_dead_code_eliminate.cpp b/src/intel/compiler/brw_opt_dead_code_eliminate.cpp similarity index 100% rename from src/intel/compiler/brw_fs_dead_code_eliminate.cpp rename to src/intel/compiler/brw_opt_dead_code_eliminate.cpp diff --git a/src/intel/compiler/brw_fs_register_coalesce.cpp b/src/intel/compiler/brw_opt_register_coalesce.cpp similarity index 100% rename from src/intel/compiler/brw_fs_register_coalesce.cpp rename to src/intel/compiler/brw_opt_register_coalesce.cpp diff --git a/src/intel/compiler/brw_fs_saturate_propagation.cpp b/src/intel/compiler/brw_opt_saturate_propagation.cpp similarity index 100% rename from src/intel/compiler/brw_fs_saturate_propagation.cpp rename to src/intel/compiler/brw_opt_saturate_propagation.cpp diff --git a/src/intel/compiler/brw_fs_opt_virtual_grfs.cpp b/src/intel/compiler/brw_opt_virtual_grfs.cpp similarity index 100% rename from src/intel/compiler/brw_fs_opt_virtual_grfs.cpp rename to src/intel/compiler/brw_opt_virtual_grfs.cpp diff --git a/src/intel/compiler/brw_fs_workaround.cpp b/src/intel/compiler/brw_workaround.cpp similarity index 100% rename from src/intel/compiler/brw_fs_workaround.cpp rename to src/intel/compiler/brw_workaround.cpp diff --git a/src/intel/compiler/meson.build b/src/intel/compiler/meson.build index 4ba682aecb8..3c9cfd2821f 100644 --- a/src/intel/compiler/meson.build +++ b/src/intel/compiler/meson.build @@ -45,36 +45,17 @@ libintel_compiler_brw_files = files( 'brw_eu_inst.h', 'brw_eu.h', 'brw_eu_validate.c', - 'brw_fs_bank_conflicts.cpp', 'brw_fs_builder.h', - 'brw_fs_cmod_propagation.cpp', - 'brw_fs_combine_constants.cpp', - 'brw_fs_copy_propagation.cpp', 'brw_fs.cpp', - 'brw_fs_cse.cpp', - 'brw_fs_dead_code_eliminate.cpp', 'brw_fs_generator.cpp', 'brw_fs.h', 'brw_fs_live_variables.cpp', 'brw_fs_live_variables.h', - 'brw_fs_lower.cpp', - 'brw_fs_lower_dpas.cpp', - 'brw_fs_lower_integer_multiplication.cpp', - 'brw_fs_lower_pack.cpp', - 'brw_fs_lower_regioning.cpp', - 'brw_fs_lower_simd_width.cpp', 'brw_fs_nir.cpp', - 'brw_fs_opt.cpp', - 'brw_fs_opt_algebraic.cpp', - 'brw_fs_opt_virtual_grfs.cpp', 'brw_fs_reg_allocate.cpp', - 'brw_fs_register_coalesce.cpp', - 'brw_fs_saturate_propagation.cpp', - 'brw_fs_scoreboard.cpp', 'brw_fs_thread_payload.cpp', 'brw_fs_validate.cpp', 'brw_fs_visitor.cpp', - 'brw_fs_workaround.cpp', 'brw_ir.h', 'brw_ir_allocator.h', 'brw_ir_analysis.h', @@ -82,7 +63,14 @@ libintel_compiler_brw_files = files( 'brw_ir_performance.h', 'brw_ir_performance.cpp', 'brw_isa_info.h', + 'brw_lower.cpp', + 'brw_lower_dpas.cpp', + 'brw_lower_integer_multiplication.cpp', 'brw_lower_logical_sends.cpp', + 'brw_lower_pack.cpp', + 'brw_lower_regioning.cpp', + 'brw_lower_scoreboard.cpp', + 'brw_lower_simd_width.cpp', 'brw_lower_subgroup_ops.cpp', 'brw_nir.h', 'brw_nir.c', @@ -99,7 +87,18 @@ libintel_compiler_brw_files = files( 'brw_nir_rt.h', 'brw_nir_rt.c', 'brw_nir_rt_builder.h', + 'brw_opt.cpp', + 'brw_opt_algebraic.cpp', + 'brw_opt_bank_conflicts.cpp', + 'brw_opt_cmod_propagation.cpp', + 'brw_opt_combine_constants.cpp', + 'brw_opt_copy_propagation.cpp', + 'brw_opt_cse.cpp', + 'brw_opt_dead_code_eliminate.cpp', + 'brw_opt_register_coalesce.cpp', + 'brw_opt_saturate_propagation.cpp', 'brw_opt_txf_combiner.cpp', + 'brw_opt_virtual_grfs.cpp', 'brw_packed_float.c', 'brw_print.cpp', 'brw_prim.h', @@ -113,6 +112,7 @@ libintel_compiler_brw_files = files( 'brw_shader.cpp', 'brw_simd_selection.cpp', 'brw_vue_map.c', + 'brw_workaround.cpp', ) brw_device_sha1_gen_src = custom_target('brw_device_sha1_gen.c', @@ -199,12 +199,12 @@ if with_tests files( 'test_eu_compact.cpp', 'test_eu_validate.cpp', - 'test_fs_cmod_propagation.cpp', - 'test_fs_combine_constants.cpp', - 'test_fs_copy_propagation.cpp', - 'test_fs_cse.cpp', - 'test_fs_saturate_propagation.cpp', - 'test_fs_scoreboard.cpp', + 'test_lower_scoreboard.cpp', + 'test_opt_cmod_propagation.cpp', + 'test_opt_combine_constants.cpp', + 'test_opt_copy_propagation.cpp', + 'test_opt_cse.cpp', + 'test_opt_saturate_propagation.cpp', 'test_simd_selection.cpp', 'test_vf_float_conversions.cpp', ), diff --git a/src/intel/compiler/test_fs_scoreboard.cpp b/src/intel/compiler/test_lower_scoreboard.cpp similarity index 100% rename from src/intel/compiler/test_fs_scoreboard.cpp rename to src/intel/compiler/test_lower_scoreboard.cpp diff --git a/src/intel/compiler/test_fs_cmod_propagation.cpp b/src/intel/compiler/test_opt_cmod_propagation.cpp similarity index 100% rename from src/intel/compiler/test_fs_cmod_propagation.cpp rename to src/intel/compiler/test_opt_cmod_propagation.cpp diff --git a/src/intel/compiler/test_fs_combine_constants.cpp b/src/intel/compiler/test_opt_combine_constants.cpp similarity index 100% rename from src/intel/compiler/test_fs_combine_constants.cpp rename to src/intel/compiler/test_opt_combine_constants.cpp diff --git a/src/intel/compiler/test_fs_copy_propagation.cpp b/src/intel/compiler/test_opt_copy_propagation.cpp similarity index 100% rename from src/intel/compiler/test_fs_copy_propagation.cpp rename to src/intel/compiler/test_opt_copy_propagation.cpp diff --git a/src/intel/compiler/test_fs_cse.cpp b/src/intel/compiler/test_opt_cse.cpp similarity index 100% rename from src/intel/compiler/test_fs_cse.cpp rename to src/intel/compiler/test_opt_cse.cpp diff --git a/src/intel/compiler/test_fs_saturate_propagation.cpp b/src/intel/compiler/test_opt_saturate_propagation.cpp similarity index 100% rename from src/intel/compiler/test_fs_saturate_propagation.cpp rename to src/intel/compiler/test_opt_saturate_propagation.cpp