Unify RayInfo between sync and async raytracing

Unify RayInfo between sync and async raytracing

Author: jaladreips

IGC/AdaptorCommon/RayTracing/TraceRayInlineLoweringPass.cpp

@@ -653,6 +653,7 @@ void TraceRayInlineLoweringPass::LowerRayInfo(Function& F)
         builder.SetInsertPoint(I);
 
         unsigned int infoKind = I->getInfoKind();
+        auto shaderTy = I->isCommitted() ? CallableShaderTypeMD::ClosestHit : CallableShaderTypeMD::AnyHit;
         auto* const ShadowMemStackPointer = getShMemRayQueryRTStack(builder, I->getQueryObjIndex());
 
         switch (infoKind)
@@ -684,25 +685,14 @@ void TraceRayInlineLoweringPass::LowerRayInfo(Function& F)
         }
         case RAY_T_CURRENT:
         {
-            Value* rayT = builder.getRayTCurrent(ShadowMemStackPointer, CallableShaderTypeMD::ClosestHit);
+            Value* rayT = builder.getRayTCurrent(ShadowMemStackPointer, shaderTy);
             I->replaceAllUsesWith(rayT);
             break;
         }
-        case CANDIDATE_TRIANGLE_T_CURRENT:
-        {
-            Value* rayT = builder.getRayTCurrent(ShadowMemStackPointer, CallableShaderTypeMD::AnyHit);
-            I->replaceAllUsesWith(rayT);
-            break;
-        }
-        case COMMITTED_TRIANGLE_FRONT_FACE:
-        case CANDIDATE_TRIANGLE_FRONT_FACE:
+        case TRIANGLE_FRONT_FACE:
         case CANDIDATE_PROCEDURAL_PRIM_NON_OPAQUE: // Procedural Primitive Opaque Info is stored in Front Face bit
         {
-            IGC::CallableShaderTypeMD ShaderTy =
-                infoKind == COMMITTED_TRIANGLE_FRONT_FACE ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
-            Value* frontFaceBit = builder.getIsFrontFace(ShadowMemStackPointer, ShaderTy);
+            Value* frontFaceBit = builder.getIsFrontFace(ShadowMemStackPointer, shaderTy);
             if (infoKind == CANDIDATE_PROCEDURAL_PRIM_NON_OPAQUE)
             {
                 frontFaceBit = builder.CreateICmpEQ(
@@ -711,132 +701,73 @@ void TraceRayInlineLoweringPass::LowerRayInfo(Function& F)
             I->replaceAllUsesWith(frontFaceBit);
             break;
         }
-        case COMMITTED_GEOMETRY_INDEX:
-        case CANDIDATE_GEOMETRY_INDEX:
+        case GEOMETRY_INDEX:
         {
             bool specialPattern = false;
-            if (infoKind == COMMITTED_GEOMETRY_INDEX && IGC_GET_FLAG_VALUE(ForceRTShortCircuitingOR))
+            if (I->isCommitted() && IGC_GET_FLAG_VALUE(ForceRTShortCircuitingOR))
             {
                 specialPattern = forceShortCurcuitingOR_CommittedGeomIdx(builder, I);
             }
 
-            IGC::CallableShaderTypeMD ShaderTy =
-                infoKind == COMMITTED_GEOMETRY_INDEX ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
-            Value* leafType = builder.getLeafType(ShadowMemStackPointer, ShaderTy == CallableShaderTypeMD::ClosestHit);
-            Value* geoIndex = builder.getGeometryIndex(ShadowMemStackPointer, I, leafType, ShaderTy, !specialPattern);
+            Value* leafType = builder.getLeafType(ShadowMemStackPointer, I->isCommitted());
+            Value* geoIndex = builder.getGeometryIndex(ShadowMemStackPointer, I, leafType, shaderTy, !specialPattern);
             IGC_ASSERT_MESSAGE(I->getType()->isIntegerTy(), "Invalid geometryIndex type!");
             I->replaceAllUsesWith(geoIndex);
             break;
         }
-        case COMMITTED_INSTANCE_INDEX:
-        case CANDIDATE_INSTANCE_INDEX:
-        case COMMITTED_INSTANCE_ID:
-        case CANDIDATE_INSTANCE_ID:
-        {
-            IGC::CallableShaderTypeMD ShaderTy =
-                (infoKind == COMMITTED_INSTANCE_INDEX || infoKind == COMMITTED_INSTANCE_ID) ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
-            DISPATCH_SHADER_RAY_INFO_TYPE infoType =
-                (infoKind == COMMITTED_INSTANCE_ID || infoKind == CANDIDATE_INSTANCE_ID) ?
-                INSTANCE_ID :
-                INSTANCE_INDEX;
-            Value* inst = (infoType == INSTANCE_ID) ?
-                builder.getInstanceID(ShadowMemStackPointer, ShaderTy, I, true) :
-                builder.getInstanceIndex(ShadowMemStackPointer, ShaderTy, I, true);
-            I->replaceAllUsesWith(inst);
+        case INSTANCE_INDEX:
+            I->replaceAllUsesWith(builder.getInstanceIndex(ShadowMemStackPointer, shaderTy, I, true));
             break;
-        }
-        case COMMITTED_PRIMITIVE_INDEX:
-        case CANDIDATE_PRIMITIVE_INDEX:
+        case INSTANCE_ID:
+            I->replaceAllUsesWith(builder.getInstanceID(ShadowMemStackPointer, shaderTy, I, true));
+            break;
+        case PRIMITIVE_INDEX:
         {
-            IGC::CallableShaderTypeMD ShaderTy =
-                infoKind == COMMITTED_PRIMITIVE_INDEX ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
-            Value* leafType = builder.getLeafType(ShadowMemStackPointer, ShaderTy == CallableShaderTypeMD::ClosestHit);
-            Value* primIndex = builder.getPrimitiveIndex(ShadowMemStackPointer, I, leafType, ShaderTy, true);
+            Value* leafType = builder.getLeafType(ShadowMemStackPointer, I->isCommitted());
+            Value* primIndex = builder.getPrimitiveIndex(ShadowMemStackPointer, I, leafType, shaderTy, true);
             IGC_ASSERT_MESSAGE(I->getType()->isIntegerTy(), "Invalid primIndex type!");
             I->replaceAllUsesWith(primIndex);
 
             break;
         }
-        case COMMITTED_BARYCENTRICS:
-        {
-            uint32_t idx = (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue();
-            Value* bary = builder.getHitBaryCentric(ShadowMemStackPointer, idx, true);
-            I->replaceAllUsesWith(bary);
-            break;
-        }
-        case CANDIDATE_BARYCENTRICS:
+        case BARYCENTRICS:
         {
             uint32_t idx = (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue();
-            Value* bary = builder.getHitBaryCentric(ShadowMemStackPointer, idx, false);
+            Value* bary = builder.getHitBaryCentric(ShadowMemStackPointer, idx, I->isCommitted());
             I->replaceAllUsesWith(bary);
             break;
         }
-        case COMMITTED_OBJECT_TO_WORLD:
-        case CANDIDATE_OBJECT_TO_WORLD:
+        case OBJECT_TO_WORLD:
         {
-            IGC::CallableShaderTypeMD ShaderTy =
-                infoKind == COMMITTED_OBJECT_TO_WORLD ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
             uint32_t dim = (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue();
-            Value* matrixComp = builder.getObjToWorld(ShadowMemStackPointer, dim, ShaderTy, I, true);
+            Value* matrixComp = builder.getObjToWorld(ShadowMemStackPointer, dim, shaderTy, I, true);
             I->replaceAllUsesWith(matrixComp);
             break;
         }
-        case COMMITTED_WORLD_TO_OBJECT:
-        case CANDIDATE_WORLD_TO_OBJECT:
+        case WORLD_TO_OBJECT:
         {
-            IGC::CallableShaderTypeMD ShaderTy =
-                infoKind == COMMITTED_WORLD_TO_OBJECT ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
             uint32_t dim = (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue();
-            Value* matrixComp = builder.getWorldToObj(ShadowMemStackPointer, dim, ShaderTy, I, true);
+            Value* matrixComp = builder.getWorldToObj(ShadowMemStackPointer, dim, shaderTy, I, true);
             I->replaceAllUsesWith(matrixComp);
             break;
-
-            break;
         }
-        case COMMITTED_OBJECT_RAY_ORG:
+        case OBJ_RAY_ORG:
         {
-            Value* rayInfo = builder.getObjRayOrig(ShadowMemStackPointer, (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue(), CallableShaderTypeMD::ClosestHit, I, true);
+            Value* rayInfo = builder.getObjRayOrig(ShadowMemStackPointer, (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue(), shaderTy, I, true);
             I->replaceAllUsesWith(rayInfo);
             break;
         }
-        case COMMITTED_OBJECT_RAY_DIR:
+        case OBJ_RAY_DIR:
         {
-            Value* rayInfo = builder.getObjRayDir(ShadowMemStackPointer, (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue(), CallableShaderTypeMD::ClosestHit, I, true);
+            Value* rayInfo = builder.getObjRayDir(ShadowMemStackPointer, (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue(), shaderTy, I, true);
             I->replaceAllUsesWith(rayInfo);
             break;
         }
-        case CANDIDATE_OBJECT_RAY_ORG:
-        {
-            Value* valueAtDim = builder.getObjRayOrig(ShadowMemStackPointer, (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue(), CallableShaderTypeMD::AnyHit, I, true);
-            I->replaceAllUsesWith(valueAtDim);
-            break;
-        }
-        case CANDIDATE_OBJECT_RAY_DIR:
+        case INST_CONTRIBUTION_TO_HITGROUP_INDEX:
         {
-            Value* valueAtDim = builder.getObjRayDir(ShadowMemStackPointer, (uint32_t)cast<ConstantInt>(I->getDim())->getZExtValue(), CallableShaderTypeMD::AnyHit, I, true);
-            I->replaceAllUsesWith(valueAtDim);
-            break;
-        }
-        case COMMITTED_INST_CONTRIBUTION_TO_HITGROUP_INDEX:
-        case CANDIDATE_INST_CONTRIBUTION_TO_HITGROUP_INDEX:
-        {
-            IGC::CallableShaderTypeMD ShaderTy =
-                infoKind == COMMITTED_INST_CONTRIBUTION_TO_HITGROUP_INDEX ?
-                CallableShaderTypeMD::ClosestHit :
-                CallableShaderTypeMD::AnyHit;
-            Value* info = builder.getInstanceContributionToHitGroupIndex(
-                ShadowMemStackPointer, ShaderTy);
-            I->replaceAllUsesWith(info);
+            I->replaceAllUsesWith(
+                builder.getInstanceContributionToHitGroupIndex(ShadowMemStackPointer, shaderTy)
+            );
             break;
         }
         default:

IGC/Compiler/CodeGenPublicEnums.h

@@ -282,46 +282,24 @@ namespace IGC
 
     enum DISPATCH_SHADER_RAY_INFO_TYPE : unsigned int
     {
-        WORLD_RAY_ORG = 0,
-        WORLD_RAY_DIR = 1,
-        OBJ_RAY_ORG = 2,
-        OBJ_RAY_DIR = 3,
-        RAY_T_MIN = 4,
-        RAY_T_CURRENT = 5,
-        PRIMITIVE_INDEX_TRIANGLE = 6,
-        PRIMITIVE_INDEX_PROCEDURAL = 7,
-        INSTANCE_ID = 8,
-        INSTANCE_INDEX = 9,
-        RAY_FLAGS = 10,
-        OBJECT_TO_WORLD = 11,
-        WORLD_TO_OBJECT = 12,
-        COMMITTED_TRIANGLE_FRONT_FACE = 13,
-        COMMITTED_GEOMETRY_INDEX = 14,
-        COMMITTED_INSTANCE_INDEX = 15,
-        COMMITTED_PRIMITIVE_INDEX = 16,
-        COMMITTED_INSTANCE_ID = 17,
-        COMMITTED_BARYCENTRICS = 18,
-        COMMITTED_OBJECT_TO_WORLD = 19,
-        COMMITTED_WORLD_TO_OBJECT = 20,
-        COMMITTED_OBJECT_RAY_ORG = 21,
-        COMMITTED_OBJECT_RAY_DIR = 22,
-        COMMITTED_INST_CONTRIBUTION_TO_HITGROUP_INDEX = 23,
-        CANDIDATE_TRIANGLE_FRONT_FACE = 25,
-        CANDIDATE_TRIANGLE_T_CURRENT = 26,
-        CANDIDATE_GEOMETRY_INDEX = 27,
-        CANDIDATE_INSTANCE_INDEX = 28,
-        CANDIDATE_PRIMITIVE_INDEX = 29,
-        CANDIDATE_INSTANCE_ID = 30,
-        CANDIDATE_BARYCENTRICS = 31,
-        CANDIDATE_OBJECT_TO_WORLD = 32,
-        CANDIDATE_WORLD_TO_OBJECT = 33,
-        CANDIDATE_OBJECT_RAY_ORG = 34,
-        CANDIDATE_OBJECT_RAY_DIR = 35,
-        CANDIDATE_PROCEDURAL_PRIM_NON_OPAQUE = 36,
-        CANDIDATE_INST_CONTRIBUTION_TO_HITGROUP_INDEX = 37,
-        GEOMETRY_INDEX_TRIANGLE = 39,
-        GEOMETRY_INDEX_PROCEDURAL = 40,
-        RAY_MASK = 43,
+        WORLD_RAY_ORG,
+        WORLD_RAY_DIR,
+        OBJ_RAY_ORG,
+        OBJ_RAY_DIR,
+        RAY_T_MIN,
+        RAY_T_CURRENT,
+        PRIMITIVE_INDEX,
+        INSTANCE_ID,
+        INSTANCE_INDEX,
+        RAY_FLAGS,
+        OBJECT_TO_WORLD,
+        WORLD_TO_OBJECT,
+        BARYCENTRICS,
+        TRIANGLE_FRONT_FACE,
+        CANDIDATE_PROCEDURAL_PRIM_NON_OPAQUE,
+        GEOMETRY_INDEX,
+        INST_CONTRIBUTION_TO_HITGROUP_INDEX,
+        RAY_MASK,
         RAY_INFO_UNKNOWN = 0xFF
     };
 

IGC/GenISAIntrinsics/GenIntrinsicInst.h

@@ -1571,6 +1571,15 @@ class RayInfoIntrinsic : public GenIntrinsicInst {
     uint32_t getDim() const {
         return (uint32_t)cast<ConstantInt>(getOperand(1))->getZExtValue();
     }
+
+    std::optional<bool> isProcedural() const {
+        if (auto* C = dyn_cast<ConstantInt>(getOperand(2)))
+            return C->getZExtValue() > 0;
+
+        IGC_ASSERT(isa<UndefValue>(getOperand(2)));
+
+        return std::nullopt;
+    }
 };
 
 class FillValueIntrinsic : public GenIntrinsicInst {
@@ -1917,6 +1926,10 @@ class RayQueryInfoIntrinsic : public RayQueryInstrisicBase {
     }
 
     Value* getDim() const {return getOperand(2);}
+
+    bool isCommitted() const {
+        return static_cast<bool>(cast<ConstantInt>(getOperand(3))->getZExtValue());
+    }
 };
 
 class RayQueryShadowMemoryToSyncStack : public RayQueryInstrisicBase {

IGC/GenISAIntrinsics/generator/input/Intrinsic_definitions.yml

@@ -11033,6 +11033,10 @@ intrinsics:
                 name: Arg1
                 type_definition: *i32
                 comment: ""
+            - !<ArgumentDefinition>
+                name: isProcedural
+                type_definition: *i1
+                comment: "If true, selected ray info queries will return data for a procedural primitive"
         attributes:
             - !AttributeID "NoUnwind"
         memory_effects:
@@ -11054,6 +11058,10 @@ intrinsics:
                 name: Arg1
                 type_definition: *i32
                 comment: ""
+            - !<ArgumentDefinition>
+                name: isProcedural
+                type_definition: *i1
+                comment: "Unused, added for parity with GenISA_RayInfo"
         attributes:
             - !AttributeID "NoUnwind"
         memory_effects:
@@ -11512,6 +11520,10 @@ intrinsics:
                 name: Arg2
                 type_definition: *i32
                 comment: "Dimension used for certain types"
+            - !<ArgumentDefinition>
+                name: isCommitted
+                type_definition: *i1
+                comment: "Is the ray info query for a committed hit?"
         attributes:
             - !AttributeID "NoUnwind"
     - !<IntrinsicDefinition>