Test GL_EXT_descriptor_heap

Extend the expect.ValidaAssemblyFileWithSubstr so it can use
a list of expected strings.

Author: dneto0

glslc/test/expect.py

@@ -242,7 +242,7 @@ def verify_assembly_file_preamble(self, filename):
             line3 = assembly_file.readline()
 
         if (line1 != '; SPIR-V\n' or
-            line2 != '; Version: 1.0\n' or
+            (not line2.startswith('; Version: 1.')) or
             (not line3.startswith('; Generator: Google Shaderc over Glslang;'))):
             return False, 'Incorrect SPV assembly'
 
@@ -427,10 +427,13 @@ class ValidAssemblyFileWithSubstr(ValidAssemblyFile):
     """Mixin class for checking that every input file generates a valid assembly
     file following the assembly file naming rule, there is no output on
     stdout/stderr, and all assembly files have the given substring specified
-    by expected_assembly_substr.
+    as self.expected_assembly_substr (if present) and substrings specified
+    by the list strings in self.expected_assembly_substrings (if present).
+    At least one string must be specified.
 
-    To mix in this class, subclasses need to provde expected_assembly_substr
-    as the expected substring.
+    To mix in this class, subclasses need to provide
+    self.expected_assembly_substr as the expected substring, or a list of
+    strings in self.expected_assembly_substrings.
     """
 
     def check_assembly_with_substr(self, status):
@@ -441,11 +444,24 @@ def check_assembly_with_substr(self, status):
             if not success:
                 return False, message
             with open(assembly_filename, 'r') as f:
-                content = f.read()
-                if self.expected_assembly_substr not in convert_to_unix_line_endings(content):
-                   return False, ('Incorrect assembly output:\n{asm}\n'
-                                  'Expected substring not found:\n{exp}'.format(
-                                  asm=content, exp=self.expected_assembly_substr))
+                content = convert_to_unix_line_endings(f.read())
+                expected_strs = []
+                if 'expected_assembly_substrings' in dir(self):
+                    expected_strs.extend(self.expected_assembly_substrings)
+                if 'expected_assembly_substr' in dir(self):
+                    expected_strs.append(self.expected_assembly_substr)
+                assert(type(expected_strs) is list)
+                assert(len(expected_strs) > 0)
+                for es in expected_strs:
+                    assert(type(es) is str)
+                    print(f"=: es {es}")
+
+                for es in expected_strs:
+                    print(f"= es {es}")
+                    if es not in content:
+                        return False, ('Incorrect assembly output:\n{asm}\n'
+                                       'Expected substring not found:\n{exp}'.format(
+                                        asm=content, exp=es))
         return True, ''
 
 

glslc/test/feature_gl_ext_descriptor_heap.py

@@ -0,0 +1,41 @@
+# Copyright 2026 The Shaderc Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import expect
+from glslc_test_framework import inside_glslc_testsuite
+from placeholder import FileShader
+
+# See GL_EXT_descriptor_heap
+# https://github.com/KhronosGroup/GLSL/blob/main/extensions/ext/GLSL_EXT_descriptor_heap.txt
+GLSL_COMPUTE_SHADER_DESCRIPTOR_HEAP_BUFFER = """#version 450
+#extension GL_EXT_descriptor_heap : require
+
+layout(descriptor_heap) uniform U { uint source; } ubo[];
+layout(descriptor_heap) buffer B { uint dest; } ssbo[];
+
+void main()
+{
+  ssbo[42].dest = ubo[2026].source;
+}"""
+
+@inside_glslc_testsuite('GL_EXT_descriptor_heap')
+class BufferSampleCompiles(expect.ValidAssemblyFileWithSubstr):
+    shader = FileShader(GLSL_COMPUTE_SHADER_DESCRIPTOR_HEAP_BUFFER, '.comp')
+    glslc_args = ['-S', shader, '--target-env=vulkan1.2']
+    expected_assembly_substrings = [
+            "OpCapability UntypedPointersKHR",
+            "OpCapability DescriptorHeapEXT",
+            "= OpUntypedAccessChainKHR",
+            "= OpBufferPointerEXT",
+    ]