Skip to content

Commit 587c7e9

Browse files
sys-igcigcbot
authored andcommitted
[Autobackout][FunctionalRegression]Revert of change: 882201b: Use Ray Query Return value in Compute Ray Tracing Extension
Modified intel_get_hit_candidate and intel_is_traversal_done functions.
1 parent dcc6f77 commit 587c7e9

File tree

4 files changed

+0
-40
lines changed

4 files changed

+0
-40
lines changed

IGC/BiFModule/Headers/bif_flag_controls.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,5 @@ BIF_FLAG_CONTROL(int, MaxHWThreadIDPerSubDevice)
3838
BIF_FLAG_CONTROL(bool, UseAssumeInGetGlobalId)
3939
BIF_FLAG_CONTROL(int, JointMatrixLoadStoreOpt)
4040
BIF_FLAG_CONTROL(bool, UseOOBChecks)
41-
BIF_FLAG_CONTROL(bool, IsRayQueryReturnOptimizationEnabled)
4241
BIF_FLAG_CONTROL(bool, UseBindlessImage)
4342
#endif // __BIF_FLAG_CONTROL_H__

IGC/BiFModule/Languages/OpenCL/Raytracing/IBiF_intel_rt_production.cl

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -375,23 +375,6 @@ intel_float4x3 intel_get_hit_object_to_world(
375375
intel_candidate_type_t
376376
intel_get_hit_candidate(intel_ray_query_t rayquery, intel_hit_type_t hit_type)
377377
{
378-
if (BIF_FLAG_CTRL_GET(IsRayQueryReturnOptimizationEnabled))
379-
{
380-
rtfence_t fence = __builtin_IB_intel_query_rt_fence(rayquery);
381-
uintptr_t fenceInt = (uintptr_t)fence;
382-
383-
intel_candidate_type_t committedStatus = (fenceInt >> 1) & 0x3;
384-
intel_candidate_type_t candidateType = (fenceInt>> 3) & 0x1;
385-
386-
if (hit_type == intel_hit_type_committed_hit)
387-
{
388-
return committedStatus - 1;
389-
}
390-
else if (hit_type == intel_hit_type_potential_hit)
391-
{
392-
return candidateType;
393-
}
394-
}
395378
return MemHit_getLeafType(get_query_hit(rayquery, hit_type)) == NODE_TYPE_QUAD
396379
? intel_candidate_type_triangle
397380
: intel_candidate_type_procedural;
@@ -463,33 +446,13 @@ int intel_get_ray_mask(intel_ray_query_t rayquery, uint bvh_level)
463446
// a procedural leaf or a non-opaque triangle leaf, and requires shader processing.
464447
bool intel_is_traversal_done(intel_ray_query_t rayquery)
465448
{
466-
if (BIF_FLAG_CTRL_GET(IsRayQueryReturnOptimizationEnabled))
467-
{
468-
rtfence_t fence = __builtin_IB_intel_query_rt_fence(rayquery);
469-
uintptr_t fenceInt = (uintptr_t)fence;
470-
471-
bool proceedFurther = (fenceInt & 0x1) != 0;
472-
473-
474-
return !proceedFurther;
475-
}
476449
bool isTraversalDone = MemHit_getDone(get_query_hit(rayquery, intel_hit_type_potential_hit));
477450
return isTraversalDone;
478451
}
479452

480453
// if traversal is done one can test for the presence of a committed hit to either invoke miss or closest hit shader
481454
bool intel_has_committed_hit(intel_ray_query_t rayquery)
482455
{
483-
if (BIF_FLAG_CTRL_GET(IsRayQueryReturnOptimizationEnabled))
484-
{
485-
rtfence_t fence = __builtin_IB_intel_query_rt_fence(rayquery);
486-
uintptr_t fenceInt = (uintptr_t)fence;
487-
488-
intel_candidate_type_t committedStatus = (fenceInt >> 1) & 0x3;
489-
490-
return committedStatus != 0;
491-
492-
}
493456
return MemHit_getValid(get_query_hit(rayquery, intel_hit_type_committed_hit));
494457
}
495458

IGC/Compiler/Builtins/BIFFlagCtrl/BIFFlagCtrlResolution.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ void BIFFlagCtrlResolution::FillFlagCtrl() {
9797
}
9898

9999
BIF_FLAG_CTRL_SET(UseOOBChecks, PtrCGC->platform.needsOutOfBoundsBuiltinChecks());
100-
BIF_FLAG_CTRL_SET(IsRayQueryReturnOptimizationEnabled, PtrCGC->platform.isRayQueryReturnOptimizationEnabled());
101100

102101
// NOTE: No need to check for UseLegacyBindlessMode,
103102
// as it's unrelated to images.

IGC/VectorCompiler/lib/GenXOpts/CMTrans/GenXBIFFlagCtrlResolution.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ void GenXBIFFlagCtrlResolution::FillFlagCtrl() {
9494
BIF_FLAG_CTRL_SET(UseNativeFP64GlobalAtomicAdd, false);
9595
BIF_FLAG_CTRL_SET(MaxHWThreadIDPerSubDevice, 1);
9696
BIF_FLAG_CTRL_SET(UseOOBChecks, false);
97-
BIF_FLAG_CTRL_SET(IsRayQueryReturnOptimizationEnabled, false);
9897
BIF_FLAG_CTRL_SET(UseBindlessImage, false);
9998
}
10099

0 commit comments

Comments
 (0)