Implement dedicated logic for handling discards in DynamicRayManagementPass

Implement dedicated logic for handling discards in DynamicRayManagementPass

Author: jaladreips

IGC/AdaptorCommon/RayTracing/DynamicRayManagementPass.cpp

@@ -238,7 +238,8 @@ bool DynamicRayManagementPass::requiresSplittingCheckReleaseRegion(Instruction&
     return
         isa<ContinuationHLIntrinsic>(I) ||
         isBarrierIntrinsic(&I) ||
-        isUserFunctionCall(&I);
+        isUserFunctionCall(&I) ||
+        isDiscardInstruction(&I);
 }
 
 void DynamicRayManagementPass::FindProceedsInOperands(Instruction* I, SetVector<TraceRaySyncProceedHLIntrinsic*>& proceeds, SmallPtrSetImpl<Instruction*>& cache)
@@ -993,6 +994,18 @@ void DynamicRayManagementPass::HandleComplexControlFlow(Function& F)
                     break;
                 }
 
+                if (isDiscardInstruction(&I) && !m_CGCtx->platform.allowDivergentControlFlowRayQueryCheckRelease())
+                {
+                    rayQueryReleaseIntrinsic->eraseFromParent();
+                    rayQueryCheckIntrinsic->eraseFromParent();
+
+                    // Remove the pair from the vector in case more Barriers or External
+                    // calls are between them.
+                    m_RayQueryCheckReleasePairs.erase(m_RayQueryCheckReleasePairs.begin() + rayQueryCheckReleasePairIndex);
+
+                    break;
+                }
+
                 // The barrier/call instruction is within the RayQueryCheck-Release pair.
                 // Insert RayQueryRelease before it, and RaytQueryCheck after, to re-enable
                 // Dynamic Ray Management.

IGC/Compiler/CISACodeGen/helper.cpp

@@ -1696,6 +1696,11 @@ namespace IGC
         return isUserFunction;
     }
 
+    bool isDiscardInstruction(const llvm::Instruction* I)
+    {
+        return isa<GenIntrinsicInst>(I) && cast<GenIntrinsicInst>(I)->getIntrinsicID() == GenISAIntrinsic::GenISA_discard;
+    }
+
     bool isURBWriteIntrinsic(const llvm::Instruction* I)
     {
         const GenIntrinsicInst* GII = dyn_cast<GenIntrinsicInst>(I);

IGC/Compiler/CISACodeGen/helper.h

@@ -192,6 +192,8 @@ namespace IGC
 
     bool isUserFunctionCall(const llvm::Instruction* I);
 
+    bool isDiscardInstruction(const llvm::Instruction* I);
+
     bool IsMemLoadIntrinsic(llvm::GenISAIntrinsic::ID id);
 
     bool IsStatelessMemLoadIntrinsic(llvm::GenISAIntrinsic::ID id);