[Autobackout][FunctionalRegression]Revert of change: f3e8665: Internal changes

sys-igc · igcbot · commit d8d2101f3be6 · 2025-05-24T18:04:02.000+02:00
Internal changes
diff --git a/IGC/AdaptorCommon/RayTracing/AutoGenRTStackAccessPrivateOS.h b/IGC/AdaptorCommon/RayTracing/AutoGenRTStackAccessPrivateOS.h
@@ -1976,7 +1976,7 @@ auto* _getObjWorldAndWorldObj_Xe(Value* arg_0, Value* arg_1, Value* arg_2, Value
   SetInsertPoint(BB_5);
   auto* V_31 = CreateAnd(arg_1, getInt32(3));
   auto* V_32 = CreateICmpEQ(V_31, getInt32(0));
-  auto* V_33 = CreateSelect(V_32, ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x3f800000))), ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x0))));
+  auto* V_33 = CreateSelect(V_32, ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x0))), ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x3f800000))));
   CreateBr(BB_7);
   V_30->addIncoming(V_29, BB_6);
   V_30->addIncoming(V_33, BB_5);
@@ -2023,7 +2023,7 @@ auto* _getObjWorldAndWorldObj_Xe3(Value* arg_0, Value* arg_1, Value* arg_2, Valu
   SetInsertPoint(BB_5);
   auto* V_29 = CreateAnd(arg_1, getInt32(3));
   auto* V_30 = CreateICmpEQ(V_29, getInt32(0));
-  auto* V_31 = CreateSelect(V_30, ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x3f800000))), ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x0))));
+  auto* V_31 = CreateSelect(V_30, ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x0))), ConstantFP::get(*Ctx.getLLVMContext(), APFloat(APFloat::IEEEsingle(), APInt(32, 0x3f800000))));
   CreateBr(BB_7);
   V_28->addIncoming(V_27, BB_6);
   V_28->addIncoming(V_31, BB_5);
diff --git a/IGC/AdaptorCommon/RayTracing/RTBuilder.cpp b/IGC/AdaptorCommon/RayTracing/RTBuilder.cpp
@@ -729,45 +729,29 @@ Value* RTBuilder::getObjRayOrig(
     RTBuilder::StackPointerVal* perLaneStackPtr, uint32_t dim, Value* ShaderTy,
     Instruction* I, bool checkInstanceLeafPtr)
 {
-
+    auto* transformWorldToObject = CreateOr(
+        {
+            CreateICmpEQ(ShaderTy, getInt32(CallableShaderTypeMD::ClosestHit)),
+        }
+    );
+    Instruction* trueTerm = nullptr;
+    Instruction* falseTerm = nullptr;
     auto* IP = &*GetInsertPoint();
+    SplitBlockAndInsertIfThenElse(transformWorldToObject, IP, &trueTerm, &falseTerm);
 
-    auto* oldBB = IP->getParent();
-    auto* bb = SplitBlock(oldBB, IP);
-
-    auto* isClosestHitBB = BasicBlock::Create(*Ctx.getLLVMContext(), VALUE_NAME("isClosestHitBB"), IP->getFunction(), bb);
-    SetInsertPoint(isClosestHitBB);
-    auto* isClosestHitBBTerm = CreateBr(bb); // we have to do this because the functions we call are going to split the block again...
-    SetInsertPoint(isClosestHitBBTerm);
+    SetInsertPoint(trueTerm);
     auto* newI = I->clone();
-    Insert(newI);
-    auto* isClosestHitV = this->TransformWorldToObject(perLaneStackPtr, dim, true, ShaderTy, newI, checkInstanceLeafPtr);
+    newI->insertBefore(trueTerm);
+    auto* trueV = this->TransformWorldToObject(perLaneStackPtr, dim, true, ShaderTy, newI, checkInstanceLeafPtr);
     newI->eraseFromParent();
 
-    auto* isMissBB = BasicBlock::Create(Context, VALUE_NAME("isMissBB"), IP->getFunction(), bb);
-    SetInsertPoint(isMissBB);
-    auto* isMissBBTerm = CreateBr(bb);
-    SetInsertPoint(isMissBBTerm);
-    auto* isMissV = getWorldRayOrig(perLaneStackPtr, dim);
-
-    auto* defaultBB = BasicBlock::Create(Context, VALUE_NAME("default"), IP->getFunction(), bb);
-    SetInsertPoint(defaultBB);
-    auto* defaultBBTerm = CreateBr(bb);
-    SetInsertPoint(defaultBBTerm);
-    auto* defaultV = getMemRayOrig(perLaneStackPtr, dim, BOTTOM_LEVEL_BVH, VALUE_NAME("ObjRayOrig[" + Twine(dim) + "]"));
-
-    // create switch statement
-    oldBB->getTerminator()->eraseFromParent();
-    SetInsertPoint(oldBB);
-    auto* switchI = CreateSwitch(ShaderTy, defaultBB);
-    switchI->addCase(getInt32(Miss), isMissBB);
-    switchI->addCase(getInt32(ClosestHit), isClosestHitBB);
+    SetInsertPoint(falseTerm);
+    auto* falseV = getMemRayOrig(perLaneStackPtr, dim, BOTTOM_LEVEL_BVH, VALUE_NAME("ObjRayOrig[" + Twine(dim) + "]"));
 
     SetInsertPoint(IP);
-    auto* info = CreatePHI(isClosestHitV->getType(), 3);
-    info->addIncoming(isClosestHitV, isClosestHitBBTerm->getParent());
-    info->addIncoming(isMissV, isMissBBTerm->getParent());
-    info->addIncoming(defaultV, defaultBBTerm->getParent());
+    auto* info = CreatePHI(trueV->getType(), 2);
+    info->addIncoming(trueV, trueTerm->getParent());
+    info->addIncoming(falseV, falseTerm->getParent());
 
     return info;
 }
@@ -776,45 +760,29 @@ Value* RTBuilder::getObjRayDir(
     RTBuilder::StackPointerVal* perLaneStackPtr, uint32_t dim, Value* ShaderTy,
     Instruction* I, bool checkInstanceLeafPtr)
 {
-
+    auto* transformWorldToObject = CreateOr(
+        {
+            CreateICmpEQ(ShaderTy, getInt32(CallableShaderTypeMD::ClosestHit)),
+        }
+    );
+    Instruction* trueTerm = nullptr;
+    Instruction* falseTerm = nullptr;
     auto* IP = &*GetInsertPoint();
+    SplitBlockAndInsertIfThenElse(transformWorldToObject, IP, &trueTerm, &falseTerm);
 
-    auto* oldBB = IP->getParent();
-    auto* bb = SplitBlock(oldBB, IP);
-
-    auto* isClosestHitBB = BasicBlock::Create(*Ctx.getLLVMContext(), VALUE_NAME("isClosestHitBB"), IP->getFunction(), bb);
-    SetInsertPoint(isClosestHitBB);
-    auto* isClosestHitBBTerm = CreateBr(bb); // we have to do this because the functions we call are going to split the block again...
-    SetInsertPoint(isClosestHitBBTerm);
+    SetInsertPoint(trueTerm);
     auto* newI = I->clone();
-    Insert(newI);
-    auto* isClosestHitV = this->TransformWorldToObject(perLaneStackPtr, dim, false, ShaderTy, newI, checkInstanceLeafPtr);
+    newI->insertBefore(trueTerm);
+    auto* trueV = this->TransformWorldToObject(perLaneStackPtr, dim, false, ShaderTy, newI, checkInstanceLeafPtr);
     newI->eraseFromParent();
 
-    auto* isMissBB = BasicBlock::Create(Context, VALUE_NAME("isMissBB"), IP->getFunction(), bb);
-    SetInsertPoint(isMissBB);
-    auto* isMissBBTerm = CreateBr(bb);
-    SetInsertPoint(isMissBBTerm);
-    auto* isMissV = getWorldRayDir(perLaneStackPtr, dim);
-
-    auto* defaultBB = BasicBlock::Create(Context, VALUE_NAME("default"), IP->getFunction(), bb);
-    SetInsertPoint(defaultBB);
-    auto* defaultBBTerm = CreateBr(bb);
-    SetInsertPoint(defaultBBTerm);
-    auto* defaultV = getMemRayDir(perLaneStackPtr, dim, BOTTOM_LEVEL_BVH, VALUE_NAME("ObjRayDir[" + Twine(dim) + "]"));
-
-    // create switch statement
-    oldBB->getTerminator()->eraseFromParent();
-    SetInsertPoint(oldBB);
-    auto* switchI = CreateSwitch(ShaderTy, defaultBB);
-    switchI->addCase(getInt32(Miss), isMissBB);
-    switchI->addCase(getInt32(ClosestHit), isClosestHitBB);
+    SetInsertPoint(falseTerm);
+    auto* falseV = getMemRayDir(perLaneStackPtr, dim, BOTTOM_LEVEL_BVH, VALUE_NAME("ObjRayDir[" + Twine(dim) + "]"));
 
     SetInsertPoint(IP);
-    auto* info = CreatePHI(isClosestHitV->getType(), 3);
-    info->addIncoming(isClosestHitV, isClosestHitBBTerm->getParent());
-    info->addIncoming(isMissV, isMissBBTerm->getParent());
-    info->addIncoming(defaultV, defaultBBTerm->getParent());
+    auto* info = CreatePHI(trueV->getType(), 2);
+    info->addIncoming(trueV, trueTerm->getParent());
+    info->addIncoming(falseV, falseTerm->getParent());
 
     return info;
 }
