diff --git a/README.md b/README.md
index 51d7d759a..7032e5cc6 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,8 @@ This framework provides a YAML representation for describing GPU pipelines and b
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [2, 1, 1] # Define how many groups to dispatch, if omitted one group is launched.
 Buffers:
   - Name: Constants
     Format: Int32
diff --git a/include/Support/Pipeline.h b/include/Support/Pipeline.h
index 18992ab23..7cdace032 100644
--- a/include/Support/Pipeline.h
+++ b/include/Support/Pipeline.h
@@ -355,10 +355,6 @@ struct IOBindings {
       Stride += VA.size();
     return Stride;
   }
-
-  uint32_t getVertexCount() const {
-    return VertexBufferPtr->size() / getVertexStride();
-  }
 };
 
 // Describes a contiguous group of bytes in a push constant block.
@@ -400,10 +396,14 @@ struct Shader {
   std::string Entry;
   std::unique_ptr<llvm::MemoryBuffer> Shader;
   std::unique_ptr<llvm::MemoryBuffer> Reflection;
-  int DispatchSize[3];
   llvm::SmallVector<SpecializationConstant> SpecializationConstants;
 };
 
+struct DispatchParametersSet {
+  std::array<uint32_t, 3> DispatchGroupCount = {1, 1, 1};
+  std::optional<uint32_t> VertexCount;
+};
+
 struct Pipeline {
   ShaderPipelineKind Kind;
   llvm::SmallVector<Shader> Shaders;
@@ -415,6 +415,17 @@ struct Pipeline {
   llvm::SmallVector<Sampler> Samplers;
   llvm::SmallVector<Result> Results;
   llvm::SmallVector<DescriptorSet> Sets;
+  DispatchParametersSet DispatchParameters;
+
+  uint32_t getVertexCount() const {
+    if (DispatchParameters.VertexCount)
+      return *DispatchParameters.VertexCount;
+
+    assert(Bindings.VertexBufferPtr != nullptr &&
+           "No VertexCount specified and no Vertex Buffer available to imply "
+           "VertexCount from.");
+    return Bindings.VertexBufferPtr->size() / Bindings.getVertexStride();
+  }
 
   uint32_t getDescriptorCount() const {
     uint32_t DescriptorCount = 0;
@@ -446,6 +457,7 @@ struct Pipeline {
   }
 
   llvm::Error validatePipelineKind();
+  llvm::Error validateDispatchParameters();
 
   bool isCompute() const { return Kind == ShaderPipelineKind::Compute; }
   bool isTraditionalRaster() const {
@@ -465,6 +477,7 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(offloadtest::VertexAttribute)
 LLVM_YAML_IS_SEQUENCE_VECTOR(offloadtest::SpecializationConstant)
 LLVM_YAML_IS_SEQUENCE_VECTOR(offloadtest::PushConstantBlock)
 LLVM_YAML_IS_SEQUENCE_VECTOR(offloadtest::PushConstantValue)
+LLVM_YAML_IS_SEQUENCE_VECTOR(offloadtest::DispatchParametersSet)
 
 namespace llvm {
 namespace yaml {
@@ -513,6 +526,10 @@ template <> struct MappingTraits<offloadtest::PushConstantBlock> {
   static void mapping(IO &I, offloadtest::PushConstantBlock &B);
 };
 
+template <> struct MappingTraits<offloadtest::DispatchParametersSet> {
+  static void mapping(IO &I, offloadtest::DispatchParametersSet &B);
+};
+
 template <> struct MappingTraits<offloadtest::VertexAttribute> {
   static void mapping(IO &I, offloadtest::VertexAttribute &A);
 };
diff --git a/lib/API/DX/Device.cpp b/lib/API/DX/Device.cpp
index e8c8dd941..ba54b6adf 100644
--- a/lib/API/DX/Device.cpp
+++ b/lib/API/DX/Device.cpp
@@ -1787,10 +1787,10 @@ class DXDevice : public offloadtest::Device {
       if (!EncoderOrErr)
         return EncoderOrErr.takeError();
       auto &Encoder = *EncoderOrErr.get();
-      const llvm::ArrayRef<int> DispatchSize =
-          llvm::ArrayRef<int>(P.Shaders[0].DispatchSize);
-      if (auto Err = Encoder.dispatch(DispatchSize[0], DispatchSize[1],
-                                      DispatchSize[2]))
+      if (auto Err =
+              Encoder.dispatch(P.DispatchParameters.DispatchGroupCount[0],
+                               P.DispatchParameters.DispatchGroupCount[1],
+                               P.DispatchParameters.DispatchGroupCount[2]))
         return Err;
       Encoder.endEncoding();
     }
@@ -2027,7 +2027,7 @@ class DXDevice : public offloadtest::Device {
                                 static_cast<LONG>(VP.Height)};
     IS.CB->CmdList->RSSetScissorRects(1, &Scissor);
 
-    IS.CB->CmdList->DrawInstanced(P.Bindings.getVertexCount(), 1, 0, 0);
+    IS.CB->CmdList->DrawInstanced(P.getVertexCount(), 1, 0, 0);
 
     // Transition the render target to copy source and copy to the readback
     // buffer.
diff --git a/lib/API/MTL/MTLDevice.cpp b/lib/API/MTL/MTLDevice.cpp
index 0b03e96ad..d82b559a5 100644
--- a/lib/API/MTL/MTLDevice.cpp
+++ b/lib/API/MTL/MTLDevice.cpp
@@ -594,10 +594,9 @@ class MTLDevice : public offloadtest::Device {
     }
     Encoder.setThreadGroupSize(TGS[0], TGS[1], TGS[2]);
 
-    const llvm::ArrayRef<int> DispatchSize =
-        llvm::ArrayRef<int>(P.Shaders[0].DispatchSize);
-    if (auto Err =
-            Encoder.dispatch(DispatchSize[0], DispatchSize[1], DispatchSize[2]))
+    if (auto Err = Encoder.dispatch(P.DispatchParameters.DispatchGroupCount[0],
+                                    P.DispatchParameters.DispatchGroupCount[1],
+                                    P.DispatchParameters.DispatchGroupCount[2]))
       return Err;
     Encoder.endEncoding();
     return llvm::Error::success();
@@ -718,7 +717,7 @@ class MTLDevice : public offloadtest::Device {
     CmdEncoder->setVertexBuffer(llvm::cast<MTLBuffer>(*IS.VB).Buf, 0, 0);
 
     CmdEncoder->drawPrimitives(MTL::PrimitiveTypeTriangle, NS::UInteger(0),
-                               P.Bindings.getVertexCount());
+                               P.getVertexCount());
 
     CmdEncoder->endEncoding();
 
diff --git a/lib/API/VK/Device.cpp b/lib/API/VK/Device.cpp
index f41ff1e35..5f3821987 100644
--- a/lib/API/VK/Device.cpp
+++ b/lib/API/VK/Device.cpp
@@ -2724,22 +2724,24 @@ class VulkanDevice : public offloadtest::Device {
       if (!EncoderOrErr)
         return EncoderOrErr.takeError();
       auto &Encoder = *EncoderOrErr.get();
-      const llvm::ArrayRef<int> DispatchSize =
-          llvm::ArrayRef<int>(P.Shaders[0].DispatchSize);
-      if (auto Err = Encoder.dispatch(DispatchSize[0], DispatchSize[1],
-                                      DispatchSize[2]))
+      if (auto Err =
+              Encoder.dispatch(P.DispatchParameters.DispatchGroupCount[0],
+                               P.DispatchParameters.DispatchGroupCount[1],
+                               P.DispatchParameters.DispatchGroupCount[2]))
         return Err;
       Encoder.endEncoding();
-      llvm::outs() << "Dispatched compute shader: { " << DispatchSize[0] << ", "
-                   << DispatchSize[1] << ", " << DispatchSize[2] << " }\n";
+      llvm::outs() << "Dispatched compute shader: { "
+                   << P.DispatchParameters.DispatchGroupCount[0] << ", "
+                   << P.DispatchParameters.DispatchGroupCount[1] << ", "
+                   << P.DispatchParameters.DispatchGroupCount[2] << " }\n";
     } else {
       VkDeviceSize Offsets[1]{0};
       assert(IS.VB);
       VkBuffer VBHandle = llvm::cast<VulkanBuffer>(*IS.VB).Buffer;
       vkCmdBindVertexBuffers(IS.CB->CmdBuffer, 0, 1, &VBHandle, Offsets);
       // instanceCount must be >=1 to draw; previously was 0 which draws nothing
-      vkCmdDraw(IS.CB->CmdBuffer, P.Bindings.getVertexCount(), 1, 0, 0);
-      llvm::outs() << "Drew " << P.Bindings.getVertexCount() << " vertices.\n";
+      vkCmdDraw(IS.CB->CmdBuffer, P.getVertexCount(), 1, 0, 0);
+      llvm::outs() << "Drew " << P.getVertexCount() << " vertices.\n";
       vkCmdEndRenderPass(IS.CB->CmdBuffer);
       copyTextureToReadback(IS.CB->CmdBuffer,
                             llvm::cast<VulkanTexture>(*IS.RenderTarget),
diff --git a/lib/Support/Pipeline.cpp b/lib/Support/Pipeline.cpp
index 5439cdaf9..393d65d1b 100644
--- a/lib/Support/Pipeline.cpp
+++ b/lib/Support/Pipeline.cpp
@@ -53,6 +53,10 @@ void MappingTraits<offloadtest::Pipeline>::mapping(IO &I,
   I.mapOptional("Bindings", P.Bindings);
   I.mapOptional("PushConstants", P.PushConstants);
 
+  I.mapOptional("DispatchParameters", P.DispatchParameters);
+  if (auto Err = P.validateDispatchParameters())
+    I.setError(llvm::toString(std::move(Err)));
+
   if (!I.outputting()) {
     for (auto &D : P.Sets) {
       for (auto &R : D.Resources) {
@@ -464,6 +468,12 @@ void MappingTraits<offloadtest::PushConstantValue>::mapping(
   }
 }
 
+void MappingTraits<offloadtest::DispatchParametersSet>::mapping(
+    IO &I, offloadtest::DispatchParametersSet &Set) {
+  I.mapOptional("DispatchGroupCount", Set.DispatchGroupCount);
+  I.mapOptional("VertexCount", Set.VertexCount);
+}
+
 void MappingTraits<offloadtest::OutputProperties>::mapping(
     IO &I, offloadtest::OutputProperties &P) {
   I.mapRequired("Height", P.Height);
@@ -516,13 +526,6 @@ void MappingTraits<offloadtest::Shader>::mapping(IO &I,
   I.mapRequired("Stage", S.Stage);
   I.mapRequired("Entry", S.Entry);
   I.mapOptional("SpecializationConstants", S.SpecializationConstants);
-
-  if (S.Stage == Stages::Compute) {
-    // Stage-specific data, not sure if this should be optional
-    // or moved into the Shaders structure.
-    MutableArrayRef<int> MutableDispatchSize(S.DispatchSize);
-    I.mapRequired("DispatchSize", MutableDispatchSize);
-  }
 }
 
 void MappingTraits<offloadtest::Result>::mapping(IO &I,
@@ -589,3 +592,23 @@ llvm::Error offloadtest::Pipeline::validatePipelineKind() {
   return llvm::createStringError(
       "The pipeline misses a Compute or Vertex Shader.");
 }
+
+llvm::Error offloadtest::Pipeline::validateDispatchParameters() {
+  switch (Kind) {
+  case ShaderPipelineKind::Compute:
+    if (DispatchParameters.VertexCount)
+      return llvm::createStringError(
+          "DispatchParameters.VertexCount set on a Compute pipeline. Only "
+          "allowed on a TraditionalRaster pipeline.");
+    break;
+  case ShaderPipelineKind::TraditionalRaster:
+    if (DispatchParameters.DispatchGroupCount !=
+        std::array<uint32_t, 3>{1, 1, 1})
+      return llvm::createStringError(
+          "DispatchParameters.DispatchGroupCount set on a TraditionalRaster "
+          "pipeline. Only allowed on a Compute pipeline.");
+    break;
+  }
+
+  return llvm::Error::success();
+}
diff --git a/test/Basic/DescriptorSets.test b/test/Basic/DescriptorSets.test
index eab0758ad..43d9f3870 100644
--- a/test/Basic/DescriptorSets.test
+++ b/test/Basic/DescriptorSets.test
@@ -14,7 +14,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Mandelbrot.test b/test/Basic/Mandelbrot.test
index f7a54c1cc..f57e5745c 100644
--- a/test/Basic/Mandelbrot.test
+++ b/test/Basic/Mandelbrot.test
@@ -57,7 +57,8 @@ const static int Dimension = 4096;
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [16384, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [16384, 1, 1]
 Buffers:
   - Name: Tex
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_const_single_subscript.i2x3.test b/test/Basic/Matrix/matrix_const_single_subscript.i2x3.test
index 66e1544c0..9cce0661e 100644
--- a/test/Basic/Matrix/matrix_const_single_subscript.i2x3.test
+++ b/test/Basic/Matrix/matrix_const_single_subscript.i2x3.test
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_const_single_subscript.test b/test/Basic/Matrix/matrix_const_single_subscript.test
index 7d11a76d0..a978b418e 100644
--- a/test/Basic/Matrix/matrix_const_single_subscript.test
+++ b/test/Basic/Matrix/matrix_const_single_subscript.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_construct_by_sub_mat.test b/test/Basic/Matrix/matrix_construct_by_sub_mat.test
index 3b7573610..424f2c719 100644
--- a/test/Basic/Matrix/matrix_construct_by_sub_mat.test
+++ b/test/Basic/Matrix/matrix_construct_by_sub_mat.test
@@ -27,7 +27,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_elementwise_cast.test b/test/Basic/Matrix/matrix_elementwise_cast.test
index 056351605..233aea244 100644
--- a/test/Basic/Matrix/matrix_elementwise_cast.test
+++ b/test/Basic/Matrix/matrix_elementwise_cast.test
@@ -37,7 +37,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_elementwise_vector_cast.test b/test/Basic/Matrix/matrix_elementwise_vector_cast.test
index 23223d296..f6ee2a535 100644
--- a/test/Basic/Matrix/matrix_elementwise_vector_cast.test
+++ b/test/Basic/Matrix/matrix_elementwise_vector_cast.test
@@ -21,7 +21,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_groupthread_swizzle_one_based.test b/test/Basic/Matrix/matrix_groupthread_swizzle_one_based.test
index a27b5fba6..d47a88988 100644
--- a/test/Basic/Matrix/matrix_groupthread_swizzle_one_based.test
+++ b/test/Basic/Matrix/matrix_groupthread_swizzle_one_based.test
@@ -59,7 +59,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_groupthread_swizzle_zero_based.test b/test/Basic/Matrix/matrix_groupthread_swizzle_zero_based.test
index bf16d02b4..b49f68448 100644
--- a/test/Basic/Matrix/matrix_groupthread_swizzle_zero_based.test
+++ b/test/Basic/Matrix/matrix_groupthread_swizzle_zero_based.test
@@ -59,7 +59,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_m-based_getter.test b/test/Basic/Matrix/matrix_m-based_getter.test
index 5589a3b47..5c630f422 100644
--- a/test/Basic/Matrix/matrix_m-based_getter.test
+++ b/test/Basic/Matrix/matrix_m-based_getter.test
@@ -58,7 +58,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_m-based_setter.test b/test/Basic/Matrix/matrix_m-based_setter.test
index 00b7cedae..6e62fa97e 100644
--- a/test/Basic/Matrix/matrix_m-based_setter.test
+++ b/test/Basic/Matrix/matrix_m-based_setter.test
@@ -119,7 +119,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_m-based_swizzle_getter.test b/test/Basic/Matrix/matrix_m-based_swizzle_getter.test
index 3f928cf1a..09a0a6aed 100644
--- a/test/Basic/Matrix/matrix_m-based_swizzle_getter.test
+++ b/test/Basic/Matrix/matrix_m-based_swizzle_getter.test
@@ -44,7 +44,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_one-based_getter.test b/test/Basic/Matrix/matrix_one-based_getter.test
index d287f739e..fd80388e4 100644
--- a/test/Basic/Matrix/matrix_one-based_getter.test
+++ b/test/Basic/Matrix/matrix_one-based_getter.test
@@ -59,7 +59,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_one-based_setter.test b/test/Basic/Matrix/matrix_one-based_setter.test
index 49d4fb889..1703ae72f 100644
--- a/test/Basic/Matrix/matrix_one-based_setter.test
+++ b/test/Basic/Matrix/matrix_one-based_setter.test
@@ -80,7 +80,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_one-based_swizzle_getter.test b/test/Basic/Matrix/matrix_one-based_swizzle_getter.test
index 0b9be1144..2ccd909c7 100644
--- a/test/Basic/Matrix/matrix_one-based_swizzle_getter.test
+++ b/test/Basic/Matrix/matrix_one-based_swizzle_getter.test
@@ -36,7 +36,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_scalar_arithmetic.test b/test/Basic/Matrix/matrix_scalar_arithmetic.test
index c80781bcb..5c6a4b256 100644
--- a/test/Basic/Matrix/matrix_scalar_arithmetic.test
+++ b/test/Basic/Matrix/matrix_scalar_arithmetic.test
@@ -26,7 +26,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_scalar_constructor.test b/test/Basic/Matrix/matrix_scalar_constructor.test
index 68c6adf51..79396fa88 100644
--- a/test/Basic/Matrix/matrix_scalar_constructor.test
+++ b/test/Basic/Matrix/matrix_scalar_constructor.test
@@ -21,7 +21,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_single_subscript_basic.i2x3.test b/test/Basic/Matrix/matrix_single_subscript_basic.i2x3.test
index fb004ccb0..da9327439 100644
--- a/test/Basic/Matrix/matrix_single_subscript_basic.i2x3.test
+++ b/test/Basic/Matrix/matrix_single_subscript_basic.i2x3.test
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_single_subscript_basic.i3x2.test b/test/Basic/Matrix/matrix_single_subscript_basic.i3x2.test
index 470c83bba..98a41aa92 100644
--- a/test/Basic/Matrix/matrix_single_subscript_basic.i3x2.test
+++ b/test/Basic/Matrix/matrix_single_subscript_basic.i3x2.test
@@ -35,7 +35,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_single_subscript_basic.test b/test/Basic/Matrix/matrix_single_subscript_basic.test
index dba199c11..9680022ba 100644
--- a/test/Basic/Matrix/matrix_single_subscript_basic.test
+++ b/test/Basic/Matrix/matrix_single_subscript_basic.test
@@ -37,7 +37,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_single_subscript_load.test b/test/Basic/Matrix/matrix_single_subscript_load.test
index c75ef038d..5024316da 100644
--- a/test/Basic/Matrix/matrix_single_subscript_load.test
+++ b/test/Basic/Matrix/matrix_single_subscript_load.test
@@ -29,7 +29,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_single_subscript_store.test b/test/Basic/Matrix/matrix_single_subscript_store.test
index a36ebb0d2..3435cb499 100644
--- a/test/Basic/Matrix/matrix_single_subscript_store.test
+++ b/test/Basic/Matrix/matrix_single_subscript_store.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_splat_cast.test b/test/Basic/Matrix/matrix_splat_cast.test
index 975cf29ec..816c3facd 100644
--- a/test/Basic/Matrix/matrix_splat_cast.test
+++ b/test/Basic/Matrix/matrix_splat_cast.test
@@ -19,7 +19,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/Matrix/matrix_swizzle_one_based.test b/test/Basic/Matrix/matrix_swizzle_one_based.test
index 77bf8cda7..287018950 100644
--- a/test/Basic/Matrix/matrix_swizzle_one_based.test
+++ b/test/Basic/Matrix/matrix_swizzle_one_based.test
@@ -61,7 +61,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_swizzle_zero_based.test b/test/Basic/Matrix/matrix_swizzle_zero_based.test
index f37cb190e..5a2fab9e0 100644
--- a/test/Basic/Matrix/matrix_swizzle_zero_based.test
+++ b/test/Basic/Matrix/matrix_swizzle_zero_based.test
@@ -61,7 +61,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/Matrix/matrix_trunc_cast.test b/test/Basic/Matrix/matrix_trunc_cast.test
index b3c958e11..4b8b5faaf 100644
--- a/test/Basic/Matrix/matrix_trunc_cast.test
+++ b/test/Basic/Matrix/matrix_trunc_cast.test
@@ -21,7 +21,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/TestFloat32Pipeline.test b/test/Basic/TestFloat32Pipeline.test
index a25072557..8677c9f3c 100644
--- a/test/Basic/TestFloat32Pipeline.test
+++ b/test/Basic/TestFloat32Pipeline.test
@@ -12,7 +12,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Basic/TestPipeline.test b/test/Basic/TestPipeline.test
index 18912122c..1c6b86cdd 100644
--- a/test/Basic/TestPipeline.test
+++ b/test/Basic/TestPipeline.test
@@ -13,7 +13,6 @@ void CSMain(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: CSMain
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/cbuffer.test b/test/Basic/cbuffer.test
index df20f4aed..090aaaf90 100644
--- a/test/Basic/cbuffer.test
+++ b/test/Basic/cbuffer.test
@@ -18,7 +18,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Basic/idiv-edges.test b/test/Basic/idiv-edges.test
index a99af4734..d26d9f784 100644
--- a/test/Basic/idiv-edges.test
+++ b/test/Basic/idiv-edges.test
@@ -16,7 +16,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf
     Format: Int32
diff --git a/test/Basic/simple.test b/test/Basic/simple.test
index 6276a521b..0a65acdd2 100644
--- a/test/Basic/simple.test
+++ b/test/Basic/simple.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Bugs/Adjacent-Partial-Writes.yaml b/test/Bugs/Adjacent-Partial-Writes.yaml
index e8fa00e99..7c355a902 100644
--- a/test/Bugs/Adjacent-Partial-Writes.yaml
+++ b/test/Bugs/Adjacent-Partial-Writes.yaml
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int64
diff --git a/test/Bugs/UAV-Sequental-Consistency.yaml b/test/Bugs/UAV-Sequental-Consistency.yaml
index 71e609e84..ccde0475b 100644
--- a/test/Bugs/UAV-Sequental-Consistency.yaml
+++ b/test/Bugs/UAV-Sequental-Consistency.yaml
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Int32
diff --git a/test/Feature/Attributes/IfBranchAttr.test b/test/Feature/Attributes/IfBranchAttr.test
index 8ced3b136..9b6a290d0 100644
--- a/test/Feature/Attributes/IfBranchAttr.test
+++ b/test/Feature/Attributes/IfBranchAttr.test
@@ -17,7 +17,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/Attributes/IfBranchFlatten.test b/test/Feature/Attributes/IfBranchFlatten.test
index 94ff019af..1ed8aac18 100644
--- a/test/Feature/Attributes/IfBranchFlatten.test
+++ b/test/Feature/Attributes/IfBranchFlatten.test
@@ -17,7 +17,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/Attributes/SwitchBranchAttr.test b/test/Feature/Attributes/SwitchBranchAttr.test
index 21d7b926a..65ecfbca5 100644
--- a/test/Feature/Attributes/SwitchBranchAttr.test
+++ b/test/Feature/Attributes/SwitchBranchAttr.test
@@ -25,7 +25,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/Attributes/SwitchFlattenAttr.test b/test/Feature/Attributes/SwitchFlattenAttr.test
index ee31f81d3..8bdae0fb7 100644
--- a/test/Feature/Attributes/SwitchFlattenAttr.test
+++ b/test/Feature/Attributes/SwitchFlattenAttr.test
@@ -25,7 +25,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/ByteAddressBuffer/ByteAddressBuffers-16bit.test b/test/Feature/ByteAddressBuffer/ByteAddressBuffers-16bit.test
index d87c56554..eac19452b 100644
--- a/test/Feature/ByteAddressBuffer/ByteAddressBuffers-16bit.test
+++ b/test/Feature/ByteAddressBuffer/ByteAddressBuffers-16bit.test
@@ -36,7 +36,8 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: In0
     Format: Int16
diff --git a/test/Feature/ByteAddressBuffer/ByteAddressBuffers-64bit.test b/test/Feature/ByteAddressBuffer/ByteAddressBuffers-64bit.test
index a755fe6f9..dc9358db3 100644
--- a/test/Feature/ByteAddressBuffer/ByteAddressBuffers-64bit.test
+++ b/test/Feature/ByteAddressBuffer/ByteAddressBuffers-64bit.test
@@ -36,7 +36,8 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: In0
     Format: Int64
diff --git a/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test b/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
index 20e940474..a6f48c707 100644
--- a/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
+++ b/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
@@ -89,7 +89,8 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: In0
     Format: Int32
diff --git a/test/Feature/ByteAddressBuffer/GetDimensions.test b/test/Feature/ByteAddressBuffer/GetDimensions.test
index dc11b8fda..d5cf7f4de 100644
--- a/test/Feature/ByteAddressBuffer/GetDimensions.test
+++ b/test/Feature/ByteAddressBuffer/GetDimensions.test
@@ -26,8 +26,9 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
 
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: A
     Format: Int32
diff --git a/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element.f32.test b/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element.f32.test
index 7898c1856..a0c8ecde5 100644
--- a/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element.f32.test
@@ -51,7 +51,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element_scalar.f32.test b/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element_scalar.f32.test
index 94d69976d..133143b36 100644
--- a/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element_scalar.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixElement/one_based_mat_element_scalar.f32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element.f32.test b/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element.f32.test
index de46d5aa0..3e5670dc7 100644
--- a/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element.f32.test
@@ -51,7 +51,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element_scalar.f32.test b/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element_scalar.f32.test
index b43e70eb9..14bbfcc8d 100644
--- a/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element_scalar.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixElement/zero_based_mat_element_scalar.f32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/MatrixSubscript/matrix_subscript.f32.test b/test/Feature/CBuffer/Matrix/MatrixSubscript/matrix_subscript.f32.test
index be9a034d2..29e9cb9bc 100644
--- a/test/Feature/CBuffer/Matrix/MatrixSubscript/matrix_subscript.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixSubscript/matrix_subscript.f32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_flag_matrix_subscript.f32.test b/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_flag_matrix_subscript.f32.test
index 3435f8ada..f8956ff48 100644
--- a/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_flag_matrix_subscript.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_flag_matrix_subscript.f32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f4x1
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test b/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test
index ae0312dda..46c22d1f2 100644
--- a/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test
+++ b/test/Feature/CBuffer/Matrix/MatrixSubscript/row_major_matrix_subscript.f32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f4x1
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer-swizzle.f32.test b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer-swizzle.f32.test
index 557bf2de3..39db8d3cf 100644
--- a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer-swizzle.f32.test
+++ b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer-swizzle.f32.test
@@ -43,7 +43,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer.f32.test b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer.f32.test
index 883b4cd6c..d63dea8a2 100644
--- a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer.f32.test
+++ b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer.f32.test
@@ -43,7 +43,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: cbuffer_f1x4
     Format: Float32
diff --git a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer_threadgroup.f4x2.test b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer_threadgroup.f4x2.test
index 3531fc8ad..3704fcfd8 100644
--- a/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer_threadgroup.f4x2.test
+++ b/test/Feature/CBuffer/Matrix/SingleSubscript/mat_cbuffer_threadgroup.f4x2.test
@@ -21,7 +21,8 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
 - Name: cbuffer_f2x4
   Format: Float32
diff --git a/test/Feature/CBuffer/array-dynamic-index.test b/test/Feature/CBuffer/array-dynamic-index.test
index f473d848b..ac5f4f714 100644
--- a/test/Feature/CBuffer/array-dynamic-index.test
+++ b/test/Feature/CBuffer/array-dynamic-index.test
@@ -16,7 +16,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Constants
     Format: Hex32
diff --git a/test/Feature/CBuffer/array-of-structs.test b/test/Feature/CBuffer/array-of-structs.test
index a5186c65b..bf2a517cc 100644
--- a/test/Feature/CBuffer/array-of-structs.test
+++ b/test/Feature/CBuffer/array-of-structs.test
@@ -26,7 +26,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Constants
     Format: Hex32
diff --git a/test/Feature/CBuffer/array-vec-index.test b/test/Feature/CBuffer/array-vec-index.test
index ebf52d8bf..5c2edf0d9 100644
--- a/test/Feature/CBuffer/array-vec-index.test
+++ b/test/Feature/CBuffer/array-vec-index.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Constants
     Format: UInt32
diff --git a/test/Feature/CBuffer/arrays-16bit.test b/test/Feature/CBuffer/arrays-16bit.test
index 75a8f0641..850da8d23 100644
--- a/test/Feature/CBuffer/arrays-16bit.test
+++ b/test/Feature/CBuffer/arrays-16bit.test
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBArrays
     Format: Hex16
diff --git a/test/Feature/CBuffer/arrays-64bit.test b/test/Feature/CBuffer/arrays-64bit.test
index 023e3e505..6f3b22104 100644
--- a/test/Feature/CBuffer/arrays-64bit.test
+++ b/test/Feature/CBuffer/arrays-64bit.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBArrays
     Format: Hex64
diff --git a/test/Feature/CBuffer/arrays.test b/test/Feature/CBuffer/arrays.test
index 2110c6f4d..90e433431 100644
--- a/test/Feature/CBuffer/arrays.test
+++ b/test/Feature/CBuffer/arrays.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBArrays
     Format: Hex32
diff --git a/test/Feature/CBuffer/dynamic-struct.test b/test/Feature/CBuffer/dynamic-struct.test
index bcc6000c9..f4d251ae5 100644
--- a/test/Feature/CBuffer/dynamic-struct.test
+++ b/test/Feature/CBuffer/dynamic-struct.test
@@ -25,7 +25,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Constants
     Format: Hex32
diff --git a/test/Feature/CBuffer/scalars-16bit.test b/test/Feature/CBuffer/scalars-16bit.test
index bb22ea524..8317d3c57 100644
--- a/test/Feature/CBuffer/scalars-16bit.test
+++ b/test/Feature/CBuffer/scalars-16bit.test
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBScalars
     Format: Hex16
diff --git a/test/Feature/CBuffer/scalars-64bit.test b/test/Feature/CBuffer/scalars-64bit.test
index e5855a47d..d4d500962 100644
--- a/test/Feature/CBuffer/scalars-64bit.test
+++ b/test/Feature/CBuffer/scalars-64bit.test
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBScalars
     Format: Hex64
diff --git a/test/Feature/CBuffer/scalars.test b/test/Feature/CBuffer/scalars.test
index b36c33a02..b734cde2e 100644
--- a/test/Feature/CBuffer/scalars.test
+++ b/test/Feature/CBuffer/scalars.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBScalars
     Format: Hex32
diff --git a/test/Feature/CBuffer/structs.test b/test/Feature/CBuffer/structs.test
index b717256ca..b56a275d2 100644
--- a/test/Feature/CBuffer/structs.test
+++ b/test/Feature/CBuffer/structs.test
@@ -60,7 +60,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBVectors
     Format: Hex32
diff --git a/test/Feature/CBuffer/vectors-16bit.test b/test/Feature/CBuffer/vectors-16bit.test
index b0cae45d5..e5cbbc63a 100644
--- a/test/Feature/CBuffer/vectors-16bit.test
+++ b/test/Feature/CBuffer/vectors-16bit.test
@@ -25,7 +25,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBVectors
     Format: Hex16
diff --git a/test/Feature/CBuffer/vectors-64bit.test b/test/Feature/CBuffer/vectors-64bit.test
index 6a7bef566..616a4c394 100644
--- a/test/Feature/CBuffer/vectors-64bit.test
+++ b/test/Feature/CBuffer/vectors-64bit.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBVectors
     Format: Hex64
diff --git a/test/Feature/CBuffer/vectors.test b/test/Feature/CBuffer/vectors.test
index 046c9f0ee..572300cf5 100644
--- a/test/Feature/CBuffer/vectors.test
+++ b/test/Feature/CBuffer/vectors.test
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: CBVectors
     Format: Hex32
diff --git a/test/Feature/Groupshared/GSVector.test b/test/Feature/Groupshared/GSVector.test
index 8db86025b..4c5755148 100644
--- a/test/Feature/Groupshared/GSVector.test
+++ b/test/Feature/Groupshared/GSVector.test
@@ -19,7 +19,6 @@ void main(uint3 ThreadID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
index 0da860678..b297dfe1f 100644
--- a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
+++ b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
@@ -13,7 +13,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float32
diff --git a/test/Feature/HLSLLib/PartiallyMappedResources.test b/test/Feature/HLSLLib/PartiallyMappedResources.test
index dff09d5fd..61362ce9b 100644
--- a/test/Feature/HLSLLib/PartiallyMappedResources.test
+++ b/test/Feature/HLSLLib/PartiallyMappedResources.test
@@ -62,7 +62,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Int32
diff --git a/test/Feature/HLSLLib/abs.32.test b/test/Feature/HLSLLib/abs.32.test
index 83a586692..21577c318 100644
--- a/test/Feature/HLSLLib/abs.32.test
+++ b/test/Feature/HLSLLib/abs.32.test
@@ -35,7 +35,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int32
diff --git a/test/Feature/HLSLLib/abs.fp16.test b/test/Feature/HLSLLib/abs.fp16.test
index 549967a5a..79d8af9a0 100644
--- a/test/Feature/HLSLLib/abs.fp16.test
+++ b/test/Feature/HLSLLib/abs.fp16.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Float16
diff --git a/test/Feature/HLSLLib/abs.fp64.test b/test/Feature/HLSLLib/abs.fp64.test
index 35c33fe37..69934300c 100644
--- a/test/Feature/HLSLLib/abs.fp64.test
+++ b/test/Feature/HLSLLib/abs.fp64.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Float64
diff --git a/test/Feature/HLSLLib/abs.int16.test b/test/Feature/HLSLLib/abs.int16.test
index aaa98ed2a..10c210fb0 100644
--- a/test/Feature/HLSLLib/abs.int16.test
+++ b/test/Feature/HLSLLib/abs.int16.test
@@ -26,7 +26,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int16
diff --git a/test/Feature/HLSLLib/abs.int64.test b/test/Feature/HLSLLib/abs.int64.test
index e01af5f35..91b2fb9f5 100644
--- a/test/Feature/HLSLLib/abs.int64.test
+++ b/test/Feature/HLSLLib/abs.int64.test
@@ -26,7 +26,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int64
diff --git a/test/Feature/HLSLLib/acos.16.test b/test/Feature/HLSLLib/acos.16.test
index 58bf10346..518d28f3f 100644
--- a/test/Feature/HLSLLib/acos.16.test
+++ b/test/Feature/HLSLLib/acos.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/acos.32.test b/test/Feature/HLSLLib/acos.32.test
index d70887f96..958a37a40 100644
--- a/test/Feature/HLSLLib/acos.32.test
+++ b/test/Feature/HLSLLib/acos.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/adduint64.test b/test/Feature/HLSLLib/adduint64.test
index 3bdf1e94f..c1dbef090 100644
--- a/test/Feature/HLSLLib/adduint64.test
+++ b/test/Feature/HLSLLib/adduint64.test
@@ -23,7 +23,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: UInt32
diff --git a/test/Feature/HLSLLib/all.32.test b/test/Feature/HLSLLib/all.32.test
index 3dc20282d..008086e4f 100644
--- a/test/Feature/HLSLLib/all.32.test
+++ b/test/Feature/HLSLLib/all.32.test
@@ -40,7 +40,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float32
diff --git a/test/Feature/HLSLLib/all.bool.test b/test/Feature/HLSLLib/all.bool.test
index 9dde8e745..dbde53512 100644
--- a/test/Feature/HLSLLib/all.bool.test
+++ b/test/Feature/HLSLLib/all.bool.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Bool
diff --git a/test/Feature/HLSLLib/all.fp16.test b/test/Feature/HLSLLib/all.fp16.test
index 9ed4e6040..ff6d96245 100644
--- a/test/Feature/HLSLLib/all.fp16.test
+++ b/test/Feature/HLSLLib/all.fp16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/all.fp64.test b/test/Feature/HLSLLib/all.fp64.test
index fee8d9915..15245e426 100644
--- a/test/Feature/HLSLLib/all.fp64.test
+++ b/test/Feature/HLSLLib/all.fp64.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/Feature/HLSLLib/all.int16.test b/test/Feature/HLSLLib/all.int16.test
index d4f92a017..9f867e91d 100644
--- a/test/Feature/HLSLLib/all.int16.test
+++ b/test/Feature/HLSLLib/all.int16.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int16
diff --git a/test/Feature/HLSLLib/all.int64.test b/test/Feature/HLSLLib/all.int64.test
index e3a92d4ab..6ae78f8fa 100644
--- a/test/Feature/HLSLLib/all.int64.test
+++ b/test/Feature/HLSLLib/all.int64.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int64
diff --git a/test/Feature/HLSLLib/and.test b/test/Feature/HLSLLib/and.test
index 131b49238..17740d34a 100644
--- a/test/Feature/HLSLLib/and.test
+++ b/test/Feature/HLSLLib/and.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Bool
diff --git a/test/Feature/HLSLLib/any.32.test b/test/Feature/HLSLLib/any.32.test
index 9969b77e8..d20c07148 100644
--- a/test/Feature/HLSLLib/any.32.test
+++ b/test/Feature/HLSLLib/any.32.test
@@ -40,7 +40,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float32
diff --git a/test/Feature/HLSLLib/any.bool.test b/test/Feature/HLSLLib/any.bool.test
index 187f34ee4..4bff27b62 100644
--- a/test/Feature/HLSLLib/any.bool.test
+++ b/test/Feature/HLSLLib/any.bool.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Bool
diff --git a/test/Feature/HLSLLib/any.fp16.test b/test/Feature/HLSLLib/any.fp16.test
index ec72eb370..345868908 100644
--- a/test/Feature/HLSLLib/any.fp16.test
+++ b/test/Feature/HLSLLib/any.fp16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/any.fp64.test b/test/Feature/HLSLLib/any.fp64.test
index 857329db5..170c86c4e 100644
--- a/test/Feature/HLSLLib/any.fp64.test
+++ b/test/Feature/HLSLLib/any.fp64.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/Feature/HLSLLib/any.int16.test b/test/Feature/HLSLLib/any.int16.test
index f082d0fbb..1fdd83ac3 100644
--- a/test/Feature/HLSLLib/any.int16.test
+++ b/test/Feature/HLSLLib/any.int16.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int16
diff --git a/test/Feature/HLSLLib/any.int64.test b/test/Feature/HLSLLib/any.int64.test
index 90bea3a13..ffd327896 100644
--- a/test/Feature/HLSLLib/any.int64.test
+++ b/test/Feature/HLSLLib/any.int64.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int64
diff --git a/test/Feature/HLSLLib/asdouble.32.test b/test/Feature/HLSLLib/asdouble.32.test
index bebebc554..92b048b9b 100644
--- a/test/Feature/HLSLLib/asdouble.32.test
+++ b/test/Feature/HLSLLib/asdouble.32.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Low
     Format: UInt32
diff --git a/test/Feature/HLSLLib/asfloat.test b/test/Feature/HLSLLib/asfloat.test
index a92d613a1..c1aa4d80b 100644
--- a/test/Feature/HLSLLib/asfloat.test
+++ b/test/Feature/HLSLLib/asfloat.test
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float32
diff --git a/test/Feature/HLSLLib/asin.16.test b/test/Feature/HLSLLib/asin.16.test
index 0c3affcc5..36b6ad167 100644
--- a/test/Feature/HLSLLib/asin.16.test
+++ b/test/Feature/HLSLLib/asin.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/asin.32.test b/test/Feature/HLSLLib/asin.32.test
index feb78249d..d1e855fdf 100644
--- a/test/Feature/HLSLLib/asin.32.test
+++ b/test/Feature/HLSLLib/asin.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/asint.test b/test/Feature/HLSLLib/asint.test
index cc98603b1..47e642e1c 100644
--- a/test/Feature/HLSLLib/asint.test
+++ b/test/Feature/HLSLLib/asint.test
@@ -37,7 +37,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int32
diff --git a/test/Feature/HLSLLib/asint16.fp16.test b/test/Feature/HLSLLib/asint16.fp16.test
index 63e70e6c7..f1cb7f6e2 100644
--- a/test/Feature/HLSLLib/asint16.fp16.test
+++ b/test/Feature/HLSLLib/asint16.fp16.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float16
diff --git a/test/Feature/HLSLLib/asint16.int16.test b/test/Feature/HLSLLib/asint16.int16.test
index 290ca2617..0811b9806 100644
--- a/test/Feature/HLSLLib/asint16.int16.test
+++ b/test/Feature/HLSLLib/asint16.int16.test
@@ -23,7 +23,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int16
diff --git a/test/Feature/HLSLLib/asuint.32.test b/test/Feature/HLSLLib/asuint.32.test
index f8e49ec26..2660a36cd 100644
--- a/test/Feature/HLSLLib/asuint.32.test
+++ b/test/Feature/HLSLLib/asuint.32.test
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: UInt32
diff --git a/test/Feature/HLSLLib/asuint.64.test b/test/Feature/HLSLLib/asuint.64.test
index fbad22981..0362bf923 100644
--- a/test/Feature/HLSLLib/asuint.64.test
+++ b/test/Feature/HLSLLib/asuint.64.test
@@ -25,7 +25,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float64
diff --git a/test/Feature/HLSLLib/asuint16.fp16.test b/test/Feature/HLSLLib/asuint16.fp16.test
index 4f5c04ceb..f7d2e8417 100644
--- a/test/Feature/HLSLLib/asuint16.fp16.test
+++ b/test/Feature/HLSLLib/asuint16.fp16.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float16
diff --git a/test/Feature/HLSLLib/asuint16.int16.test b/test/Feature/HLSLLib/asuint16.int16.test
index fb2517efe..ec53180cd 100644
--- a/test/Feature/HLSLLib/asuint16.int16.test
+++ b/test/Feature/HLSLLib/asuint16.int16.test
@@ -23,7 +23,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: UInt16
diff --git a/test/Feature/HLSLLib/atan.16.test b/test/Feature/HLSLLib/atan.16.test
index 189a70fb9..fc5d86686 100644
--- a/test/Feature/HLSLLib/atan.16.test
+++ b/test/Feature/HLSLLib/atan.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/atan.32.test b/test/Feature/HLSLLib/atan.32.test
index 961a3e8cc..aad1ff811 100644
--- a/test/Feature/HLSLLib/atan.32.test
+++ b/test/Feature/HLSLLib/atan.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/atan2.16.test b/test/Feature/HLSLLib/atan2.16.test
index 998c178e4..d81495b3e 100644
--- a/test/Feature/HLSLLib/atan2.16.test
+++ b/test/Feature/HLSLLib/atan2.16.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float16
diff --git a/test/Feature/HLSLLib/atan2.32.test b/test/Feature/HLSLLib/atan2.32.test
index c5c08a804..513c78e0f 100644
--- a/test/Feature/HLSLLib/atan2.32.test
+++ b/test/Feature/HLSLLib/atan2.32.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float32
diff --git a/test/Feature/HLSLLib/ceil.16.test b/test/Feature/HLSLLib/ceil.16.test
index d66cf1da5..3e252c629 100644
--- a/test/Feature/HLSLLib/ceil.16.test
+++ b/test/Feature/HLSLLib/ceil.16.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/ceil.32.test b/test/Feature/HLSLLib/ceil.32.test
index 670e63572..29df05b49 100644
--- a/test/Feature/HLSLLib/ceil.32.test
+++ b/test/Feature/HLSLLib/ceil.32.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/clamp.32.test b/test/Feature/HLSLLib/clamp.32.test
index 13aedfbcf..6007a6cf2 100644
--- a/test/Feature/HLSLLib/clamp.32.test
+++ b/test/Feature/HLSLLib/clamp.32.test
@@ -36,7 +36,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int32
diff --git a/test/Feature/HLSLLib/clamp.fp16.test b/test/Feature/HLSLLib/clamp.fp16.test
index e94fc164c..637d59c3e 100644
--- a/test/Feature/HLSLLib/clamp.fp16.test
+++ b/test/Feature/HLSLLib/clamp.fp16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float16
diff --git a/test/Feature/HLSLLib/clamp.fp64.test b/test/Feature/HLSLLib/clamp.fp64.test
index ecee619c4..bdd0b1755 100644
--- a/test/Feature/HLSLLib/clamp.fp64.test
+++ b/test/Feature/HLSLLib/clamp.fp64.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float64
diff --git a/test/Feature/HLSLLib/clamp.int16.test b/test/Feature/HLSLLib/clamp.int16.test
index 932b0c9d1..833f1cb3a 100644
--- a/test/Feature/HLSLLib/clamp.int16.test
+++ b/test/Feature/HLSLLib/clamp.int16.test
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int16
diff --git a/test/Feature/HLSLLib/clamp.int64.test b/test/Feature/HLSLLib/clamp.int64.test
index d079c0486..e7adad494 100644
--- a/test/Feature/HLSLLib/clamp.int64.test
+++ b/test/Feature/HLSLLib/clamp.int64.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int64
diff --git a/test/Feature/HLSLLib/cos.16.test b/test/Feature/HLSLLib/cos.16.test
index 02bfa9af4..b4e560168 100644
--- a/test/Feature/HLSLLib/cos.16.test
+++ b/test/Feature/HLSLLib/cos.16.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/cos.32.test b/test/Feature/HLSLLib/cos.32.test
index 47da82f98..3d384a42e 100644
--- a/test/Feature/HLSLLib/cos.32.test
+++ b/test/Feature/HLSLLib/cos.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/cos.nan-inf-denorm.32.test b/test/Feature/HLSLLib/cos.nan-inf-denorm.32.test
index de917b366..5524622e5 100644
--- a/test/Feature/HLSLLib/cos.nan-inf-denorm.32.test
+++ b/test/Feature/HLSLLib/cos.nan-inf-denorm.32.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/cosh.16.test b/test/Feature/HLSLLib/cosh.16.test
index 5d671ad3a..f2fdc03d2 100644
--- a/test/Feature/HLSLLib/cosh.16.test
+++ b/test/Feature/HLSLLib/cosh.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/cosh.32.test b/test/Feature/HLSLLib/cosh.32.test
index b79c9a0da..e7d6a19b6 100644
--- a/test/Feature/HLSLLib/cosh.32.test
+++ b/test/Feature/HLSLLib/cosh.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/countbits.16.test b/test/Feature/HLSLLib/countbits.16.test
index 998700074..03c833af3 100644
--- a/test/Feature/HLSLLib/countbits.16.test
+++ b/test/Feature/HLSLLib/countbits.16.test
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int16
diff --git a/test/Feature/HLSLLib/countbits.32.test b/test/Feature/HLSLLib/countbits.32.test
index 4d3458787..64492b7fd 100644
--- a/test/Feature/HLSLLib/countbits.32.test
+++ b/test/Feature/HLSLLib/countbits.32.test
@@ -26,7 +26,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int32
diff --git a/test/Feature/HLSLLib/countbits.64.test b/test/Feature/HLSLLib/countbits.64.test
index bec3ec85f..221921e2d 100644
--- a/test/Feature/HLSLLib/countbits.64.test
+++ b/test/Feature/HLSLLib/countbits.64.test
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int64
diff --git a/test/Feature/HLSLLib/cross.16.test b/test/Feature/HLSLLib/cross.16.test
index 5f8b814b7..be93bf088 100644
--- a/test/Feature/HLSLLib/cross.16.test
+++ b/test/Feature/HLSLLib/cross.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/cross.32.test b/test/Feature/HLSLLib/cross.32.test
index f5a3d099e..71f79530f 100644
--- a/test/Feature/HLSLLib/cross.32.test
+++ b/test/Feature/HLSLLib/cross.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float32
diff --git a/test/Feature/HLSLLib/degrees.16.test b/test/Feature/HLSLLib/degrees.16.test
index 9b2b3eb0c..d66df795a 100644
--- a/test/Feature/HLSLLib/degrees.16.test
+++ b/test/Feature/HLSLLib/degrees.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/degrees.32.test b/test/Feature/HLSLLib/degrees.32.test
index 4dec94cf0..4090a2a18 100644
--- a/test/Feature/HLSLLib/degrees.32.test
+++ b/test/Feature/HLSLLib/degrees.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/distance.16.test b/test/Feature/HLSLLib/distance.16.test
index 61de2b17a..858c8710c 100644
--- a/test/Feature/HLSLLib/distance.16.test
+++ b/test/Feature/HLSLLib/distance.16.test
@@ -65,7 +65,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/distance.32.test b/test/Feature/HLSLLib/distance.32.test
index 08a8698cc..74019ff0b 100644
--- a/test/Feature/HLSLLib/distance.32.test
+++ b/test/Feature/HLSLLib/distance.32.test
@@ -65,7 +65,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float32
diff --git a/test/Feature/HLSLLib/dot.32.test b/test/Feature/HLSLLib/dot.32.test
index 2921df3e0..6bf6f3cd8 100644
--- a/test/Feature/HLSLLib/dot.32.test
+++ b/test/Feature/HLSLLib/dot.32.test
@@ -58,7 +58,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Float32
diff --git a/test/Feature/HLSLLib/dot.fp16.test b/test/Feature/HLSLLib/dot.fp16.test
index 9c3b4130d..e1decab4a 100644
--- a/test/Feature/HLSLLib/dot.fp16.test
+++ b/test/Feature/HLSLLib/dot.fp16.test
@@ -25,7 +25,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/dot.fp64.test b/test/Feature/HLSLLib/dot.fp64.test
index 6a16a4a9a..2c29ea90c 100644
--- a/test/Feature/HLSLLib/dot.fp64.test
+++ b/test/Feature/HLSLLib/dot.fp64.test
@@ -25,7 +25,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float64
diff --git a/test/Feature/HLSLLib/dot.int16.test b/test/Feature/HLSLLib/dot.int16.test
index 1f1c3463a..041581816 100644
--- a/test/Feature/HLSLLib/dot.int16.test
+++ b/test/Feature/HLSLLib/dot.int16.test
@@ -42,7 +42,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Int16
diff --git a/test/Feature/HLSLLib/dot.int64.test b/test/Feature/HLSLLib/dot.int64.test
index bc9d33945..f7a998254 100644
--- a/test/Feature/HLSLLib/dot.int64.test
+++ b/test/Feature/HLSLLib/dot.int64.test
@@ -42,7 +42,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Int64
diff --git a/test/Feature/HLSLLib/dot2add.test b/test/Feature/HLSLLib/dot2add.test
index 6d61b5f77..353ca20ad 100644
--- a/test/Feature/HLSLLib/dot2add.test
+++ b/test/Feature/HLSLLib/dot2add.test
@@ -24,7 +24,6 @@ void main(uint3 DTID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: A
     Format: Float16
diff --git a/test/Feature/HLSLLib/dot4add.test b/test/Feature/HLSLLib/dot4add.test
index e6839d359..c19d8b2c0 100644
--- a/test/Feature/HLSLLib/dot4add.test
+++ b/test/Feature/HLSLLib/dot4add.test
@@ -25,7 +25,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Hex32
diff --git a/test/Feature/HLSLLib/exp.16.test b/test/Feature/HLSLLib/exp.16.test
index bb6526e63..8d392f8fd 100644
--- a/test/Feature/HLSLLib/exp.16.test
+++ b/test/Feature/HLSLLib/exp.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/exp.32.test b/test/Feature/HLSLLib/exp.32.test
index eecc1c4c4..698d9a7c2 100644
--- a/test/Feature/HLSLLib/exp.32.test
+++ b/test/Feature/HLSLLib/exp.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/exp2.16.test b/test/Feature/HLSLLib/exp2.16.test
index c05ecf1a3..8a608da84 100644
--- a/test/Feature/HLSLLib/exp2.16.test
+++ b/test/Feature/HLSLLib/exp2.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/exp2.32.test b/test/Feature/HLSLLib/exp2.32.test
index 9aea637cf..988838da6 100644
--- a/test/Feature/HLSLLib/exp2.32.test
+++ b/test/Feature/HLSLLib/exp2.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/f16tof32.test b/test/Feature/HLSLLib/f16tof32.test
index 3b7e65960..8d20cc6b6 100644
--- a/test/Feature/HLSLLib/f16tof32.test
+++ b/test/Feature/HLSLLib/f16tof32.test
@@ -45,7 +45,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: UInt32 
diff --git a/test/Feature/HLSLLib/f32tof16.test b/test/Feature/HLSLLib/f32tof16.test
index e8f35b33d..83bff2e19 100644
--- a/test/Feature/HLSLLib/f32tof16.test
+++ b/test/Feature/HLSLLib/f32tof16.test
@@ -43,7 +43,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/firstbithigh.16.test b/test/Feature/HLSLLib/firstbithigh.16.test
index 43e4eb131..5824c3d9c 100644
--- a/test/Feature/HLSLLib/firstbithigh.16.test
+++ b/test/Feature/HLSLLib/firstbithigh.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Hex16
diff --git a/test/Feature/HLSLLib/firstbithigh.32.test b/test/Feature/HLSLLib/firstbithigh.32.test
index 8df80a5c1..5764f3bde 100644
--- a/test/Feature/HLSLLib/firstbithigh.32.test
+++ b/test/Feature/HLSLLib/firstbithigh.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Hex32
diff --git a/test/Feature/HLSLLib/firstbithigh.64.test b/test/Feature/HLSLLib/firstbithigh.64.test
index 8c4c6f9f3..09b5fcd9e 100644
--- a/test/Feature/HLSLLib/firstbithigh.64.test
+++ b/test/Feature/HLSLLib/firstbithigh.64.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Hex64
diff --git a/test/Feature/HLSLLib/firstbitlow.16.test b/test/Feature/HLSLLib/firstbitlow.16.test
index 44c367213..1a8e59a1a 100644
--- a/test/Feature/HLSLLib/firstbitlow.16.test
+++ b/test/Feature/HLSLLib/firstbitlow.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Hex16
diff --git a/test/Feature/HLSLLib/firstbitlow.32.test b/test/Feature/HLSLLib/firstbitlow.32.test
index 441179b06..84620b607 100644
--- a/test/Feature/HLSLLib/firstbitlow.32.test
+++ b/test/Feature/HLSLLib/firstbitlow.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Hex32
diff --git a/test/Feature/HLSLLib/firstbitlow.64.test b/test/Feature/HLSLLib/firstbitlow.64.test
index 1c3cfbecf..784be9172 100644
--- a/test/Feature/HLSLLib/firstbitlow.64.test
+++ b/test/Feature/HLSLLib/firstbitlow.64.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Hex64
diff --git a/test/Feature/HLSLLib/floor.16.test b/test/Feature/HLSLLib/floor.16.test
index ce359f3b0..33c6feef1 100644
--- a/test/Feature/HLSLLib/floor.16.test
+++ b/test/Feature/HLSLLib/floor.16.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/floor.32.test b/test/Feature/HLSLLib/floor.32.test
index ee0f05f50..2df657c45 100644
--- a/test/Feature/HLSLLib/floor.32.test
+++ b/test/Feature/HLSLLib/floor.32.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/fma.matrix.test b/test/Feature/HLSLLib/fma.matrix.test
index b4114e57d..c6fdef9d0 100644
--- a/test/Feature/HLSLLib/fma.matrix.test
+++ b/test/Feature/HLSLLib/fma.matrix.test
@@ -41,7 +41,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: A
     Format: Float64
diff --git a/test/Feature/HLSLLib/fma.test b/test/Feature/HLSLLib/fma.test
index d76b195b4..089c6cbd3 100644
--- a/test/Feature/HLSLLib/fma.test
+++ b/test/Feature/HLSLLib/fma.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: A
     Format: Float64
diff --git a/test/Feature/HLSLLib/fmod.16.test b/test/Feature/HLSLLib/fmod.16.test
index 30594543e..dfa78e739 100644
--- a/test/Feature/HLSLLib/fmod.16.test
+++ b/test/Feature/HLSLLib/fmod.16.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float16
diff --git a/test/Feature/HLSLLib/fmod.32.test b/test/Feature/HLSLLib/fmod.32.test
index ec02aef1b..b515d695b 100644
--- a/test/Feature/HLSLLib/fmod.32.test
+++ b/test/Feature/HLSLLib/fmod.32.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Float32
diff --git a/test/Feature/HLSLLib/frac.16.test b/test/Feature/HLSLLib/frac.16.test
index 57fe745e4..ac7a55e9a 100644
--- a/test/Feature/HLSLLib/frac.16.test
+++ b/test/Feature/HLSLLib/frac.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/frac.32.test b/test/Feature/HLSLLib/frac.32.test
index 7cbe9496c..e9ac70e89 100644
--- a/test/Feature/HLSLLib/frac.32.test
+++ b/test/Feature/HLSLLib/frac.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/isinf.16.test b/test/Feature/HLSLLib/isinf.16.test
index d99d2ec9c..dca370250 100644
--- a/test/Feature/HLSLLib/isinf.16.test
+++ b/test/Feature/HLSLLib/isinf.16.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/isinf.32.test b/test/Feature/HLSLLib/isinf.32.test
index 1a02bed0e..1366dea17 100644
--- a/test/Feature/HLSLLib/isinf.32.test
+++ b/test/Feature/HLSLLib/isinf.32.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/ldexp.16.test b/test/Feature/HLSLLib/ldexp.16.test
index f1e5a5660..3c26dd1d5 100644
--- a/test/Feature/HLSLLib/ldexp.16.test
+++ b/test/Feature/HLSLLib/ldexp.16.test
@@ -32,7 +32,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/ldexp.32.test b/test/Feature/HLSLLib/ldexp.32.test
index 494d2da67..f43d08e02 100644
--- a/test/Feature/HLSLLib/ldexp.32.test
+++ b/test/Feature/HLSLLib/ldexp.32.test
@@ -32,7 +32,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/length.16.test b/test/Feature/HLSLLib/length.16.test
index 326d380e6..060947576 100644
--- a/test/Feature/HLSLLib/length.16.test
+++ b/test/Feature/HLSLLib/length.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/length.32.test b/test/Feature/HLSLLib/length.32.test
index 780fd9981..7bb1d42fd 100644
--- a/test/Feature/HLSLLib/length.32.test
+++ b/test/Feature/HLSLLib/length.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/lerp.16.test b/test/Feature/HLSLLib/lerp.16.test
index c3a05a3aa..6f9d4fd1c 100644
--- a/test/Feature/HLSLLib/lerp.16.test
+++ b/test/Feature/HLSLLib/lerp.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/lerp.32.test b/test/Feature/HLSLLib/lerp.32.test
index a087d2a9a..b1b483fa3 100644
--- a/test/Feature/HLSLLib/lerp.32.test
+++ b/test/Feature/HLSLLib/lerp.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float32
diff --git a/test/Feature/HLSLLib/log.16.test b/test/Feature/HLSLLib/log.16.test
index 20a038758..eb2de6785 100644
--- a/test/Feature/HLSLLib/log.16.test
+++ b/test/Feature/HLSLLib/log.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/log.32.test b/test/Feature/HLSLLib/log.32.test
index d94683019..44c05fff1 100644
--- a/test/Feature/HLSLLib/log.32.test
+++ b/test/Feature/HLSLLib/log.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/log10.16.test b/test/Feature/HLSLLib/log10.16.test
index f0f798c9f..71a45902f 100644
--- a/test/Feature/HLSLLib/log10.16.test
+++ b/test/Feature/HLSLLib/log10.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/log10.32.test b/test/Feature/HLSLLib/log10.32.test
index e6c30347d..7fd082b23 100644
--- a/test/Feature/HLSLLib/log10.32.test
+++ b/test/Feature/HLSLLib/log10.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/log2.16.test b/test/Feature/HLSLLib/log2.16.test
index faa494829..3a8cdf666 100644
--- a/test/Feature/HLSLLib/log2.16.test
+++ b/test/Feature/HLSLLib/log2.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/log2.32.test b/test/Feature/HLSLLib/log2.32.test
index c2afedf00..5beb60c5a 100644
--- a/test/Feature/HLSLLib/log2.32.test
+++ b/test/Feature/HLSLLib/log2.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/mad.32.test b/test/Feature/HLSLLib/mad.32.test
index 1a2a4fd5e..e8fa8b2db 100644
--- a/test/Feature/HLSLLib/mad.32.test
+++ b/test/Feature/HLSLLib/mad.32.test
@@ -40,7 +40,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: M0
     Format: Float32
diff --git a/test/Feature/HLSLLib/mad.fp16.test b/test/Feature/HLSLLib/mad.fp16.test
index 89c14245e..b10ec7f4d 100644
--- a/test/Feature/HLSLLib/mad.fp16.test
+++ b/test/Feature/HLSLLib/mad.fp16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: M
     Format: Float16
diff --git a/test/Feature/HLSLLib/mad.fp64.test b/test/Feature/HLSLLib/mad.fp64.test
index 27edd2958..0c308a183 100644
--- a/test/Feature/HLSLLib/mad.fp64.test
+++ b/test/Feature/HLSLLib/mad.fp64.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: M
     Format: Float64
diff --git a/test/Feature/HLSLLib/mad.int16.test b/test/Feature/HLSLLib/mad.int16.test
index 706a39baf..5eee56b3b 100644
--- a/test/Feature/HLSLLib/mad.int16.test
+++ b/test/Feature/HLSLLib/mad.int16.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: M0
     Format: Int16
diff --git a/test/Feature/HLSLLib/mad.int64.test b/test/Feature/HLSLLib/mad.int64.test
index fdc61eb48..4d60d9789 100644
--- a/test/Feature/HLSLLib/mad.int64.test
+++ b/test/Feature/HLSLLib/mad.int64.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: M0
     Format: Int64
diff --git a/test/Feature/HLSLLib/max.32.test b/test/Feature/HLSLLib/max.32.test
index 478a4938b..cee26dca2 100644
--- a/test/Feature/HLSLLib/max.32.test
+++ b/test/Feature/HLSLLib/max.32.test
@@ -37,7 +37,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Float32
diff --git a/test/Feature/HLSLLib/max.fp16.test b/test/Feature/HLSLLib/max.fp16.test
index 37f7c5b4f..4c76d8b87 100644
--- a/test/Feature/HLSLLib/max.fp16.test
+++ b/test/Feature/HLSLLib/max.fp16.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/max.fp64.test b/test/Feature/HLSLLib/max.fp64.test
index eb5bfd4d3..d8ee49d61 100644
--- a/test/Feature/HLSLLib/max.fp64.test
+++ b/test/Feature/HLSLLib/max.fp64.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float64
diff --git a/test/Feature/HLSLLib/max.int16.test b/test/Feature/HLSLLib/max.int16.test
index 70dc2e7a1..41b64bfd5 100644
--- a/test/Feature/HLSLLib/max.int16.test
+++ b/test/Feature/HLSLLib/max.int16.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Int16
diff --git a/test/Feature/HLSLLib/max.int64.test b/test/Feature/HLSLLib/max.int64.test
index 524751e0c..8e9984eef 100644
--- a/test/Feature/HLSLLib/max.int64.test
+++ b/test/Feature/HLSLLib/max.int64.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Int64
diff --git a/test/Feature/HLSLLib/min.32.test b/test/Feature/HLSLLib/min.32.test
index ddab91538..0bce39912 100644
--- a/test/Feature/HLSLLib/min.32.test
+++ b/test/Feature/HLSLLib/min.32.test
@@ -39,7 +39,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Float32
diff --git a/test/Feature/HLSLLib/min.fp16.test b/test/Feature/HLSLLib/min.fp16.test
index 519ec22a5..e3c690782 100644
--- a/test/Feature/HLSLLib/min.fp16.test
+++ b/test/Feature/HLSLLib/min.fp16.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/min.fp64.test b/test/Feature/HLSLLib/min.fp64.test
index 304e999e7..25013b716 100644
--- a/test/Feature/HLSLLib/min.fp64.test
+++ b/test/Feature/HLSLLib/min.fp64.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float64
diff --git a/test/Feature/HLSLLib/min.int16.test b/test/Feature/HLSLLib/min.int16.test
index 10f5145c5..c069b1eb8 100644
--- a/test/Feature/HLSLLib/min.int16.test
+++ b/test/Feature/HLSLLib/min.int16.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Int16
diff --git a/test/Feature/HLSLLib/min.int64.test b/test/Feature/HLSLLib/min.int64.test
index d244add05..c0d52a518 100644
--- a/test/Feature/HLSLLib/min.int64.test
+++ b/test/Feature/HLSLLib/min.int64.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X0
     Format: Int64
diff --git a/test/Feature/HLSLLib/mul.fp16.test b/test/Feature/HLSLLib/mul.fp16.test
index 9673b3a13..66dfd630a 100644
--- a/test/Feature/HLSLLib/mul.fp16.test
+++ b/test/Feature/HLSLLib/mul.fp16.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/mul.fp32.test b/test/Feature/HLSLLib/mul.fp32.test
index 07dbf34b0..0bb9e3632 100644
--- a/test/Feature/HLSLLib/mul.fp32.test
+++ b/test/Feature/HLSLLib/mul.fp32.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/mul.fp64.test b/test/Feature/HLSLLib/mul.fp64.test
index 315bb6d13..da14cc5c8 100644
--- a/test/Feature/HLSLLib/mul.fp64.test
+++ b/test/Feature/HLSLLib/mul.fp64.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/Feature/HLSLLib/mul.int16.test b/test/Feature/HLSLLib/mul.int16.test
index 18110d192..2cb23793c 100644
--- a/test/Feature/HLSLLib/mul.int16.test
+++ b/test/Feature/HLSLLib/mul.int16.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/Feature/HLSLLib/mul.int32.test b/test/Feature/HLSLLib/mul.int32.test
index c33e9d3f6..56df282f5 100644
--- a/test/Feature/HLSLLib/mul.int32.test
+++ b/test/Feature/HLSLLib/mul.int32.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/HLSLLib/mul.int64.test b/test/Feature/HLSLLib/mul.int64.test
index 2faec4b2e..3607ea142 100644
--- a/test/Feature/HLSLLib/mul.int64.test
+++ b/test/Feature/HLSLLib/mul.int64.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/Feature/HLSLLib/normalize.16.test b/test/Feature/HLSLLib/normalize.16.test
index a057b6f58..6268443d4 100644
--- a/test/Feature/HLSLLib/normalize.16.test
+++ b/test/Feature/HLSLLib/normalize.16.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/normalize.32.test b/test/Feature/HLSLLib/normalize.32.test
index 4370fdc2c..01023b344 100644
--- a/test/Feature/HLSLLib/normalize.32.test
+++ b/test/Feature/HLSLLib/normalize.32.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/or.test b/test/Feature/HLSLLib/or.test
index ee3fd58a5..d3a39b5cc 100644
--- a/test/Feature/HLSLLib/or.test
+++ b/test/Feature/HLSLLib/or.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Bool
diff --git a/test/Feature/HLSLLib/pow.16.test b/test/Feature/HLSLLib/pow.16.test
index 10a4a6149..924eb5972 100644
--- a/test/Feature/HLSLLib/pow.16.test
+++ b/test/Feature/HLSLLib/pow.16.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float16
diff --git a/test/Feature/HLSLLib/pow.32.test b/test/Feature/HLSLLib/pow.32.test
index c4d1e84b5..a056a258b 100644
--- a/test/Feature/HLSLLib/pow.32.test
+++ b/test/Feature/HLSLLib/pow.32.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: X
     Format: Float32
diff --git a/test/Feature/HLSLLib/radians.16.test b/test/Feature/HLSLLib/radians.16.test
index d27500f41..c8934a014 100644
--- a/test/Feature/HLSLLib/radians.16.test
+++ b/test/Feature/HLSLLib/radians.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/radians.32.test b/test/Feature/HLSLLib/radians.32.test
index b075146b1..fe3bd58c3 100644
--- a/test/Feature/HLSLLib/radians.32.test
+++ b/test/Feature/HLSLLib/radians.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/rcp.16.test b/test/Feature/HLSLLib/rcp.16.test
index cdba4d384..c949f6cec 100644
--- a/test/Feature/HLSLLib/rcp.16.test
+++ b/test/Feature/HLSLLib/rcp.16.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/rcp.32.test b/test/Feature/HLSLLib/rcp.32.test
index b59a8ad99..f07ba9aea 100644
--- a/test/Feature/HLSLLib/rcp.32.test
+++ b/test/Feature/HLSLLib/rcp.32.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/rcp.64.test b/test/Feature/HLSLLib/rcp.64.test
index 47f0b7994..5039c0d6e 100644
--- a/test/Feature/HLSLLib/rcp.64.test
+++ b/test/Feature/HLSLLib/rcp.64.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/Feature/HLSLLib/reflect.16.test b/test/Feature/HLSLLib/reflect.16.test
index 5b188738e..825864a62 100644
--- a/test/Feature/HLSLLib/reflect.16.test
+++ b/test/Feature/HLSLLib/reflect.16.test
@@ -40,7 +40,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   
   - Name: IncidentRay2D
diff --git a/test/Feature/HLSLLib/reflect.32.test b/test/Feature/HLSLLib/reflect.32.test
index 4044f31e5..84fddaeac 100644
--- a/test/Feature/HLSLLib/reflect.32.test
+++ b/test/Feature/HLSLLib/reflect.32.test
@@ -40,7 +40,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   
   - Name: IncidentRay2D
diff --git a/test/Feature/HLSLLib/refract.16.test b/test/Feature/HLSLLib/refract.16.test
index aab7c7ad8..899936020 100644
--- a/test/Feature/HLSLLib/refract.16.test
+++ b/test/Feature/HLSLLib/refract.16.test
@@ -42,7 +42,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   
   - Name: IncidentRay2D
diff --git a/test/Feature/HLSLLib/refract.32.test b/test/Feature/HLSLLib/refract.32.test
index b52bc5a1c..042515bbe 100644
--- a/test/Feature/HLSLLib/refract.32.test
+++ b/test/Feature/HLSLLib/refract.32.test
@@ -42,7 +42,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   
   - Name: IncidentRay2D
diff --git a/test/Feature/HLSLLib/reversebits.16.test b/test/Feature/HLSLLib/reversebits.16.test
index 271eb47f6..09d835c17 100644
--- a/test/Feature/HLSLLib/reversebits.16.test
+++ b/test/Feature/HLSLLib/reversebits.16.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: UInt16
diff --git a/test/Feature/HLSLLib/reversebits.32.test b/test/Feature/HLSLLib/reversebits.32.test
index 0b977b46b..84881b5de 100644
--- a/test/Feature/HLSLLib/reversebits.32.test
+++ b/test/Feature/HLSLLib/reversebits.32.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: UInt32
diff --git a/test/Feature/HLSLLib/reversebits.64.test b/test/Feature/HLSLLib/reversebits.64.test
index 2e2a5c1b9..61fe68d9c 100644
--- a/test/Feature/HLSLLib/reversebits.64.test
+++ b/test/Feature/HLSLLib/reversebits.64.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: UInt64
diff --git a/test/Feature/HLSLLib/round.16.test b/test/Feature/HLSLLib/round.16.test
index 1505fb7cd..f2bfee40a 100644
--- a/test/Feature/HLSLLib/round.16.test
+++ b/test/Feature/HLSLLib/round.16.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/round.32.test b/test/Feature/HLSLLib/round.32.test
index 1acc16cfc..0a1f9de95 100644
--- a/test/Feature/HLSLLib/round.32.test
+++ b/test/Feature/HLSLLib/round.32.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/rsqrt.16.test b/test/Feature/HLSLLib/rsqrt.16.test
index 9bf8cf25c..4c9385320 100644
--- a/test/Feature/HLSLLib/rsqrt.16.test
+++ b/test/Feature/HLSLLib/rsqrt.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/rsqrt.32.test b/test/Feature/HLSLLib/rsqrt.32.test
index e519e5dff..86a4a5f38 100644
--- a/test/Feature/HLSLLib/rsqrt.32.test
+++ b/test/Feature/HLSLLib/rsqrt.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/saturate.16.test b/test/Feature/HLSLLib/saturate.16.test
index 533c0863c..502e0bc2c 100644
--- a/test/Feature/HLSLLib/saturate.16.test
+++ b/test/Feature/HLSLLib/saturate.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/saturate.32.test b/test/Feature/HLSLLib/saturate.32.test
index f1c702ccf..f7970cd4a 100644
--- a/test/Feature/HLSLLib/saturate.32.test
+++ b/test/Feature/HLSLLib/saturate.32.test
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/select.32.test b/test/Feature/HLSLLib/select.32.test
index 42108e7cb..026edfbe3 100644
--- a/test/Feature/HLSLLib/select.32.test
+++ b/test/Feature/HLSLLib/select.32.test
@@ -116,7 +116,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Cond
     Format: Bool
diff --git a/test/Feature/HLSLLib/select.fp16.test b/test/Feature/HLSLLib/select.fp16.test
index 0666d68a4..56fd78538 100644
--- a/test/Feature/HLSLLib/select.fp16.test
+++ b/test/Feature/HLSLLib/select.fp16.test
@@ -49,7 +49,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Cond
     Format: Bool
diff --git a/test/Feature/HLSLLib/select.fp64.test b/test/Feature/HLSLLib/select.fp64.test
index d42f6d06a..f5e8be2c5 100644
--- a/test/Feature/HLSLLib/select.fp64.test
+++ b/test/Feature/HLSLLib/select.fp64.test
@@ -49,7 +49,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Cond
     Format: Bool
diff --git a/test/Feature/HLSLLib/select.int16.test b/test/Feature/HLSLLib/select.int16.test
index 997541bcb..592943d63 100644
--- a/test/Feature/HLSLLib/select.int16.test
+++ b/test/Feature/HLSLLib/select.int16.test
@@ -72,7 +72,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Cond
     Format: Bool
diff --git a/test/Feature/HLSLLib/select.int64.test b/test/Feature/HLSLLib/select.int64.test
index d830e7732..492650cfd 100644
--- a/test/Feature/HLSLLib/select.int64.test
+++ b/test/Feature/HLSLLib/select.int64.test
@@ -71,7 +71,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Cond
     Format: Bool
diff --git a/test/Feature/HLSLLib/select.struct.test b/test/Feature/HLSLLib/select.struct.test
index 01bfd2bda..cf66bb207 100644
--- a/test/Feature/HLSLLib/select.struct.test
+++ b/test/Feature/HLSLLib/select.struct.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Cond
     Format: Bool
diff --git a/test/Feature/HLSLLib/sign.32.test b/test/Feature/HLSLLib/sign.32.test
index 89ba4e48e..2dab935a4 100644
--- a/test/Feature/HLSLLib/sign.32.test
+++ b/test/Feature/HLSLLib/sign.32.test
@@ -45,7 +45,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int32
diff --git a/test/Feature/HLSLLib/sign.fp16.test b/test/Feature/HLSLLib/sign.fp16.test
index d5608d2ca..e90968d24 100644
--- a/test/Feature/HLSLLib/sign.fp16.test
+++ b/test/Feature/HLSLLib/sign.fp16.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Float16
diff --git a/test/Feature/HLSLLib/sign.fp64.test b/test/Feature/HLSLLib/sign.fp64.test
index b9446e7bd..4981c0abd 100644
--- a/test/Feature/HLSLLib/sign.fp64.test
+++ b/test/Feature/HLSLLib/sign.fp64.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Float64
diff --git a/test/Feature/HLSLLib/sign.int16.test b/test/Feature/HLSLLib/sign.int16.test
index df5aa07cc..6e648f680 100644
--- a/test/Feature/HLSLLib/sign.int16.test
+++ b/test/Feature/HLSLLib/sign.int16.test
@@ -26,7 +26,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int16
diff --git a/test/Feature/HLSLLib/sign.int64.test b/test/Feature/HLSLLib/sign.int64.test
index 1deee7c1d..fc376a94e 100644
--- a/test/Feature/HLSLLib/sign.int64.test
+++ b/test/Feature/HLSLLib/sign.int64.test
@@ -26,7 +26,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int64
diff --git a/test/Feature/HLSLLib/sin.16.test b/test/Feature/HLSLLib/sin.16.test
index 1ff9f8520..0060086bf 100644
--- a/test/Feature/HLSLLib/sin.16.test
+++ b/test/Feature/HLSLLib/sin.16.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/sin.32.test b/test/Feature/HLSLLib/sin.32.test
index fe6d0a67d..570119e18 100644
--- a/test/Feature/HLSLLib/sin.32.test
+++ b/test/Feature/HLSLLib/sin.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/sin.nan-inf-denorm.32.test b/test/Feature/HLSLLib/sin.nan-inf-denorm.32.test
index f97fc60d9..29e38594d 100644
--- a/test/Feature/HLSLLib/sin.nan-inf-denorm.32.test
+++ b/test/Feature/HLSLLib/sin.nan-inf-denorm.32.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/sinh.16.test b/test/Feature/HLSLLib/sinh.16.test
index ba023a33d..78da76029 100644
--- a/test/Feature/HLSLLib/sinh.16.test
+++ b/test/Feature/HLSLLib/sinh.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/sinh.32.test b/test/Feature/HLSLLib/sinh.32.test
index d38e91b27..118d45dc1 100644
--- a/test/Feature/HLSLLib/sinh.32.test
+++ b/test/Feature/HLSLLib/sinh.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/smoothstep.16.test b/test/Feature/HLSLLib/smoothstep.16.test
index 65ca060d1..adf27baec 100644
--- a/test/Feature/HLSLLib/smoothstep.16.test
+++ b/test/Feature/HLSLLib/smoothstep.16.test
@@ -48,7 +48,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   
   - Name: Min2D
diff --git a/test/Feature/HLSLLib/smoothstep.32.test b/test/Feature/HLSLLib/smoothstep.32.test
index f710c795f..3b7ef3884 100644
--- a/test/Feature/HLSLLib/smoothstep.32.test
+++ b/test/Feature/HLSLLib/smoothstep.32.test
@@ -48,7 +48,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   
   - Name: Min2D
diff --git a/test/Feature/HLSLLib/sqrt.16.test b/test/Feature/HLSLLib/sqrt.16.test
index 104a4bd0f..b42e44073 100644
--- a/test/Feature/HLSLLib/sqrt.16.test
+++ b/test/Feature/HLSLLib/sqrt.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/sqrt.32.test b/test/Feature/HLSLLib/sqrt.32.test
index 19c5756fd..b9002ff55 100644
--- a/test/Feature/HLSLLib/sqrt.32.test
+++ b/test/Feature/HLSLLib/sqrt.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/step.16.test b/test/Feature/HLSLLib/step.16.test
index 16636b9df..02b93cd00 100644
--- a/test/Feature/HLSLLib/step.16.test
+++ b/test/Feature/HLSLLib/step.16.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Y
     Format: Float16
diff --git a/test/Feature/HLSLLib/step.32.test b/test/Feature/HLSLLib/step.32.test
index e5fa52b9d..c870ef366 100644
--- a/test/Feature/HLSLLib/step.32.test
+++ b/test/Feature/HLSLLib/step.32.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Y
     Format: Float32
diff --git a/test/Feature/HLSLLib/tanh.16.test b/test/Feature/HLSLLib/tanh.16.test
index c2717a1b5..d4c205a6d 100644
--- a/test/Feature/HLSLLib/tanh.16.test
+++ b/test/Feature/HLSLLib/tanh.16.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/tanh.32.test b/test/Feature/HLSLLib/tanh.32.test
index 7b45e607d..59b9a255a 100644
--- a/test/Feature/HLSLLib/tanh.32.test
+++ b/test/Feature/HLSLLib/tanh.32.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/transpose.bool.test b/test/Feature/HLSLLib/transpose.bool.test
index 5d93762b1..278b00a40 100644
--- a/test/Feature/HLSLLib/transpose.bool.test
+++ b/test/Feature/HLSLLib/transpose.bool.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/HLSLLib/transpose.fp16.test b/test/Feature/HLSLLib/transpose.fp16.test
index d8cb738e4..b5baac5c3 100644
--- a/test/Feature/HLSLLib/transpose.fp16.test
+++ b/test/Feature/HLSLLib/transpose.fp16.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/transpose.fp32.test b/test/Feature/HLSLLib/transpose.fp32.test
index 008b0fe86..1ce1eab3c 100644
--- a/test/Feature/HLSLLib/transpose.fp32.test
+++ b/test/Feature/HLSLLib/transpose.fp32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/HLSLLib/transpose.fp64.test b/test/Feature/HLSLLib/transpose.fp64.test
index a473e2525..2cc5a37ba 100644
--- a/test/Feature/HLSLLib/transpose.fp64.test
+++ b/test/Feature/HLSLLib/transpose.fp64.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/Feature/HLSLLib/transpose.int16.test b/test/Feature/HLSLLib/transpose.int16.test
index 3dc7ca964..4739b4821 100644
--- a/test/Feature/HLSLLib/transpose.int16.test
+++ b/test/Feature/HLSLLib/transpose.int16.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/Feature/HLSLLib/transpose.int32.test b/test/Feature/HLSLLib/transpose.int32.test
index 361c8b658..9c3bda37a 100644
--- a/test/Feature/HLSLLib/transpose.int32.test
+++ b/test/Feature/HLSLLib/transpose.int32.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/Feature/HLSLLib/transpose.int64.test b/test/Feature/HLSLLib/transpose.int64.test
index 6aaf03783..6df534b6f 100644
--- a/test/Feature/HLSLLib/transpose.int64.test
+++ b/test/Feature/HLSLLib/transpose.int64.test
@@ -64,7 +64,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/Feature/HLSLLib/trunc.16.test b/test/Feature/HLSLLib/trunc.16.test
index df2be4068..f025b04a5 100644
--- a/test/Feature/HLSLLib/trunc.16.test
+++ b/test/Feature/HLSLLib/trunc.16.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/Feature/HLSLLib/trunc.32.test b/test/Feature/HLSLLib/trunc.32.test
index 98c36cffd..1b054427a 100644
--- a/test/Feature/HLSLLib/trunc.32.test
+++ b/test/Feature/HLSLLib/trunc.32.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/ImplicitBindings/all-implicit.test b/test/Feature/ImplicitBindings/all-implicit.test
index 808cda345..f64812bb5 100644
--- a/test/Feature/ImplicitBindings/all-implicit.test
+++ b/test/Feature/ImplicitBindings/all-implicit.test
@@ -19,7 +19,8 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: BufA
     Format: Int32
diff --git a/test/Feature/ImplicitBindings/simple-resources.test b/test/Feature/ImplicitBindings/simple-resources.test
index 29507297f..7f88f1ff7 100644
--- a/test/Feature/ImplicitBindings/simple-resources.test
+++ b/test/Feature/ImplicitBindings/simple-resources.test
@@ -19,7 +19,8 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: BufA
     Format: Int32
diff --git a/test/Feature/MaximalReconvergence/loop_peeling.test b/test/Feature/MaximalReconvergence/loop_peeling.test
index 3efd1d1cb..482bd365c 100644
--- a/test/Feature/MaximalReconvergence/loop_peeling.test
+++ b/test/Feature/MaximalReconvergence/loop_peeling.test
@@ -17,7 +17,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/Feature/PushConstant/array_of_matrices.test b/test/Feature/PushConstant/array_of_matrices.test
index f2b1b3f27..f4eb0c938 100644
--- a/test/Feature/PushConstant/array_of_matrices.test
+++ b/test/Feature/PushConstant/array_of_matrices.test
@@ -26,7 +26,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Float32
diff --git a/test/Feature/PushConstant/arrays.test b/test/Feature/PushConstant/arrays.test
index d01eda6e9..5d7e92571 100644
--- a/test/Feature/PushConstant/arrays.test
+++ b/test/Feature/PushConstant/arrays.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/bool.test b/test/Feature/PushConstant/bool.test
index e47b15e5c..d3d5ad7d6 100644
--- a/test/Feature/PushConstant/bool.test
+++ b/test/Feature/PushConstant/bool.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/explicit_offset.test b/test/Feature/PushConstant/explicit_offset.test
index bfbfe4987..7430f5b0b 100644
--- a/test/Feature/PushConstant/explicit_offset.test
+++ b/test/Feature/PushConstant/explicit_offset.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/matrix.test b/test/Feature/PushConstant/matrix.test
index 66daa9993..186092599 100644
--- a/test/Feature/PushConstant/matrix.test
+++ b/test/Feature/PushConstant/matrix.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Float32
diff --git a/test/Feature/PushConstant/methods.test b/test/Feature/PushConstant/methods.test
index 52ae877ad..0e5640e7c 100644
--- a/test/Feature/PushConstant/methods.test
+++ b/test/Feature/PushConstant/methods.test
@@ -23,7 +23,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/mixed_types.test b/test/Feature/PushConstant/mixed_types.test
index 3a5a7ec6a..bf4e6e7b1 100644
--- a/test/Feature/PushConstant/mixed_types.test
+++ b/test/Feature/PushConstant/mixed_types.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Float32
diff --git a/test/Feature/PushConstant/multiple_values.test b/test/Feature/PushConstant/multiple_values.test
index 9e858dd0e..9c274e68c 100644
--- a/test/Feature/PushConstant/multiple_values.test
+++ b/test/Feature/PushConstant/multiple_values.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/multiple_values_offset.test b/test/Feature/PushConstant/multiple_values_offset.test
index 70c797b7b..98706e1c8 100644
--- a/test/Feature/PushConstant/multiple_values_offset.test
+++ b/test/Feature/PushConstant/multiple_values_offset.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/nested_structs.test b/test/Feature/PushConstant/nested_structs.test
index e8a2a5c58..403963cfd 100644
--- a/test/Feature/PushConstant/nested_structs.test
+++ b/test/Feature/PushConstant/nested_structs.test
@@ -28,7 +28,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/padding.test b/test/Feature/PushConstant/padding.test
index 55c076e9e..e7b8c874f 100644
--- a/test/Feature/PushConstant/padding.test
+++ b/test/Feature/PushConstant/padding.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Float32
diff --git a/test/Feature/PushConstant/simple.test b/test/Feature/PushConstant/simple.test
index 3513adeb4..20329c8b5 100644
--- a/test/Feature/PushConstant/simple.test
+++ b/test/Feature/PushConstant/simple.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/static_member.test b/test/Feature/PushConstant/static_member.test
index 3db3f28d5..b5479dd39 100644
--- a/test/Feature/PushConstant/static_member.test
+++ b/test/Feature/PushConstant/static_member.test
@@ -23,7 +23,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/struct_content.test b/test/Feature/PushConstant/struct_content.test
index f76f88f9a..5033ff561 100644
--- a/test/Feature/PushConstant/struct_content.test
+++ b/test/Feature/PushConstant/struct_content.test
@@ -24,7 +24,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Int32
diff --git a/test/Feature/PushConstant/types.test b/test/Feature/PushConstant/types.test
index 45396c001..bb05ae496 100644
--- a/test/Feature/PushConstant/types.test
+++ b/test/Feature/PushConstant/types.test
@@ -25,7 +25,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Float32
diff --git a/test/Feature/PushConstant/types_16bit.test b/test/Feature/PushConstant/types_16bit.test
index 1cedc3a19..5402f9d77 100644
--- a/test/Feature/PushConstant/types_16bit.test
+++ b/test/Feature/PushConstant/types_16bit.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output
     Format: Float32
diff --git a/test/Feature/PushConstant/types_64bit.test b/test/Feature/PushConstant/types_64bit.test
index c88f205cd..6661f937f 100644
--- a/test/Feature/PushConstant/types_64bit.test
+++ b/test/Feature/PushConstant/types_64bit.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: output_d
     Format: Float64
diff --git a/test/Feature/ResourceArrays/array-global.test b/test/Feature/ResourceArrays/array-global.test
index bbc07f061..bf88f71ce 100644
--- a/test/Feature/ResourceArrays/array-global.test
+++ b/test/Feature/ResourceArrays/array-global.test
@@ -36,7 +36,8 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 2, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 2, 1]
 Buffers:
   - Name: BufA
     Format: Int32
diff --git a/test/Feature/ResourceArrays/array-local.test b/test/Feature/ResourceArrays/array-local.test
index 5d78ea462..40e72264d 100644
--- a/test/Feature/ResourceArrays/array-local.test
+++ b/test/Feature/ResourceArrays/array-local.test
@@ -28,7 +28,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufA
     Format: Float32
diff --git a/test/Feature/ResourceArrays/array-local2.test b/test/Feature/ResourceArrays/array-local2.test
index 8967405c2..b4ff7a61b 100644
--- a/test/Feature/ResourceArrays/array-local2.test
+++ b/test/Feature/ResourceArrays/array-local2.test
@@ -26,7 +26,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufX
     Format: Int32
diff --git a/test/Feature/ResourceArrays/array-of-constant-buffers.test b/test/Feature/ResourceArrays/array-of-constant-buffers.test
index 3418de22c..5e2fd37d3 100644
--- a/test/Feature/ResourceArrays/array-of-constant-buffers.test
+++ b/test/Feature/ResourceArrays/array-of-constant-buffers.test
@@ -22,8 +22,9 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 2, 1]
 
+DispatchParameters:
+  DispatchGroupCount: [4, 2, 1]
 Buffers:
   - Name: CB
     Format: Int32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-global.test b/test/Feature/ResourceArrays/multi-dim-array-global.test
index cb4f5820b..01c7e4bb4 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-global.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-global.test
@@ -19,7 +19,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufIn
     Format: Int32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-local.test b/test/Feature/ResourceArrays/multi-dim-array-local.test
index 1be42933e..b375e5b60 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-local.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-local.test
@@ -31,7 +31,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufA
     Format: Float32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test b/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test
index 87a9e24a4..76241b873 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test
@@ -20,7 +20,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufIn
     Format: Float32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-subset.test b/test/Feature/ResourceArrays/multi-dim-array-subset.test
index ead1a5089..a70b2189c 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-subset.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-subset.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufIn
     Format: Int32
diff --git a/test/Feature/ResourceArrays/multi-dim-unbounded-array-nuri.test b/test/Feature/ResourceArrays/multi-dim-unbounded-array-nuri.test
index d6dec296c..7bcd4d65f 100644
--- a/test/Feature/ResourceArrays/multi-dim-unbounded-array-nuri.test
+++ b/test/Feature/ResourceArrays/multi-dim-unbounded-array-nuri.test
@@ -17,7 +17,6 @@ void main(uint3 GTI : SV_GroupThreadID, uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf
     Format: Int32
diff --git a/test/Feature/ResourceArrays/multi-dim-unbounded-array.test b/test/Feature/ResourceArrays/multi-dim-unbounded-array.test
index edae62a38..e5ad471b3 100644
--- a/test/Feature/ResourceArrays/multi-dim-unbounded-array.test
+++ b/test/Feature/ResourceArrays/multi-dim-unbounded-array.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf
     Format: Int32
diff --git a/test/Feature/ResourceArrays/overflow-unbounded-array.test b/test/Feature/ResourceArrays/overflow-unbounded-array.test
index 91319c8c7..f4111893c 100644
--- a/test/Feature/ResourceArrays/overflow-unbounded-array.test
+++ b/test/Feature/ResourceArrays/overflow-unbounded-array.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf0
     Format: Int32
diff --git a/test/Feature/ResourceArrays/unbounded-array-nuri.test b/test/Feature/ResourceArrays/unbounded-array-nuri.test
index f719e0796..9cbc4b3ca 100644
--- a/test/Feature/ResourceArrays/unbounded-array-nuri.test
+++ b/test/Feature/ResourceArrays/unbounded-array-nuri.test
@@ -17,7 +17,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf
     Format: Int32
diff --git a/test/Feature/ResourceArrays/unbounded-array.test b/test/Feature/ResourceArrays/unbounded-array.test
index 1d319e11b..17edae204 100644
--- a/test/Feature/ResourceArrays/unbounded-array.test
+++ b/test/Feature/ResourceArrays/unbounded-array.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/array-of-structs-with-res.test b/test/Feature/ResourcesInStructs/array-of-structs-with-res.test
index dcbe31ce8..af5af5e10 100644
--- a/test/Feature/ResourcesInStructs/array-of-structs-with-res.test
+++ b/test/Feature/ResourcesInStructs/array-of-structs-with-res.test
@@ -25,7 +25,6 @@ void main(uint3 ID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufD2
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/res-array-of-matrix-in-struct.test b/test/Feature/ResourcesInStructs/res-array-of-matrix-in-struct.test
index 2e5d23e1e..7acb46001 100644
--- a/test/Feature/ResourcesInStructs/res-array-of-matrix-in-struct.test
+++ b/test/Feature/ResourcesInStructs/res-array-of-matrix-in-struct.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufB1
     Format: Float32
diff --git a/test/Feature/ResourcesInStructs/res-in-struct-local-arg.test b/test/Feature/ResourcesInStructs/res-in-struct-local-arg.test
index 4b66a5887..2a6658328 100644
--- a/test/Feature/ResourcesInStructs/res-in-struct-local-arg.test
+++ b/test/Feature/ResourcesInStructs/res-in-struct-local-arg.test
@@ -32,7 +32,6 @@ void main(uint3 ID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufA1
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/res-in-struct-mix.test b/test/Feature/ResourcesInStructs/res-in-struct-mix.test
index 1276ec139..1cf16928e 100644
--- a/test/Feature/ResourcesInStructs/res-in-struct-mix.test
+++ b/test/Feature/ResourcesInStructs/res-in-struct-mix.test
@@ -35,7 +35,6 @@ void main(uint3 ID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf_g_F_SrvBuf1
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/res-in-struct-simple-array.test b/test/Feature/ResourcesInStructs/res-in-struct-simple-array.test
index d3f530488..3dc078021 100644
--- a/test/Feature/ResourcesInStructs/res-in-struct-simple-array.test
+++ b/test/Feature/ResourcesInStructs/res-in-struct-simple-array.test
@@ -24,7 +24,6 @@ void main(uint3 ID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufB1
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/res-in-struct-simple-one.test b/test/Feature/ResourcesInStructs/res-in-struct-simple-one.test
index 128cb1aa7..3a8702ea9 100644
--- a/test/Feature/ResourcesInStructs/res-in-struct-simple-one.test
+++ b/test/Feature/ResourcesInStructs/res-in-struct-simple-one.test
@@ -21,7 +21,6 @@ void main(uint3 ID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufA1
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/res-in-struct-this-access.test b/test/Feature/ResourcesInStructs/res-in-struct-this-access.test
index d2d7e72d5..532fbb49a 100644
--- a/test/Feature/ResourcesInStructs/res-in-struct-this-access.test
+++ b/test/Feature/ResourcesInStructs/res-in-struct-this-access.test
@@ -26,7 +26,6 @@ void main(uint3 ID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufA1
     Format: Int32
diff --git a/test/Feature/ResourcesInStructs/res-of-matrix-in-struct.test b/test/Feature/ResourcesInStructs/res-of-matrix-in-struct.test
index 11cfa7757..fc92f1349 100644
--- a/test/Feature/ResourcesInStructs/res-of-matrix-in-struct.test
+++ b/test/Feature/ResourcesInStructs/res-of-matrix-in-struct.test
@@ -20,7 +20,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: BufA1
     Format: Int32
diff --git a/test/Feature/RootSignatures/Defaults.test b/test/Feature/RootSignatures/Defaults.test
index fa4666516..531b921f1 100644
--- a/test/Feature/RootSignatures/Defaults.test
+++ b/test/Feature/RootSignatures/Defaults.test
@@ -40,7 +40,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/DescriptorTables.test b/test/Feature/RootSignatures/DescriptorTables.test
index e31d491a1..2dc6d75a2 100644
--- a/test/Feature/RootSignatures/DescriptorTables.test
+++ b/test/Feature/RootSignatures/DescriptorTables.test
@@ -20,7 +20,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/RootSignatures/Flags.test b/test/Feature/RootSignatures/Flags.test
index 0823f6311..9e128656f 100644
--- a/test/Feature/RootSignatures/Flags.test
+++ b/test/Feature/RootSignatures/Flags.test
@@ -45,7 +45,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/ManualDescriptors.test b/test/Feature/RootSignatures/ManualDescriptors.test
index 42cf5c4d3..b5f07d8af 100644
--- a/test/Feature/RootSignatures/ManualDescriptors.test
+++ b/test/Feature/RootSignatures/ManualDescriptors.test
@@ -41,7 +41,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/NumberParameters.test b/test/Feature/RootSignatures/NumberParameters.test
index 354422afb..2f7b55d76 100644
--- a/test/Feature/RootSignatures/NumberParameters.test
+++ b/test/Feature/RootSignatures/NumberParameters.test
@@ -45,7 +45,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/ParameterInsensitivity.test b/test/Feature/RootSignatures/ParameterInsensitivity.test
index 9dff4e1d9..37e57b7ea 100644
--- a/test/Feature/RootSignatures/ParameterInsensitivity.test
+++ b/test/Feature/RootSignatures/ParameterInsensitivity.test
@@ -41,7 +41,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/RootConstants.test b/test/Feature/RootSignatures/RootConstants.test
index 0639ba514..992f5637b 100644
--- a/test/Feature/RootSignatures/RootConstants.test
+++ b/test/Feature/RootSignatures/RootConstants.test
@@ -22,7 +22,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/RootDescriptorAndTables.test b/test/Feature/RootSignatures/RootDescriptorAndTables.test
index 09c597f05..9b9ccfdee 100644
--- a/test/Feature/RootSignatures/RootDescriptorAndTables.test
+++ b/test/Feature/RootSignatures/RootDescriptorAndTables.test
@@ -26,7 +26,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/RootDescriptors.test b/test/Feature/RootSignatures/RootDescriptors.test
index c65e25fdb..025df9645 100644
--- a/test/Feature/RootSignatures/RootDescriptors.test
+++ b/test/Feature/RootSignatures/RootDescriptors.test
@@ -26,7 +26,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Feature/RootSignatures/StaticSamplers.test b/test/Feature/RootSignatures/StaticSamplers.test
index 68e03c920..1281d03ff 100644
--- a/test/Feature/RootSignatures/StaticSamplers.test
+++ b/test/Feature/RootSignatures/StaticSamplers.test
@@ -40,7 +40,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/RootSignatures/TwoDescriptorTables.test b/test/Feature/RootSignatures/TwoDescriptorTables.test
index b3b554306..d8d3bcae3 100644
--- a/test/Feature/RootSignatures/TwoDescriptorTables.test
+++ b/test/Feature/RootSignatures/TwoDescriptorTables.test
@@ -20,7 +20,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/Semantics/ComputeSystemValues.test b/test/Feature/Semantics/ComputeSystemValues.test
index b72f9ef63..30f0ca134 100644
--- a/test/Feature/Semantics/ComputeSystemValues.test
+++ b/test/Feature/Semantics/ComputeSystemValues.test
@@ -21,7 +21,8 @@ void main(uint3 DTID : SV_DispatchThreadID, uint3 GID : SV_GroupID, uint3 GTID :
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [2, 2, 2]
+DispatchParameters:
+  DispatchGroupCount: [2, 2, 2]
 Buffers:
   - Name: OUTPUT
     Format: Int32
diff --git a/test/Feature/SpecializationConstant/duplicate_spec_id.test b/test/Feature/SpecializationConstant/duplicate_spec_id.test
index 0e7d90621..c39f878da 100644
--- a/test/Feature/SpecializationConstant/duplicate_spec_id.test
+++ b/test/Feature/SpecializationConstant/duplicate_spec_id.test
@@ -16,7 +16,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: 123, Type: Int32 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/duplicate_spec_id_in_config.test b/test/Feature/SpecializationConstant/duplicate_spec_id_in_config.test
index bfadbe576..0f01c9788 100644
--- a/test/Feature/SpecializationConstant/duplicate_spec_id_in_config.test
+++ b/test/Feature/SpecializationConstant/duplicate_spec_id_in_config.test
@@ -13,7 +13,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: 123, Type: Int32 }
       - { ConstantID: 0, Value: 456, Type: Int32 }
diff --git a/test/Feature/SpecializationConstant/invalid_bool.test b/test/Feature/SpecializationConstant/invalid_bool.test
index cb71f72d5..35f941ee9 100644
--- a/test/Feature/SpecializationConstant/invalid_bool.test
+++ b/test/Feature/SpecializationConstant/invalid_bool.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: Bool }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/invalid_double.test b/test/Feature/SpecializationConstant/invalid_double.test
index f05600526..645b6fd5b 100644
--- a/test/Feature/SpecializationConstant/invalid_double.test
+++ b/test/Feature/SpecializationConstant/invalid_double.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: Float64 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/invalid_float.test b/test/Feature/SpecializationConstant/invalid_float.test
index da5dbbd90..0432ae0e8 100644
--- a/test/Feature/SpecializationConstant/invalid_float.test
+++ b/test/Feature/SpecializationConstant/invalid_float.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: Float32 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/invalid_int16.test b/test/Feature/SpecializationConstant/invalid_int16.test
index 5807e3b17..c298c2a69 100644
--- a/test/Feature/SpecializationConstant/invalid_int16.test
+++ b/test/Feature/SpecializationConstant/invalid_int16.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: Int16 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/invalid_int32.test b/test/Feature/SpecializationConstant/invalid_int32.test
index 8d007416c..b864f48dd 100644
--- a/test/Feature/SpecializationConstant/invalid_int32.test
+++ b/test/Feature/SpecializationConstant/invalid_int32.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: Int32 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/invalid_uint16.test b/test/Feature/SpecializationConstant/invalid_uint16.test
index eed1cb952..63d887bad 100644
--- a/test/Feature/SpecializationConstant/invalid_uint16.test
+++ b/test/Feature/SpecializationConstant/invalid_uint16.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: UInt16 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/invalid_uint32.test b/test/Feature/SpecializationConstant/invalid_uint32.test
index f74cdabe5..b1614ae6b 100644
--- a/test/Feature/SpecializationConstant/invalid_uint32.test
+++ b/test/Feature/SpecializationConstant/invalid_uint32.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: "not a number", Type: UInt32 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/spec_const.f64.test b/test/Feature/SpecializationConstant/spec_const.f64.test
index 44c0c9de5..f92a69501 100644
--- a/test/Feature/SpecializationConstant/spec_const.f64.test
+++ b/test/Feature/SpecializationConstant/spec_const.f64.test
@@ -13,7 +13,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: 2.718, Type: Float64 }
 Buffers:
diff --git a/test/Feature/SpecializationConstant/spec_const_32_bits.test b/test/Feature/SpecializationConstant/spec_const_32_bits.test
index 129caf5c9..f4005ccf5 100644
--- a/test/Feature/SpecializationConstant/spec_const_32_bits.test
+++ b/test/Feature/SpecializationConstant/spec_const_32_bits.test
@@ -37,7 +37,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 0, Value: 1, Type: Bool }
       - { ConstantID: 1, Value: 42, Type: Int32 }
diff --git a/test/Feature/SpecializationConstant/spec_const_other_sizes.test b/test/Feature/SpecializationConstant/spec_const_other_sizes.test
index 9733e6768..02f9f94f5 100644
--- a/test/Feature/SpecializationConstant/spec_const_other_sizes.test
+++ b/test/Feature/SpecializationConstant/spec_const_other_sizes.test
@@ -20,7 +20,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
     SpecializationConstants:
       - { ConstantID: 1, Value: 123, Type: Int16 }
       - { ConstantID: 2, Value: 456, Type: UInt16 }
diff --git a/test/Feature/StructuredBuffer/GetDimensions.test b/test/Feature/StructuredBuffer/GetDimensions.test
index b58c283a2..a99d2c31a 100644
--- a/test/Feature/StructuredBuffer/GetDimensions.test
+++ b/test/Feature/StructuredBuffer/GetDimensions.test
@@ -49,8 +49,9 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
 
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: A
     Format: Int32
diff --git a/test/Feature/StructuredBuffer/dec_counter.test b/test/Feature/StructuredBuffer/dec_counter.test
index 24889237b..3b726d687 100644
--- a/test/Feature/StructuredBuffer/dec_counter.test
+++ b/test/Feature/StructuredBuffer/dec_counter.test
@@ -14,7 +14,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: Hex32
diff --git a/test/Feature/StructuredBuffer/inc_counter.test b/test/Feature/StructuredBuffer/inc_counter.test
index 2b1ab16fd..c8e1b02c0 100644
--- a/test/Feature/StructuredBuffer/inc_counter.test
+++ b/test/Feature/StructuredBuffer/inc_counter.test
@@ -14,7 +14,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: Hex32
diff --git a/test/Feature/StructuredBuffer/inc_counter_array.test b/test/Feature/StructuredBuffer/inc_counter_array.test
index f189eda83..f909b1a7e 100644
--- a/test/Feature/StructuredBuffer/inc_counter_array.test
+++ b/test/Feature/StructuredBuffer/inc_counter_array.test
@@ -18,7 +18,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: Hex32
diff --git a/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test b/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test
index 5d5545369..eac569f57 100644
--- a/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test
+++ b/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test
@@ -27,7 +27,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: Hex32
diff --git a/test/Feature/StructuredBuffer/layout.test b/test/Feature/StructuredBuffer/layout.test
index fe0530e7d..cd3c90e1a 100644
--- a/test/Feature/StructuredBuffer/layout.test
+++ b/test/Feature/StructuredBuffer/layout.test
@@ -36,7 +36,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/StructuredBuffer/matrix.test b/test/Feature/StructuredBuffer/matrix.test
index a8e9750e8..aadde7ba5 100644
--- a/test/Feature/StructuredBuffer/matrix.test
+++ b/test/Feature/StructuredBuffer/matrix.test
@@ -30,7 +30,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: InA
     Format: Float32
diff --git a/test/Feature/StructuredBuffer/matrix_assign.test b/test/Feature/StructuredBuffer/matrix_assign.test
index af767a456..eb1e0f1b7 100644
--- a/test/Feature/StructuredBuffer/matrix_assign.test
+++ b/test/Feature/StructuredBuffer/matrix_assign.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: InA
     Format: Float32
diff --git a/test/Feature/StructuredBuffer/packed.test b/test/Feature/StructuredBuffer/packed.test
index b668900ff..494846341 100644
--- a/test/Feature/StructuredBuffer/packed.test
+++ b/test/Feature/StructuredBuffer/packed.test
@@ -20,7 +20,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Buf
     Format: Int32
diff --git a/test/Feature/StructuredBuffer/simple.test b/test/Feature/StructuredBuffer/simple.test
index e043c5c9b..8efaba9e6 100644
--- a/test/Feature/StructuredBuffer/simple.test
+++ b/test/Feature/StructuredBuffer/simple.test
@@ -21,7 +21,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Hex32
diff --git a/test/Feature/StructuredBuffer/srv.test b/test/Feature/StructuredBuffer/srv.test
index 0ac224fd8..f761a4ff5 100644
--- a/test/Feature/StructuredBuffer/srv.test
+++ b/test/Feature/StructuredBuffer/srv.test
@@ -15,7 +15,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Hex32
diff --git a/test/Feature/StructuredBuffer/stride.test b/test/Feature/StructuredBuffer/stride.test
index 17a7ae8ad..38266fec4 100644
--- a/test/Feature/StructuredBuffer/stride.test
+++ b/test/Feature/StructuredBuffer/stride.test
@@ -15,7 +15,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/Textures/Texture2D.Gather.test.yaml b/test/Feature/Textures/Texture2D.Gather.test.yaml
index 4f7845cbf..538471766 100644
--- a/test/Feature/Textures/Texture2D.Gather.test.yaml
+++ b/test/Feature/Textures/Texture2D.Gather.test.yaml
@@ -49,7 +49,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/Textures/Texture2D.GatherCmp.test.yaml b/test/Feature/Textures/Texture2D.GatherCmp.test.yaml
index 1fd952f10..9a950a6c8 100644
--- a/test/Feature/Textures/Texture2D.GatherCmp.test.yaml
+++ b/test/Feature/Textures/Texture2D.GatherCmp.test.yaml
@@ -65,7 +65,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/Textures/Texture2D.GetDimensions.test.yaml b/test/Feature/Textures/Texture2D.GetDimensions.test.yaml
index 488ab1758..874ef3088 100644
--- a/test/Feature/Textures/Texture2D.GetDimensions.test.yaml
+++ b/test/Feature/Textures/Texture2D.GetDimensions.test.yaml
@@ -53,7 +53,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex1
diff --git a/test/Feature/Textures/Texture2D.Load.test.yaml b/test/Feature/Textures/Texture2D.Load.test.yaml
index 836cd9020..31a4c2ff0 100644
--- a/test/Feature/Textures/Texture2D.Load.test.yaml
+++ b/test/Feature/Textures/Texture2D.Load.test.yaml
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/Textures/Texture2D.OperatorIndex.test.yaml b/test/Feature/Textures/Texture2D.OperatorIndex.test.yaml
index 7b094fe51..aec5149fd 100644
--- a/test/Feature/Textures/Texture2D.OperatorIndex.test.yaml
+++ b/test/Feature/Textures/Texture2D.OperatorIndex.test.yaml
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/Textures/Texture2D.SRVToUAV.array.test.yaml b/test/Feature/Textures/Texture2D.SRVToUAV.array.test.yaml
index 262c0103c..7f642adb2 100644
--- a/test/Feature/Textures/Texture2D.SRVToUAV.array.test.yaml
+++ b/test/Feature/Textures/Texture2D.SRVToUAV.array.test.yaml
@@ -18,7 +18,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/Textures/Texture2D.SRVToUAV.test.yaml b/test/Feature/Textures/Texture2D.SRVToUAV.test.yaml
index 91c3907fd..175182bbb 100644
--- a/test/Feature/Textures/Texture2D.SRVToUAV.test.yaml
+++ b/test/Feature/Textures/Texture2D.SRVToUAV.test.yaml
@@ -14,7 +14,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/Feature/Textures/Texture2D.SampleGrad.test.yaml b/test/Feature/Textures/Texture2D.SampleGrad.test.yaml
index f55154803..6ea23f4d3 100644
--- a/test/Feature/Textures/Texture2D.SampleGrad.test.yaml
+++ b/test/Feature/Textures/Texture2D.SampleGrad.test.yaml
@@ -38,7 +38,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/Textures/Texture2D.Sampler.mips.test.yaml b/test/Feature/Textures/Texture2D.Sampler.mips.test.yaml
index 50d574b5d..f11b76940 100644
--- a/test/Feature/Textures/Texture2D.Sampler.mips.test.yaml
+++ b/test/Feature/Textures/Texture2D.Sampler.mips.test.yaml
@@ -32,7 +32,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/Textures/Texture2D.mips.OperatorIndex.test.yaml b/test/Feature/Textures/Texture2D.mips.OperatorIndex.test.yaml
index ddefddd50..49f8ee4ba 100644
--- a/test/Feature/Textures/Texture2D.mips.OperatorIndex.test.yaml
+++ b/test/Feature/Textures/Texture2D.mips.OperatorIndex.test.yaml
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: Tex
diff --git a/test/Feature/TypedBuffer/64bit-scalar.test b/test/Feature/TypedBuffer/64bit-scalar.test
index 75dd94108..3af81978e 100644
--- a/test/Feature/TypedBuffer/64bit-scalar.test
+++ b/test/Feature/TypedBuffer/64bit-scalar.test
@@ -33,7 +33,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: U0
     Format: Int64
diff --git a/test/Feature/TypedBuffer/64bit-vector.test b/test/Feature/TypedBuffer/64bit-vector.test
index 294f3afc8..ad0f4134e 100644
--- a/test/Feature/TypedBuffer/64bit-vector.test
+++ b/test/Feature/TypedBuffer/64bit-vector.test
@@ -33,7 +33,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: U0
     Format: Int64
diff --git a/test/Feature/TypedBuffer/GetDimensions.test b/test/Feature/TypedBuffer/GetDimensions.test
index d14d7a557..ac161de31 100644
--- a/test/Feature/TypedBuffer/GetDimensions.test
+++ b/test/Feature/TypedBuffer/GetDimensions.test
@@ -26,8 +26,9 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
 
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: A
     Format: Int32
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Gather.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Gather.test.yaml
index e4bdde612..49854bacf 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Gather.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Gather.test.yaml
@@ -48,7 +48,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTexClamp
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GatherCmp.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GatherCmp.test.yaml
index 04fcb4189..b37435331 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GatherCmp.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GatherCmp.test.yaml
@@ -46,7 +46,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTexLess
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GetDimensions.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GetDimensions.test.yaml
index a88971a57..d123d5f0d 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GetDimensions.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.GetDimensions.test.yaml
@@ -53,7 +53,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTex1
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Load.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Load.test.yaml
index abdf397fd..a01f8b107 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Load.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Load.test.yaml
@@ -27,7 +27,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTex
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.SampleGrad.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.SampleGrad.test.yaml
index 059aaa4db..447de0e2d 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.SampleGrad.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.SampleGrad.test.yaml
@@ -37,7 +37,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTex0
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Sampler.mips.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Sampler.mips.test.yaml
index 09eb420c3..6805edec1 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Sampler.mips.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.Sampler.mips.test.yaml
@@ -31,7 +31,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTexMagLinearMinPoint
diff --git a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.mips.OperatorIndex.test.yaml b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.mips.OperatorIndex.test.yaml
index bacd1d7f0..ad4a79e40 100644
--- a/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.mips.OperatorIndex.test.yaml
+++ b/test/Feature/Vk.SampledTextures/Vk.SampledTexture2D/Vk.SampledTexture2D.mips.OperatorIndex.test.yaml
@@ -17,7 +17,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: SampledTex
diff --git a/test/Feature/WaveOps/WaveActiveAllTrue.test b/test/Feature/WaveOps/WaveActiveAllTrue.test
index b38d6de01..8c1fff474 100644
--- a/test/Feature/WaveOps/WaveActiveAllTrue.test
+++ b/test/Feature/WaveOps/WaveActiveAllTrue.test
@@ -26,7 +26,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/Feature/WaveOps/WaveActiveAnyTrue.test b/test/Feature/WaveOps/WaveActiveAnyTrue.test
index 9c077c66b..ac8c92e48 100644
--- a/test/Feature/WaveOps/WaveActiveAnyTrue.test
+++ b/test/Feature/WaveOps/WaveActiveAnyTrue.test
@@ -25,7 +25,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/Feature/WaveOps/WaveActiveCountBits.test b/test/Feature/WaveOps/WaveActiveCountBits.test
index 29abb35ab..ac81a2f95 100644
--- a/test/Feature/WaveOps/WaveActiveCountBits.test
+++ b/test/Feature/WaveOps/WaveActiveCountBits.test
@@ -27,7 +27,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/Feature/WaveOps/WaveGetLaneIndex.test b/test/Feature/WaveOps/WaveGetLaneIndex.test
index c523fe72c..e18798a30 100644
--- a/test/Feature/WaveOps/WaveGetLaneIndex.test
+++ b/test/Feature/WaveOps/WaveGetLaneIndex.test
@@ -12,7 +12,8 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [2, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [2, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/Feature/WaveOps/WaveIsFirstLane.test b/test/Feature/WaveOps/WaveIsFirstLane.test
index c0489eefa..d3dc62cd1 100644
--- a/test/Feature/WaveOps/WaveIsFirstLane.test
+++ b/test/Feature/WaveOps/WaveIsFirstLane.test
@@ -28,7 +28,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/Tools/Offloader/BufferExact-error-array.test b/test/Tools/Offloader/BufferExact-error-array.test
index f88e1bbaf..5aa3b662e 100644
--- a/test/Tools/Offloader/BufferExact-error-array.test
+++ b/test/Tools/Offloader/BufferExact-error-array.test
@@ -15,7 +15,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: OutArray
     Format: Int32
diff --git a/test/Tools/Offloader/BufferExact-error.test b/test/Tools/Offloader/BufferExact-error.test
index 3594d869b..73bcc9f62 100644
--- a/test/Tools/Offloader/BufferExact-error.test
+++ b/test/Tools/Offloader/BufferExact-error.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: Int32
diff --git a/test/Tools/Offloader/BufferExact.test b/test/Tools/Offloader/BufferExact.test
index 2da32816b..55e27d4a7 100644
--- a/test/Tools/Offloader/BufferExact.test
+++ b/test/Tools/Offloader/BufferExact.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Int32
diff --git a/test/Tools/Offloader/BufferFloat-16bit.test b/test/Tools/Offloader/BufferFloat-16bit.test
index 5867aab02..f1b16ba40 100644
--- a/test/Tools/Offloader/BufferFloat-16bit.test
+++ b/test/Tools/Offloader/BufferFloat-16bit.test
@@ -21,7 +21,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float16
diff --git a/test/Tools/Offloader/BufferFloat-64bit.test b/test/Tools/Offloader/BufferFloat-64bit.test
index d702b536e..6904c5ef7 100644
--- a/test/Tools/Offloader/BufferFloat-64bit.test
+++ b/test/Tools/Offloader/BufferFloat-64bit.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float64
diff --git a/test/Tools/Offloader/BufferFloat-error-16bit.test b/test/Tools/Offloader/BufferFloat-error-16bit.test
index e688f6597..ba48c39c7 100644
--- a/test/Tools/Offloader/BufferFloat-error-16bit.test
+++ b/test/Tools/Offloader/BufferFloat-error-16bit.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float16
diff --git a/test/Tools/Offloader/BufferFloat-error-32bit.test b/test/Tools/Offloader/BufferFloat-error-32bit.test
index e7f5682a4..83c882719 100644
--- a/test/Tools/Offloader/BufferFloat-error-32bit.test
+++ b/test/Tools/Offloader/BufferFloat-error-32bit.test
@@ -14,7 +14,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float32
diff --git a/test/Tools/Offloader/BufferFloat-error-64bit.test b/test/Tools/Offloader/BufferFloat-error-64bit.test
index a0aac8f3c..6d5f65480 100644
--- a/test/Tools/Offloader/BufferFloat-error-64bit.test
+++ b/test/Tools/Offloader/BufferFloat-error-64bit.test
@@ -18,7 +18,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float64
diff --git a/test/Tools/Offloader/BufferFloat-error.test b/test/Tools/Offloader/BufferFloat-error.test
index 9476f52e4..29243bb03 100644
--- a/test/Tools/Offloader/BufferFloat-error.test
+++ b/test/Tools/Offloader/BufferFloat-error.test
@@ -16,7 +16,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float32
diff --git a/test/Tools/Offloader/BufferFloat.test b/test/Tools/Offloader/BufferFloat.test
index d7ec59c00..f953433fd 100644
--- a/test/Tools/Offloader/BufferFloat.test
+++ b/test/Tools/Offloader/BufferFloat.test
@@ -19,7 +19,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out1
     Format: Float32
diff --git a/test/Tools/Offloader/BufferFormats.test b/test/Tools/Offloader/BufferFormats.test
index a57c6877e..e88ca7c5d 100644
--- a/test/Tools/Offloader/BufferFormats.test
+++ b/test/Tools/Offloader/BufferFormats.test
@@ -22,7 +22,6 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In0
     Format: Int32
diff --git a/test/Tools/Offloader/BufferSizeValidation.test.yaml b/test/Tools/Offloader/BufferSizeValidation.test.yaml
index f586d68dc..6954c62c0 100644
--- a/test/Tools/Offloader/BufferSizeValidation.test.yaml
+++ b/test/Tools/Offloader/BufferSizeValidation.test.yaml
@@ -3,7 +3,6 @@
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: MismatchBuffer
diff --git a/test/Tools/Offloader/array-in-root-constant.test b/test/Tools/Offloader/array-in-root-constant.test
index a25ae8587..d6ca475a2 100644
--- a/test/Tools/Offloader/array-in-root-constant.test
+++ b/test/Tools/Offloader/array-in-root-constant.test
@@ -19,7 +19,8 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 2, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 2, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Tools/Offloader/array-in-root-descriptor.test b/test/Tools/Offloader/array-in-root-descriptor.test
index 7ad0fd31b..44722d0c8 100644
--- a/test/Tools/Offloader/array-in-root-descriptor.test
+++ b/test/Tools/Offloader/array-in-root-descriptor.test
@@ -18,7 +18,8 @@ void main() {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 2, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 2, 1]
 RuntimeSettings:
   DirectX:
     RootParameters:
diff --git a/test/Tools/Offloader/missing-counter-binding.test b/test/Tools/Offloader/missing-counter-binding.test
index a26f56c90..6c29fda73 100644
--- a/test/Tools/Offloader/missing-counter-binding.test
+++ b/test/Tools/Offloader/missing-counter-binding.test
@@ -12,7 +12,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: Hex32
diff --git a/test/UseCase/particle-life.test b/test/UseCase/particle-life.test
index 4d4bf505d..3aa8b0502 100644
--- a/test/UseCase/particle-life.test
+++ b/test/UseCase/particle-life.test
@@ -156,7 +156,8 @@ uint float_to_abgr(float3 rgb) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [32, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [32, 1, 1]
 Buffers:
   - Name: CONSTANTS
     Format: Int32
diff --git a/test/WaveOps/ComponentAccumulationDataRace.test b/test/WaveOps/ComponentAccumulationDataRace.test
index 5f0f4f33a..2b0756f36 100644
--- a/test/WaveOps/ComponentAccumulationDataRace.test
+++ b/test/WaveOps/ComponentAccumulationDataRace.test
@@ -32,7 +32,6 @@ void main(uint3 ThreadID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/ComponentDataRace.test b/test/WaveOps/ComponentDataRace.test
index 34895a5b0..43c8384aa 100644
--- a/test/WaveOps/ComponentDataRace.test
+++ b/test/WaveOps/ComponentDataRace.test
@@ -19,7 +19,6 @@ void main(uint3 ThreadID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: UInt32
diff --git a/test/WaveOps/GSFlag.test b/test/WaveOps/GSFlag.test
index a8009d2c4..ce9358b06 100644
--- a/test/WaveOps/GSFlag.test
+++ b/test/WaveOps/GSFlag.test
@@ -25,7 +25,6 @@ void main(uint GI : SV_GroupIndex) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Output
     Format: Int32
diff --git a/test/WaveOps/GroupMemoryBarrierWithGroupSync.test b/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
index a28c27ad7..36c5a9f18 100644
--- a/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
+++ b/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
@@ -46,7 +46,6 @@ void main(uint3 ThreadID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/GroupSharedMatrixElementExprComponentDataRace.test b/test/WaveOps/GroupSharedMatrixElementExprComponentDataRace.test
index d5a4a022f..fc57bd33c 100644
--- a/test/WaveOps/GroupSharedMatrixElementExprComponentDataRace.test
+++ b/test/WaveOps/GroupSharedMatrixElementExprComponentDataRace.test
@@ -41,7 +41,6 @@ void main(uint3 ThreadID : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/GroupSharedMatrixEltComponentDataRace.test b/test/WaveOps/GroupSharedMatrixEltComponentDataRace.test
index ed7498660..08f0f44be 100644
--- a/test/WaveOps/GroupSharedMatrixEltComponentDataRace.test
+++ b/test/WaveOps/GroupSharedMatrixEltComponentDataRace.test
@@ -26,7 +26,6 @@ void main(uint3 ThreadID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/GroupSharedMatrixRowComponentDataRace.test b/test/WaveOps/GroupSharedMatrixRowComponentDataRace.test
index 3c82575d5..703951945 100644
--- a/test/WaveOps/GroupSharedMatrixRowComponentDataRace.test
+++ b/test/WaveOps/GroupSharedMatrixRowComponentDataRace.test
@@ -25,7 +25,6 @@ void main(uint3 ThreadID : SV_GroupThreadID, uint FlatThreadID : SV_GroupIndex)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/QuadReadAcrossDiagonal.32.test b/test/WaveOps/QuadReadAcrossDiagonal.32.test
index 3261d4b64..d9a4d7c15 100644
--- a/test/WaveOps/QuadReadAcrossDiagonal.32.test
+++ b/test/WaveOps/QuadReadAcrossDiagonal.32.test
@@ -67,7 +67,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/QuadReadAcrossDiagonal.convergence.test b/test/WaveOps/QuadReadAcrossDiagonal.convergence.test
index ed651122b..c4dca0318 100644
--- a/test/WaveOps/QuadReadAcrossDiagonal.convergence.test
+++ b/test/WaveOps/QuadReadAcrossDiagonal.convergence.test
@@ -25,7 +25,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/QuadReadAcrossDiagonal.fp16.test b/test/WaveOps/QuadReadAcrossDiagonal.fp16.test
index 70958b40b..ae9dc7996 100644
--- a/test/WaveOps/QuadReadAcrossDiagonal.fp16.test
+++ b/test/WaveOps/QuadReadAcrossDiagonal.fp16.test
@@ -27,7 +27,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/QuadReadAcrossDiagonal.fp64.test b/test/WaveOps/QuadReadAcrossDiagonal.fp64.test
index b3203481e..2473aaa81 100644
--- a/test/WaveOps/QuadReadAcrossDiagonal.fp64.test
+++ b/test/WaveOps/QuadReadAcrossDiagonal.fp64.test
@@ -27,7 +27,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/QuadReadAcrossDiagonal.int16.test b/test/WaveOps/QuadReadAcrossDiagonal.int16.test
index 18b34e08e..f2a2215f2 100644
--- a/test/WaveOps/QuadReadAcrossDiagonal.int16.test
+++ b/test/WaveOps/QuadReadAcrossDiagonal.int16.test
@@ -48,7 +48,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/QuadReadAcrossDiagonal.int64.test b/test/WaveOps/QuadReadAcrossDiagonal.int64.test
index f6819ea34..09f7f658c 100644
--- a/test/WaveOps/QuadReadAcrossDiagonal.int64.test
+++ b/test/WaveOps/QuadReadAcrossDiagonal.int64.test
@@ -48,7 +48,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/QuadReadAcrossX.32.test b/test/WaveOps/QuadReadAcrossX.32.test
index 0e0ace848..b9ff6fe34 100644
--- a/test/WaveOps/QuadReadAcrossX.32.test
+++ b/test/WaveOps/QuadReadAcrossX.32.test
@@ -67,7 +67,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/QuadReadAcrossX.convergence.test b/test/WaveOps/QuadReadAcrossX.convergence.test
index e35637974..d906c38b2 100644
--- a/test/WaveOps/QuadReadAcrossX.convergence.test
+++ b/test/WaveOps/QuadReadAcrossX.convergence.test
@@ -25,7 +25,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/QuadReadAcrossX.fp16.test b/test/WaveOps/QuadReadAcrossX.fp16.test
index ec739a609..ee0435c53 100644
--- a/test/WaveOps/QuadReadAcrossX.fp16.test
+++ b/test/WaveOps/QuadReadAcrossX.fp16.test
@@ -27,7 +27,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/QuadReadAcrossX.fp64.test b/test/WaveOps/QuadReadAcrossX.fp64.test
index 0a67ba3a4..65c1fd09d 100644
--- a/test/WaveOps/QuadReadAcrossX.fp64.test
+++ b/test/WaveOps/QuadReadAcrossX.fp64.test
@@ -27,7 +27,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/QuadReadAcrossX.int16.test b/test/WaveOps/QuadReadAcrossX.int16.test
index 5b09c573e..d4bac24b8 100644
--- a/test/WaveOps/QuadReadAcrossX.int16.test
+++ b/test/WaveOps/QuadReadAcrossX.int16.test
@@ -48,7 +48,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/QuadReadAcrossX.int64.test b/test/WaveOps/QuadReadAcrossX.int64.test
index 63083413a..f23f233f4 100644
--- a/test/WaveOps/QuadReadAcrossX.int64.test
+++ b/test/WaveOps/QuadReadAcrossX.int64.test
@@ -48,7 +48,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/QuadReadAcrossY.32.test b/test/WaveOps/QuadReadAcrossY.32.test
index b5b6ca24e..3d57da15f 100644
--- a/test/WaveOps/QuadReadAcrossY.32.test
+++ b/test/WaveOps/QuadReadAcrossY.32.test
@@ -67,7 +67,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/QuadReadAcrossY.convergence.test b/test/WaveOps/QuadReadAcrossY.convergence.test
index 921a2ecec..029eb8e8f 100644
--- a/test/WaveOps/QuadReadAcrossY.convergence.test
+++ b/test/WaveOps/QuadReadAcrossY.convergence.test
@@ -25,7 +25,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/QuadReadAcrossY.fp16.test b/test/WaveOps/QuadReadAcrossY.fp16.test
index d2dfa4551..e0f76ec72 100644
--- a/test/WaveOps/QuadReadAcrossY.fp16.test
+++ b/test/WaveOps/QuadReadAcrossY.fp16.test
@@ -27,7 +27,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/QuadReadAcrossY.fp64.test b/test/WaveOps/QuadReadAcrossY.fp64.test
index 85da1e0f9..8bf126e53 100644
--- a/test/WaveOps/QuadReadAcrossY.fp64.test
+++ b/test/WaveOps/QuadReadAcrossY.fp64.test
@@ -27,7 +27,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/QuadReadAcrossY.int16.test b/test/WaveOps/QuadReadAcrossY.int16.test
index ba38fe5a2..947deb5cb 100644
--- a/test/WaveOps/QuadReadAcrossY.int16.test
+++ b/test/WaveOps/QuadReadAcrossY.int16.test
@@ -48,7 +48,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/QuadReadAcrossY.int64.test b/test/WaveOps/QuadReadAcrossY.int64.test
index 921db96d4..dc1ba9d66 100644
--- a/test/WaveOps/QuadReadAcrossY.int64.test
+++ b/test/WaveOps/QuadReadAcrossY.int64.test
@@ -48,7 +48,6 @@ void main(uint3 dtid : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WaveActiveAllEqual.32.test b/test/WaveOps/WaveActiveAllEqual.32.test
index f73461ba6..6f3250322 100644
--- a/test/WaveOps/WaveActiveAllEqual.32.test
+++ b/test/WaveOps/WaveActiveAllEqual.32.test
@@ -149,7 +149,6 @@ void main(uint3 TID : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WaveActiveAllEqual.Wave128.test b/test/WaveOps/WaveActiveAllEqual.Wave128.test
index b9c746b98..d0ff3a1aa 100644
--- a/test/WaveOps/WaveActiveAllEqual.Wave128.test
+++ b/test/WaveOps/WaveActiveAllEqual.Wave128.test
@@ -65,7 +65,6 @@ void main(uint3 TID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int32
diff --git a/test/WaveOps/WaveActiveAllEqual.Wave32.test b/test/WaveOps/WaveActiveAllEqual.Wave32.test
index 30c6e1def..5bcb60f79 100644
--- a/test/WaveOps/WaveActiveAllEqual.Wave32.test
+++ b/test/WaveOps/WaveActiveAllEqual.Wave32.test
@@ -65,7 +65,6 @@ void main(uint3 TID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int32
diff --git a/test/WaveOps/WaveActiveAllEqual.Wave64.test b/test/WaveOps/WaveActiveAllEqual.Wave64.test
index 756538423..e9b950632 100644
--- a/test/WaveOps/WaveActiveAllEqual.Wave64.test
+++ b/test/WaveOps/WaveActiveAllEqual.Wave64.test
@@ -65,7 +65,6 @@ void main(uint3 TID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In1
     Format: Int32
diff --git a/test/WaveOps/WaveActiveAllEqual.fp16.test b/test/WaveOps/WaveActiveAllEqual.fp16.test
index 880deaa24..7cab7cd9a 100644
--- a/test/WaveOps/WaveActiveAllEqual.fp16.test
+++ b/test/WaveOps/WaveActiveAllEqual.fp16.test
@@ -57,7 +57,6 @@ void main(uint3 TID : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   # Everything is 0xbc00, which is -1.0
   - Name: In
diff --git a/test/WaveOps/WaveActiveAllEqual.fp64.test b/test/WaveOps/WaveActiveAllEqual.fp64.test
index 80a422820..1c532a1a4 100644
--- a/test/WaveOps/WaveActiveAllEqual.fp64.test
+++ b/test/WaveOps/WaveActiveAllEqual.fp64.test
@@ -57,7 +57,6 @@ void main(uint3 TID : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WaveActiveAllEqual.int16.test b/test/WaveOps/WaveActiveAllEqual.int16.test
index defebf15b..52b607bae 100644
--- a/test/WaveOps/WaveActiveAllEqual.int16.test
+++ b/test/WaveOps/WaveActiveAllEqual.int16.test
@@ -106,7 +106,6 @@ void main(uint3 TID : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WaveActiveAllEqual.int64.test b/test/WaveOps/WaveActiveAllEqual.int64.test
index 555999540..715a98a37 100644
--- a/test/WaveOps/WaveActiveAllEqual.int64.test
+++ b/test/WaveOps/WaveActiveAllEqual.int64.test
@@ -106,7 +106,6 @@ void main(uint3 TID : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WaveActiveBallot.Modulo.Wave128.test b/test/WaveOps/WaveActiveBallot.Modulo.Wave128.test
index 6f7c22b46..ae31d5dc1 100644
--- a/test/WaveOps/WaveActiveBallot.Modulo.Wave128.test
+++ b/test/WaveOps/WaveActiveBallot.Modulo.Wave128.test
@@ -15,7 +15,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/WaveActiveBallot.Modulo.Wave32.test b/test/WaveOps/WaveActiveBallot.Modulo.Wave32.test
index ef4c1870d..20b0f1379 100644
--- a/test/WaveOps/WaveActiveBallot.Modulo.Wave32.test
+++ b/test/WaveOps/WaveActiveBallot.Modulo.Wave32.test
@@ -15,7 +15,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/WaveActiveBallot.Modulo.Wave64.test b/test/WaveOps/WaveActiveBallot.Modulo.Wave64.test
index 7de00a56f..5a96fe3c7 100644
--- a/test/WaveOps/WaveActiveBallot.Modulo.Wave64.test
+++ b/test/WaveOps/WaveActiveBallot.Modulo.Wave64.test
@@ -15,7 +15,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/WaveActiveBallot.Wave128.test b/test/WaveOps/WaveActiveBallot.Wave128.test
index 5b4420ae4..00ef33da1 100644
--- a/test/WaveOps/WaveActiveBallot.Wave128.test
+++ b/test/WaveOps/WaveActiveBallot.Wave128.test
@@ -24,7 +24,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/WaveActiveBallot.Wave32.test b/test/WaveOps/WaveActiveBallot.Wave32.test
index 5d769b382..185cd0bc8 100644
--- a/test/WaveOps/WaveActiveBallot.Wave32.test
+++ b/test/WaveOps/WaveActiveBallot.Wave32.test
@@ -22,7 +22,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/WaveActiveBallot.Wave64.test b/test/WaveOps/WaveActiveBallot.Wave64.test
index 5ef7e60a1..ce23e4005 100644
--- a/test/WaveOps/WaveActiveBallot.Wave64.test
+++ b/test/WaveOps/WaveActiveBallot.Wave64.test
@@ -22,7 +22,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Out
     Format: UInt32
diff --git a/test/WaveOps/WaveActiveBitAnd.convergence.test b/test/WaveOps/WaveActiveBitAnd.convergence.test
index 1397edbda..b2d0a098a 100644
--- a/test/WaveOps/WaveActiveBitAnd.convergence.test
+++ b/test/WaveOps/WaveActiveBitAnd.convergence.test
@@ -42,7 +42,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
 
diff --git a/test/WaveOps/WaveActiveBitAnd.int.test b/test/WaveOps/WaveActiveBitAnd.int.test
index 32b1711b0..0a54c5fb3 100644
--- a/test/WaveOps/WaveActiveBitAnd.int.test
+++ b/test/WaveOps/WaveActiveBitAnd.int.test
@@ -30,7 +30,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: In
diff --git a/test/WaveOps/WaveActiveBitAnd.int64.test b/test/WaveOps/WaveActiveBitAnd.int64.test
index 7a3c5e34f..a45af82ad 100644
--- a/test/WaveOps/WaveActiveBitAnd.int64.test
+++ b/test/WaveOps/WaveActiveBitAnd.int64.test
@@ -30,7 +30,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1,1,1]
 
 Buffers:
   - Name: In
diff --git a/test/WaveOps/WaveActiveBitOr.convergence.test b/test/WaveOps/WaveActiveBitOr.convergence.test
index 61e700240..692adf688 100644
--- a/test/WaveOps/WaveActiveBitOr.convergence.test
+++ b/test/WaveOps/WaveActiveBitOr.convergence.test
@@ -42,7 +42,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
 
diff --git a/test/WaveOps/WaveActiveBitOr.int.test b/test/WaveOps/WaveActiveBitOr.int.test
index ea10b9636..3d0dde882 100644
--- a/test/WaveOps/WaveActiveBitOr.int.test
+++ b/test/WaveOps/WaveActiveBitOr.int.test
@@ -32,7 +32,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: In
diff --git a/test/WaveOps/WaveActiveBitOr.int64.test b/test/WaveOps/WaveActiveBitOr.int64.test
index 7faca1032..e96df5cda 100644
--- a/test/WaveOps/WaveActiveBitOr.int64.test
+++ b/test/WaveOps/WaveActiveBitOr.int64.test
@@ -31,7 +31,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: In
diff --git a/test/WaveOps/WaveActiveBitXor.convergence.test b/test/WaveOps/WaveActiveBitXor.convergence.test
index 11a74f854..2e1f7c29e 100644
--- a/test/WaveOps/WaveActiveBitXor.convergence.test
+++ b/test/WaveOps/WaveActiveBitXor.convergence.test
@@ -42,7 +42,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
 
diff --git a/test/WaveOps/WaveActiveBitXor.int.test b/test/WaveOps/WaveActiveBitXor.int.test
index 365022dfe..7bdacd616 100644
--- a/test/WaveOps/WaveActiveBitXor.int.test
+++ b/test/WaveOps/WaveActiveBitXor.int.test
@@ -43,7 +43,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1,1,1]
 
 Buffers:
   - Name: In
diff --git a/test/WaveOps/WaveActiveBitXor.int64.test b/test/WaveOps/WaveActiveBitXor.int64.test
index 87369cde7..4040537c7 100644
--- a/test/WaveOps/WaveActiveBitXor.int64.test
+++ b/test/WaveOps/WaveActiveBitXor.int64.test
@@ -41,7 +41,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 
 Buffers:
   - Name: In
diff --git a/test/WaveOps/WaveActiveMax.fp16.test b/test/WaveOps/WaveActiveMax.fp16.test
index e8e10a244..e5adb268e 100644
--- a/test/WaveOps/WaveActiveMax.fp16.test
+++ b/test/WaveOps/WaveActiveMax.fp16.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/WaveActiveMax.fp32.test b/test/WaveOps/WaveActiveMax.fp32.test
index 9cc0eb222..7649607b0 100644
--- a/test/WaveOps/WaveActiveMax.fp32.test
+++ b/test/WaveOps/WaveActiveMax.fp32.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/WaveActiveMax.fp64.test b/test/WaveOps/WaveActiveMax.fp64.test
index 4de585b3d..2cd5a2928 100644
--- a/test/WaveOps/WaveActiveMax.fp64.test
+++ b/test/WaveOps/WaveActiveMax.fp64.test
@@ -43,7 +43,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WaveActiveMax.int16.test b/test/WaveOps/WaveActiveMax.int16.test
index a68f23511..ab4fb51bb 100644
--- a/test/WaveOps/WaveActiveMax.int16.test
+++ b/test/WaveOps/WaveActiveMax.int16.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WaveActiveMax.int32.test b/test/WaveOps/WaveActiveMax.int32.test
index 0ce7e5573..f6018b22d 100644
--- a/test/WaveOps/WaveActiveMax.int32.test
+++ b/test/WaveOps/WaveActiveMax.int32.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WaveActiveMax.int64.test b/test/WaveOps/WaveActiveMax.int64.test
index 7d42220be..6d885b58d 100644
--- a/test/WaveOps/WaveActiveMax.int64.test
+++ b/test/WaveOps/WaveActiveMax.int64.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WaveActiveMax.test b/test/WaveOps/WaveActiveMax.test
index a778c3c84..a422e6e03 100644
--- a/test/WaveOps/WaveActiveMax.test
+++ b/test/WaveOps/WaveActiveMax.test
@@ -17,7 +17,6 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: Nans
     Format: Float32
diff --git a/test/WaveOps/WaveActiveMin.fp16.test b/test/WaveOps/WaveActiveMin.fp16.test
index 591476cf8..308a079ef 100644
--- a/test/WaveOps/WaveActiveMin.fp16.test
+++ b/test/WaveOps/WaveActiveMin.fp16.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/WaveActiveMin.fp32.test b/test/WaveOps/WaveActiveMin.fp32.test
index 34a7525a8..eb28f7f5c 100644
--- a/test/WaveOps/WaveActiveMin.fp32.test
+++ b/test/WaveOps/WaveActiveMin.fp32.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/WaveActiveMin.fp64.test b/test/WaveOps/WaveActiveMin.fp64.test
index fb256d5dc..eff985fff 100644
--- a/test/WaveOps/WaveActiveMin.fp64.test
+++ b/test/WaveOps/WaveActiveMin.fp64.test
@@ -43,7 +43,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WaveActiveMin.int16.test b/test/WaveOps/WaveActiveMin.int16.test
index 6bd60b54f..9ad5bc72d 100644
--- a/test/WaveOps/WaveActiveMin.int16.test
+++ b/test/WaveOps/WaveActiveMin.int16.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WaveActiveMin.int32.test b/test/WaveOps/WaveActiveMin.int32.test
index c3d314742..38bc31add 100644
--- a/test/WaveOps/WaveActiveMin.int32.test
+++ b/test/WaveOps/WaveActiveMin.int32.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WaveActiveMin.int64.test b/test/WaveOps/WaveActiveMin.int64.test
index 4b6f475ec..c6743d015 100644
--- a/test/WaveOps/WaveActiveMin.int64.test
+++ b/test/WaveOps/WaveActiveMin.int64.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WaveActiveSum.convergence.test b/test/WaveOps/WaveActiveSum.convergence.test
index 38307cf38..d22a3f66d 100644
--- a/test/WaveOps/WaveActiveSum.convergence.test
+++ b/test/WaveOps/WaveActiveSum.convergence.test
@@ -21,7 +21,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/WaveOps/WaveActiveSum.fp16.test b/test/WaveOps/WaveActiveSum.fp16.test
index fc81bf8b3..af9f23ece 100644
--- a/test/WaveOps/WaveActiveSum.fp16.test
+++ b/test/WaveOps/WaveActiveSum.fp16.test
@@ -53,7 +53,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/WaveActiveSum.fp32.test b/test/WaveOps/WaveActiveSum.fp32.test
index dbd5b3de6..d60ea26a5 100644
--- a/test/WaveOps/WaveActiveSum.fp32.test
+++ b/test/WaveOps/WaveActiveSum.fp32.test
@@ -53,7 +53,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/WaveActiveSum.fp64.test b/test/WaveOps/WaveActiveSum.fp64.test
index 44250e237..0d8c97654 100644
--- a/test/WaveOps/WaveActiveSum.fp64.test
+++ b/test/WaveOps/WaveActiveSum.fp64.test
@@ -53,7 +53,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WaveActiveSum.int16.test b/test/WaveOps/WaveActiveSum.int16.test
index e754d9c2e..c6f21a619 100644
--- a/test/WaveOps/WaveActiveSum.int16.test
+++ b/test/WaveOps/WaveActiveSum.int16.test
@@ -99,7 +99,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WaveActiveSum.int32.test b/test/WaveOps/WaveActiveSum.int32.test
index 9a99984fd..68a749e38 100644
--- a/test/WaveOps/WaveActiveSum.int32.test
+++ b/test/WaveOps/WaveActiveSum.int32.test
@@ -98,7 +98,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WaveActiveSum.int64.test b/test/WaveOps/WaveActiveSum.int64.test
index 38715956b..f553484ad 100644
--- a/test/WaveOps/WaveActiveSum.int64.test
+++ b/test/WaveOps/WaveActiveSum.int64.test
@@ -99,7 +99,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WavePrefixCountBits.Wave128.test b/test/WaveOps/WavePrefixCountBits.Wave128.test
index 4ae7e7c66..684891175 100644
--- a/test/WaveOps/WavePrefixCountBits.Wave128.test
+++ b/test/WaveOps/WavePrefixCountBits.Wave128.test
@@ -18,7 +18,6 @@ void main(uint3 tid : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out1
     Format: UInt32
diff --git a/test/WaveOps/WavePrefixCountBits.Wave32.test b/test/WaveOps/WavePrefixCountBits.Wave32.test
index 6c3178951..64d1a91a7 100644
--- a/test/WaveOps/WavePrefixCountBits.Wave32.test
+++ b/test/WaveOps/WavePrefixCountBits.Wave32.test
@@ -18,7 +18,6 @@ void main(uint3 tid : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out1
     Format: UInt32
diff --git a/test/WaveOps/WavePrefixCountBits.Wave64.test b/test/WaveOps/WavePrefixCountBits.Wave64.test
index 415f95617..d0aa246e0 100644
--- a/test/WaveOps/WavePrefixCountBits.Wave64.test
+++ b/test/WaveOps/WavePrefixCountBits.Wave64.test
@@ -18,7 +18,6 @@ void main(uint3 tid : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:  
   - Name: Out1
     Format: UInt32
diff --git a/test/WaveOps/WavePrefixProduct.32.test b/test/WaveOps/WavePrefixProduct.32.test
index 82cf24fe9..1b23dab76 100644
--- a/test/WaveOps/WavePrefixProduct.32.test
+++ b/test/WaveOps/WavePrefixProduct.32.test
@@ -139,7 +139,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WavePrefixProduct.convergence.test b/test/WaveOps/WavePrefixProduct.convergence.test
index 9021c35d6..727d6915b 100644
--- a/test/WaveOps/WavePrefixProduct.convergence.test
+++ b/test/WaveOps/WavePrefixProduct.convergence.test
@@ -27,7 +27,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/WaveOps/WavePrefixProduct.fp16.test b/test/WaveOps/WavePrefixProduct.fp16.test
index 29b0e8044..f7390d73f 100644
--- a/test/WaveOps/WavePrefixProduct.fp16.test
+++ b/test/WaveOps/WavePrefixProduct.fp16.test
@@ -50,7 +50,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/WavePrefixProduct.fp64.test b/test/WaveOps/WavePrefixProduct.fp64.test
index 1578d2a5f..c03b3eabb 100644
--- a/test/WaveOps/WavePrefixProduct.fp64.test
+++ b/test/WaveOps/WavePrefixProduct.fp64.test
@@ -50,7 +50,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WavePrefixProduct.int16.test b/test/WaveOps/WavePrefixProduct.int16.test
index b1272e1db..99de29175 100644
--- a/test/WaveOps/WavePrefixProduct.int16.test
+++ b/test/WaveOps/WavePrefixProduct.int16.test
@@ -95,7 +95,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WavePrefixProduct.int64.test b/test/WaveOps/WavePrefixProduct.int64.test
index 6c17a0538..3b2773695 100644
--- a/test/WaveOps/WavePrefixProduct.int64.test
+++ b/test/WaveOps/WavePrefixProduct.int64.test
@@ -95,7 +95,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WavePrefixSum.32.test b/test/WaveOps/WavePrefixSum.32.test
index 179828874..2af0b7b2b 100644
--- a/test/WaveOps/WavePrefixSum.32.test
+++ b/test/WaveOps/WavePrefixSum.32.test
@@ -139,7 +139,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WavePrefixSum.convergence.test b/test/WaveOps/WavePrefixSum.convergence.test
index 99ebe509c..0844334a0 100644
--- a/test/WaveOps/WavePrefixSum.convergence.test
+++ b/test/WaveOps/WavePrefixSum.convergence.test
@@ -27,7 +27,6 @@ void main(uint3 threadID : SV_DispatchThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: value
     Format: Int32
diff --git a/test/WaveOps/WavePrefixSum.fp16.test b/test/WaveOps/WavePrefixSum.fp16.test
index abe0a9798..515ca316c 100644
--- a/test/WaveOps/WavePrefixSum.fp16.test
+++ b/test/WaveOps/WavePrefixSum.fp16.test
@@ -50,7 +50,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/WavePrefixSum.fp64.test b/test/WaveOps/WavePrefixSum.fp64.test
index 55839e22c..f5aa6f988 100644
--- a/test/WaveOps/WavePrefixSum.fp64.test
+++ b/test/WaveOps/WavePrefixSum.fp64.test
@@ -50,7 +50,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WavePrefixSum.int16.test b/test/WaveOps/WavePrefixSum.int16.test
index 9b8151d8b..67647a507 100644
--- a/test/WaveOps/WavePrefixSum.int16.test
+++ b/test/WaveOps/WavePrefixSum.int16.test
@@ -95,7 +95,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WavePrefixSum.int64.test b/test/WaveOps/WavePrefixSum.int64.test
index dab3a3b9f..bf676a239 100644
--- a/test/WaveOps/WavePrefixSum.int64.test
+++ b/test/WaveOps/WavePrefixSum.int64.test
@@ -95,7 +95,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [ 1, 1, 1 ]
 Buffers:
   - Name: In
     Format: Int64
diff --git a/test/WaveOps/WaveReadLaneAt.16.test b/test/WaveOps/WaveReadLaneAt.16.test
index 64709ef94..a1486c706 100644
--- a/test/WaveOps/WaveReadLaneAt.16.test
+++ b/test/WaveOps/WaveReadLaneAt.16.test
@@ -38,7 +38,8 @@ void main(uint32_t3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int16
diff --git a/test/WaveOps/WaveReadLaneAt.32.test b/test/WaveOps/WaveReadLaneAt.32.test
index aa758caf7..22c59d840 100644
--- a/test/WaveOps/WaveReadLaneAt.32.test
+++ b/test/WaveOps/WaveReadLaneAt.32.test
@@ -45,7 +45,8 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int32
diff --git a/test/WaveOps/WaveReadLaneAt.Bool.test b/test/WaveOps/WaveReadLaneAt.Bool.test
index 62ce833fe..6a1cb71dc 100644
--- a/test/WaveOps/WaveReadLaneAt.Bool.test
+++ b/test/WaveOps/WaveReadLaneAt.Bool.test
@@ -21,7 +21,8 @@ void main(uint32_t3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InBool
     Format: Bool
diff --git a/test/WaveOps/WaveReadLaneAt.Float.64.test b/test/WaveOps/WaveReadLaneAt.Float.64.test
index c29118ae7..cb28ddf62 100644
--- a/test/WaveOps/WaveReadLaneAt.Float.64.test
+++ b/test/WaveOps/WaveReadLaneAt.Float.64.test
@@ -21,7 +21,8 @@ void main(uint32_t3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InFloat
     Format: Float64
diff --git a/test/WaveOps/WaveReadLaneAt.Int.64.test b/test/WaveOps/WaveReadLaneAt.Int.64.test
index c7b93e667..6ea605228 100644
--- a/test/WaveOps/WaveReadLaneAt.Int.64.test
+++ b/test/WaveOps/WaveReadLaneAt.Int.64.test
@@ -29,7 +29,8 @@ void main(uint32_t3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int64
diff --git a/test/WaveOps/WaveReadLaneAt.divergent.test b/test/WaveOps/WaveReadLaneAt.divergent.test
index 93f029cae..e480a3ab0 100644
--- a/test/WaveOps/WaveReadLaneAt.divergent.test
+++ b/test/WaveOps/WaveReadLaneAt.divergent.test
@@ -26,7 +26,8 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [16, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [16, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int32
diff --git a/test/WaveOps/WaveReadLaneAt.index.test b/test/WaveOps/WaveReadLaneAt.index.test
index 2253eb122..9b8334a69 100644
--- a/test/WaveOps/WaveReadLaneAt.index.test
+++ b/test/WaveOps/WaveReadLaneAt.index.test
@@ -39,7 +39,8 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InInt
     Format: Int32
diff --git a/test/WaveOps/WaveReadLaneAt.mtx.test b/test/WaveOps/WaveReadLaneAt.mtx.test
index ba17d8a2c..6014748bc 100644
--- a/test/WaveOps/WaveReadLaneAt.mtx.test
+++ b/test/WaveOps/WaveReadLaneAt.mtx.test
@@ -20,7 +20,8 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InMatrix
     Format: Float32
diff --git a/test/WaveOps/WaveReadLaneAt.udt.test b/test/WaveOps/WaveReadLaneAt.udt.test
index 832b89141..2dcaa6ff1 100644
--- a/test/WaveOps/WaveReadLaneAt.udt.test
+++ b/test/WaveOps/WaveReadLaneAt.udt.test
@@ -21,7 +21,8 @@ void main(uint3 TID : SV_GroupThreadID) {
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [4, 1, 1]
+DispatchParameters:
+  DispatchGroupCount: [4, 1, 1]
 Buffers:
   - Name: InUDS
     Format: Hex32
diff --git a/test/WaveOps/WaveReadLaneFirst.128Threads.test b/test/WaveOps/WaveReadLaneFirst.128Threads.test
index 64d1afd7d..66a951004 100644
--- a/test/WaveOps/WaveReadLaneFirst.128Threads.test
+++ b/test/WaveOps/WaveReadLaneFirst.128Threads.test
@@ -33,7 +33,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WaveReadLaneFirst.fp16.test b/test/WaveOps/WaveReadLaneFirst.fp16.test
index 9173d417a..f510e8faa 100644
--- a/test/WaveOps/WaveReadLaneFirst.fp16.test
+++ b/test/WaveOps/WaveReadLaneFirst.fp16.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float16
diff --git a/test/WaveOps/WaveReadLaneFirst.fp32.test b/test/WaveOps/WaveReadLaneFirst.fp32.test
index e6f32eae0..f6be875a0 100644
--- a/test/WaveOps/WaveReadLaneFirst.fp32.test
+++ b/test/WaveOps/WaveReadLaneFirst.fp32.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float32
diff --git a/test/WaveOps/WaveReadLaneFirst.fp64.test b/test/WaveOps/WaveReadLaneFirst.fp64.test
index be362c284..6a610c17c 100644
--- a/test/WaveOps/WaveReadLaneFirst.fp64.test
+++ b/test/WaveOps/WaveReadLaneFirst.fp64.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Float64
diff --git a/test/WaveOps/WaveReadLaneFirst.int16.test b/test/WaveOps/WaveReadLaneFirst.int16.test
index 29f1b0ae1..d3fb40fa7 100644
--- a/test/WaveOps/WaveReadLaneFirst.int16.test
+++ b/test/WaveOps/WaveReadLaneFirst.int16.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int16
diff --git a/test/WaveOps/WaveReadLaneFirst.int32.test b/test/WaveOps/WaveReadLaneFirst.int32.test
index 29680fc85..a28f06069 100644
--- a/test/WaveOps/WaveReadLaneFirst.int32.test
+++ b/test/WaveOps/WaveReadLaneFirst.int32.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int32
diff --git a/test/WaveOps/WaveReadLaneFirst.int64.test b/test/WaveOps/WaveReadLaneFirst.int64.test
index f52ec1478..14b4756bf 100644
--- a/test/WaveOps/WaveReadLaneFirst.int64.test
+++ b/test/WaveOps/WaveReadLaneFirst.int64.test
@@ -44,7 +44,6 @@ void main(uint3 tid : SV_GroupThreadID)
 Shaders:
   - Stage: Compute
     Entry: main
-    DispatchSize: [1, 1, 1]
 Buffers:
   - Name: In
     Format: Int64