Multi-revert of auto-GRF related patches

Revert `igc-1.0.15468.18` " limit max GRF if kernel is SIMD16"
This reverts commit 04e24cd.

Revert `igc-1.0.15468.17` " Add option to set maximum GRF number that vISA can select"
This reverts commit 555731c.

Revert " precompiled emulation inlining improvements"
This reverts commit a239bf5.

Author: pkwasnie-intel

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -4603,13 +4603,6 @@ namespace IGC
                     SaveOption(vISA_AutoGRFSelection, true);
                 }
 
-                if (m_program->m_Platform->supportsAutoGRFSelection() &&
-                    m_program->m_Platform->getPlatformInfo().eProductFamily == IGFX_PVC &&
-                    m_program->m_dispatchSize == SIMDMode::SIMD16)
-                {
-                    SaveOption(vISA_MaxGRFNum, unsigned(128));
-                }
-
                 // Emit warnings if mismatch is found in user input
                 // Mismatch between number of threads and GRF size (per module)
                 if (ClContext->getNumThreadsPerEU() > 0 &&  ClContext->getExpGRFSize() > 0 &&

IGC/Compiler/Optimizer/PreCompiledFuncImport.cpp

@@ -17,7 +17,6 @@ SPDX-License-Identifier: MIT
 #include "llvm/IR/InstIterator.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/GenericDomTree.h"
-#include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Bitcode/BitcodeReader.h"
 #include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/Linker/Linker.h"
@@ -633,7 +632,7 @@ bool PreCompiledFuncImport::runOnModule(Module& M)
     m_changed = false;
 
     // When we test it, we need to set emuKind
-    if (IGC_GET_FLAG_VALUE(TestIGCPreCompiledFunctions) == 1)
+    if (IGC_IS_FLAG_ENABLED(TestIGCPreCompiledFunctions))
     {
         m_emuKind = IGC_GET_FLAG_VALUE(ForceEmuKind) ? IGC_GET_FLAG_VALUE(ForceEmuKind) : EmuKind::EMU_DP;
         checkAndSetEnableSubroutine();
@@ -828,11 +827,12 @@ bool PreCompiledFuncImport::runOnModule(Module& M)
         }
     }
 
-    llvm::SmallVector<ImportedFunction, 32> importedFunctions;
-    unsigned totalNumberOfInlinedInst = 0, totalNumberOfPotentiallyInlinedInst = 0;
+    unsigned totalNumberOfInlinedInst = 0;
     int emuFC = (int)IGC_GET_FLAG_VALUE(EmulationFunctionControl);
 
-    // Post processing, set those imported functions as internal linkage.
+    // Post processing, set those imported functions as internal linkage
+    // and alwaysinline. Also count how many instructions would be added
+    // to the shader if inlining occurred.
     for (auto II = M.begin(), IE = M.end(); II != IE; )
     {
         Function* Func = &(*II);
@@ -854,101 +854,92 @@ bool PreCompiledFuncImport::runOnModule(Module& M)
                 continue;
             }
 
-            if (std::find(importedFunctions.begin(), importedFunctions.end(), Func) == importedFunctions.end())
-                importedFunctions.push_back(Func);
-        }
-        else
-        {
-            // Make sure original func isn't inlined accidentally.
+            // Remove noinline/AlwaysInline attr if present.
+            Func->removeFnAttr(llvm::Attribute::NoInline);
             Func->removeFnAttr(llvm::Attribute::AlwaysInline);
-        }
-    }
-
-    // Sort imported instructions in preferred inlining order.
-    std::sort(importedFunctions.begin(), importedFunctions.end(), ImportedFunction::compare);
 
