Google Git
Sign in
skia/external/github.com/KhronosGroup/SPIRV-Tools/971a7b6e8d7740035bbff089bbbf9f42951ecfd5^!/.
commit
971a7b6e8d7740035bbff089bbbf9f42951ecfd5
[log]
author
Shahbaz Youssefi <syoussefi@google.com>
Tue Nov 25 11:04:02 2025 -0500
committer
GitHub <noreply@github.com>
Tue Nov 25 11:04:02 2025 -0500
tree
591a7d7a7e8e8ac6707edcf20b16a73c0480540b
parent
186078866b88db9a91ef985b98f666c29241a869 [diff]
diff: Match OpExtInst in debug and types/values sections (#6430)


diff --git a/source/diff/diff.cpp b/source/diff/diff.cpp
index 7fd21f3..d548aea 100644
--- a/source/diff/diff.cpp
+++ b/source/diff/diff.cpp

@@ -1219,6 +1219,7 @@
     case spv::Op::OpMemberDecorate:
       return DoOperandsMatch(src_inst, dst_inst, 0, 3);
     case spv::Op::OpExtInst:
+      return DoOperandsMatch(src_inst, dst_inst, 0, 2);
     case spv::Op::OpDecorationGroup:
     case spv::Op::OpGroupDecorate:
     case spv::Op::OpGroupMemberDecorate:
@@ -2612,6 +2613,9 @@
   // This section includes OpExtInst for DebugInfo extension
   MatchDebugAndAnnotationInstructions(src_->ext_inst_debuginfo(),
                                       dst_->ext_inst_debuginfo());
+  // OpExtInst can exist in other sections too, such as with non-semantic info.
+  MatchDebugAndAnnotationInstructions(src_->types_values(),
+                                      dst_->types_values());
 }
 
 void Differ::MatchAnnotations() {

diff --git a/test/diff/diff_files/OpExtInst_in_variables_autogen.cpp b/test/diff/diff_files/OpExtInst_in_variables_autogen.cpp
new file mode 100644
index 0000000..bc510d0
--- /dev/null
+++ b/test/diff/diff_files/OpExtInst_in_variables_autogen.cpp

@@ -0,0 +1,292 @@
+// GENERATED FILE - DO NOT EDIT.
+// Generated by generate_tests.py
+//
+// Copyright (c) 2022 Google LLC.
+//
+// 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.
+
+#include "../diff_test_utils.h"
+#include "gtest/gtest.h"
+
+namespace spvtools {
+namespace diff {
+namespace {
+
+// Tests a diff where the shader has OpExtInst in the debug, decorations and
+// types/variables sections.
+constexpr char kSrc[] = R"(               OpCapability Shader
+               OpExtension "SPV_KHR_non_semantic_info"
+          %1 = OpExtInstImport "GLSL.std.450"
+         %20 = OpExtInstImport "NonSemantic.MadeUp"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %9 %11
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+               OpName %4 "main"
+         %21 = OpExtInst %2 %20 123
+         %22 = OpExtInst %2 %20 234
+               OpName %9 "color"
+               OpName %11 "v"
+               OpDecorate %9 RelaxedPrecision
+               OpDecorate %9 Location 0
+               OpDecorate %11 RelaxedPrecision
+               OpDecorate %11 Location 0
+         %23 = OpExtInst %2 %20 345
+         %24 = OpExtInst %2 %20 456
+               OpDecorate %12 RelaxedPrecision
+               OpDecorate %13 RelaxedPrecision
+               OpDecorate %14 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 4
+          %8 = OpTypePointer Output %7
+          %9 = OpVariable %8 Output
+         %10 = OpTypePointer Input %6
+         %11 = OpVariable %10 Input
+         %25 = OpExtInst %2 %20 567
+         %26 = OpExtInst %2 %20 678
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %12 = OpLoad %6 %11
+         %13 = OpExtInst %6 %1 Log2 %12
+         %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+               OpStore %9 %14
+               OpReturn
+               OpFunctionEnd)";
+constexpr char kDst[] = R"(               OpCapability Shader
+               OpExtension "SPV_KHR_non_semantic_info"
+          %1 = OpExtInstImport "GLSL.std.450"
+         %30 = OpExtInstImport "NonSemantic.MadeUp"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %9 %11
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+               OpName %4 "main"
+         %31 = OpExtInst %2 %30 123
+         %32 = OpExtInst %2 %30 2340
+               OpName %9 "color"
+               OpName %11 "v"
+               OpDecorate %9 RelaxedPrecision
+               OpDecorate %9 Location 0
+               OpDecorate %11 RelaxedPrecision
+               OpDecorate %11 Location 0
+         %33 = OpExtInst %2 %30 3450
+         %34 = OpExtInst %2 %30 456
+               OpDecorate %12 RelaxedPrecision
+               OpDecorate %13 RelaxedPrecision
+               OpDecorate %14 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 4
+          %8 = OpTypePointer Output %7
+          %9 = OpVariable %8 Output
+         %10 = OpTypePointer Input %6
+         %11 = OpVariable %10 Input
+         %35 = OpExtInst %2 %30 567
+         %36 = OpExtInst %2 %30 678
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %12 = OpLoad %6 %11
+         %13 = OpExtInst %6 %1 Log2 %12
+         %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+               OpStore %9 %14
+               OpReturn
+               OpFunctionEnd
+)";
+
+TEST(DiffTest, OpextinstInVariables) {
+  constexpr char kDiff[] = R"( ; SPIR-V
+ ; Version: 1.6
+ ; Generator: Khronos SPIR-V Tools Assembler; 0
+-; Bound: 27
++; Bound: 29
+ ; Schema: 0
+ OpCapability Shader
+ OpExtension "SPV_KHR_non_semantic_info"
+ %1 = OpExtInstImport "GLSL.std.450"
+ %20 = OpExtInstImport "NonSemantic.MadeUp"
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint Fragment %4 "main" %9 %11
+ OpExecutionMode %4 OriginUpperLeft
+ OpSource ESSL 310
+ OpName %4 "main"
+ OpName %9 "color"
+ OpName %11 "v"
+ OpDecorate %9 RelaxedPrecision
+ OpDecorate %9 Location 0
+ OpDecorate %11 RelaxedPrecision
+ OpDecorate %11 Location 0
+ OpDecorate %12 RelaxedPrecision
+ OpDecorate %13 RelaxedPrecision
+ OpDecorate %14 RelaxedPrecision
+ %21 = OpExtInst %2 %20 123
+-%22 = OpExtInst %2 %20 234
+-%23 = OpExtInst %2 %20 345
++%27 = OpExtInst %2 %20 2340
++%28 = OpExtInst %2 %20 3450
+ %24 = OpExtInst %2 %20 456
+ %2 = OpTypeVoid
+ %3 = OpTypeFunction %2
+ %6 = OpTypeFloat 32
+ %7 = OpTypeVector %6 4
+ %8 = OpTypePointer Output %7
+ %9 = OpVariable %8 Output
+ %10 = OpTypePointer Input %6
+ %11 = OpVariable %10 Input
+ %25 = OpExtInst %2 %20 567
+ %26 = OpExtInst %2 %20 678
+ %4 = OpFunction %2 None %3
+ %5 = OpLabel
+ %12 = OpLoad %6 %11
+ %13 = OpExtInst %6 %1 Log2 %12
+ %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+ OpStore %9 %14
+ OpReturn
+ OpFunctionEnd
+)";
+  Options options;
+  DoStringDiffTest(kSrc, kDst, kDiff, options);
+}
+
+TEST(DiffTest, OpextinstInVariablesNoDebug) {
+  constexpr char kSrcNoDebug[] = R"(               OpCapability Shader
+               OpExtension "SPV_KHR_non_semantic_info"
+          %1 = OpExtInstImport "GLSL.std.450"
+         %20 = OpExtInstImport "NonSemantic.MadeUp"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %9 %11
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+         %21 = OpExtInst %2 %20 123
+         %22 = OpExtInst %2 %20 234
+               OpDecorate %9 RelaxedPrecision
+               OpDecorate %9 Location 0
+               OpDecorate %11 RelaxedPrecision
+               OpDecorate %11 Location 0
+         %23 = OpExtInst %2 %20 345
+         %24 = OpExtInst %2 %20 456
+               OpDecorate %12 RelaxedPrecision
+               OpDecorate %13 RelaxedPrecision
+               OpDecorate %14 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 4
+          %8 = OpTypePointer Output %7
+          %9 = OpVariable %8 Output
+         %10 = OpTypePointer Input %6
+         %11 = OpVariable %10 Input
+         %25 = OpExtInst %2 %20 567
+         %26 = OpExtInst %2 %20 678
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %12 = OpLoad %6 %11
+         %13 = OpExtInst %6 %1 Log2 %12
+         %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+               OpStore %9 %14
+               OpReturn
+               OpFunctionEnd
+)";
+  constexpr char kDstNoDebug[] = R"(               OpCapability Shader
+               OpExtension "SPV_KHR_non_semantic_info"
+          %1 = OpExtInstImport "GLSL.std.450"
+         %30 = OpExtInstImport "NonSemantic.MadeUp"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %9 %11
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+         %31 = OpExtInst %2 %30 123
+         %32 = OpExtInst %2 %30 2340
+               OpDecorate %9 RelaxedPrecision
+               OpDecorate %9 Location 0
+               OpDecorate %11 RelaxedPrecision
+               OpDecorate %11 Location 0
+         %33 = OpExtInst %2 %30 3450
+         %34 = OpExtInst %2 %30 456
+               OpDecorate %12 RelaxedPrecision
+               OpDecorate %13 RelaxedPrecision
+               OpDecorate %14 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 4
+          %8 = OpTypePointer Output %7
+          %9 = OpVariable %8 Output
+         %10 = OpTypePointer Input %6
+         %11 = OpVariable %10 Input
+         %35 = OpExtInst %2 %30 567
+         %36 = OpExtInst %2 %30 678
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %12 = OpLoad %6 %11
+         %13 = OpExtInst %6 %1 Log2 %12
+         %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+               OpStore %9 %14
+               OpReturn
+               OpFunctionEnd
+)";
+  constexpr char kDiff[] = R"( ; SPIR-V
+ ; Version: 1.6
+ ; Generator: Khronos SPIR-V Tools Assembler; 0
+-; Bound: 27
++; Bound: 29
+ ; Schema: 0
+ OpCapability Shader
+ OpExtension "SPV_KHR_non_semantic_info"
+ %1 = OpExtInstImport "GLSL.std.450"
+ %20 = OpExtInstImport "NonSemantic.MadeUp"
+ OpMemoryModel Logical GLSL450
+ OpEntryPoint Fragment %4 "main" %9 %11
+ OpExecutionMode %4 OriginUpperLeft
+ OpSource ESSL 310
+ OpDecorate %9 RelaxedPrecision
+ OpDecorate %9 Location 0
+ OpDecorate %11 RelaxedPrecision
+ OpDecorate %11 Location 0
+ OpDecorate %12 RelaxedPrecision
+ OpDecorate %13 RelaxedPrecision
+ OpDecorate %14 RelaxedPrecision
+ %21 = OpExtInst %2 %20 123
+-%22 = OpExtInst %2 %20 234
+-%23 = OpExtInst %2 %20 345
++%27 = OpExtInst %2 %20 2340
++%28 = OpExtInst %2 %20 3450
+ %24 = OpExtInst %2 %20 456
+ %2 = OpTypeVoid
+ %3 = OpTypeFunction %2
+ %6 = OpTypeFloat 32
+ %7 = OpTypeVector %6 4
+ %8 = OpTypePointer Output %7
+ %9 = OpVariable %8 Output
+ %10 = OpTypePointer Input %6
+ %11 = OpVariable %10 Input
+ %25 = OpExtInst %2 %20 567
+ %26 = OpExtInst %2 %20 678
+ %4 = OpFunction %2 None %3
+ %5 = OpLabel
+ %12 = OpLoad %6 %11
+ %13 = OpExtInst %6 %1 Log2 %12
+ %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+ OpStore %9 %14
+ OpReturn
+ OpFunctionEnd
+)";
+  Options options;
+  DoStringDiffTest(kSrcNoDebug, kDstNoDebug, kDiff, options);
+}
+
+}  // namespace
+}  // namespace diff
+}  // namespace spvtools

