[dawn][d3d] Use returned workgroup info for IR path

Update Dawn's D3D backends to use the workgroup information returned
by the Tint HLSL backend, instead of getting it from the inspector.

This is in preparation for moving more transforms into the IR backend.

Bug: 380043961
Change-Id: Iceef5f90e5e2a4393a5ec84d37f3a21ed388f1f0
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/219474
Reviewed-by: Antonio Maiorano <[email protected]>
Commit-Queue: James Price <[email protected]>

src/dawn/native/d3d/ShaderUtils.cpp

@@ -250,13 +250,6 @@ MaybeError TranslateToHLSL(d3d::HlslCompilationRequest r,
                                       &transformOutputs, nullptr));
     }
 
-    // Validate workgroup size after program runs transforms.
-    if (r.stage == SingleShaderStage::Compute) {
-        Extent3D _;
-        DAWN_TRY_ASSIGN(_, ValidateComputeStageWorkgroupSize(transformedProgram,
-                                                             kRemappedEntryPointName, r.limits));
-    }
-
     bool usesVertexIndex = false;
     bool usesInstanceIndex = false;
     if (r.stage == SingleShaderStage::Vertex) {
@@ -277,7 +270,25 @@ MaybeError TranslateToHLSL(d3d::HlslCompilationRequest r,
                         ir.Failure().reason.Str());
 
         result = tint::hlsl::writer::Generate(ir.Get(), r.tintOptions);
+
+        // Workgroup validation has to come after `Generate` because it may require overrides to
+        // have been substituted.
+        if (r.stage == SingleShaderStage::Compute) {
+            // Validate workgroup size and workgroup storage size.
+            Extent3D _;
+            DAWN_TRY_ASSIGN(
+                _, ValidateComputeStageWorkgroupSize(
+                       result->workgroup_info.x, result->workgroup_info.y, result->workgroup_info.z,
+                       result->workgroup_info.storage_size, r.limits));
+        }
     } else {
+        // Validate workgroup size after program runs transforms.
+        if (r.stage == SingleShaderStage::Compute) {
+            Extent3D _;
+            DAWN_TRY_ASSIGN(_, ValidateComputeStageWorkgroupSize(
+                                   transformedProgram, kRemappedEntryPointName, r.limits));
+        }
+
         result = tint::hlsl::writer::Generate(transformedProgram, r.tintOptions);
     }