From bb32ce8c97aaace6b6a0145fc76a3c9672908942 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 13 Feb 2022 01:32:02 -0700 Subject: [PATCH] gpu-dawn: use source scanning for spvtools_opt target Signed-off-by: Stephen Gutekanst --- gpu-dawn/build.zig | 18 ++-- gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp | 90 ------------------- .../src/dawn/sources/spirv_tools_opt_2.cpp | 10 --- 3 files changed, 8 insertions(+), 110 deletions(-) delete mode 100644 gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp delete mode 100644 gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp diff --git a/gpu-dawn/build.zig b/gpu-dawn/build.zig index abecfa5b..214be817 100644 --- a/gpu-dawn/build.zig +++ b/gpu-dawn/build.zig @@ -1007,16 +1007,14 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti ) catch unreachable; // spvtools_opt - sources.appendSlice(&.{ - thisDir() ++ "/src/dawn/sources/spirv_tools_opt.cpp", - thisDir() ++ "/src/dawn/sources/spirv_tools_opt_2.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/dataflow.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/local_single_store_elim_pass.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/loop_unswitch_pass.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/mem_pass.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/ssa_rewrite_pass.cpp", - thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/vector_dce.cpp", - }) catch unreachable; + scanSources( + b, + &sources, + "libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/opt/", + &.{ ".cpp", ".c", ".cc" }, + &.{}, + &.{ "test", "benchmark" }, + ) catch unreachable; // spvtools_link for ([_][]const u8{ diff --git a/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp b/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp deleted file mode 100644 index f66d9fef..00000000 --- a/gpu-dawn/src/dawn/sources/spirv_tools_opt.cpp +++ /dev/null @@ -1,90 +0,0 @@ -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/amd_ext_to_khr.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/block_merge_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/block_merge_util.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/build_module.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/ccp_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/cfg.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/cfg_cleanup_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/code_sink.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/combine_access_chains.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/compact_ids_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/composite.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/constants.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/control_dependence.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_half_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_sampled_image_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/dataflow.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_branch_elim_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_insert_elim_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_variable_elimination.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/debug_info_manager.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/decoration_manager.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/def_use_manager.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/desc_sroa.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/desc_sroa_util.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/dominator_analysis.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/dominator_tree.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_constant_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_functions_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_functions_util.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_members_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/feature_manager.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/fix_storage_class.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/flatten_decoration_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/fold.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/fold_spec_constant_op_and_composite_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/freeze_spec_constant_value_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/function.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/graphics_robust_access_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/if_conversion.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/inline_exhaustive_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/inline_opaque_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/inline_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/inst_bindless_check_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/inst_buff_addr_check_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/inst_debug_printf_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/instruction.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/instruction_list.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/instrument_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/interp_fixup_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/ir_loader.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/licm_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/local_redundancy_elimination.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/local_single_block_elim_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_dependence.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_dependence_helpers.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_descriptor.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_fission.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_fusion.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_fusion_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_peeling.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_unroller.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_utils.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/merge_return_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/module.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/optimizer.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/pass_manager.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/private_to_local_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/propagator.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/reduce_load_size.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/redundancy_elimination.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/register_pressure.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/relax_float_ops_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/remove_duplicates_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/replace_invalid_opc.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_analysis.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_analysis_simplification.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/simplification_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/strength_reduction_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_debug_info_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_nonsemantic_info_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/struct_cfg_analysis.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/unify_const_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/upgrade_memory_model.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/value_number_table.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/workaround1209.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/wrap_opkill.cpp" diff --git a/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp b/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp deleted file mode 100644 index 702dc906..00000000 --- a/gpu-dawn/src/dawn/sources/spirv_tools_opt_2.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/basic_block.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/copy_prop_arrays.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/folding_rules.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/ir_context.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/local_access_chain_convert_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/remove_unused_interface_variables_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/replace_desc_array_access_using_var_index.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_replacement_pass.cpp" -#include "third_party/vulkan-deps/spirv-tools/src/source/opt/set_spec_constant_default_value_pass.cpp"