Update traceinvoke test

Author: simoll

tools/clang/test/LitDXILValidation/ser_hitobject_traceinvoke_passing.ll

@@ -1,4 +1,5 @@
-; RUN: %dxv %s | FileCheck %s
+; REQUIRES: dxil-1-9
+; RUN: %dxv %s 2>&1 | FileCheck %s
 
 ; CHECK: Validation succeeded.
 
@@ -15,20 +16,12 @@ target triple = "dxil-ms-dx"
 
 ; Function Attrs: nounwind
 define void @"\01?main@@YAXXZ"() #0 {
-  %payload = alloca %struct.Payload, align 4
-  %rtas = load %dx.types.Handle, %dx.types.Handle* @"\01?RTAS@@3URaytracingAccelerationStructure@@A", align 4
-
-  ; Setup acceleration structure handle
-  %handle = call %dx.types.Handle @dx.op.createHandleForLib.dx.types.Handle(i32 160, %dx.types.Handle %rtas)  ; CreateHandleForLib(Resource)
-  %annotatedHandle = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %handle, %dx.types.ResourceProperties { i32 16, i32 0 })  ; AnnotateHandle(res,props)  resource: RTAccelerationStructure
-
-  ; Test HitObject_TraceRay (opcode 262)
-  %r262 = call %dx.types.HitObject @dx.op.hitObject_TraceRay.struct.Payload(i32 262, %dx.types.Handle %annotatedHandle, i32 513, i32 1, i32 2, i32 4, i32 0, float 0.000000e+00, float 1.000000e+00, float 2.000000e+00, float 3.000000e+00, float 4.000000e+00, float 5.000000e+00, float 6.000000e+00, float 7.000000e+00, %struct.Payload* nonnull %payload)  ; HitObject_TraceRay(accelerationStructure,rayFlags,instanceInclusionMask,rayContributionToHitGroupIndex,multiplierForGeometryContributionToHitGroupIndex,missShaderIndex,Origin_X,Origin_Y,Origin_Z,TMin,Direction_X,Direction_Y,Direction_Z,TMax,payload)
-
-  ; Test HitObject_Invoke (opcode 267)
-  %nop = call %dx.types.HitObject @dx.op.hitObject_MakeNop(i32 266)  ; HitObject_MakeNop()
-  call void @dx.op.hitObject_Invoke.struct.Payload(i32 267, %dx.types.HitObject %r262, %struct.Payload* nonnull %payload)  ; HitObject_Invoke(hitObject,payload)
-
+  %1 = load %dx.types.Handle, %dx.types.Handle* @"\01?RTAS@@3URaytracingAccelerationStructure@@A", align 4
+  %2 = alloca %struct.Payload, align 4
+  %3 = call %dx.types.Handle @dx.op.createHandleForLib.dx.types.Handle(i32 160, %dx.types.Handle %1)  ; CreateHandleForLib(Resource)
+  %4 = call %dx.types.Handle @dx.op.annotateHandle(i32 216, %dx.types.Handle %3, %dx.types.ResourceProperties { i32 16, i32 0 })  ; AnnotateHandle(res,props)  resource: RTAccelerationStructure
+  %5 = call %dx.types.HitObject @dx.op.hitObject_TraceRay.struct.Payload(i32 262, %dx.types.Handle %4, i32 513, i32 1, i32 2, i32 4, i32 0, float 0.000000e+00, float 1.000000e+00, float 2.000000e+00, float 3.000000e+00, float 4.000000e+00, float 5.000000e+00, float 6.000000e+00, float 7.000000e+00, %struct.Payload* nonnull %2)  ; HitObject_TraceRay(accelerationStructure,rayFlags,instanceInclusionMask,rayContributionToHitGroupIndex,multiplierForGeometryContributionToHitGroupIndex,missShaderIndex,Origin_X,Origin_Y,Origin_Z,TMin,Direction_X,Direction_Y,Direction_Z,TMax,payload)
+  call void @dx.op.hitObject_Invoke.struct.Payload(i32 267, %dx.types.HitObject %5, %struct.Payload* nonnull %2)  ; HitObject_Invoke(hitObject,payload)
   ret void
 }
 
@@ -38,9 +31,6 @@ declare %dx.types.HitObject @dx.op.hitObject_TraceRay.struct.Payload(i32, %dx.ty
 ; Function Attrs: nounwind
 declare void @dx.op.hitObject_Invoke.struct.Payload(i32, %dx.types.HitObject, %struct.Payload*) #0
 
-; Function Attrs: nounwind readnone
-declare %dx.types.HitObject @dx.op.hitObject_MakeNop(i32) #1
-
 ; Function Attrs: nounwind readnone
 declare %dx.types.Handle @dx.op.annotateHandle(i32, %dx.types.Handle, %dx.types.ResourceProperties) #1
 
@@ -51,24 +41,28 @@ attributes #0 = { nounwind }
 attributes #1 = { nounwind readnone }
 attributes #2 = { nounwind readonly }
 
-!0 = !{i32 1, i32 9}
-!1 = !{!"lib", i32 6, i32 9}
-!2 = !{!3, null, null, null}
-!3 = !{!4}
-!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}
-!5 = !{i32 0, i32 4}
-!6 = !{i32 1, void ()* @"\01?main@@YAXXZ", !7}
-!7 = !{!8}
-!8 = !{i32 1, !5, !5}
-!9 = !{null, !"", null, !2, !10}
-!10 = !{i32 0, i64 33554432}
-!11 = !{void ()* @"\01?main@@YAXXZ", !"\01?main@@YAXXZ", null, null, !12}
-!12 = !{i32 8, i32 7, i32 5, !13}
-!13 = !{i32 0}
-
 !dx.version = !{!0}
 !dx.valver = !{!0}
 !dx.shaderModel = !{!1}
 !dx.resources = !{!2}
-!dx.typeAnnotations = !{!6}
-!dx.entryPoints = !{!9, !11}
+!dx.typeAnnotations = !{!3}
+!dx.dxrPayloadAnnotations = !{!4}
+!dx.entryPoints = !{!5, !6}
+
+!0 = !{i32 1, i32 9}
+!1 = !{!"lib", i32 6, i32 9}
+!2 = !{!7, null, null, null}
+!3 = !{i32 1, void ()* @"\01?main@@YAXXZ", !8}
+!4 = !{i32 0, %struct.Payload undef, !9}
+!5 = !{null, !"", null, !2, null}
+!6 = !{void ()* @"\01?main@@YAXXZ", !"\01?main@@YAXXZ", null, null, !10}
+!7 = !{!11}
+!8 = !{!12}
+!9 = !{!13}
+!10 = !{i32 8, i32 7, i32 5, !14}
+!11 = !{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, !15}
+!12 = !{i32 1, !16, !16}
+!13 = !{i32 0, i32 8210}
+!14 = !{i32 0}
+!15 = !{i32 0, i32 4}
+!16 = !{}