Skip to content

S
swiftshader
Commit 1a599631 by Nicolas Capens Committed by Nicolas Capens
Options

Fix Android.bp build after SPIRV-Tools update

Bug: b/123642959 Change-Id: I145adbd76fe04f0bdf9fb7ee4e581aaeaba5fccc Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/50069Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent 3476ca34
Showing with 53 additions and 15 deletions
third_party/SPIRV-Headers/Android.bp
...@@ -30,6 +30,41 @@ filegroup { ...@@ -30,6 +30,41 @@ filegroup {
} }
filegroup { filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.debuginfo.grammar.json",
srcs: ["include/spirv/unified1/extinst.debuginfo.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json",
srcs: ["include/spirv/unified1/extinst.opencl.debuginfo.100.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.spv-amd-gcn-shader.grammar.json",
srcs: ["include/spirv/unified1/extinst.spv-amd-gcn-shader.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-ballot.grammar.json",
srcs: ["include/spirv/unified1/extinst.spv-amd-shader-ballot.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json",
srcs: ["include/spirv/unified1/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-trinary-minmax.grammar.json",
srcs: ["include/spirv/unified1/extinst.spv-amd-shader-trinary-minmax.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_unified1_extinst.nonsemantic.clspvreflection.grammar.json",
srcs: ["include/spirv/unified1/extinst.nonsemantic.clspvreflection.grammar.json"],
}
filegroup {
name: "swiftshader_spirv_headers_spir-v.xml", name: "swiftshader_spirv_headers_spir-v.xml",
srcs: ["include/spirv/spir-v.xml"], srcs: ["include/spirv/spir-v.xml"],
} }
third_party/SPIRV-Tools/Android.bp
...@@ -37,30 +37,33 @@ genrule { ...@@ -37,30 +37,33 @@ genrule {
"spv-amd-shader-ballot.insts.inc", "spv-amd-shader-ballot.insts.inc",
"spv-amd-shader-explicit-vertex-parameter.insts.inc", "spv-amd-shader-explicit-vertex-parameter.insts.inc",
"spv-amd-shader-trinary-minmax.insts.inc", "spv-amd-shader-trinary-minmax.insts.inc",
"nonsemantic.clspvreflection.insts.inc",
], ],
srcs: [ srcs: [
":swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json",
":swiftshader_spirv_headers_unified1_extinst.opencl.std.100.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.opencl.std.100.grammar.json",
":swiftshader_spirv_headers_unified1_spirv.core.grammar.json", ":swiftshader_spirv_headers_unified1_spirv.core.grammar.json",
"source/extinst.debuginfo.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.debuginfo.grammar.json",
"source/extinst.opencl.debuginfo.100.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json",
"source/extinst.spv-amd-gcn-shader.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.spv-amd-gcn-shader.grammar.json",
"source/extinst.spv-amd-shader-ballot.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-ballot.grammar.json",
"source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json",
"source/extinst.spv-amd-shader-trinary-minmax.grammar.json", ":swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-trinary-minmax.grammar.json",
":swiftshader_spirv_headers_unified1_extinst.nonsemantic.clspvreflection.grammar.json",
], ],
tool_files: ["utils/generate_grammar_tables.py"], tool_files: ["utils/generate_grammar_tables.py"],
cmd: cmd:
"$(location) --extinst-vendor-grammar=$(location source/extinst.spv-amd-gcn-shader.grammar.json) --vendor-insts-output=$(location spv-amd-gcn-shader.insts.inc) --vendor-operand-kind-prefix=; "+ "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.spv-amd-gcn-shader.grammar.json) --vendor-insts-output=$(location spv-amd-gcn-shader.insts.inc) --vendor-operand-kind-prefix=; "+
"$(location) --spirv-core-grammar=$(location :swiftshader_spirv_headers_unified1_spirv.core.grammar.json) --extinst-debuginfo-grammar=$(location source/extinst.debuginfo.grammar.json) --extinst-cldebuginfo100-grammar=$(location source/extinst.opencl.debuginfo.100.grammar.json) --core-insts-output=$(location core.insts-unified1.inc) --operand-kinds-output=$(location operand.kinds-unified1.inc); "+ "$(location) --spirv-core-grammar=$(location :swiftshader_spirv_headers_unified1_spirv.core.grammar.json) --extinst-debuginfo-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.debuginfo.grammar.json) --extinst-cldebuginfo100-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json) --core-insts-output=$(location core.insts-unified1.inc) --operand-kinds-output=$(location operand.kinds-unified1.inc); "+
"$(location) --extinst-vendor-grammar=$(location source/extinst.debuginfo.grammar.json) --vendor-insts-output=$(location debuginfo.insts.inc) --vendor-operand-kind-prefix=; "+ "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.debuginfo.grammar.json) --vendor-insts-output=$(location debuginfo.insts.inc) --vendor-operand-kind-prefix=; "+
"$(location) --extinst-vendor-grammar=$(location source/extinst.spv-amd-shader-ballot.grammar.json) --vendor-insts-output=$(location spv-amd-shader-ballot.insts.inc) --vendor-operand-kind-prefix=; "+ "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-ballot.grammar.json) --vendor-insts-output=$(location spv-amd-shader-ballot.insts.inc) --vendor-operand-kind-prefix=; "+
"$(location) --extinst-vendor-grammar=$(location source/extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json) --vendor-insts-output=$(location spv-amd-shader-explicit-vertex-parameter.insts.inc) --vendor-operand-kind-prefix=; "+ "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-explicit-vertex-parameter.grammar.json) --vendor-insts-output=$(location spv-amd-shader-explicit-vertex-parameter.insts.inc) --vendor-operand-kind-prefix=; "+
"$(location) --extinst-vendor-grammar=$(location source/extinst.spv-amd-shader-trinary-minmax.grammar.json) --vendor-insts-output=$(location spv-amd-shader-trinary-minmax.insts.inc) --vendor-operand-kind-prefix=; "+ "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.spv-amd-shader-trinary-minmax.grammar.json) --vendor-insts-output=$(location spv-amd-shader-trinary-minmax.insts.inc) --vendor-operand-kind-prefix=; "+
"$(location) --extinst-vendor-grammar=$(location source/extinst.opencl.debuginfo.100.grammar.json) --vendor-insts-output=$(location opencl.debuginfo.100.insts.inc) --vendor-operand-kind-prefix=CLDEBUG100_; "+ "$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json) --vendor-insts-output=$(location opencl.debuginfo.100.insts.inc) --vendor-operand-kind-prefix=CLDEBUG100_; "+
"$(location) --spirv-core-grammar=$(location :swiftshader_spirv_headers_unified1_spirv.core.grammar.json) --extinst-debuginfo-grammar=$(location source/extinst.debuginfo.grammar.json) --extinst-cldebuginfo100-grammar=$(location source/extinst.opencl.debuginfo.100.grammar.json) --extension-enum-output=$(location extension_enum.inc) --enum-string-mapping-output=$(location enum_string_mapping.inc); "+ "$(location) --spirv-core-grammar=$(location :swiftshader_spirv_headers_unified1_spirv.core.grammar.json) --extinst-debuginfo-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.debuginfo.grammar.json) --extinst-cldebuginfo100-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.debuginfo.100.grammar.json) --extension-enum-output=$(location extension_enum.inc) --enum-string-mapping-output=$(location enum_string_mapping.inc); "+
"$(location) --extinst-opencl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.std.100.grammar.json) --opencl-insts-output=$(location opencl.std.insts.inc); "+ "$(location) --extinst-opencl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.opencl.std.100.grammar.json) --opencl-insts-output=$(location opencl.std.insts.inc); "+
"$(location) --extinst-glsl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json) --glsl-insts-output=$(location glsl.std.450.insts.inc); " "$(location) --extinst-glsl-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.glsl.std.450.grammar.json) --glsl-insts-output=$(location glsl.std.450.insts.inc); " +
"$(location) --extinst-vendor-grammar=$(location :swiftshader_spirv_headers_unified1_extinst.nonsemantic.clspvreflection.grammar.json) --vendor-insts-output=$(location nonsemantic.clspvreflection.insts.inc) --vendor-operand-kind-prefix=; "
} }
genrule { genrule {
......
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