diff --git a/IGC/AdaptorCommon/RayTracing/RayTracingInterface.cpp b/IGC/AdaptorCommon/RayTracing/RayTracingInterface.cpp
@@ -21,7 +21,6 @@ SPDX-License-Identifier: MIT
 #include "AdaptorCommon/RayTracing/RayTracingAddressSpaceAliasAnalysis.h"
 #include "AdaptorCommon/AddImplicitArgs.hpp"
 #include "AdaptorCommon/ProcessFuncAttributes.h"
-#include "AdaptorOCL/MoveStaticAllocas.h"
 #include "Compiler/CISACodeGen/CodeSinking.hpp"
 #include "Compiler/CISACodeGen/helper.h"
 #include "Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryUsageAnalysis.hpp"
diff --git a/IGC/AdaptorCommon/RayTracing/TraceRayInlineLoweringPass.cpp b/IGC/AdaptorCommon/RayTracing/TraceRayInlineLoweringPass.cpp
@@ -206,7 +206,6 @@ void TraceRayInlineLoweringPass::LowerAllocateRayQuery(
 
     for (auto* I : convertRayQueryToRTStackPointers)
     {
-        builder.SetInsertPoint(I);
         auto* rtstack = getShMemRayQueryRTStack(builder, I->getRayQueryAllocationHandle());
         I->replaceAllUsesWith(rtstack);
     }
diff --git a/IGC/GenISAIntrinsics/GenIntrinsicInst.h b/IGC/GenISAIntrinsics/GenIntrinsicInst.h
@@ -1463,7 +1463,6 @@ class TraceRayAsyncHLIntrinsic : public ContinuationHLIntrinsic {
     void setTMax(Value* V) { setOperand(15, V); }
     Value* getPayload() const { return getOperand(16); }
     Value* getComparisonValue() const { return getOperand(17); }
-    Value* getInternalRayFlags() const { return getOperand(18); }
 };
 
 class CallShaderHLIntrinsic : public ContinuationHLIntrinsic {
diff --git a/IGC/GenISAIntrinsics/generator/input/Intrinsic_definitions.yml b/IGC/GenISAIntrinsics/generator/input/Intrinsic_definitions.yml
@@ -11464,10 +11464,6 @@ intrinsics:
                 comment: "reserved"
             - !<ArgumentDefinition>
                 name: Arg18
-                type_definition: *i32
-                comment: "reserved"
-            - !<ArgumentDefinition>
-                name: Arg19
                 type_definition: *f32
                 comment: "reserved"
         attributes:

Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,6 @@ void TraceRayInlineLoweringPass::LowerAllocateRayQuery(`
`206`	`206`
`207`	`207`	`for (auto* I : convertRayQueryToRTStackPointers)`
`208`	`208`	`{`
`209`		`- builder.SetInsertPoint(I);`
`210`	`209`	`auto* rtstack = getShMemRayQueryRTStack(builder, I->getRayQueryAllocationHandle());`
`211`	`210`	`I->replaceAllUsesWith(rtstack);`
`212`	`211`	`}`