-    // Post processing, set those imported functions as alwaysinline.
-    // Also count how many instructions would be added to the shader
-    // if inlining occurred.
-    for (auto II = importedFunctions.begin(), IE = importedFunctions.end(); II != IE; ++II)
-    {
-        Function* Func = II->F;
+            if (m_enableCallForEmulation &&
+                emuFC != FLAG_FCALL_DEFAULT &&
+                emuFC != FLAG_FCALL_FORCE_INLINE)
+            {
+                // Disable inlining completely.
+                continue;
+            }
 
-        // Remove noinline/AlwaysInline attr if present.
-        Func->removeFnAttr(llvm::Attribute::NoInline);
-        Func->removeFnAttr(llvm::Attribute::AlwaysInline);
+            if (Func->hasOneUse() || emuFC == FLAG_FCALL_FORCE_INLINE)
+            {
+                Func->addFnAttr(llvm::Attribute::AlwaysInline);
+                continue;
+            }
 
-        if (m_enableCallForEmulation &&
-            emuFC != FLAG_FCALL_DEFAULT &&
-            emuFC != FLAG_FCALL_FORCE_INLINE)
-        {
-            // Disable inlining completely.
-            continue;
-        }
+            // Count number of instructions in the function
+            unsigned NumInst = 0;
+            for (BasicBlock& BB : Func->getBasicBlockList()) {
+                NumInst += BB.getInstList().size();
+            }
 
-        if (Func->hasOneUse() || emuFC == FLAG_FCALL_FORCE_INLINE)
-        {
-            Func->addFnAttr(llvm::Attribute::AlwaysInline);
-            continue;
-        }
+            // Don't want to subroutine small functions
+            if (NumInst <= 5)
+            {
+                // Add AlwaysInline attribute to force inlining all calls.
+                Func->addFnAttr(llvm::Attribute::AlwaysInline);
 
-        // Don't want to subroutine small functions
-        if (II->funcInstructions <= 5)
-        {
-            // Add AlwaysInline attribute to force inlining all calls.
-            Func->addFnAttr(llvm::Attribute::AlwaysInline);
+                continue;
+            }
 
-            continue;
+            totalNumberOfInlinedInst += NumInst * Func->getNumUses();
         }
-
-        totalNumberOfPotentiallyInlinedInst += II->totalInstructions;
-
-        // If function fits in threshold, always inline.
-        if (totalNumberOfInlinedInst + II->totalInstructions <= (unsigned)IGC_GET_FLAG_VALUE(InlinedEmulationThreshold))
+        else
         {
-            totalNumberOfInlinedInst += II->totalInstructions;
-            Func->addFnAttr(llvm::Attribute::AlwaysInline);
+            // Make sure original func isn't inlined accidentally.
+            Func->removeFnAttr(llvm::Attribute::AlwaysInline);
         }
     }
 
