Skip to content

Commit a4f8cf9

Browse files
simollsimoll
authored
[SER] Validate HitObject_FromRayQuery[WithAttrs] (#7402)
Validate: HitObject_FromRayQuery HitObject_FromRayQueryWithAttrs Rules: No `undef` inputs SER implementation tracker: #7214
1 parent 11e2895 commit a4f8cf9

File tree

2 files changed

+110
-0
lines changed

2 files changed

+110
-0
lines changed

‎lib/DxilValidation/DxilValidation.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,6 +2287,17 @@ static void ValidateDxilOperationCallInProfile(CallInst *CI,
22872287
break;
22882288
}
22892289

2290+
// Shader Execution Reordering - from ray query
2291+
case DXIL::OpCode::HitObject_FromRayQuery:
2292+
case DXIL::OpCode::HitObject_FromRayQueryWithAttrs: {
2293+
for (unsigned i = 1; i < CI->getNumOperands(); ++i) {
2294+
Value *Arg = CI->getArgOperand(i);
2295+
if (isa<UndefValue>(Arg))
2296+
ValCtx.EmitInstrError(CI, ValidationRule::InstrNoReadingUninitialized);
2297+
}
2298+
break;
2299+
}
2300+
22902301
case DXIL::OpCode::AtomicBinOp:
22912302
case DXIL::OpCode::AtomicCompareExchange: {
22922303
Type *pOverloadType = OP::GetOverloadType(Opcode, CI->getCalledFunction());

‎tools/clang/test/LitDXILValidation/ser_hitobject_fromrayquery_failing.ll

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
; REQUIRES: dxil-1-9
2+
; RUN: not %dxv %s 2>&1 | FileCheck %s
3+
4+
; CHECK: Function: ?main@@YAXXZ: error: Instructions should not read uninitialized value.
5+
; CHECK-NEXT: note: at '%attrsud3 = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 %rq, i32 16, %struct.CustomAttrs* nonnull undef)' in block '#0' of function '?main@@YAXXZ'.
6+
; CHECK-NEXT: Function: ?main@@YAXXZ: error: Instructions should not read uninitialized value.
7+
; CHECK-NEXT: note: at '%attrsud2 = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 %rq, i32 undef, %struct.CustomAttrs* nonnull %attra)' in block '#0' of function '?main@@YAXXZ'.
8+
; CHECK-NEXT: Function: ?main@@YAXXZ: error: Instructions should not read uninitialized value.
9+
; CHECK-NEXT: note: at '%attrsud1 = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 undef, i32 16, %struct.CustomAttrs* nonnull %attra)' in block '#0' of function '?main@@YAXXZ'.
10+
; CHECK-NEXT: Function: ?main@@YAXXZ: error: Instructions should not read uninitialized value.
11+
; CHECK-NEXT: note: at '%ud1 = call %dx.types.HitObject @dx.op.hitObject_FromRayQuery(i32 263, i32 undef)' in block '#0' of function '?main@@YAXXZ'.
12+
; CHECK-NEXT: Validation failed.
13+
14+
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"
15+
target triple = "dxil-ms-dx"
16+
17+
%dx.types.Handle = type { i8* }
18+
%struct.Payload = type { <3 x float> }
19+
%struct.CustomAttrs = type { float, float }
20+
%dx.types.ResourceProperties = type { i32, i32 }
21+
%dx.types.HitObject = type { i8* }
22+
%struct.RaytracingAccelerationStructure = type { i32 }
23+
24+
@"\01?RTAS@@3URaytracingAccelerationStructure@@A" = external constant %dx.types.Handle, align 4
25+
26+
; Function Attrs: nounwind
27+
declare void @llvm.lifetime.start(i64, i8* nocapture) #0
28+
29+
; Function Attrs: nounwind
30+
declare void @llvm.lifetime.end(i64, i8* nocapture) #0
31+
32+
; Function Attrs: nounwind
33+
define void @"\01?main@@YAXXZ"() #0 {
34+
%ldh = load %dx.types.Handle, %dx.types.Handle* @"\01?RTAS@@3URaytracingAccelerationStructure@@A", align 4
35+
%attra = alloca %struct.CustomAttrs, align 4
36+
%rq = call i32 @dx.op.allocateRayQuery(i32 178, i32 5) ; AllocateRayQuery(constRayFlags)
37+
%createh = call %dx.types.Handle @dx.op.createHandleForLib.dx.types.Handle(i32 160, %dx.types.Handle %ldh) ; CreateHandleForLib(Resource)
38+
%annoth = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %createh, %dx.types.ResourceProperties { i32 16, i32 0 }) ; AnnotateHandle(res,props) resource: RTAccelerationStructure
39+
call void @dx.op.rayQuery_TraceRayInline(i32 179, i32 %rq, %dx.types.Handle %annoth, i32 0, i32 255, float 0.000000e+00, float 0.000000e+00, float 0.000000e+00, float 0.000000e+00, float 1.000000e+00, float 0.000000e+00, float 0.000000e+00, float 9.999000e+03) ; RayQuery_TraceRayInline(rayQueryHandle,accelerationStructure,rayFlags,instanceInclusionMask,origin_X,origin_Y,origin_Z,tMin,direction_X,direction_Y,direction_Z,tMax)
40+
41+
%ok = call %dx.types.HitObject @dx.op.hitObject_FromRayQuery(i32 263, i32 %rq) ; HitObject_FromRayQuery(rayQueryHandle)
42+
%ud1 = call %dx.types.HitObject @dx.op.hitObject_FromRayQuery(i32 263, i32 undef) ; HitObject_FromRayQuery(rayQueryHandle)
43+
44+
%attrsok = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 %rq, i32 16, %struct.CustomAttrs* nonnull %attra) ; HitObject_FromRayQueryWithAttrs(rayQueryHandle,HitKind,CommittedAttribs)
45+
%attrsud1 = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 undef, i32 16, %struct.CustomAttrs* nonnull %attra) ; HitObject_FromRayQueryWithAttrs(rayQueryHandle,HitKind,CommittedAttribs)
46+
%attrsud2 = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 %rq, i32 undef, %struct.CustomAttrs* nonnull %attra) ; HitObject_FromRayQueryWithAttrs(rayQueryHandle,HitKind,CommittedAttribs)
47+
%attrsud3 = call %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32 264, i32 %rq, i32 16, %struct.CustomAttrs* nonnull undef) ; HitObject_FromRayQueryWithAttrs(rayQueryHandle,HitKind,CommittedAttribs)
48+
49+
ret void
50+
}
51+
52+
; Function Attrs: nounwind
53+
declare i32 @dx.op.allocateRayQuery(i32, i32) #0
54+
55+
; Function Attrs: nounwind
56+
declare void @dx.op.rayQuery_TraceRayInline(i32, i32, %dx.types.Handle, i32, i32, float, float, float, float, float, float, float, float) #0
57+
58+
; Function Attrs: nounwind readonly
59+
declare %dx.types.HitObject @dx.op.hitObject_FromRayQueryWithAttrs.struct.CustomAttrs(i32, i32, i32, %struct.CustomAttrs*) #1
60+
61+
; Function Attrs: nounwind readonly
62+
declare %dx.types.HitObject @dx.op.hitObject_FromRayQuery(i32, i32) #1
63+
64+
; Function Attrs: nounwind readnone
65+
declare %dx.types.Handle @dx.op.annotateHandle(i32, %dx.types.Handle, %dx.types.ResourceProperties) #2
66+
67+
; Function Attrs: nounwind readonly
68+
declare %dx.types.Handle @dx.op.createHandleForLib.dx.types.Handle(i32, %dx.types.Handle) #1
69+
70+
attributes #0 = { nounwind }
71+
attributes #1 = { nounwind readonly }
72+
attributes #2 = { nounwind readnone }
73+
74+
!dx.version = !{!0}
75+
!dx.valver = !{!0}
76+
!dx.shaderModel = !{!1}
77+
!dx.resources = !{!2}
78+
!dx.typeAnnotations = !{!6}
79+
!dx.dxrPayloadAnnotations = !{!10}
80+
!dx.entryPoints = !{!13, !15}
81+
82+
!0 = !{i32 1, i32 9}
83+
!1 = !{!"lib", i32 6, i32 9}
84+
!2 = !{!3, null, null, null}
85+
!3 = !{!4}
86+
!4 = !{i32 0, %struct.RaytracingAccelerationStructure* bitcast (%dx.types.Handle* @"\01?RTAS@@3URaytracingAccelerationStructure@@A" to %struct.RaytracingAccelerationStructure*), !"RTAS", i32 -1, i32 -1, i32 1, i32 16, i32 0, !5}
87+
!5 = !{i32 0, i32 4}
88+
!6 = !{i32 1, void ()* @"\01?main@@YAXXZ", !7}
89+
!7 = !{!8}
90+
!8 = !{i32 1, !9, !9}
91+
!9 = !{}
92+
!10 = !{i32 0, %struct.Payload undef, !11}
93+
!11 = !{!12}
94+
!12 = !{i32 0, i32 8210}
95+
!13 = !{null, !"", null, !2, !14}
96+
!14 = !{i32 0, i64 33554432}
97+
!15 = !{void ()* @"\01?main@@YAXXZ", !"\01?main@@YAXXZ", null, null, !16}
98+
!16 = !{i32 8, i32 7, i32 5, !17}
99+
!17 = !{i32 0}

0 commit comments

Comments
 (0)