Validate HitObject/NumCoherenceBits is not undef / Validate

CoherenceBits when NumBits != 0 / move tests to LitDXILValidation and
update them

Author: simoll

lib/DxilValidation/DxilValidation.cpp

@@ -1874,14 +1874,25 @@ static void ValidateDxilOperationCallInProfile(CallInst *CI,
 
   // Shader Execution Reordering
   case DXIL::OpCode::MaybeReorderThread: {
+    Value *HitObject = CI->getArgOperand(1);
     Value *CoherenceHintBits = CI->getArgOperand(2);
     Value *NumCoherenceHintBits = CI->getArgOperand(3);
 
-    if (isa<UndefValue>(CoherenceHintBits) ||
-        isa<UndefValue>(NumCoherenceHintBits)) {
+    if (isa<UndefValue>(HitObject))
+      ValCtx.EmitInstrError(CI, ValidationRule::InstrUndefHitObject);
+
+    if (isa<UndefValue>(NumCoherenceHintBits))
+      ValCtx.EmitInstrError(
+          CI, ValidationRule::InstrMayReorderThreadUndefCoherenceHintParam);
+
+    ConstantInt *NumCoherenceHintBitsConst =
+        dyn_cast<ConstantInt>(NumCoherenceHintBits);
+    const bool HasCoherenceHint =
+        NumCoherenceHintBitsConst &&
+        NumCoherenceHintBitsConst->getLimitedValue() != 0;
+    if (HasCoherenceHint && isa<UndefValue>(CoherenceHintBits))
       ValCtx.EmitInstrError(
           CI, ValidationRule::InstrMayReorderThreadUndefCoherenceHintParam);
-    }
   } break;
 
   case DXIL::OpCode::AtomicBinOp:

…ILValidation/ser_maybereorder_failing.ll …ILValidation/ser_maybereorder_failing.lltools/clang/test/DXILValidation/ser_maybereorder_failing.ll renamed to tools/clang/test/LitDXILValidation/ser_maybereorder_failing.ll tools/clang/test/DXILValidation/ser_maybereorder_failing.ll renamed to tools/clang/test/LitDXILValidation/ser_maybereorder_failing.ll

@@ -1,26 +1,36 @@
+; REQUIRES: dxil-1-9
 ; RUN: not %dxv %s 2>&1 | FileCheck %s
 
 target datalayout = "e-m:e-p:32:32-i1:32-i8:32-i16:32-i32:32-i64:64-f16:32-f32:32-f64:64-n8:16:32:64"
 target triple = "dxil-ms-dx"
 
 %dx.types.HitObject = type { i8* }
 
+; CHECK: Function: 
?main@@YAXXZ: error: Use of undef coherence hint or num coherence hint bits in MaybeReorderThread.
+; CHECK-NEXT: note: at 'call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 1, i32 undef)'
+
+; CHECK: Function: 
?main@@YAXXZ: error: Use of undef coherence hint or num coherence hint bits in MaybeReorderThread.
+; CHECK-NEXT: note: at 'call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 undef, i32 1)'
+
+; CHECK: Function: 
?main@@YAXXZ: error: HitObject is undef.
+; CHECK-NEXT: note: at 'call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject undef, i32 11, i32 0)'
+
+; CHECK: Validation failed.
+
 ; Function Attrs: nounwind
 define void @"\01?main@@YAXXZ"() #0 {
   %nop = call %dx.types.HitObject @dx.op.hitObject_MakeNop(i32 266)  ; HitObject_MakeNop()
 
-; Validate that coherence hint is not undef.
-  call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 undef, i32 0)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
-; CHECK: Function: 
?main@@YAXXZ: error: Use of undef coherence hint or num coherence hint bits in MaybeReorderThread.
-; CHECK-NEXT: note: at 'call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 undef, i32 0)'
+  ; Validate that hit object is not undef.
+  call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject undef, i32 11, i32 0)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
 
-; Validate that num coherence hint bits from LSB is not undef.
+  ; Validate that coherence hint is not undef while numCoherenceHintBitsFromLSB is not 0.
+  call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 undef, i32 1)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
+
+  ; Validate that num coherence hint bits from LSB is not undef.
   call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 1, i32 undef)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
-; CHECK-NEXT: Function: 
?main@@YAXXZ: error: Use of undef coherence hint or num coherence hint bits in MaybeReorderThread.
-; CHECK-NEXT: note: at 'call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 1, i32 undef)'
   ret void
 }
-; CHECK-NEXT: Validation failed.
 
 ; Function Attrs: nounwind readnone
 declare %dx.types.HitObject @dx.op.hitObject_MakeNop(i32) #1

…ILValidation/ser_maybereorder_passing.ll …ILValidation/ser_maybereorder_passing.lltools/clang/test/DXILValidation/ser_maybereorder_passing.ll renamed to tools/clang/test/LitDXILValidation/ser_maybereorder_passing.ll tools/clang/test/DXILValidation/ser_maybereorder_passing.ll renamed to tools/clang/test/LitDXILValidation/ser_maybereorder_passing.ll

@@ -1,3 +1,4 @@
+; REQUIRES: dxil-1-9
 ; RUN: %dxv %s | FileCheck %s
 
 ; CHECK: Validation succeeded.
@@ -11,7 +12,9 @@ target triple = "dxil-ms-dx"
 define void @"\01?main@@YAXXZ"() #0 {
   %nop = call %dx.types.HitObject @dx.op.hitObject_MakeNop(i32 266)  ; HitObject_MakeNop()
   call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 241, i32 3)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
-  call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject undef, i32 242, i32 7)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
+  
+  ; Coherence hint disabled, accept 'undef' coherence hint bits.
+  call void @dx.op.maybeReorderThread(i32 268, %dx.types.HitObject %nop, i32 undef, i32 0)  ; MaybeReorderThread(hitObject,coherenceHint,numCoherenceHintBitsFromLSB)
   ret void
 }
 

utils/hct/hctdb.py

@@ -7831,6 +7831,10 @@ def build_valrules(self):
         )
 
         # Shader Execution Reordering
+        self.add_valrule(
+            "Instr.UndefHitObject",
+            "HitObject is undef.",
+        )
         self.add_valrule(
             "Instr.MayReorderThreadUndefCoherenceHintParam",
             "Use of undef coherence hint or num coherence hint bits in MaybeReorderThread.",