aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BUILD.gn7
-rw-r--r--DEPS2
-rw-r--r--src/sksl/SkSLCompiler.cpp24
-rw-r--r--third_party/spirv-headers/BUILD.gn8
-rw-r--r--third_party/spirv-tools/BUILD.gn168
5 files changed, 208 insertions, 1 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 4d1e4eff12..c24637151e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -33,6 +33,7 @@ declare_args() {
skia_enable_jumper = is_skia_dev_build
skia_enable_gpu = true
skia_enable_pdf = true
+ skia_enable_spirv_validation = is_skia_dev_build && is_debug
skia_enable_tools = is_skia_dev_build
skia_enable_vulkan_debug_layers = is_skia_dev_build && is_debug
skia_vulkan_sdk = getenv("VULKAN_SDK")
@@ -432,6 +433,12 @@ optional("gpu") {
public_defines += [ "SK_ENABLE_VK_LAYERS" ]
}
}
+ if (skia_enable_spirv_validation) {
+ deps = [
+ "//third_party/spirv-tools",
+ ]
+ public_defines += [ "SK_ENABLE_SPIRV_VALIDATION" ]
+ }
}
optional("jpeg") {
diff --git a/DEPS b/DEPS
index 18a049655c..7b5dc1d3e7 100644
--- a/DEPS
+++ b/DEPS
@@ -17,6 +17,8 @@ deps = {
"third_party/externals/piex" : "https://android.googlesource.com/platform/external/piex.git@8f540f64b6c170a16fb7e6e52d61819705c1522a",
"third_party/externals/sdl" : "https://skia.googlesource.com/third_party/sdl@9b526d28cb2d7f0ccff0613c94bb52abc8f53b6f",
"third_party/externals/sfntly" : "https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git@b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916",
+ "third_party/externals/spirv-headers" : "https://github.com/KhronosGroup/SPIRV-Headers.git@2d6ba39368a781edd82eff5df2b6bc614e892329",
+ "third_party/externals/spirv-tools" : "https://github.com/KhronosGroup/SPIRV-Tools.git@1fb8c37b5718118b49eec59dc383cfa3f98643c0",
#"third_party/externals/v8" : "https://chromium.googlesource.com/v8/v8.git@5f1ae66d5634e43563b2d25ea652dfb94c31a3b4",
"third_party/externals/zlib" : "https://chromium.googlesource.com/chromium/src/third_party/zlib@4576304a4b9835aa8646c9735b079e1d96858633",
}
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index d5742390a9..1cbc4410b5 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -21,6 +21,10 @@
#include "ir/SkSLVarDeclarations.h"
#include "SkMutex.h"
+#ifdef SK_ENABLE_SPIRV_VALIDATION
+#include "spirv-tools/libspirv.hpp"
+#endif
+
#define STRINGIFY(x) #x
// include the built-in shader symbols as static strings
@@ -486,10 +490,28 @@ std::unique_ptr<Program> Compiler::convertProgram(Program::Kind kind, SkString t
return result;
}
-
bool Compiler::toSPIRV(const Program& program, SkWStream& out) {
+#ifdef SK_ENABLE_SPIRV_VALIDATION
+ SkDynamicMemoryWStream buffer;
+ SPIRVCodeGenerator cg(&fContext, &program, this, &buffer);
+ bool result = cg.generateCode();
+ if (result) {
+ sk_sp<SkData> data(buffer.detachAsData());
+ spvtools::SpirvTools tools(SPV_ENV_VULKAN_1_0);
+ SkASSERT(0 == data->size() % 4);
+ auto dumpmsg = [](spv_message_level_t, const char*, const spv_position_t&, const char* m) {
+ SkDebugf("SPIR-V validation error: %s\n", m);
+ };
+ tools.SetMessageConsumer(dumpmsg);
+ // Verify that the SPIR-V we produced is valid. If this assert fails, check the logs prior
+ // to the failure to see the validation errors.
+ SkAssertResult(tools.Validate((const uint32_t*) data->data(), data->size() / 4));
+ out.write(data->data(), data->size());
+ }
+#else
SPIRVCodeGenerator cg(&fContext, &program, this, &out);
bool result = cg.generateCode();
+#endif
this->writeErrorCount();
return result;
}
diff --git a/third_party/spirv-headers/BUILD.gn b/third_party/spirv-headers/BUILD.gn
new file mode 100644
index 0000000000..faae8cdbb4
--- /dev/null
+++ b/third_party/spirv-headers/BUILD.gn
@@ -0,0 +1,8 @@
+declare_args() {
+}
+
+import("../third_party.gni")
+
+third_party("spirv-headers") {
+ public_include_dirs = [ "../externals/spirv-headers/include" ]
+}
diff --git a/third_party/spirv-tools/BUILD.gn b/third_party/spirv-tools/BUILD.gn
new file mode 100644
index 0000000000..882e0e17da
--- /dev/null
+++ b/third_party/spirv-tools/BUILD.gn
@@ -0,0 +1,168 @@
+import("../third_party.gni")
+
+template("spirv_core_tables") {
+ version = invoker.version
+ action("spirv_core_tables_" + target_name) {
+ script = "../externals/spirv-tools/utils/generate_grammar_tables.py"
+ sources = [
+ "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json",
+ ]
+ outputs = [
+ "$root_out_dir/spirv-tools/core.insts-$version.inc",
+ "$root_out_dir/spirv-tools/operand.kinds-$version.inc",
+ ]
+ args = [
+ "--spirv-core-grammar=" + rebase_path(
+ "../externals/spirv-headers/include/spirv/$version/spirv.core.grammar.json"),
+ "--core-insts-output=" +
+ rebase_path("$root_out_dir/spirv-tools/core.insts-$version.inc"),
+ "--operand-kinds-output=" +
+ rebase_path("$root_out_dir/spirv-tools/operand.kinds-$version.inc"),
+ ]
+ }
+}
+
+spirv_core_tables("1.0") {
+ version = "1.0"
+}
+spirv_core_tables("1.1") {
+ version = "1.1"
+}
+
+action("spirv_glsl_tables") {
+ script = "../externals/spirv-tools/utils/generate_grammar_tables.py"
+ sources = [
+ "../externals/spirv-headers/include/spirv/1.0/extinst.glsl.std.450.grammar.json",
+ "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json",
+ ]
+ outputs = [
+ "$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc",
+ ]
+ args = [
+ "--spirv-core-grammar=" + rebase_path(
+ "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json"),
+ "--extinst-glsl-grammar=" +
+ rebase_path("../externals/spirv-headers/include/spirv/1.0/" +
+ "extinst.glsl.std.450.grammar.json"),
+ "--glsl-insts-output=" +
+ rebase_path("$root_out_dir/spirv-tools/glsl.std.450.insts-1.0.inc"),
+ ]
+}
+
+action("spirv_opencl_tables") {
+ script = "../externals/spirv-tools/utils/generate_grammar_tables.py"
+ sources = [
+ "../externals/spirv-headers/include/spirv/1.0/extinst.opencl.std.100.grammar.json",
+ "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json",
+ ]
+ outputs = [
+ "$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc",
+ ]
+ args = [
+ "--spirv-core-grammar=" + rebase_path(
+ "../externals/spirv-headers/include/spirv/1.0/spirv.core.grammar.json"),
+ "--extinst-opencl-grammar=" +
+ rebase_path("../externals/spirv-headers/include/spirv/1.0/" +
+ "extinst.glsl.std.450.grammar.json"),
+ "--opencl-insts-output=" +
+ rebase_path("$root_out_dir/spirv-tools/opencl.std.insts-1.0.inc"),
+ ]
+}
+
+action("spirv_build_version") {
+ script = "../externals/spirv-tools/utils/update_build_version.py"
+ sources = [
+ "../externals/spirv-tools/CHANGES",
+ ]
+ outputs = [
+ "$root_out_dir/spirv-tools/build.inc",
+ ]
+ args = [
+ rebase_path("../externals/spirv-tools"),
+ rebase_path("$root_out_dir/spirv-tools/build-version.inc"),
+ ]
+}
+
+action("spirv_generators") {
+ script = "../externals/spirv-tools/utils/generate_registry_tables.py"
+ sources = [
+ "../externals/spirv-headers/include/spirv/spir-v.xml",
+ ]
+ outputs = [
+ "$root_out_dir/spirv-tools/generators.inc",
+ ]
+ args = [
+ "--xml=" +
+ rebase_path("../externals/spirv-headers/include/spirv/spir-v.xml"),
+ "--generator-output=" +
+ rebase_path("$root_out_dir/spirv-tools/generators.inc"),
+ ]
+}
+
+third_party("spirv-tools") {
+ public_include_dirs = [
+ "../externals/spirv-tools/include",
+ "../externals/spirv-tools/source",
+ "$root_out_dir/spirv-tools",
+ ]
+ deps = [
+ ":spirv_build_version",
+ ":spirv_core_tables_1.0",
+ ":spirv_core_tables_1.1",
+ ":spirv_glsl_tables",
+ ":spirv_opencl_tables",
+ "//third_party/spirv-headers",
+ ]
+ sources = [
+ "../externals/spirv-tools/source/assembly_grammar.cpp",
+ "../externals/spirv-tools/source/binary.cpp",
+ "../externals/spirv-tools/source/diagnostic.cpp",
+ "../externals/spirv-tools/source/disassemble.cpp",
+ "../externals/spirv-tools/source/ext_inst.cpp",
+ "../externals/spirv-tools/source/extensions.cpp",
+ "../externals/spirv-tools/source/libspirv.cpp",
+ "../externals/spirv-tools/source/message.cpp",
+ "../externals/spirv-tools/source/name_mapper.cpp",
+ "../externals/spirv-tools/source/opcode.cpp",
+ "../externals/spirv-tools/source/operand.cpp",
+ "../externals/spirv-tools/source/opt/build_module.cpp",
+ "../externals/spirv-tools/source/opt/def_use_manager.cpp",
+ "../externals/spirv-tools/source/opt/eliminate_dead_constant_pass.cpp",
+ "../externals/spirv-tools/source/opt/fold_spec_constant_op_and_composite_pass.cpp",
+ "../externals/spirv-tools/source/opt/freeze_spec_constant_value_pass.cpp",
+ "../externals/spirv-tools/source/opt/function.cpp",
+ "../externals/spirv-tools/source/opt/instruction.cpp",
+ "../externals/spirv-tools/source/opt/ir_loader.cpp",
+ "../externals/spirv-tools/source/opt/module.cpp",
+ "../externals/spirv-tools/source/opt/optimizer.cpp",
+ "../externals/spirv-tools/source/opt/pass_manager.cpp",
+ "../externals/spirv-tools/source/opt/set_spec_constant_default_value_pass.cpp",
+ "../externals/spirv-tools/source/opt/strip_debug_info_pass.cpp",
+ "../externals/spirv-tools/source/opt/type_manager.cpp",
+ "../externals/spirv-tools/source/opt/types.cpp",
+ "../externals/spirv-tools/source/opt/unify_const_pass.cpp",
+ "../externals/spirv-tools/source/parsed_operand.cpp",
+ "../externals/spirv-tools/source/print.cpp",
+ "../externals/spirv-tools/source/software_version.cpp",
+ "../externals/spirv-tools/source/spirv_endian.cpp",
+ "../externals/spirv-tools/source/spirv_target_env.cpp",
+ "../externals/spirv-tools/source/spirv_validator_options.cpp",
+ "../externals/spirv-tools/source/table.cpp",
+ "../externals/spirv-tools/source/text.cpp",
+ "../externals/spirv-tools/source/text_handler.cpp",
+ "../externals/spirv-tools/source/util/parse_number.cpp",
+ "../externals/spirv-tools/source/val/basic_block.cpp",
+ "../externals/spirv-tools/source/val/construct.cpp",
+ "../externals/spirv-tools/source/val/function.cpp",
+ "../externals/spirv-tools/source/val/instruction.cpp",
+ "../externals/spirv-tools/source/val/validation_state.cpp",
+ "../externals/spirv-tools/source/validate.cpp",
+ "../externals/spirv-tools/source/validate_cfg.cpp",
+ "../externals/spirv-tools/source/validate_datarules.cpp",
+ "../externals/spirv-tools/source/validate_decorations.cpp",
+ "../externals/spirv-tools/source/validate_id.cpp",
+ "../externals/spirv-tools/source/validate_instruction.cpp",
+ "../externals/spirv-tools/source/validate_layout.cpp",
+ "../externals/spirv-tools/source/validate_type_unique.cpp",
+ ]
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 18:43:20 +0000