Addresses additional review comments.

Also restores file inadvertently committed source file changed for debugging.

Author: danbrown-amd

tools/clang/lib/AST/ExprConstant.cpp

@@ -9457,7 +9457,7 @@ bool Expr::isVulkanSpecConstantExpr(const ASTContext &Ctx,
   if (!V || !V->hasAttr<VKConstantIdAttr>())
     return false;
   if (const Expr *I = V->getAnyInitializer())
-    return I->isCXX11ConstantExpr(Ctx, Result);
+    return I->IgnoreParenCasts()->isCXX11ConstantExpr(Ctx, Result);
   return true;
 }
 

tools/clang/lib/SPIRV/SpirvEmitter.cpp

@@ -13750,11 +13750,7 @@ bool SpirvEmitter::processNumThreadsAttr(const FunctionDecl *decl) {
         return (unsigned)apsInt.getZExtValue();
       if (E->isVulkanSpecConstantExpr(astContext, &apValue) &&
           apValue.isInt()) {
-        Expr::EvalResult evalResult;
-        if (E->EvaluateAsRValue(evalResult, astContext) &&
-            !evalResult.HasSideEffects) {
-          return (unsigned)evalResult.Val.getInt().getZExtValue();
-        }
+        return apValue.getInt().getZExtValue();
       }
     }
     return 1U;
@@ -15839,15 +15835,16 @@ bool SpirvEmitter::spirvToolsValidate(std::vector<uint32_t> *mod,
 void SpirvEmitter::addDerivativeGroupExecutionMode() {
   assert(spvContext.isCS());
 
-  SpirvExecutionMode *numThreadsEm =
-      dyn_cast<SpirvExecutionMode>(spvBuilder.getModule()->findExecutionMode(
-          entryFunction, spv::ExecutionMode::LocalSize));
+  SpirvExecutionMode *numThreadsEm = dyn_cast_or_null<SpirvExecutionMode>(
+      spvBuilder.getModule()->findExecutionMode(entryFunction,
+                                                spv::ExecutionMode::LocalSize));
+  // If there is no LocalSize, there must be LocalSizeId.
   if (!numThreadsEm)
     return addDerivativeGroupExecutionModeId();
   auto numThreads = numThreadsEm->getParams();
 
   // The layout of the quad is determined by the numer of threads in each
-  // dimention. From the HLSL spec
+  // dimension. From the HLSL spec
   // (https://microsoft.github.io/DirectX-Specs/d3d/HLSL_SM_6_6_Derivatives.html):
   //
   // Where numthreads has an X value divisible by 4 and Y and Z are both 1, the
@@ -15885,7 +15882,7 @@ void SpirvEmitter::addDerivativeGroupExecutionModeId() {
   };
 
   // The layout of the quad is determined by the numer of threads in each
-  // dimention. From the HLSL spec
+  // dimension. From the HLSL spec
   // (https://microsoft.github.io/DirectX-Specs/d3d/HLSL_SM_6_6_Derivatives.html):
   //
   // Where numthreads has an X value divisible by 4 and Y and Z are both 1, the

tools/clang/test/CodeGenSPIRV/vk.spec-constant.attributes.derivative-group.hlsl

@@ -0,0 +1,35 @@
+// RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl %s -spirv 2>&1 | FileCheck -check-prefix=CHECK-LINEAR %s
+// RUN: %dxc -T cs_6_6 -E main -fspv-extension=SPV_NV_compute_shader_derivatives -fcgl -DQUADS %s -spirv 2>&1 | FileCheck -check-prefix=CHECK-QUADS %s
+
+// Note: validation disabled until NodePayloadAMDX pointers are allowed
+// as function arguments
+
+// CHECK-LINEAR: OpCapability ComputeDerivativeGroupLinearKHR
+// CHECK-LINEAR: OpExecutionMode %{{[^ ]*}} DerivativeGroupLinearKHR
+// CHECK-QUADS: OpCapability ComputeDerivativeGroupQuadsKHR
+// CHECK-QUADS: OpExecutionMode %{{[^ ]*}} DerivativeGroupQuadsKHR
+
+SamplerState ss : register(s2);
+SamplerComparisonState scs;
+
+RWStructuredBuffer<uint> o;
+Texture1D        <float>  t1;
+
+#ifdef QUADS
+[[vk::constant_id(0)]]
+const uint NumThreadsX = 2;
+[[vk::constant_id(1)]]
+const uint NumThreadsY = 2;
+#else
+[[vk::constant_id(0)]]
+const uint NumThreadsX = 24;
+[[vk::constant_id(1)]]
+const uint NumThreadsY = 1;
+#endif
+
+[numthreads(NumThreadsX,NumThreadsY,1)]
+void main(uint3 id : SV_GroupThreadID)
+{
+    o[0] = t1.Sample(ss, 1);
+}
+

tools/clang/unittests/HLSL/RewriterTest.cpp

@@ -26,7 +26,6 @@
 #include <vector>
 #include <string>
 #include <cassert>
-#include <iostream>
 #include <sstream>
 #include <algorithm>
 #ifdef _WIN32