Fix GN build for OpenCL.DebugInfo.100 update (#3134)
The utils/generate_grammar_tables.py vendor-operand-kind-prefix
can now take a value of "...nil..." to signify the empty string.
That's needed because GN doesn't quote empty string arguments
correctly down into its action commands.
Fixes #3120
diff --git a/BUILD.gn b/BUILD.gn
index 3c85c4e..5ed85d9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -69,6 +69,7 @@
"${spirv_headers}/include/spirv/$version/spirv.core.grammar.json"
debuginfo_insts_file = "source/extinst.debuginfo.grammar.json"
cldebuginfo100_insts_file = "source/extinst.opencl.debuginfo.100.grammar.json"
+
extension_enum_file = "${target_gen_dir}/extension_enum.inc"
extension_map_file = "${target_gen_dir}/enum_string_mapping.inc"
@@ -86,6 +87,8 @@
]
inputs = [
core_json_file,
+ debuginfo_insts_file,
+ cldebuginfo100_insts_file,
]
outputs = [
extension_enum_file,
@@ -105,11 +108,18 @@
core_json_file =
"${spirv_headers}/include/spirv/$version/spirv.core.grammar.json"
glsl_json_file = "${spirv_headers}/include/spirv/${version}/extinst.glsl.std.450.grammar.json"
+ debuginfo_insts_file = "source/extinst.debuginfo.grammar.json"
+ cldebuginfo100_insts_file = "source/extinst.opencl.debuginfo.100.grammar.json"
+
glsl_insts_file = "${target_gen_dir}/glsl.std.450.insts.inc"
args = [
"--spirv-core-grammar",
rebase_path(core_json_file, root_build_dir),
+ "--extinst-debuginfo-grammar",
+ rebase_path(debuginfo_insts_file, root_build_dir),
+ "--extinst-cldebuginfo100-grammar",
+ rebase_path(cldebuginfo100_insts_file, root_build_dir),
"--extinst-glsl-grammar",
rebase_path(glsl_json_file, root_build_dir),
"--glsl-insts-output",
@@ -118,6 +128,8 @@
inputs = [
core_json_file,
glsl_json_file,
+ debuginfo_insts_file,
+ cldebuginfo100_insts_file,
]
outputs = [
glsl_insts_file,
@@ -135,20 +147,29 @@
core_json_file =
"${spirv_headers}/include/spirv/$version/spirv.core.grammar.json"
- opengl_json_file = "${spirv_headers}/include/spirv/${version}/extinst.opencl.std.100.grammar.json"
+ opencl_json_file = "${spirv_headers}/include/spirv/${version}/extinst.opencl.std.100.grammar.json"
+ debuginfo_insts_file = "source/extinst.debuginfo.grammar.json"
+ cldebuginfo100_insts_file = "source/extinst.opencl.debuginfo.100.grammar.json"
+
opencl_insts_file = "${target_gen_dir}/opencl.std.insts.inc"
args = [
"--spirv-core-grammar",
rebase_path(core_json_file, root_build_dir),
+ "--extinst-debuginfo-grammar",
+ rebase_path(debuginfo_insts_file, root_build_dir),
+ "--extinst-cldebuginfo100-grammar",
+ rebase_path(cldebuginfo100_insts_file, root_build_dir),
"--extinst-opencl-grammar",
- rebase_path(opengl_json_file, root_build_dir),
+ rebase_path(opencl_json_file, root_build_dir),
"--opencl-insts-output",
rebase_path(opencl_insts_file, root_build_dir),
]
inputs = [
core_json_file,
- opengl_json_file,
+ opencl_json_file,
+ debuginfo_insts_file,
+ cldebuginfo100_insts_file,
]
outputs = [
opencl_insts_file,
@@ -174,7 +195,7 @@
rebase_path(extinst_output_base, root_build_dir),
]
inputs = [
- debug_insts_file,
+ invoker.grammar_file,
]
outputs = [
"${extinst_output_base}.h",
@@ -267,16 +288,16 @@
}
spvtools_vendor_tables = [
- ["spv-amd-shader-explicit-vertex-parameter", ""],
- ["spv-amd-shader-trinary-minmax", ""],
- ["spv-amd-gcn-shader", ""],
- ["spv-amd-shader-ballot", ""],
- ["debuginfo", ""],
+ ["spv-amd-shader-explicit-vertex-parameter", "...nil..."],
+ ["spv-amd-shader-trinary-minmax", "...nil..."],
+ ["spv-amd-gcn-shader", "...nil..."],
+ ["spv-amd-shader-ballot", "...nil..."],
+ ["debuginfo", "...nil..."],
["opencl.debuginfo.100", "CLDEBUG100_"],
]
foreach(table_def, spvtools_vendor_tables) {
- spvtools_vendor_table(table) {
+ spvtools_vendor_table(table_def[0]) {
name = table_def[0]
operand_kind_prefix = table_def[1]
}
diff --git a/utils/generate_grammar_tables.py b/utils/generate_grammar_tables.py
index 943d0d1..2a67733 100755
--- a/utils/generate_grammar_tables.py
+++ b/utils/generate_grammar_tables.py
@@ -765,6 +765,11 @@
help='prefix for operand kinds (to disambiguate operand type enums)')
args = parser.parse_args()
+ # The GN build system needs this because it doesn't handle quoting
+ # empty string arguments well.
+ if args.vendor_operand_kind_prefix == "...nil...":
+ args.vendor_operand_kind_prefix = ""
+
if (args.core_insts_output is None) != \
(args.operand_kinds_output is None):
print('error: --core-insts-output and --operand-kinds-output '
