Merge pull request #204 from frasercrmck/spirv-ll-validate-tests

[spirv-ll] Validate LIT tests with `spirv-val`

Author: frasercrmck

modules/compiler/spirv-ll/test/CMakeLists.txt

@@ -33,7 +33,7 @@ if(CA_ASSEMBLE_SPIRV_LL_LIT_TESTS_OFFLINE)
   else()
   endif()
 
-  find_package(SpirvTools COMPONENTS spirv-as)
+  find_package(SpirvTools COMPONENTS spirv-as spirv-val)
   if(TARGET spirv::spirv-as)
     # Get the found spirv-as version, takes the form: v<year>.<point>(-dev)?
     # We treat 'dev' as the previous point release: see below.

modules/compiler/spirv-ll/test/glsl/CMakeLists.txt

@@ -806,9 +806,19 @@ foreach(glsl ${GLSL_FILES})
   if(GLSL_UNSUPPORTED STREQUAL False)
     # Generate .spv from .comp source.
     file(RELATIVE_PATH spvOut ${CMAKE_BINARY_DIR} ${spv})
+
+    # Work out whether we're validating this SPIR-V file.
+    set(OPTIONAL_VALIDATE_DEPENDS)
+    set(OPTIONAL_VALIDATE_COMMAND)
+    if(TARGET spirv::spirv-val)
+      set(OPTIONAL_VALIDATE_DEPENDS spirv::spirv-val)
+      set(OPTIONAL_VALIDATE_COMMAND COMMAND spirv::spirv-val ${spv})
+    endif()
+
     add_custom_command(OUTPUT ${spv}
       COMMAND ${glslangValidator_EXECUTABLE} -s -V -o ${spv} ${comp}
-      DEPENDS ${glslangValidator_EXECUTABLE} ${comp}
+      ${OPTIONAL_VALIDATE_COMMAND}
+      DEPENDS ${glslangValidator_EXECUTABLE} ${OPTIONAL_VALIDATE_DEPENDS} ${comp}
       COMMENT "Building SPIR-V ${spvOut}")
     list(APPEND LitTestFiles ${spv})
   endif()

modules/compiler/spirv-ll/test/glsl/builtin_var_gl_GlobalInvocationID.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/builtin_var_gl_LocalInvocationID.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/builtin_var_gl_LocalInvocationIndex.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/builtin_var_gl_NumWorkGroups.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/builtin_var_gl_WorkGroupID.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/descriptor_set_bool.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/descriptor_set_double.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan -c Float64 %spv_file_s | FileCheck %s
 
 #version 450

modules/compiler/spirv-ll/test/glsl/descriptor_set_float.comp

@@ -15,6 +15,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 // RUN: %if online-glsl %{ glslangValidator -s -V -o %spv_file_s %s %}
+// RUN: %if online-glsl %{ spirv-val %spv_file_s %}
 // RUN: spirv-ll-tool -a Vulkan %spv_file_s | FileCheck %s
 
 #version 450