From 4a9fda49e02dcf32ab39f190e6f07b48844e7195 Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Fri, 10 Dec 2021 05:55:11 -0700 Subject: [PATCH] gpu: reduce compilation units to improve iteration time by ~566ms See hexops/mach#124 Signed-off-by: Stephen Gutekanst --- gpu/build_dawn.zig | 216 ++------------------- gpu/src/dawn/sources/spirv_cross.cpp | 9 + gpu/src/dawn/sources/spirv_tools.cpp | 24 +++ gpu/src/dawn/sources/spirv_tools_opt.cpp | 89 +++++++++ gpu/src/dawn/sources/spirv_tools_opt_2.cpp | 9 + gpu/src/dawn/sources/spirv_tools_val.cpp | 40 ++++ 6 files changed, 189 insertions(+), 198 deletions(-) create mode 100644 gpu/src/dawn/sources/spirv_cross.cpp create mode 100644 gpu/src/dawn/sources/spirv_tools.cpp create mode 100644 gpu/src/dawn/sources/spirv_tools_opt.cpp create mode 100644 gpu/src/dawn/sources/spirv_tools_opt_2.cpp create mode 100644 gpu/src/dawn/sources/spirv_tools_val.cpp diff --git a/gpu/build_dawn.zig b/gpu/build_dawn.zig index 660f8068..a818002c 100644 --- a/gpu/build_dawn.zig +++ b/gpu/build_dawn.zig @@ -975,6 +975,7 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti var flags = std.ArrayList([]const u8).init(b.allocator); options.appendFlags(&flags, true) catch unreachable; flags.appendSlice(&.{ + include("libs/dawn"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src"), include("libs/dawn/third_party/vulkan-deps/spirv-tools/src/include"), include("libs/dawn/third_party/vulkan-deps/spirv-headers/src/include"), @@ -983,194 +984,25 @@ fn buildLibSPIRVTools(b: *Builder, step: *std.build.LibExeObjStep, options: Opti }) catch unreachable; // spvtools - for ([_][]const u8{ - "third_party/vulkan-deps/spirv-tools/src/source/assembly_grammar.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/binary.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/diagnostic.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/disassemble.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/enum_string_mapping.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/ext_inst.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/extensions.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/libspirv.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/name_mapper.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/operand.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/parsed_operand.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/print.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/spirv_endian.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/spirv_fuzzer_options.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/spirv_optimizer_options.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/spirv_reducer_options.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/spirv_target_env.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/spirv_validator_options.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/table.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/text.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/text_handler.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/util/bit_vector.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/util/parse_number.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/util/string_utils.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/util/timer.cpp", - }) |path| { - var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable; - lib.addCSourceFile(abs_path, flags.items); - } + lib.addCSourceFiles(&.{ + thisDir() ++ "/src/dawn/sources/spirv_tools.cpp", + thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/operand.cpp", + thisDir() ++ "/libs/dawn/third_party/vulkan-deps/spirv-tools/src/source/spirv_reducer_options.cpp", + }, flags.items); // spvtools_val - for ([_][]const u8{ - "third_party/vulkan-deps/spirv-tools/src/source/val/basic_block.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/construct.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/function.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/instruction.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_adjacency.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_arithmetics.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_atomics.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_barriers.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_bitwise.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_builtins.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_capability.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_cfg.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_composites.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_constants.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_conversion.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_debug.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_decorations.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_derivatives.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_execution_limitations.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_function.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_id.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_image.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_instruction.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_layout.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_literals.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_logicals.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory_semantics.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_misc.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_mode_setting.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_non_uniform.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_primitives.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_scopes.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_small_type_uses.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validate_type.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp", - }) |path| { - var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable; - lib.addCSourceFile(abs_path, flags.items); - } + lib.addCSourceFile(thisDir() ++ "/src/dawn/sources/spirv_tools_val.cpp", flags.items); // spvtools_opt - for ([_][]const u8{ - "third_party/vulkan-deps/spirv-tools/src/source/opt/aggressive_dead_code_elim_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/amd_ext_to_khr.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/basic_block.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/block_merge_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/block_merge_util.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/build_module.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/ccp_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/cfg.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/cfg_cleanup_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/code_sink.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/combine_access_chains.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/compact_ids_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/composite.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/const_folding_rules.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/constants.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/control_dependence.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_sampled_image_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/convert_to_half_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/copy_prop_arrays.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/dataflow.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_branch_elim_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_insert_elim_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/dead_variable_elimination.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/debug_info_manager.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/decoration_manager.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/def_use_manager.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/desc_sroa.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/dominator_analysis.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/dominator_tree.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_constant_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_functions_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_functions_util.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/eliminate_dead_members_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/feature_manager.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/fix_storage_class.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/flatten_decoration_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/fold.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/fold_spec_constant_op_and_composite_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/folding_rules.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/freeze_spec_constant_value_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/function.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/graphics_robust_access_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/if_conversion.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/inline_exhaustive_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/inline_opaque_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/inline_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/inst_bindless_check_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/inst_buff_addr_check_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/inst_debug_printf_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/instruction.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/instruction_list.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/instrument_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/interp_fixup_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/ir_context.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/ir_loader.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/licm_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/local_access_chain_convert_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/local_redundancy_elimination.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/local_single_block_elim_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/local_single_store_elim_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_dependence.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_dependence_helpers.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_descriptor.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_fission.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_fusion.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_fusion_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_peeling.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_unroller.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_unswitch_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/loop_utils.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/mem_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/merge_return_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/module.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/optimizer.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/pass_manager.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/private_to_local_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/propagator.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/reduce_load_size.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/redundancy_elimination.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/register_pressure.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/relax_float_ops_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/remove_duplicates_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/remove_unused_interface_variables_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/replace_invalid_opc.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_analysis.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_analysis_simplification.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/scalar_replacement_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/set_spec_constant_default_value_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/simplification_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/ssa_rewrite_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/strength_reduction_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_debug_info_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/strip_reflect_info_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/struct_cfg_analysis.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/type_manager.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/types.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/unify_const_pass.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/upgrade_memory_model.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/value_number_table.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/vector_dce.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/workaround1209.cpp", - "third_party/vulkan-deps/spirv-tools/src/source/opt/wrap_opkill.cpp", - }) |path| { - var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable; - lib.addCSourceFile(abs_path, flags.items); - } + lib.addCSourceFiles(&.{ + 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/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", + }, flags.items); // spvtools_link for ([_][]const u8{ @@ -1196,6 +1028,7 @@ fn buildLibSPIRVCross(b: *Builder, step: *std.build.LibExeObjStep, options: Opti flags.appendSlice(&.{ "-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS", include("libs/dawn/third_party/vulkan-deps/spirv-cross/src"), + include("libs/dawn"), "-Wno-extra-semi", "-Wno-ignored-qualifiers", "-Wno-implicit-fallthrough", @@ -1210,20 +1043,7 @@ fn buildLibSPIRVCross(b: *Builder, step: *std.build.LibExeObjStep, options: Opti if (target.os.tag != .windows) flags.append("-fno-exceptions") catch unreachable; // spvtools_link - for ([_][]const u8{ - "third_party/vulkan-deps/spirv-cross/src/spirv_cfg.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_cross.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_glsl.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_msl.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_parser.cpp", - "third_party/vulkan-deps/spirv-cross/src/spirv_reflect.cpp", - }) |path| { - var abs_path = std.fs.path.join(b.allocator, &.{ thisDir(), "libs/dawn", path }) catch unreachable; - lib.addCSourceFile(abs_path, flags.items); - } + lib.addCSourceFile(thisDir() ++ "/src/dawn/sources/spirv_cross.cpp", flags.items); return lib; } diff --git a/gpu/src/dawn/sources/spirv_cross.cpp b/gpu/src/dawn/sources/spirv_cross.cpp new file mode 100644 index 00000000..fcb2411c --- /dev/null +++ b/gpu/src/dawn/sources/spirv_cross.cpp @@ -0,0 +1,9 @@ +#include "third_party/vulkan-deps/spirv-cross/src/spirv_cfg.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_cross.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_cross_parsed_ir.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_cross_util.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_glsl.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_hlsl.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_msl.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_parser.cpp" +#include "third_party/vulkan-deps/spirv-cross/src/spirv_reflect.cpp" diff --git a/gpu/src/dawn/sources/spirv_tools.cpp b/gpu/src/dawn/sources/spirv_tools.cpp new file mode 100644 index 00000000..7118cab7 --- /dev/null +++ b/gpu/src/dawn/sources/spirv_tools.cpp @@ -0,0 +1,24 @@ +#include "third_party/vulkan-deps/spirv-tools/src/source/assembly_grammar.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/binary.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/diagnostic.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/disassemble.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/enum_string_mapping.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/ext_inst.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/extensions.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/libspirv.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/name_mapper.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/opcode.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/parsed_operand.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/print.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_endian.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_fuzzer_options.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_optimizer_options.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_target_env.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/spirv_validator_options.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/table.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/text.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/text_handler.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/util/bit_vector.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/util/parse_number.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/util/string_utils.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/util/timer.cpp" diff --git a/gpu/src/dawn/sources/spirv_tools_opt.cpp b/gpu/src/dawn/sources/spirv_tools_opt.cpp new file mode 100644 index 00000000..50f8c93d --- /dev/null +++ b/gpu/src/dawn/sources/spirv_tools_opt.cpp @@ -0,0 +1,89 @@ +#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_sampled_image_pass.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/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/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_reflect_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/src/dawn/sources/spirv_tools_opt_2.cpp b/gpu/src/dawn/sources/spirv_tools_opt_2.cpp new file mode 100644 index 00000000..76d9c4b3 --- /dev/null +++ b/gpu/src/dawn/sources/spirv_tools_opt_2.cpp @@ -0,0 +1,9 @@ +#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/scalar_replacement_pass.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/opt/set_spec_constant_default_value_pass.cpp" diff --git a/gpu/src/dawn/sources/spirv_tools_val.cpp b/gpu/src/dawn/sources/spirv_tools_val.cpp new file mode 100644 index 00000000..a36eb573 --- /dev/null +++ b/gpu/src/dawn/sources/spirv_tools_val.cpp @@ -0,0 +1,40 @@ +#include "third_party/vulkan-deps/spirv-tools/src/source/val/basic_block.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/construct.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/function.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/instruction.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_adjacency.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_annotation.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_arithmetics.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_atomics.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_barriers.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_bitwise.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_builtins.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_capability.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_cfg.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_composites.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_constants.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_conversion.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_debug.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_decorations.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_derivatives.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_execution_limitations.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_extensions.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_function.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_id.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_image.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_instruction.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_interfaces.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_layout.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_literals.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_logicals.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_memory_semantics.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_misc.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_mode_setting.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_non_uniform.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_primitives.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_scopes.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_small_type_uses.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validate_type.cpp" +#include "third_party/vulkan-deps/spirv-tools/src/source/val/validation_state.cpp"