-    // Check if more functions can fit in threshold if they would be split into inline/noinline copies.
-    if (m_enableCallForEmulation && emuFC == FLAG_FCALL_DEFAULT && totalNumberOfInlinedInst < (unsigned)IGC_GET_FLAG_VALUE(InlinedEmulationThreshold))
-    {
-        for (auto II = importedFunctions.begin(); II != importedFunctions.end(); ++II)
-        {
-            Function* Func = II->F;
-
-            if (Func->hasFnAttribute(llvm::Attribute::AlwaysInline))
-                continue;
-
-            unsigned calls = ((unsigned)IGC_GET_FLAG_VALUE(InlinedEmulationThreshold) - totalNumberOfInlinedInst) / II->funcInstructions;
-            if (calls > 0)
-            {
-                // Split function into inline/no-inline copies.
-                ImportedFunction copy = createInlinedCopy(*II, calls);
-                importedFunctions.push_back(copy);
-                totalNumberOfInlinedInst += copy.totalInstructions;
-            }
+    // If true, it is a slow version of DP emu functions. Those functions
+    // are the original ones for just passing conformance, not for perf.
+    auto isSlowDPEmuFunc = [](Function* F) {
+        StringRef FN = F->getName();
+        if (FN.equals("__igcbuiltin_dp_add") ||
+            FN.equals("__igcbuiltin_dp_sub") ||
+            FN.equals("__igcbuiltin_dp_fma") ||
+            FN.equals("__igcbuiltin_dp_mul") ||
+            FN.equals("__igcbuiltin_dp_div") ||
+            FN.equals("__igcbuiltin_dp_cmp") ||
+            FN.equals("__igcbuiltin_dp_to_int32") ||
+            FN.equals("__igcbuiltin_dp_to_uint32") ||
+            FN.equals("__igcbuiltin_int32_to_dp") ||
+            FN.equals("__igcbuiltin_uint32_to_dp") ||
+            FN.equals("__igcbuiltin_dp_to_sp") ||
+            FN.equals("__igcbuiltin_sp_to_dp") ||
+            FN.equals("__igcbuiltin_dp_sqrt")) {
+            return true;
         }
-    }
+        return false;
+    };
 
-    for (auto II = importedFunctions.begin(), IE = importedFunctions.end(); II != IE; ++II)
+    for (auto II = M.begin(), IE = M.end(); II != IE; )
     {
-        Function* Func = II->F;
+        Function* Func = &(*II);
+        ++II;
+        if (!Func || Func->isDeclaration())
+        {
+            continue;
+        }
 
-        if (!Func->hasFnAttribute(llvm::Attribute::AlwaysInline))
+        if (!origFunctions.count(Func) && !Func->hasFnAttribute(llvm::Attribute::AlwaysInline))
         {
             // Special handling of DP functions: any one that has not been marked as inline
             // at this point, it will be either subroutine or stackcall.
-            const bool isDPCallFunc = (isDPEmu() && II->isSlowDPEmuFunc());
+            const bool isDPCallFunc = (isDPEmu() && isSlowDPEmuFunc(Func));
 
             // Use subroutine/stackcall for some DP emulation functions if
             // EmulationFunctionControl is set so, or
             // use subroutines if total number of instructions added when
             // all emulated functions are inlined exceed InlinedEmulationThreshold.
             // If Func is a slow version of DP emu func, perf isn't important.
             if (m_enableCallForEmulation &&
-                (totalNumberOfPotentiallyInlinedInst > (unsigned)IGC_GET_FLAG_VALUE(InlinedEmulationThreshold) ||
+                (totalNumberOfInlinedInst > (unsigned)IGC_GET_FLAG_VALUE(InlinedEmulationThreshold) ||
                  isDPCallFunc))
             {
                 Func->addFnAttr(llvm::Attribute::NoInline);
@@ -1013,128 +1004,6 @@ bool PreCompiledFuncImport::runOnModule(Module& M)
     return m_changed;
 }
 
-PreCompiledFuncImport::ImportedFunction::ImportedFunction(Function* F)
-    : F(F), type(EmuType::OTHER), funcInstructions(0), totalInstructions(0)
-{
-    // Count number of new instructions added by inlining.
-    for (BasicBlock& BB : F->getBasicBlockList())
-        funcInstructions += BB.getInstList().size();
-
-    updateUses();
-
-    // Get type of imported function.
-    StringRef name = F->getName();
-
-    if (name.equals("__igcbuiltin_dp_div_nomadm_ieee") ||
-        name.equals("__igcbuiltin_dp_div_nomadm_fast") ||
-        name.equals("__igcbuiltin_dp_sqrt_nomadm_ieee") ||
-        name.equals("__igcbuiltin_dp_sqrt_nomadm_fast"))
-    {
-        type = EmuType::FASTDP;
-    }
-    else if (name.equals("__igcbuiltin_dp_add") ||
-        name.equals("__igcbuiltin_dp_sub") ||
-        name.equals("__igcbuiltin_dp_fma") ||
-        name.equals("__igcbuiltin_dp_mul") ||
-        name.equals("__igcbuiltin_dp_div") ||
-        name.equals("__igcbuiltin_dp_cmp") ||
-        name.equals("__igcbuiltin_dp_to_int32") ||
-        name.equals("__igcbuiltin_dp_to_uint32") ||
-        name.equals("__igcbuiltin_int32_to_dp") ||
-        name.equals("__igcbuiltin_uint32_to_dp") ||
-        name.equals("__igcbuiltin_dp_to_sp") ||
-        name.equals("__igcbuiltin_sp_to_dp") ||
-        name.equals("__igcbuiltin_dp_sqrt"))
-    {
-        // If true, it is a slow version of DP emu functions. Those functions
-        // are the original ones for just passing conformance, not for perf.
-        type = EmuType::SLOWDP;
-    }
-    else
-    {
-        for (int i = 0; i < NUM_FUNCTIONS && type == EmuType::OTHER; ++i)
-        {
-            for (int j = 0; j < NUM_TYPES && type == EmuType::OTHER; ++j)
-            {
-                if (name.equals(m_Int64SpDivRemFunctionNames[i][j]) ||
-                    name.equals(m_Int64DpDivRemFunctionNames[i][j]))
-                {
-                    type = EmuType::INT64;
-                }
-            }
-        }
-    }
-}
-
-void PreCompiledFuncImport::ImportedFunction::updateUses()
-{
-    totalInstructions = funcInstructions * F->getNumUses();
-}
-
-PreCompiledFuncImport::ImportedFunction PreCompiledFuncImport::ImportedFunction::copy(ImportedFunction& other)
-{
-    ValueToValueMapTy VM;
-    Function* copy = CloneFunction(other.F, VM);
-    return PreCompiledFuncImport::ImportedFunction(copy, other.type, other.funcInstructions, 0);
-}
-
-// Compare two imported functions in order preferred for inlining.
-bool PreCompiledFuncImport::ImportedFunction::compare(ImportedFunction& L, ImportedFunction& R)
-{
-    // First sort by preferred type of emulation.
-    if (L.type != R.type)
-        return L.type < R.type;
-
-    // Then sort by number of inlined instructions.
-    return L.totalInstructions < R.totalInstructions;
-};
-
-PreCompiledFuncImport::ImportedFunction PreCompiledFuncImport::createInlinedCopy(ImportedFunction& IF, unsigned n)
-{
-    std::vector<CallInst*> toDelete;
-
-    // Make copy that is always inlined.
-    ImportedFunction copy = ImportedFunction::copy(IF);
-    copy.F->setName(IF.F->getName() + "_always_inline");
-    copy.F->addFnAttr(llvm::Attribute::AlwaysInline);
-
-    // Collect first n calls to replace with copy.
-    llvm::SmallVector<CallInst*, 8> calls;
-    auto it = IF.F->user_begin();
-    for (unsigned i = 0; i < n; ++i)
-    {
-        CallInst* oldCall = dyn_cast<CallInst>(*(it++));
-        IGC_ASSERT(oldCall);
-        calls.push_back(oldCall);
-    }
-
-    // Replace with always inlined copy.
-    for (CallInst* oldCall : calls)
-    {
-        std::vector<Value*> args;
-        for (unsigned arg = 0; arg < IGCLLVM::getNumArgOperands(oldCall); ++arg)
-            args.push_back(oldCall->getArgOperand(arg));
-
-        // Create new call and insert it before old one
-        CallInst* newCall = CallInst::Create(copy.F, args, "", oldCall);
-
-        newCall->setCallingConv(copy.F->getCallingConv());
-        newCall->setAttributes(oldCall->getAttributes());
-        newCall->setDebugLoc(oldCall->getDebugLoc());
-
-        oldCall->replaceAllUsesWith(newCall);
-        toDelete.push_back(oldCall);
-    }
-
-    for (auto C : toDelete)
-        C->eraseFromParent();
-
-    copy.updateUses();
-    IF.updateUses();
-
-    return copy;
-}
-
 void PreCompiledFuncImport::visitBinaryOperator(BinaryOperator& I)
 {
     if (I.getOperand(0)->getType()->isIntOrIntVectorTy())
@@ -2679,7 +2548,6 @@ void PreCompiledFuncImport::checkAndSetEnableSubroutine()
     bool SPDiv = isSPDiv();
     bool DPEmu = isDPEmu();
     bool DPDivSqrtEmu = isDPDivSqrtEmu();
-    bool I64DivRem = isI64DivRem();
 
     Module* M = m_pCtx->getModule();
     for (auto FI = M->begin(), FE = M->end(); FI != FE; ++FI)
@@ -2722,15 +2590,6 @@ void PreCompiledFuncImport::checkAndSetEnableSubroutine()
                     m_enableCallForEmulation = true;
                 }
                 break;
-            case Instruction::UDiv:
-            case Instruction::URem:
-            case Instruction::SDiv:
-            case Instruction::SRem:
-                if (I64DivRem && I->getOperand(0)->getType()->isIntegerTy(64))
-                {
-                    m_enableCallForEmulation = true;
-                }
-                break;
             }
 
             GenIntrinsicInst* GII = dyn_cast<GenIntrinsicInst>(I);