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

7 files changed, 26 insertions, 26 deletions

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