Remove integer variants of SampleCmp (microsoft#5930)

Disable integer resource for SampleCmp/CmpLevel/CmpLevelZero.

Fixes microsoft#5564

Author: python3kgae

lib/DXIL/DxilOperations.cpp

@@ -685,7 +685,7 @@ const OP::OpCodeProperty OP::m_OpCodeProps[(unsigned)OP::OpCode::NumOpCodes] = {
         "SampleCmp",
         OCC::SampleCmp,
         "sampleCmp",
-        {false, true, true, false, false, false, true, true, false, false,
+        {false, true, true, false, false, false, false, false, false, false,
          false},
         Attribute::ReadOnly,
     },
@@ -694,7 +694,7 @@ const OP::OpCodeProperty OP::m_OpCodeProps[(unsigned)OP::OpCode::NumOpCodes] = {
         "SampleCmpLevelZero",
         OCC::SampleCmpLevelZero,
         "sampleCmpLevelZero",
-        {false, true, true, false, false, false, true, true, false, false,
+        {false, true, true, false, false, false, false, false, false, false,
          false},
         Attribute::ReadOnly,
     },

lib/HLSL/DxilValidation.cpp

@@ -975,7 +975,7 @@ static void ValidateSampleInst(CallInst *CI, Value *srvHandle,
   isSampleCompTy |= compTy == DXIL::ComponentType::SNormF16;
   isSampleCompTy |= compTy == DXIL::ComponentType::UNormF16;
   const ShaderModel *pSM = ValCtx.DxilMod.GetShaderModel();
-  if (pSM->IsSM67Plus()) {
+  if (pSM->IsSM67Plus() && !IsSampleC) {
     isSampleCompTy |= compTy == DXIL::ComponentType::I16;
     isSampleCompTy |= compTy == DXIL::ComponentType::U16;
     isSampleCompTy |= compTy == DXIL::ComponentType::I32;

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -5884,6 +5884,12 @@ bool HLSLExternalSource::IsValidObjectElement(LPCSTR tableName,
       return true;
     // 6.7 adds UINT sampler support
     if (IS_BASIC_UINT(kind) || IS_BASIC_SINT(kind)) {
+      bool IsSampleC = (op == IntrinsicOp::MOP_SampleCmp ||
+                        op == IntrinsicOp::MOP_SampleCmpLevel ||
+                        op == IntrinsicOp::MOP_SampleCmpLevelZero);
+      // SampleCmp* cannot support integer resource.
+      if (IsSampleC)
+        return false;
       const auto *SM = hlsl::ShaderModel::GetByName(
           m_sema->getLangOpts().HLSLProfile.c_str());
       return SM->IsSM67Plus();

tools/clang/test/HLSLFileCheck/hlsl/objects/Texture/sampleInteger.hlsl

@@ -1,50 +1,41 @@
-// RUN: %dxc -T ps_6_7 %s -DTYPE=uint | FileCheck %s
-// RUN: %dxc -T ps_6_7 %s -DTYPE=int | FileCheck %s
+// RUN: %dxc -T ps_6_7 %s -DSKIP_SAMPLE_CMP -DTYPE=uint | FileCheck %s
+// RUN: %dxc -T ps_6_7 %s -DSKIP_SAMPLE_CMP -DTYPE=int | FileCheck %s
 // RUN: %dxc -T ps_6_6 %s -DTYPE=uint | FileCheck %s -check-prefix=CHKFAIL
-// RUN: %dxc -T ps_6_7 %s -DTYPE=uint16_t -enable-16bit-types | FileCheck %s -check-prefix=CHECK16
-// RUN: %dxc -T ps_6_7 %s -DTYPE=int16_t -enable-16bit-types | FileCheck %s -check-prefix=CHECK16
+// RUN: %dxc -T ps_6_7 %s -DSKIP_SAMPLE_CMP -DTYPE=uint16_t -enable-16bit-types | FileCheck %s -check-prefix=CHECK16
+// RUN: %dxc -T ps_6_7 %s -DSKIP_SAMPLE_CMP -DTYPE=int16_t -enable-16bit-types | FileCheck %s -check-prefix=CHECK16
 // RUN: %dxc -T ps_6_6 %s -DTYPE=uint16_t -enable-16bit-types | FileCheck %s -check-prefix=CHKFAIL
 
 SamplerState g_samp : register(s0);
 SamplerComparisonState g_sampCmp : register(s01);
 Texture2D<TYPE> g_tex0 : register(t0);
 
-// CHECK: Note: shader requires additional functionality:
-// CHECK-NEXT: Advanced Texture Ops
 // CHECK: call %dx.types.ResRet.i32 @dx.op.sample.i32(i32 60
 // CHECK: call %dx.types.ResRet.i32 @dx.op.sampleBias.i32(i32 61
 // CHECK: call %dx.types.ResRet.i32 @dx.op.sampleLevel.i32(i32 62
 // CHECK: call %dx.types.ResRet.i32 @dx.op.sampleGrad.i32(i32 63
-// CHECK: call %dx.types.ResRet.f32 @dx.op.sampleCmp.f32(i32 64
-// CHECK: call %dx.types.ResRet.f32 @dx.op.sampleCmpLevelZero.f32(i32 65
-// CHECK: call %dx.types.ResRet.f32 @dx.op.sampleCmpLevel.f32(i32 224
 
-// CHECK16: Note: shader requires additional functionality:
-// CHECK16: Advanced Texture Ops
 // CHECK16: call %dx.types.ResRet.i16 @dx.op.sample.i16(i32 60
 // CHECK16: call %dx.types.ResRet.i16 @dx.op.sampleBias.i16(i32 61
 // CHECK16: call %dx.types.ResRet.i16 @dx.op.sampleLevel.i16(i32 62
 // CHECK16: call %dx.types.ResRet.i16 @dx.op.sampleGrad.i16(i32 63
-// CHECK16: call %dx.types.ResRet.f32 @dx.op.sampleCmp.f32(i32 64
-// CHECK16: call %dx.types.ResRet.f32 @dx.op.sampleCmpLevelZero.f32(i32 65
-// CHECK16: call %dx.types.ResRet.f32 @dx.op.sampleCmpLevel.f32(i32 224
 
 // CHKFAIL: error: cannot Sample from resource containing
 // CHKFAIL: error: cannot SampleBias from resource containing
 // CHKFAIL: error: cannot SampleLevel from resource containing
 // CHKFAIL: error: cannot SampleGrad from resource containing
 // CHKFAIL: error: cannot SampleCmp from resource containing
 // CHKFAIL: error: cannot SampleCmpLevelZero from resource containing
+// CHKFAIL: error: cannot SampleCmpLevel from resource containing
 
 float4 main(float2 coord : TEXCOORD0) : SV_Target {
   float res = 0;     
   res = g_tex0.Sample(g_samp, coord);
   res += g_tex0.SampleBias(g_samp, coord, 0.0);
   res += g_tex0.SampleLevel(g_samp, coord, 0.0);
   res += g_tex0.SampleGrad(g_samp, coord, 0.0, 0.0);
+#ifndef SKIP_SAMPLE_CMP
   res += g_tex0.SampleCmp(g_sampCmp, coord, 0.0);
   res += g_tex0.SampleCmpLevelZero(g_sampCmp, coord, 0.0);
-#if  __SHADER_TARGET_MAJOR > 6 || (__SHADER_TARGET_MAJOR == 6 && __SHADER_TARGET_MINOR >= 7)
   res += g_tex0.SampleCmpLevel(g_sampCmp, coord, 0.0, 0.0);
 #endif
   return res;

utils/hct/hctdb.py

@@ -1891,7 +1891,7 @@ def UFI(name, **mappings):
             next_op_idx,
             "SampleCmp",
             "samples a texture and compares a single component against the specified comparison value",
-            "hfwi",
+            "hf",
             "ro",
             [
                 db_dxil_param(
@@ -1936,7 +1936,7 @@ def UFI(name, **mappings):
             next_op_idx,
             "SampleCmpLevelZero",
             "samples a texture and compares a single component against the specified comparison value",
-            "hfwi",
+            "hf",
             "ro",
             [
                 db_dxil_param(