diff --git a/test/diff/diff_files/OpExtInst_in_variables_dst.spvasm b/test/diff/diff_files/OpExtInst_in_variables_dst.spvasm
new file mode 100644
index 0000000..59ba05b
--- /dev/null
+++ b/test/diff/diff_files/OpExtInst_in_variables_dst.spvasm

@@ -0,0 +1,40 @@
+               OpCapability Shader
+               OpExtension "SPV_KHR_non_semantic_info"
+          %1 = OpExtInstImport "GLSL.std.450"
+         %30 = OpExtInstImport "NonSemantic.MadeUp"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %9 %11
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+               OpName %4 "main"
+         %31 = OpExtInst %2 %30 123
+         %32 = OpExtInst %2 %30 2340
+               OpName %9 "color"
+               OpName %11 "v"
+               OpDecorate %9 RelaxedPrecision
+               OpDecorate %9 Location 0
+               OpDecorate %11 RelaxedPrecision
+               OpDecorate %11 Location 0
+         %33 = OpExtInst %2 %30 3450
+         %34 = OpExtInst %2 %30 456
+               OpDecorate %12 RelaxedPrecision
+               OpDecorate %13 RelaxedPrecision
+               OpDecorate %14 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 4
+          %8 = OpTypePointer Output %7
+          %9 = OpVariable %8 Output
+         %10 = OpTypePointer Input %6
+         %11 = OpVariable %10 Input
+         %35 = OpExtInst %2 %30 567
+         %36 = OpExtInst %2 %30 678
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %12 = OpLoad %6 %11
+         %13 = OpExtInst %6 %1 Log2 %12
+         %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+               OpStore %9 %14
+               OpReturn
+               OpFunctionEnd

