Manual revert for fp64 emu

Manual revert for fp64 emu

Author: matborzyszkowski

IGC/AdaptorCommon/AddImplicitArgs.cpp

@@ -747,25 +747,19 @@ void BuiltinCallGraphAnalysis::combineTwoArgDetail(
 
 void BuiltinCallGraphAnalysis::writeBackAllIntoMetaData(const ImplicitArgumentDetail& data, Function * f)
 {
-    CodeGenContext* pCtx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
     FunctionInfoMetaDataHandle funcInfo = m_pMdUtils->getFunctionsInfoItem(f);
     funcInfo->clearImplicitArgInfoList();
 
     bool isEntry = isEntryFunc(m_pMdUtils, f);
 
-    // Check if DP emulation is used and the function uses DP operations. Emulation needs r0 and private_base
-    // implicit args, so these args have to exist. r0 and private_base args are adding by analysis passes.
-    bool needImplicitArgs = pCtx->m_hasDPEmu && f->hasFnAttribute("uses-fp64-math");
-
     for (const auto& A : data.ArgsMaps)
     {
         // For the implicit args that have GenISAIntrinsic support used in subroutines,
         // they do not require to be added as explicit arguments other than in the caller kernel.
         // Always add metadata for stackcalls to provide info for inlining. They won't be added
         // to function argument list.
-        // For DP emulation the implicit args are required
         ImplicitArg::ArgType argId = A.first;
-        if (!isEntry && ImplicitArgs::hasIntrinsicSupport(argId) && !needImplicitArgs)
+        if (!isEntry && ImplicitArgs::hasIntrinsicSupport(argId))
         {
             bool isStackCall = f->hasFnAttribute("visaStackCall");
             if (!isStackCall && IGC_IS_FLAG_ENABLED(EnableImplicitArgAsIntrinsic))

IGC/Compiler/CodeGenPublic.h

@@ -904,7 +904,6 @@ namespace IGC
         bool m_hasLegacyDebugInfo = false;
         bool m_hasEmu64BitInsts = false;
         bool m_hasDPDivSqrtEmu = false;
-        bool m_hasDPEmu = false;
 
         // Flag for staged compilation
         CG_FLAG_t m_CgFlag = FLAG_CG_ALL_SIMDS;

IGC/Compiler/Optimizer/OpenCLPasses/ErrorCheckPass.cpp

@@ -104,36 +104,30 @@ void ErrorCheck::visitInstruction(llvm::Instruction& I)
 {
     auto ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
 
-    // This is the condition that double emulation is used.
-    if ((IGC_IS_FLAG_ENABLED(ForceDPEmulation) ||
-        (ctx->m_DriverInfo.NeedFP64(ctx->platform.getPlatformInfo().eProductFamily) && ctx->platform.hasNoFP64Inst())))
-    {
-        ctx->m_hasDPEmu = true;
-    }
-
     bool poisonFP64KernelsEnabled = false;
     if (ctx->type == ShaderType::OPENCL_SHADER)
     {
         OpenCLProgramContext *OCLContext = static_cast<OpenCLProgramContext*>(ctx);
         poisonFP64KernelsEnabled = OCLContext->m_InternalOptions.EnableUnsupportedFP64Poisoning;
     }
 
-    // chcek that has HW DP support and DP emu is disabled
-    if (!ctx->platform.hasNoFP64Inst() && !ctx->m_hasDPEmu)
-        return;
-
-    // check that input does not use double
-    const bool usesDouble = isFP64Operation(&I);
-    if (!usesDouble)
-        return;
-
-    if (!poisonFP64KernelsEnabled && !ctx->m_hasDPEmu) {
-        ctx->EmitError("Double type is not supported on this platform.", &I);
-        m_hasError = true;
-        return;
+    if (!ctx->m_DriverInfo.NeedFP64(ctx->platform.getPlatformInfo().eProductFamily) && ctx->platform.hasNoFP64Inst()
+        && IGC_IS_FLAG_DISABLED(ForceDPEmulation))
+    {
+        // check that input does not use double
+        // For testing purpose, this check is skipped if ForceDPEmulation is on.
+        const bool usesDouble = isFP64Operation(&I);
+        if (!usesDouble)
+            return;
+
+        if (!poisonFP64KernelsEnabled) {
+            ctx->EmitError("Double type is not supported on this platform.", &I);
+            m_hasError = true;
+            return;
+        }
+        Function *F = I.getParent()->getParent();
+        F->addFnAttr("uses-fp64-math");
     }
-    Function *F = I.getParent()->getParent();
-    F->addFnAttr("uses-fp64-math");
 }
 
 void ErrorCheck::visitCallInst(CallInst& CI)

IGC/Compiler/Optimizer/OpenCLPasses/PoisonFP64KernelsPass.cpp

@@ -52,13 +52,6 @@ bool PoisonFP64Kernels::doInitialization(CallGraph &CG) {
 }
 
 bool PoisonFP64Kernels::runOnSCC(CallGraphSCC &SCC) {
-    auto ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
-    // If DP emu is enabled we don't need poison fp64 pass
-    if (ctx->m_hasDPEmu)
-    {
-        return false;
-    }
-
     bool modified = false;
     for (CallGraphNode *Node : SCC) {
         Function *F = Node->getFunction();

IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryUsageAnalysis.cpp

@@ -124,8 +124,10 @@ bool PrivateMemoryUsageAnalysis::runOnFunction(Function& F)
     CodeGenContext* pCtx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
     if (!m_hasPrivateMem)
     {
-        // For double emulation, need to add private base (conservative).
-        if (pCtx->m_hasDPEmu)
+        CodeGenContext* pCtx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
+        // This is the condition that double emulation is used.
+        if ((IGC_IS_FLAG_ENABLED(ForceDPEmulation) ||
+            (pCtx->m_DriverInfo.NeedFP64(pCtx->platform.getPlatformInfo().eProductFamily) && pCtx->platform.hasNoFP64Inst())))
         {
             m_hasPrivateMem = true;
         }