address review + fix test

Author: ArielG-NV

source/slang/slang-emit-spirv-ops.h

@@ -73,20 +73,6 @@ SpvInst* emitOpEntryPoint(
     return emitInst(parent, inst, SpvOpEntryPoint, executionModel, entryPoint, name, interfaces);
 }
 
-// https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#OpExecutionMode
-template<typename... Operands, typename T>
-SpvInst* emitOpExecutionMode(
-    SpvInstParent* parent,
-    IRInst* inst,
-    const T& entryPoint,
-    SpvExecutionMode mode,
-    const Operands& ...ops
-)
-{
-    static_assert(isSingular<T>);
-    return emitInst(parent, inst, SpvOpExecutionMode, entryPoint, mode, ops...);
-}
-
 // https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#OpCapability
 SpvInst* emitOpCapability(SpvInstParent* parent, IRInst* inst, SpvCapability capability)
 {

source/slang/slang-emit-spirv.cpp

@@ -6141,15 +6141,17 @@ struct SPIRVEmitContext
         }
     }
 
+    // https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#OpExecutionMode
     Dictionary<SpvWord, OrderedHashSet<SpvExecutionMode>> m_executionModes;
     template<typename... Operands>
     void requireSPIRVExecutionMode(IRInst* parentInst, SpvWord entryPoint, SpvExecutionMode executionMode, const Operands& ...ops)
     {
         if (m_executionModes[entryPoint].add(executionMode))
         {
-            emitOpExecutionMode(
+            emitInst(
                 getSection(SpvLogicalSectionID::ExecutionModes),
                 parentInst,
+                SpvOpExecutionMode,
                 entryPoint,
                 executionMode,
                 ops...

tests/glsl-intrinsic/compute-derivative/intrinsic-derivative-function-in-compute.slang

@@ -10,12 +10,16 @@
 // CHECK_GLSL_LINEAR_C: layout(derivative_group_linearNV)
 
 //TEST:SIMPLE(filecheck=CHECK_SPV_QUAD_C): -allow-glsl -stage compute -entry computeMain -target spirv -DQUAD -DCOMPUTE
-// CHECK_SPV_QUAD_C-COUNT-1: DerivativeGroupQuadsNV
-// CHECK_SPV_QUAD_C-COUNT-1: "SPV_NV_compute_shader_derivatives"
+// CHECK_SPV_QUAD_C: DerivativeGroupQuadsNV
+// CHECK_SPV_QUAD_C-NOT: DerivativeGroupQuadsNV
+// CHECK_SPV_QUAD_C: "SPV_NV_compute_shader_derivatives"
+// CHECK_SPV_QUAD_C-NOT: "SPV_NV_compute_shader_derivatives"
 
 //TEST:SIMPLE(filecheck=CHECK_SPV_LINEAR_C): -allow-glsl -stage compute -entry computeMain -target spirv -DLINEAR -DCOMPUTE
-// CHECK_SPV_LINEAR_C-COUNT-1: DerivativeGroupLinearNV
-// CHECK_SPV_LINEAR_C-COUNT-1: "SPV_NV_compute_shader_derivatives"
+// CHECK_SPV_LINEAR_C: DerivativeGroupLinearNV
+// CHECK_SPV_LINEAR_C-NOT: DerivativeGroupLinearNV
+// CHECK_SPV_LINEAR_C: "SPV_NV_compute_shader_derivatives"
+// CHECK_SPV_LINEAR_C-NOT: "SPV_NV_compute_shader_derivatives"
 
 //TEST:SIMPLE(filecheck=CHECK_HLSL_C): -allow-glsl -stage compute -entry computeMain -target hlsl -DCOMPUTE
 // CHECK_HLSL_C: computeMain(