diff --git a/test/diff/diff_files/OpExtInst_in_variables_src.spvasm b/test/diff/diff_files/OpExtInst_in_variables_src.spvasm
new file mode 100644
index 0000000..ca78909
--- /dev/null
+++ b/test/diff/diff_files/OpExtInst_in_variables_src.spvasm

@@ -0,0 +1,41 @@
+;; Tests a diff where the shader has OpExtInst in the debug, decorations and types/variables sections.
+               OpCapability Shader
+               OpExtension "SPV_KHR_non_semantic_info"
+          %1 = OpExtInstImport "GLSL.std.450"
+         %20 = OpExtInstImport "NonSemantic.MadeUp"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %9 %11
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+               OpName %4 "main"
+         %21 = OpExtInst %2 %20 123
+         %22 = OpExtInst %2 %20 234
+               OpName %9 "color"
+               OpName %11 "v"
+               OpDecorate %9 RelaxedPrecision
+               OpDecorate %9 Location 0
+               OpDecorate %11 RelaxedPrecision
+               OpDecorate %11 Location 0
+         %23 = OpExtInst %2 %20 345
+         %24 = OpExtInst %2 %20 456
+               OpDecorate %12 RelaxedPrecision
+               OpDecorate %13 RelaxedPrecision
+               OpDecorate %14 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 4
+          %8 = OpTypePointer Output %7
+          %9 = OpVariable %8 Output
+         %10 = OpTypePointer Input %6
+         %11 = OpVariable %10 Input
+         %25 = OpExtInst %2 %20 567
+         %26 = OpExtInst %2 %20 678
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %12 = OpLoad %6 %11
+         %13 = OpExtInst %6 %1 Log2 %12
+         %14 = OpCompositeConstruct %7 %13 %13 %13 %13
+               OpStore %9 %14
+               OpReturn
+               OpFunctionEnd

diff --git a/test/diff/diff_files/diff_test_files_autogen.cmake b/test/diff/diff_files/diff_test_files_autogen.cmake
index ce687d5..b916cd7 100644
--- a/test/diff/diff_files/diff_test_files_autogen.cmake
+++ b/test/diff/diff_files/diff_test_files_autogen.cmake

@@ -18,6 +18,7 @@
 list(APPEND DIFF_TEST_FILES
 "diff_files/OpExtInst_in_dst_only_autogen.cpp"
 "diff_files/OpExtInst_in_src_only_autogen.cpp"
+"diff_files/OpExtInst_in_variables_autogen.cpp"
 "diff_files/OpTypeForwardPointer_basic_autogen.cpp"
 "diff_files/OpTypeForwardPointer_intertwined_autogen.cpp"
 "diff_files/OpTypeForwardPointer_mismatching_class_autogen.cpp"