Update spirv-header and spirv-tools to Jun/2024 (#4679)

The following external directories are updated.
It is to use a new SPIRV keyword, "OpExtInstWithForwardRefs".

Related to #4304

external/spirv-header:
> commit 2acb319af38d43be3ea76bfabf3998e5281d8d12
> Author: Kévin Petit kevin.petit@arm.com
> Date: Wed Jun 12 16:41:14 2024 +0100
> SPV_ARM_cooperative_matrix_layouts (#433)

external/spirv-tools:
> commit ce46482db7ab3ea9c52fce832d27ca40b14f8e87
> Author: Nathan Gauër brioche@google.com
> Date: Thu Jun 6 12:17:51 2024 +0200
> Add KHR suffix to OpExtInstWithForwardRef opcode. (#5704)
> The KHR suffix was missing from the published SPIR-V extension.
> This is now fixed, but requires some patches in SPIRV-Tools.

external/spirv-tools-generated:
This is generated from spirv-tools

19 files changed, 108 insertions, 108 deletions

diff --git a/tests/glsl-intrinsic/raytracing/glsl-rayAnyhit.slang b/tests/glsl-intrinsic/raytracing/glsl-rayAnyhit.slang
index 0ad09d64d..a9ad750ff 100644
--- a/tests/glsl-intrinsic/raytracing/glsl-rayAnyhit.slang
+++ b/tests/glsl-intrinsic/raytracing/glsl-rayAnyhit.slang
@@ -12,10 +12,10 @@ buffer MyBlockName
 bool testVars() {
     return true
 // CHECK_GLSL-DAG: gl_HitTEXT
-// CHECK_SPV-DAG: RayTmaxNV
+// CHECK_SPV-DAG: RayTmax{{NV|KHR}}
         && gl_HitTEXT != 99.0f
 // CHECK_GLSL-DAG: gl_HitKindEXT
-// CHECK_SPV-DAG: HitKindNV
+// CHECK_SPV-DAG: HitKind{{NV|KHR}}
         && gl_HitKindEXT != 0xFFFFFFFF
         ;    
 }
diff --git a/tests/glsl-intrinsic/raytracing/glsl-rayGen.slang b/tests/glsl-intrinsic/raytracing/glsl-rayGen.slang
index 2969dcb9b..c887095d5 100644
--- a/tests/glsl-intrinsic/raytracing/glsl-rayGen.slang
+++ b/tests/glsl-intrinsic/raytracing/glsl-rayGen.slang
@@ -10,13 +10,13 @@ buffer MyBlockName
 } outputBuffer;
 
 // CHECK_GLSL-DAG: rayPayloadEXT
-// CHECK_SPV-DAG: RayPayloadNV
+// CHECK_SPV-DAG: RayPayload{{NV|KHR}}
 layout(location = 2) rayPayloadEXT vec4 payload;
 // CHECK_GLSL-DAG: hitObjectAttributeNV
 // CHECK_SPV-DAG: HitObjectAttributeNV
 layout(location = 2) hitObjectAttributeNV vec4 attrMain;
 // CHECK_GLSL-DAG: callableDataEXT
-// CHECK_SPV-DAG: CallableDataNV
+// CHECK_SPV-DAG: CallableData{{NV|KHR}}
 layout(location = 0) callableDataEXT vec4 outcall;
 
 __generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
diff --git a/tests/glsl-intrinsic/raytracing/glsl-rayIntersection.slang b/tests/glsl-intrinsic/raytracing/glsl-rayIntersection.slang
index 92549e2d7..98c0e8b1b 100644
--- a/tests/glsl-intrinsic/raytracing/glsl-rayIntersection.slang
+++ b/tests/glsl-intrinsic/raytracing/glsl-rayIntersection.slang
@@ -10,7 +10,7 @@ buffer MyBlockName
 } outputBuffer;
 
 //CHECK_GLSL-DAG: hitAttributeEXT
-//CHECK_SPV-DAG: HitAttributeNV
+//CHECK_SPV-DAG: HitAttribute{{NV|KHR}}
 hitAttributeEXT vec4 hitAttr;
 
 __generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
@@ -44,16 +44,16 @@ bool testVars() {
 // CHECK_SPV-DAG: InstanceId
         && gl_InstanceID != 10000
 // CHECK_GLSL-DAG: gl_InstanceCustomIndexEXT
-// CHECK_SPV-DAG: InstanceCustomIndexNV
+// CHECK_SPV-DAG: InstanceCustomIndex{{NV|KHR}}
         && gl_InstanceCustomIndexEXT != 10000
 // CHECK_GLSL-DAG: gl_GeometryIndexEXT
 // CHECK_SPV-DAG: RayGeometryIndexKHR
         && gl_GeometryIndexEXT != 10000
 // CHECK_GLSL-DAG: gl_ObjectRayOriginEXT
-// CHECK_SPV-DAG: ObjectRayOriginNV
+// CHECK_SPV-DAG: ObjectRayOrigin{{NV|KHR}}
         && gl_ObjectRayOriginEXT != vec3(99)
 // CHECK_GLSL-DAG: gl_ObjectRayDirectionEXT
-// CHECK_SPV-DAG: ObjectRayDirectionNV
+// CHECK_SPV-DAG: ObjectRayDirection{{NV|KHR}}
         && gl_ObjectRayDirectionEXT != vec3(99)
 // CHECK_GLSL-DAG: gl_ObjectToWorldEXT
 //COM: CHECK_SPV-DAG: ObjectToWorldNV
diff --git a/tests/glsl-intrinsic/raytracing/glsl-rayMiss.slang b/tests/glsl-intrinsic/raytracing/glsl-rayMiss.slang
index 714b214e1..98e5422ab 100644
--- a/tests/glsl-intrinsic/raytracing/glsl-rayMiss.slang
+++ b/tests/glsl-intrinsic/raytracing/glsl-rayMiss.slang
@@ -10,7 +10,7 @@ buffer MyBlockName
 } outputBuffer;
 
 // CHECK_GLSL-DAG: rayPayloadInEXT
-// CHECK_SPV-DAG: IncomingRayPayloadNV
+// CHECK_SPV-DAG: IncomingRayPayload{{NV|KHR}}
 layout(location = 2) rayPayloadInEXT vec4 payload;
 // CHECK_GLSL-DAG: hitObjectAttributeNV
 // CHECK_SPV-DAG: HitObjectAttributeNV
@@ -33,19 +33,19 @@ bool testVars() {
 // spirv checked with CHECK_SPV-DAG-N
         && gl_LaunchSizeEXT != uint3(99)
 // CHECK_GLSL-DAG: gl_WorldRayOriginEXT
-// CHECK_SPV-DAG: WorldRayOriginNV
+// CHECK_SPV-DAG: WorldRayOrigin{{NV|KHR}}
         && gl_WorldRayOriginEXT != vec3(99)
 // CHECK_GLSL-DAG: gl_WorldRayDirectionEXT
-// CHECK_SPV-DAG: WorldRayDirectionNV
+// CHECK_SPV-DAG: WorldRayDirection{{NV|KHR}}
         && gl_WorldRayDirectionEXT != vec3(99)
 // CHECK_GLSL-DAG: gl_RayTminEXT
-// CHECK_SPV-DAG: RayTminNV
+// CHECK_SPV-DAG: RayTmin{{NV|KHR}}
         && gl_RayTminEXT != 99.0f
 // CHECK_GLSL-DAG: gl_RayTmaxEXT
-// CHECK_SPV-DAG: RayTmaxNV
+// CHECK_SPV-DAG: RayTmax{{NV|KHR}}
         && gl_RayTmaxEXT != 99.0f
 // CHECK_GLSL-DAG: gl_IncomingRayFlagsEXT
-// CHECK_SPV-DAG: IncomingRayFlagsNV
+// CHECK_SPV-DAG: IncomingRayFlags{{NV|KHR}}
         && gl_IncomingRayFlagsEXT != 0xFFFFFFFF
 // CHECK_GLSL-DAG: gl_CurrentRayTimeNV
 // CHECK_SPV-DAG: CurrentRayTimeNV
diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang
index 668b5e0d9..0d6d70b4a 100644
--- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang
+++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang
@@ -9,25 +9,25 @@
 
 // SPIRV: OpEntryPoint
 
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchIdNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSizeNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTminNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmaxNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlagsNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchId{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSize{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmax{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlags{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceId
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceCustomIndexNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceCustomIndex{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayGeometryIndexKHR
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn PrimitiveId
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectToWorldNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldToObjectNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn HitKindNV
-
-// SPIRV-DAG: OpTypePointer HitAttributeNV
-// SPIRV-DAG: OpTypePointer IncomingRayPayloadNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectToWorld{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldToObject{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn HitKind{{NV|KHR}}
+
+// SPIRV-DAG: OpTypePointer HitAttribute{{NV|KHR}}
+// SPIRV-DAG: OpTypePointer IncomingRayPayload{{NV|KHR}}
  
 // SPIRV-DAG: OpTerminateRayKHR
 // SPIRV-DAG: OpIgnoreIntersectionKHR
@@ -207,4 +207,4 @@ void main( inout RayPayload payload, in BuiltInTriangleIntersectionAttributes at
     }
 
     payload.RayHitT = val;
-}
\ No newline at end of file
+}
diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-chit.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-chit.slang
index c9b3e6fef..a645bcd10 100644
--- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-chit.slang
+++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-chit.slang
@@ -11,30 +11,30 @@
 
 // SPIRV: OpEntryPoint
 
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchIdNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSizeNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchId{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSize{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} Binding 0
 // SPIRV-DAG: OpDecorate %{{.*}} DescriptorSet 0
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTminNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmaxNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlagsNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmax{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlags{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceId
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceCustomIndexNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceCustomIndex{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayGeometryIndexKHR
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn PrimitiveId
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectToWorldNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldToObjectNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn HitKindNV
-
-// SPIRV-DAG: OpTypePointer IncomingRayPayloadNV
-// SPIRV-DAG: OpTypePointer RayPayloadNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectToWorld{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldToObject{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn HitKind{{NV|KHR}}
+
+// SPIRV-DAG: OpTypePointer IncomingRayPayload{{NV|KHR}}
+// SPIRV-DAG: OpTypePointer RayPayload{{NV|KHR}}
 // SPIRV-DAG: OpTypeAccelerationStructureKHR
-// SPIRV-DAG: OpTypePointer HitAttributeNV
-// SPIRV-DAG: OpTypePointer CallableDataNV
+// SPIRV-DAG: OpTypePointer HitAttribute{{NV|KHR}}
+// SPIRV-DAG: OpTypePointer CallableData{{NV|KHR}}
 
 // SPIRV: OpTraceRayKHR
 // SPIRV: OpTraceRayMotionNV
@@ -284,4 +284,4 @@ void main( inout RayPayload payload, in BuiltInTriangleIntersectionAttributes at
     val += params.value;
 
     payload.RayHitT = val;
-}
\ No newline at end of file
+}
diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang
index 08536a7b7..74bd62b9e 100644
--- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang
+++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang
@@ -9,24 +9,24 @@
 
 // SPIRV: OpEntryPoint
 
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchIdNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSizeNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTminNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmaxNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlagsNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchId{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSize{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmax{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlags{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceId
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceCustomIndexNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn InstanceCustomIndex{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayGeometryIndexKHR
 // SPIRV-DAG: OpDecorate %{{.*}} BuiltIn PrimitiveId
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectToWorldNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldToObjectNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn ObjectToWorld{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldToObject{{NV|KHR}}
 
-// SPIRV-DAG: OpTypePointer HitAttributeNV
-// SPIRV-DAG: OpVariable %{{.*}} HitAttributeNV
+// SPIRV-DAG: OpTypePointer HitAttribute{{NV|KHR}}
+// SPIRV-DAG: OpVariable %{{.*}} HitAttribute{{NV|KHR}}
 
 // SPIRV: OpReportIntersectionKHR
 
@@ -195,4 +195,4 @@ void main()
             ReportHit( (rayTMin <= t1 && t1 < rayTMax) ? t1 : t2, 0, IDs );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-miss.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-miss.slang
index ee492c15f..3a6707763 100644
--- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-miss.slang
+++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-miss.slang
@@ -11,15 +11,15 @@
 
 // SPIRV: OpEntryPoint
 
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchIdNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSizeNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchId{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSize{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} Binding 0
 // SPIRV-DAG: OpDecorate %{{.*}} DescriptorSet 0
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOriginNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirectionNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTminNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmaxNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlagsNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayOrigin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn WorldRayDirection{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmin{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn RayTmax{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn IncomingRayFlags{{NV|KHR}}
 
 // SPIRV: OpTraceRayKHR
 // SPIRV: OpTraceRayMotionNV
@@ -200,4 +200,4 @@ void main( inout RayPayload payload )
     val += params.value;
 
     payload.RayHitT = val;
-}
\ No newline at end of file
+}
diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-rgen.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-rgen.slang
index afda4d9d0..6542aa8ff 100644
--- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-rgen.slang
+++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-rgen.slang
@@ -11,8 +11,8 @@
 
 // SPIRV: OpEntryPoint
 
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchIdNV
-// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSizeNV
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchId{{NV|KHR}}
+// SPIRV-DAG: OpDecorate %{{.*}} BuiltIn LaunchSize{{NV|KHR}}
 // SPIRV-DAG: OpDecorate %{{.*}} Binding 0
 // SPIRV-DAG: OpDecorate %{{.*}} DescriptorSet 0
 // SPIRV-DAG: OpDecorate %{{.*}} Binding 1
@@ -160,4 +160,4 @@ void main()
 
         screenOutput[DispatchRaysIndex().xy] = float4(params.value, params.value, params.value, params.value);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/nv-extensions/nv-ray-tracing-motion-blur.slang b/tests/nv-extensions/nv-ray-tracing-motion-blur.slang
index f07bc6977..a07d98a88 100644
--- a/tests/nv-extensions/nv-ray-tracing-motion-blur.slang
+++ b/tests/nv-extensions/nv-ray-tracing-motion-blur.slang
@@ -119,7 +119,7 @@ void main()
     outputImage[launchID] = float4(color, 1.0);
 }
 
-// CHECK_SPV: %{{.*}} = OpVariable %_ptr_RayPayload{{(NV)?}}_ReflectionRay{{.*}} RayPayload
+// CHECK_SPV: %{{.*}} = OpVariable %_ptr_RayPayload{{NV|KHR}}_ReflectionRay{{.*}} RayPayload
 // CHECK_SPV: OpTraceRayMotionNV
 // CHECK_SPV: OpTraceRayKHR
 
@@ -127,4 +127,4 @@ void main()
 // CHECK_HLSL: TraceRay
 
 // CHECK_GLSL: traceRayMotionNV(
-// CHECK_GLSL: traceRayEXT(
\ No newline at end of file
+// CHECK_GLSL: traceRayEXT(
diff --git a/tests/pipeline/rasterization/mesh/hello.slang b/tests/pipeline/rasterization/mesh/hello.slang
index 8a64805c0..558a761fa 100644
--- a/tests/pipeline/rasterization/mesh/hello.slang
+++ b/tests/pipeline/rasterization/mesh/hello.slang
@@ -11,8 +11,8 @@
 // SPIRV: OpEntryPoint MeshEXT %main
 
 // SPIRV-DAG: OpExecutionMode %main OutputVertices 3
-// SPIRV-DAG: OpExecutionMode %main OutputPrimitivesNV 1
-// SPIRV-DAG: OpExecutionMode %main OutputTrianglesNV
+// SPIRV-DAG: OpExecutionMode %main OutputPrimitives{{NV|EXT}} 1
+// SPIRV-DAG: OpExecutionMode %main OutputTriangles{{NV|EXT}}
 
 // SPIRV: OpSetMeshOutputsEXT
 
diff --git a/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang b/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang
index 4294314a6..b5f4f215e 100644
--- a/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang
+++ b/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang
@@ -2,10 +2,10 @@
 //TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage mesh -emit-spirv-directly
 
 // CHECK: OpDecorate %gl_PrimitiveID BuiltIn PrimitiveId
-// CHECK: OpDecorate %gl_PrimitiveID PerPrimitiveNV
+// CHECK: OpDecorate %gl_PrimitiveID PerPrimitive{{NV|EXT}}
 
 // CHECK: OpDecorate {{.*}} BuiltIn CullPrimitiveEXT
-// CHECK: OpDecorate {{.*}} PerPrimitiveNV
+// CHECK: OpDecorate {{.*}} PerPrimitive{{NV|EXT}}
 
 const static let color: float3[] = {
   float3(1.0, 0.0, 0.0),
diff --git a/tests/vkray/anyhit.slang b/tests/vkray/anyhit.slang
index b99e31df9..641fa3059 100644
--- a/tests/vkray/anyhit.slang
+++ b/tests/vkray/anyhit.slang
@@ -55,9 +55,9 @@ void main(
 // SPIRV-DAG: OpCapability RayTracingPositionFetchKHR
 // SPIRV: OpEntryPoint
 // SPIRV: BuiltIn HitTriangleVertexPositionsKHR
-// SPIRV: OpTypePointer HitAttributeNV
-// SPIRV: OpTypePointer HitAttributeNV
-// SPIRV: OpVariable{{.*}}HitAttributeNV
+// SPIRV: OpTypePointer HitAttribute{{NV|KHR}}
+// SPIRV: OpTypePointer HitAttribute{{NV|KHR}}
+// SPIRV: OpVariable{{.*}}HitAttribute{{NV|KHR}}
 // SPIRV: OpIgnoreIntersectionKHR
 // SPIRV: OpTerminateRayKHR
 // SPIRV-DAG: %{{.*}} = OpAccessChain %{{.*}} %{{.*}} %{{.*}}
@@ -68,8 +68,8 @@ void main(
 // GL_SPIRV-DAG: OpCapability RayTracingPositionFetchKHR
 // GL_SPIRV: OpEntryPoint
 // GL_SPIRV: BuiltIn HitTriangleVertexPositionsKHR
-// GL_SPIRV-DAG: OpTypePointer HitAttributeNV
-// GL_SPIRV-DAG: OpTypePointer HitAttributeNV
+// GL_SPIRV-DAG: OpTypePointer HitAttribute{{NV|KHR}}
+// GL_SPIRV-DAG: OpTypePointer HitAttribute{{NV|KHR}}
 // GL_SPIRV: OpTerminateRayKHR
 // GL_SPIRV: OpIgnoreIntersectionKHR
 // GL_SPIRV-DAG: %{{.*}} = OpAccessChain %{{.*}} %{{.*}} %{{.*}}
diff --git a/tests/vkray/callable.slang b/tests/vkray/callable.slang
index 583002bc9..f3aa55979 100644
--- a/tests/vkray/callable.slang
+++ b/tests/vkray/callable.slang
@@ -19,8 +19,8 @@ void main(in out MaterialPayload ioPayload)
 // CHECK-DAG: OpCapability RayTracingKHR
 // CHECK-DAG: OpExtension "SPV_KHR_ray_tracing"
 // CHECK: OpEntryPoint
-// CHECK-DAG: OpTypePointer IncomingCallableDataNV
-// CHECK-DAG: OpTypePointer IncomingCallableDataNV
-// CHECK-DAG: OpTypePointer IncomingCallableDataNV
+// CHECK-DAG: OpTypePointer IncomingCallableData{{NV|KHR}}
+// CHECK-DAG: OpTypePointer IncomingCallableData{{NV|KHR}}
+// CHECK-DAG: OpTypePointer IncomingCallableData{{NV|KHR}}
 // CHECK-DAG: %{{.*}} = OpAccessChain %{{.*}} %{{.*}} %{{.*}}
 // CHECK-DAG: %{{.*}} = OpAccessChain %{{.*}} %{{.*}} %{{.*}}
diff --git a/tests/vkray/closesthit.slang b/tests/vkray/closesthit.slang
index 01337cf60..31728abc1 100644
--- a/tests/vkray/closesthit.slang
+++ b/tests/vkray/closesthit.slang
@@ -43,20 +43,20 @@ void main(
 
 // CHECK: OpCapability RayTracing
 // CHECK: OpCapability RayTracingPositionFetchKHR
-// CHECK: OpEntryPoint ClosestHitNV %main "main"
+// CHECK: OpEntryPoint ClosestHit{{NV|KHR}} %main "main"
 // CHECK-DAG: OpDecorate %[[INSTANCE_ID:[A-Za-z0-9_]+]] BuiltIn InstanceId
-// CHECK-DAG: OpDecorate %[[INSTANCE_INDEX:[A-Za-z0-9_]+]] BuiltIn InstanceCustomIndexNV
+// CHECK-DAG: OpDecorate %[[INSTANCE_INDEX:[A-Za-z0-9_]+]] BuiltIn InstanceCustomIndex{{NV|KHR}}
 // CHECK-DAG: OpDecorate %{{.*}} BuiltIn PrimitiveId
-// CHECK-DAG: OpDecorate %{{.*}} BuiltIn HitKindNV
-// CHECK-DAG: OpDecorate %{{.*}} BuiltIn RayTmaxNV
-// CHECK-DAG: OpDecorate %{{.*}} BuiltIn RayTminNV
+// CHECK-DAG: OpDecorate %{{.*}} BuiltIn HitKind{{NV|KHR}}
+// CHECK-DAG: OpDecorate %{{.*}} BuiltIn RayTmax{{NV|KHR}}
+// CHECK-DAG: OpDecorate %{{.*}} BuiltIn RayTmin{{NV|KHR}}
 // CHECK-DAG: OpDecorate %{{.*}} BuiltIn HitTriangleVertexPositionsKHR
-// CHECK-DAG: %ShaderRecord{{.*}} = OpVariable %_ptr_ShaderRecordBufferNV{{.*}} ShaderRecordBufferNV
-// CHECK-DAG: %{{.*}} = OpVariable %_ptr_IncomingRayPayloadNV_ReflectionRay{{.*}} IncomingRayPayloadNV
+// CHECK-DAG: %ShaderRecord{{.*}} = OpVariable %_ptr_ShaderRecordBuffer{{.*}} ShaderRecordBuffer{{NV|KHR}}
+// CHECK-DAG: %{{.*}} = OpVariable %_ptr_IncomingRayPayload{{NV|KHR}}_ReflectionRay{{.*}} IncomingRayPayload{{NV|KHR}}
 // CHECK-DAG: %{{.*}} = OpLoad %{{u?}}int %[[INSTANCE_ID]]
 // CHECK-DAG: %{{.*}} = OpLoad %{{u?}}int %[[INSTANCE_INDEX]]
-// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_ShaderRecordBufferNV_uint %ShaderRecord{{.*}} %int_0
-// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_IncomingRayPayloadNV_v4float %{{.*}} %int_0
+// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_ShaderRecordBuffer{{NV|KHR}}_uint %ShaderRecord{{.*}} %int_0
+// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_IncomingRayPayload{{NV|KHR}}_v4float %{{.*}} %int_0
 // CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_0
 // CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_1
 // CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_Input_v3float %{{.*}} %{{u?}}int_2
diff --git a/tests/vkray/entry-point-params.slang b/tests/vkray/entry-point-params.slang
index 993f2a3b7..e3f29bc5b 100644
--- a/tests/vkray/entry-point-params.slang
+++ b/tests/vkray/entry-point-params.slang
@@ -16,8 +16,8 @@ void main(
 
 // CHECK: OpCapability RayTracingKHR
 // CHECK: OpExtension "SPV_KHR_ray_tracing"
-// CHECK: OpEntryPoint RayGenerationNV %main
-// CHECK-DAG: OpDecorate %[[LaunchID:[A-Za-z0-9_]+]] BuiltIn LaunchIdNV
+// CHECK: OpEntryPoint RayGeneration{{NV|KHR}} %main
+// CHECK-DAG: OpDecorate %[[LaunchID:[A-Za-z0-9_]+]] BuiltIn LaunchId{{NV|KHR}}
 // CHECK-DAG: %[[LaunchID]] = OpVariable %_ptr_Input_v3uint Input
 // CHECK-DAG: %{{.*}} = OpLoad %v3uint %[[LaunchID]]
-// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_ShaderRecordBufferNV_float %{{.*}} %int_0
+// CHECK-DAG: %{{.*}} = OpAccessChain %_ptr_ShaderRecordBuffer{{NV|KHR}}_float %{{.*}} %int_0
diff --git a/tests/vkray/intersection.slang b/tests/vkray/intersection.slang
index 4b4495680..358a42e17 100644
--- a/tests/vkray/intersection.slang
+++ b/tests/vkray/intersection.slang
@@ -46,10 +46,10 @@ void main()
 	}
 }
 
-// CHECK: OpEntryPoint IntersectionNV %main "main"
-// CHECK: OpDecorate %[[rayTMin:[a-zA-Z0-9_]+]] BuiltIn RayTminNV
+// CHECK: OpEntryPoint Intersection{{NV|KHR}} %main "main"
+// CHECK: OpDecorate %{{[a-zA-Z0-9_]+}} BuiltIn RayTmin{{NV|KHR}}
 
-// CHECK-DAG: %[[ATTR:[A-Za-z0-9_]+]] = OpVariable %_ptr_HitAttributeNV_SphereHitAttributes{{.*}} HitAttributeNV
+// CHECK-DAG: %[[ATTR:[A-Za-z0-9_]+]] = OpVariable %_ptr_HitAttribute{{NV|KHR}}_SphereHitAttributes{{.*}} HitAttribute{{NV|KHR}}
 // CHECK-DAG: %[[VAL:[A-Za-z0-9_]+]] = Op{{.+}} %SphereHitAttributes{{.*}} {{.*}}
 // CHECK-DAG: OpStore %[[ATTR]] %[[VAL]]
 
diff --git a/tests/vkray/raygen.slang b/tests/vkray/raygen.slang
index d63b3a668..28bad734a 100644
--- a/tests/vkray/raygen.slang
+++ b/tests/vkray/raygen.slang
@@ -117,7 +117,7 @@ void main()
     outputImage[int2(gl_LaunchIDNV.xy)] = float4(color, 1.0);
 }
 
-// CHECK_SPV: %{{.*}} = OpVariable %_ptr_RayPayload{{(NV)?}}_ReflectionRay{{.*}} RayPayload
+// CHECK_SPV: %{{.*}} = OpVariable %_ptr_RayPayload{{NV|KHR}}_ReflectionRay{{.*}} RayPayload
 // CHECK_SPV: OpTraceRayKHR
 // CHECK_SPV: OpTraceRayKHR
 
@@ -125,4 +125,4 @@ void main()
 // CHECK_HLSL: TraceRay
 
 // CHECK_GLSL: traceRayEXT(
-// CHECK_GLSL: traceRayEXT(
\ No newline at end of file
+// CHECK_GLSL: traceRayEXT(
diff --git a/tests/vkray/rayquery-closesthit.slang b/tests/vkray/rayquery-closesthit.slang
index 33e1c9c9a..06027fd4d 100644
--- a/tests/vkray/rayquery-closesthit.slang
+++ b/tests/vkray/rayquery-closesthit.slang
@@ -28,7 +28,7 @@ void main(
 // CHECK: OpCapability RayQueryPositionFetchKHR
 // CHECK: OpExtension "SPV_KHR_ray_query"
 // CHECK: OpExtension "SPV_KHR_ray_tracing_position_fetch"
-// CHECK: OpEntryPoint ClosestHitNV %main "main"
+// CHECK: OpEntryPoint ClosestHit{{NV|KHR}} %main "main"
 // CHECK: OpRayQueryInitializeKHR %rayQuery{{.*}}
 // CHECK: OpRayQueryGetIntersectionTriangleVertexPositionsKHR %_arr_v3float_{{u?}}int_3{{.*}} %rayQuery{{.*}} %{{u?}}int_0
 // CHECK: OpRayQueryGetIntersectionTriangleVertexPositionsKHR %_arr_v3float_{{u?}}int_3{{.*}} %rayQuery{{.*}} %{{u?}}int_1