diff --git a/external/SPIRV-Headers b/external/SPIRV-Headers
index db5a00f8c..2a9b6f951 160000
--- a/external/SPIRV-Headers
+++ b/external/SPIRV-Headers
@@ -1 +1 @@
-Subproject commit db5a00f8cebe81146cafabf89019674a3c4bf03d
+Subproject commit 2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801
diff --git a/external/SPIRV-Tools b/external/SPIRV-Tools
index 72c291332..6dcc7e350 160000
--- a/external/SPIRV-Tools
+++ b/external/SPIRV-Tools
@@ -1 +1 @@
-Subproject commit 72c291332a0558ab4121eff9db97e428b574b58b
+Subproject commit 6dcc7e350a0b9871a825414d42329e44b0eb8109
diff --git a/tools/clang/test/CodeGenSPIRV/ddx.compute.hlsl b/tools/clang/test/CodeGenSPIRV/ddx.compute.hlsl
index 2cb9fd2bc..e72c4ccc1 100644
--- a/tools/clang/test/CodeGenSPIRV/ddx.compute.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/ddx.compute.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 
 SamplerState ss : register(s2);
diff --git a/tools/clang/test/CodeGenSPIRV/single.derivative.execmode.hlsl b/tools/clang/test/CodeGenSPIRV/single.derivative.execmode.hlsl
index 75b127bb0..6fb6b6988 100644
--- a/tools/clang/test/CodeGenSPIRV/single.derivative.execmode.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/single.derivative.execmode.hlsl
@@ -3,10 +3,10 @@
 // This test checks that the execution mode is not added multiple times. Other
 // tests will verify that the code generation is correct.
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
-// CHECK-NOT: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
+// CHECK-NOT: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.linear.hlsl b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.linear.hlsl
index 00cdf1aa4..cb2e8c591 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.linear.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.linear.hlsl
@@ -1,8 +1,8 @@
-// RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
+// RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s --check-prefix=CHECK
 
-// CHECK: OpCapability ComputeDerivativeGroupLinearNV
+// CHECK: OpCapability ComputeDerivativeGroupLinearKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupLinearNV
+// CHECK: OpExecutionMode %main DerivativeGroupLinearKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.quad.hlsl b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.quad.hlsl
index 8ed4ebed3..84cdcdf22 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.quad.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.compute.quad.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.linear.hlsl b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.linear.hlsl
index 617dcdab4..efbb0d82a 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.linear.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.linear.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupLinearNV
+// CHECK: OpCapability ComputeDerivativeGroupLinearKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupLinearNV
+// CHECK: OpExecutionMode %main DerivativeGroupLinearKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.quad.hlsl b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.quad.hlsl
index ebaad50b5..10de7c258 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.quad.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.calculate.lod.unclamped.compute.quad.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.sample.compute.linear.hlsl b/tools/clang/test/CodeGenSPIRV/texture.sample.compute.linear.hlsl
index bdaa1fd99..0d56a3a90 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.sample.compute.linear.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.sample.compute.linear.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupLinearNV
+// CHECK: OpCapability ComputeDerivativeGroupLinearKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupLinearNV
+// CHECK: OpExecutionMode %main DerivativeGroupLinearKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.sample.compute.quad.hlsl b/tools/clang/test/CodeGenSPIRV/texture.sample.compute.quad.hlsl
index 9f846f137..bbedad9c6 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.sample.compute.quad.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.sample.compute.quad.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.linear.hlsl b/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.linear.hlsl
index 4db7b5f33..2ce02bb9e 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.linear.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.linear.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupLinearNV
+// CHECK: OpCapability ComputeDerivativeGroupLinearKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupLinearNV
+// CHECK: OpExecutionMode %main DerivativeGroupLinearKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.quad.hlsl b/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.quad.hlsl
index e90f5d81b..a64e6f84d 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.quad.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.samplebias.compute.quad.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.linear.hlsl b/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.linear.hlsl
index 6c1904aaa..a5fca1ada 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.linear.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.linear.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupLinearNV
+// CHECK: OpCapability ComputeDerivativeGroupLinearKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupLinearNV
+// CHECK: OpExecutionMode %main DerivativeGroupLinearKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;
diff --git a/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.quad.hlsl b/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.quad.hlsl
index a54bda3e9..550c80f41 100644
--- a/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.quad.hlsl
+++ b/tools/clang/test/CodeGenSPIRV/texture.samplecmp.compute.quad.hlsl
@@ -1,8 +1,8 @@
 // RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl  %s -spirv  2>&1 | FileCheck %s
 
-// CHECK: OpCapability ComputeDerivativeGroupQuadsNV
+// CHECK: OpCapability ComputeDerivativeGroupQuadsKHR
 // CHECK: OpExtension "SPV_NV_compute_shader_derivatives"
-// CHECK: OpExecutionMode %main DerivativeGroupQuadsNV
+// CHECK: OpExecutionMode %main DerivativeGroupQuadsKHR
 
 SamplerState ss : register(s2);
 SamplerComparisonState scs;