Skip to content

A
angle
Commit 57186360 by Jamie Madill Committed by Commit Bot
Options

Roll SPIRV-Tools and SPIRV-headers (June 2018)

Bug: angleproject:2691 Change-Id: I754431c7cf7cdbb5b631e9db90b7c1471b5bf9ee Reviewed-on: https://chromium-review.googlesource.com/1117309 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarLuc Ferron <lucferron@chromium.org> Reviewed-by: 's avatarTobin Ehlis <tobine@google.com>
parent a26de250
Showing with 95 additions and 57 deletions
DEPS
...@@ -15,10 +15,10 @@ vars = { ...@@ -15,10 +15,10 @@ vars = {
'glslang_revision': '2edde6665d9a56ead5ea0e55b4e64d9a803e6164', 'glslang_revision': '2edde6665d9a56ead5ea0e55b4e64d9a803e6164',
# Current revision fo the SPIRV-Headers Vulkan support library. # Current revision fo the SPIRV-Headers Vulkan support library.
'spirv_headers_revision': '98b01515724c428d0f0a5d01deffcce0f5f5e61c', 'spirv_headers_revision': '87a720a5a7ba8fb2ede50fef57e5d936e5e45e97',
# Current revision of SPIRV-Tools for Vulkan. # Current revision of SPIRV-Tools for Vulkan.
'spirv_tools_revision': '9996173f363729b3a97309685dbd4d78547a63a7', 'spirv_tools_revision': '8ecd833dbc20447bcd7041596fc71050ed0d4ed5',
# Current revision of Khronos Vulkan-Headers. # Current revision of Khronos Vulkan-Headers.
'vulkan_headers_revision': '634e3658d6fa8f95f9062a3a7831d5567baf0eb3', 'vulkan_headers_revision': '634e3658d6fa8f95f9062a3a7831d5567baf0eb3',
......
third_party/spirv-tools/BUILD.gn
...@@ -19,27 +19,7 @@ raw_spirv_include_dir = rebase_path(spirv_include_dir, root_build_dir) ...@@ -19,27 +19,7 @@ raw_spirv_include_dir = rebase_path(spirv_include_dir, root_build_dir)
grammar_processing_script = "src/utils/generate_grammar_tables.py" grammar_processing_script = "src/utils/generate_grammar_tables.py"
action("spirv_tools_gen_enum_string_mapping") { spvtools_core_tables = [ "unified1" ]
script = grammar_processing_script
sources = [
"$spirv_include_dir/1.2/spirv.core.grammar.json",
]
outputs = [
"$vulkan_gen_dir/extension_enum.inc",
"$vulkan_gen_dir/enum_string_mapping.inc",
]
args = [
"--spirv-core-grammar=$raw_spirv_include_dir/1.2/spirv.core.grammar.json",
"--extension-enum-output=$raw_vulkan_gen_dir/extension_enum.inc",
"--enum-string-mapping-output=$raw_vulkan_gen_dir/enum_string_mapping.inc",
]
}
spvtools_core_tables = [
"1.0",
"1.1",
"1.2",
]
foreach(version, spvtools_core_tables) { foreach(version, spvtools_core_tables) {
action("spirv_tools_gen_core_tables_" + version) { action("spirv_tools_gen_core_tables_" + version) {
...@@ -53,42 +33,74 @@ foreach(version, spvtools_core_tables) { ...@@ -53,42 +33,74 @@ foreach(version, spvtools_core_tables) {
] ]
args = [ args = [
"--spirv-core-grammar=$raw_spirv_include_dir/$version/spirv.core.grammar.json", "--spirv-core-grammar=$raw_spirv_include_dir/$version/spirv.core.grammar.json",
"--extinst-debuginfo-grammar=$raw_spirv_source_dir/extinst.debuginfo.grammar.json",
"--core-insts-output=$raw_vulkan_gen_dir/core.insts-$version.inc", "--core-insts-output=$raw_vulkan_gen_dir/core.insts-$version.inc",
"--operand-kinds-output=$raw_vulkan_gen_dir/operand.kinds-$version.inc", "--operand-kinds-output=$raw_vulkan_gen_dir/operand.kinds-$version.inc",
] ]
} }
} }
action("spirv_tools_gen_glsl_tables") { spvtools_enum_string_mapping = [ "unified1" ]
script = grammar_processing_script
sources = [ foreach(version, spvtools_enum_string_mapping) {
"$spirv_include_dir/1.0/extinst.glsl.std.450.grammar.json", action("spirv_tools_gen_enum_string_mapping_" + version) {
"$spirv_include_dir/1.0/spirv.core.grammar.json", script = grammar_processing_script
] sources = [
outputs = [ "$spirv_include_dir/$version/spirv.core.grammar.json",
"$vulkan_gen_dir/glsl.std.450.insts-1.0.inc", ]
] outputs = [
args = [ "$vulkan_gen_dir/extension_enum.inc",
"--spirv-core-grammar=$raw_spirv_include_dir/1.0/spirv.core.grammar.json", "$vulkan_gen_dir/enum_string_mapping.inc",
"--extinst-glsl-grammar=$raw_spirv_include_dir/1.0/extinst.glsl.std.450.grammar.json", ]
"--glsl-insts-output=$raw_vulkan_gen_dir/glsl.std.450.insts-1.0.inc", args = [
] "--spirv-core-grammar=$raw_spirv_include_dir/$version/spirv.core.grammar.json",
"--extinst-debuginfo-grammar=$raw_spirv_source_dir/extinst.debuginfo.grammar.json",
"--extension-enum-output=$raw_vulkan_gen_dir/extension_enum.inc",
"--enum-string-mapping-output=$raw_vulkan_gen_dir/enum_string_mapping.inc",
]
}
} }
action("spirv_tools_gen_opencl_tables") { spvtools_opencl_tables = [ "unified1" ]
script = grammar_processing_script
sources = [ foreach(version, spvtools_opencl_tables) {
"$spirv_include_dir/1.0/extinst.opencl.std.100.grammar.json", action("spirv_tools_gen_opencl_tables_" + version) {
"$spirv_include_dir/1.0/spirv.core.grammar.json", script = grammar_processing_script
] sources = [
outputs = [ "$spirv_include_dir/$version/extinst.opencl.std.100.grammar.json",
"$vulkan_gen_dir/opencl.std.insts-1.0.inc", "$spirv_include_dir/$version/spirv.core.grammar.json",
] ]
args = [ outputs = [
"--spirv-core-grammar=$raw_spirv_include_dir/1.0/spirv.core.grammar.json", "$vulkan_gen_dir/opencl.std.insts.inc",
"--extinst-opencl-grammar=$raw_spirv_include_dir/1.0/extinst.opencl.std.100.grammar.json", ]
"--opencl-insts-output=$raw_vulkan_gen_dir/opencl.std.insts-1.0.inc", args = [
] "--spirv-core-grammar=$raw_spirv_include_dir/$version/spirv.core.grammar.json",
"--extinst-debuginfo-grammar=$raw_spirv_source_dir/extinst.debuginfo.grammar.json",
"--extinst-opencl-grammar=$raw_spirv_include_dir/$version/extinst.opencl.std.100.grammar.json",
"--opencl-insts-output=$raw_vulkan_gen_dir/opencl.std.insts.inc",
]
}
}
spvtools_glsl_tables = [ "unified1" ]
foreach(version, spvtools_glsl_tables) {
action("spirv_tools_gen_glsl_tables_" + version) {
script = grammar_processing_script
sources = [
"$spirv_include_dir/$version/extinst.glsl.std.450.grammar.json",
"$spirv_include_dir/$version/spirv.core.grammar.json",
]
outputs = [
"$vulkan_gen_dir/glsl.std.450.insts.inc",
]
args = [
"--spirv-core-grammar=$raw_spirv_include_dir/$version/spirv.core.grammar.json",
"--extinst-debuginfo-grammar=$raw_spirv_source_dir/extinst.debuginfo.grammar.json",
"--extinst-glsl-grammar=$raw_spirv_include_dir/$version/extinst.glsl.std.450.grammar.json",
"--glsl-insts-output=$raw_vulkan_gen_dir/glsl.std.450.insts.inc",
]
}
} }
action("spirv_tools_gen_generators_inc") { action("spirv_tools_gen_generators_inc") {
...@@ -105,11 +117,27 @@ action("spirv_tools_gen_generators_inc") { ...@@ -105,11 +117,27 @@ action("spirv_tools_gen_generators_inc") {
] ]
} }
action("spirv_tools_gen_debuginfo_h") {
script = "src/utils/generate_language_headers.py"
sources = [
"$spirv_source_dir/extinst.debuginfo.grammar.json",
]
outputs = [
"$vulkan_gen_dir/DebugInfo.h",
]
args = [
"--extinst-name=DebugInfo",
"--extinst-grammar=$raw_spirv_source_dir/extinst.debuginfo.grammar.json",
"--extinst-output-base=$raw_vulkan_gen_dir/DebugInfo",
]
}
spvtools_vendor_tables = [ spvtools_vendor_tables = [
"spv-amd-shader-explicit-vertex-parameter", "spv-amd-shader-explicit-vertex-parameter",
"spv-amd-shader-trinary-minmax", "spv-amd-shader-trinary-minmax",
"spv-amd-gcn-shader", "spv-amd-gcn-shader",
"spv-amd-shader-ballot", "spv-amd-shader-ballot",
"debuginfo",
] ]
foreach(target_name, spvtools_vendor_tables) { foreach(target_name, spvtools_vendor_tables) {
...@@ -149,13 +177,12 @@ config("spirv_tools_config") { ...@@ -149,13 +177,12 @@ config("spirv_tools_config") {
} }
static_library("spirv_tools") { static_library("spirv_tools") {
deps = [ deps = [
":spirv_tools_gen_core_tables_1.0", ":spirv_tools_gen_core_tables_unified1",
":spirv_tools_gen_core_tables_1.1", ":spirv_tools_gen_debuginfo_h",
":spirv_tools_gen_core_tables_1.2", ":spirv_tools_gen_enum_string_mapping_unified1",
":spirv_tools_gen_enum_string_mapping",
":spirv_tools_gen_generators_inc", ":spirv_tools_gen_generators_inc",
":spirv_tools_gen_glsl_tables", ":spirv_tools_gen_glsl_tables_unified1",
":spirv_tools_gen_opencl_tables", ":spirv_tools_gen_opencl_tables_unified1",
] ]
include_dirs = [ include_dirs = [
vulkan_gen_dir, vulkan_gen_dir,
...@@ -190,6 +217,7 @@ static_library("spirv_tools") { ...@@ -190,6 +217,7 @@ static_library("spirv_tools") {
# TODO(jmadill): Determine if this is ever needed. # TODO(jmadill): Determine if this is ever needed.
#"src/source/software_version.cpp", #"src/source/software_version.cpp",
"$vulkan_gen_dir/DebugInfo.h",
"src/source/enum_string_mapping.cpp", "src/source/enum_string_mapping.cpp",
"src/source/extensions.cpp", "src/source/extensions.cpp",
"src/source/extensions.h", "src/source/extensions.h",
...@@ -220,19 +248,29 @@ static_library("spirv_tools") { ...@@ -220,19 +248,29 @@ static_library("spirv_tools") {
"src/source/val/validation_state.cpp", "src/source/val/validation_state.cpp",
"src/source/validate.cpp", "src/source/validate.cpp",
"src/source/validate.h", "src/source/validate.h",
"src/source/validate_adjacency.cpp",
"src/source/validate_arithmetics.cpp", "src/source/validate_arithmetics.cpp",
"src/source/validate_atomics.cpp",
"src/source/validate_barriers.cpp",
"src/source/validate_bitwise.cpp", "src/source/validate_bitwise.cpp",
"src/source/validate_builtins.cpp",
"src/source/validate_capability.cpp", "src/source/validate_capability.cpp",
"src/source/validate_cfg.cpp", "src/source/validate_cfg.cpp",
"src/source/validate_composites.cpp",
"src/source/validate_conversion.cpp", "src/source/validate_conversion.cpp",
"src/source/validate_datarules.cpp", "src/source/validate_datarules.cpp",
"src/source/validate_decorations.cpp", "src/source/validate_decorations.cpp",
"src/source/validate_derivatives.cpp", "src/source/validate_derivatives.cpp",
"src/source/validate_ext_inst.cpp",
"src/source/validate_id.cpp", "src/source/validate_id.cpp",
"src/source/validate_image.cpp", "src/source/validate_image.cpp",
"src/source/validate_instruction.cpp", "src/source/validate_instruction.cpp",
"src/source/validate_interfaces.cpp",
"src/source/validate_layout.cpp", "src/source/validate_layout.cpp",
"src/source/validate_literals.cpp",
"src/source/validate_logicals.cpp", "src/source/validate_logicals.cpp",
"src/source/validate_non_uniform.cpp",
"src/source/validate_primitives.cpp",
"src/source/validate_type_unique.cpp", "src/source/validate_type_unique.cpp",
] ]
public_configs = [ ":spirv_tools_config" ] public_configs = [ ":spirv_tools_config" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment