Simplify RQ throttling keys

Replace DisableRayQueryDynamicRayManagementMechanism and ForceRayQueryDynamicRayManagementMechanism with one key: OverrideRayQueryThrottling.
OverrideRayQueryThrottling is ignored when it's not set. When set, 0 will disable RQ throttling while 1 will enable RQ throttling.

Author: jaladreips

IGC/AdaptorCommon/RayTracing/RayTracingInterface.cpp

@@ -145,8 +145,7 @@ void RayTracingInlineLowering(CodeGenContext* pContext)
     if (IGC_IS_FLAG_ENABLED(OverrideTMax))
         mpm.add(createOverrideTMaxPass(IGC_GET_FLAG_VALUE(OverrideTMax)));
 
-    if (pContext->platform.isDynamicRayQueryDynamicRayManagementMechanismEnabled() && pContext->getModuleMetaData()->compOpt.EnableDynamicRQManagement ||
-        IGC_IS_FLAG_ENABLED(ForceRayQueryDynamicRayManagementMechanism))
+    if (pContext->platform.enableRayQueryThrottling(pContext->getModuleMetaData()->compOpt.EnableDynamicRQManagement))
     {
         mpm.add(CreateDynamicRayManagementPass());
     }

IGC/Compiler/CISACodeGen/Platform.hpp

@@ -1541,10 +1541,20 @@ bool supportsProgrammableOffsets() const
     return isCoreChildOf(IGFX_XE2_HPG_CORE);
 }
 
-bool isDynamicRayQueryDynamicRayManagementMechanismEnabled() const
+bool supportsRayQueryThrottling() const
 {
-    return (isCoreChildOf(IGFX_XE2_HPG_CORE) &&
-        IGC_IS_FLAG_DISABLED(DisableRayQueryDynamicRayManagementMechanism));
+    return isCoreChildOf(IGFX_XE2_HPG_CORE);
+}
+
+bool enableRayQueryThrottling(bool enableByDefault) const
+{
+    if (!supportsRayQueryThrottling())
+        return false;
+
+    if (IGC_IS_FLAG_SET(OverrideRayQueryThrottling))
+        return IGC_GET_FLAG_VALUE(OverrideRayQueryThrottling);
+
+    return enableByDefault;
 }
 
 bool isSWSubTriangleOpacityCullingEmulationEnabled() const

IGC/common/igc_flags.h

@@ -1045,8 +1045,7 @@ DECLARE_IGC_GROUP("Raytracing Options")
     DECLARE_IGC_REGKEY(bool, EnableRTPrintf, false, "Enable printf for ray tracing.", true)
     DECLARE_IGC_REGKEY(DWORD, PrintfBufferSize, 0, "Set printf buffer size. Unit: KB.", true)
     DECLARE_IGC_REGKEY(bool, DisableRayQueryReturnOptimization, false, "RayQuery Return Optimization", true)
-    DECLARE_IGC_REGKEY(bool, DisableRayQueryDynamicRayManagementMechanism, true, "Dynamic ray management mechanism for Synchronous Ray Tracing", true)
-    DECLARE_IGC_REGKEY(bool, ForceRayQueryDynamicRayManagementMechanism, false, "Force dynamic ray management regardless of other disable mechanisms", true)
+    DECLARE_IGC_REGKEY(bool, OverrideRayQueryThrottling, false, "Force rayquery throttling (dynamic ray management) to be enabled or disabled. Default value of this key is ignored", true)
     DECLARE_IGC_REGKEY(bool, DisableRayQueryDynamicRayManagementMechanismForExternalFunctionsCalls, false, "Disable dynamic ray management mechanism for shaders with external functions calls", true)
     DECLARE_IGC_REGKEY(bool, DisableRayQueryDynamicRayManagementMechanismForBarriers, false, "Disable dynamic ray management mechanism for shaders with barriers", true)
     DECLARE_IGC_REGKEY(bool, EnableOuterLoopHoistingForRayQueryDynamicRayManagementMechanism, false, "Disable dynamic ray management mechanism for shaders with barriers", true)