Skip to content

Commit

Permalink
Update upstream spirv-tools
Browse files Browse the repository at this point in the history
  • Loading branch information
khyperia committed Feb 1, 2021
1 parent 02385e0 commit 2d7c7aa
Show file tree
Hide file tree
Showing 10 changed files with 340 additions and 163 deletions.
6 changes: 0 additions & 6 deletions spirv-tools-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ fn opt(build: &mut Build) {
"dead_insert_elim_pass",
"dead_variable_elimination",
"debug_info_manager",
"decompose_initialized_variables_pass",
"decoration_manager",
"def_use_manager",
"desc_sroa",
Expand All @@ -99,7 +98,6 @@ fn opt(build: &mut Build) {
"folding_rules",
"freeze_spec_constant_value_pass",
"function",
"generate_webgpu_initializers_pass",
"graphics_robust_access_pass",
"if_conversion",
"inline_exhaustive_pass",
Expand All @@ -113,7 +111,6 @@ fn opt(build: &mut Build) {
"instrument_pass",
"ir_context",
"ir_loader",
"legalize_vector_shuffle_pass",
"licm_pass",
"local_access_chain_convert_pass",
"local_redundancy_elimination",
Expand All @@ -137,7 +134,6 @@ fn opt(build: &mut Build) {
"pass_manager",
"pch_source_opt",
"private_to_local_pass",
"process_lines_pass",
"propagator",
"reduce_load_size",
"redundancy_elimination",
Expand All @@ -150,10 +146,8 @@ fn opt(build: &mut Build) {
"scalar_replacement_pass",
"set_spec_constant_default_value_pass",
"simplification_pass",
"split_invalid_unreachable_pass",
"ssa_rewrite_pass",
"strength_reduction_pass",
"strip_atomic_counter_memory_pass",
"strip_debug_info_pass",
"strip_reflect_info_pass",
"struct_cfg_analysis",
Expand Down
2 changes: 1 addition & 1 deletion spirv-tools-sys/generated/build-version.inc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"v2020.6", "SPIRV-Tools v2020.6 v2020.5-81-g6c992630"
"v2020.7-dev", "SPIRV-Tools v2020.7-dev v2020.6-50-g0a3a1712"
106 changes: 65 additions & 41 deletions spirv-tools-sys/generated/core.insts-unified1.inc

Large diffs are not rendered by default.

78 changes: 74 additions & 4 deletions spirv-tools-sys/generated/enum_string_mapping.inc

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions spirv-tools-sys/generated/extension_enum.inc
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,30 @@ kSPV_EXT_shader_viewport_index_layer,
kSPV_GOOGLE_decorate_string,
kSPV_GOOGLE_hlsl_functionality1,
kSPV_GOOGLE_user_type,
kSPV_INTEL_arbitrary_precision_integers,
kSPV_INTEL_blocking_pipes,
kSPV_INTEL_device_side_avc_motion_estimation,
kSPV_INTEL_float_controls2,
kSPV_INTEL_fp_fast_math_mode,
kSPV_INTEL_fpga_buffer_location,
kSPV_INTEL_fpga_cluster_attributes,
kSPV_INTEL_fpga_loop_controls,
kSPV_INTEL_fpga_memory_accesses,
kSPV_INTEL_fpga_memory_attributes,
kSPV_INTEL_fpga_reg,
kSPV_INTEL_function_pointers,
kSPV_INTEL_inline_assembly,
kSPV_INTEL_io_pipes,
kSPV_INTEL_kernel_attributes,
kSPV_INTEL_long_constant_composite,
kSPV_INTEL_loop_fuse,
kSPV_INTEL_media_block_io,
kSPV_INTEL_shader_integer_functions2,
kSPV_INTEL_subgroups,
kSPV_INTEL_unstructured_loop_controls,
kSPV_INTEL_usm_storage_classes,
kSPV_INTEL_variable_length_array,
kSPV_INTEL_vector_compute,
kSPV_KHR_16bit_storage,
kSPV_KHR_8bit_storage,
kSPV_KHR_device_group,
Expand All @@ -53,6 +66,7 @@ kSPV_KHR_subgroup_vote,
kSPV_KHR_terminate_invocation,
kSPV_KHR_variable_pointers,
kSPV_KHR_vulkan_memory_model,
kSPV_KHR_workgroup_memory_explicit_layout,
kSPV_NVX_multiview_per_view_attributes,
kSPV_NV_compute_shader_derivatives,
kSPV_NV_cooperative_matrix,
Expand Down
3 changes: 2 additions & 1 deletion spirv-tools-sys/generated/generators.inc
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,5 @@
{23, "Google", "Tint Compiler", "Google Tint Compiler"},
{24, "Google", "ANGLE Shader Compiler", "Google ANGLE Shader Compiler"},
{25, "Netease Games", "Messiah Shader Compiler", "Netease Games Messiah Shader Compiler"},
{26, "Xenia", "Xenia Emulator Microcode Translator", "Xenia Xenia Emulator Microcode Translator"},
{26, "Xenia", "Xenia Emulator Microcode Translator", "Xenia Xenia Emulator Microcode Translator"},
{27, "Embark Studios", "Rust GPU Compiler Backend", "Embark Studios Rust GPU Compiler Backend"},
272 changes: 182 additions & 90 deletions spirv-tools-sys/generated/operand.kinds-unified1.inc

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion spirv-tools-sys/spirv-tools
Submodule spirv-tools updated 212 files
18 changes: 0 additions & 18 deletions spirv-tools-sys/src/c/opt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ struct Optimus;

enum Passes {
Null,
StripAtomicCounterMemory,
StripDebugInfo,
StripReflectInfo,
EliminateDeadFunctions,
Expand Down Expand Up @@ -54,11 +53,7 @@ enum Passes {
CombineAccessChains,
UpgradeMemoryModel,
CodeSinking,
GenerateWebGPUInitializers,
FixStorageClass,
LegalizeVectorShuffle,
DecomposeInitializedVariables,
SplitInvalidUnreachable,
GraphicsRobustAccess,
DescriptorScalarReplacement,
WrapOpKill,
Expand Down Expand Up @@ -168,7 +163,6 @@ extern "C" {

switch (pass) {
PASS(Null)
PASS(StripAtomicCounterMemory)
PASS(StripDebugInfo)
PASS(StripReflectInfo)
PASS(EliminateDeadFunctions)
Expand Down Expand Up @@ -217,11 +211,7 @@ extern "C" {
PASS(CombineAccessChains)
PASS(UpgradeMemoryModel)
PASS(CodeSinking)
PASS(GenerateWebGPUInitializers)
PASS(FixStorageClass)
PASS(LegalizeVectorShuffle)
PASS(DecomposeInitializedVariables)
PASS(SplitInvalidUnreachable)
PASS(GraphicsRobustAccess)
PASS(DescriptorScalarReplacement)
PASS(WrapOpKill)
Expand All @@ -237,14 +227,6 @@ extern "C" {
((spvtools::Optimizer*)optimizer)->RegisterSizePasses();
}

SPIRV_TOOLS_EXPORT void optimizer_register_vulkan_to_webgpu_passes(Optimus* optimizer) {
((spvtools::Optimizer*)optimizer)->RegisterVulkanToWebGPUPasses();
}

SPIRV_TOOLS_EXPORT void optimizer_register_webgpu_to_vulkan_passes(Optimus* optimizer) {
((spvtools::Optimizer*)optimizer)->RegisterWebGPUToVulkanPasses();
}

SPIRV_TOOLS_EXPORT void optimizer_register_hlsl_legalization_passes(Optimus* optimizer) {
((spvtools::Optimizer*)optimizer)->RegisterLegalizationPasses();
}
Expand Down

0 comments on commit 2d7c7aa

Please sign in to comment.