[Autobackout][FuncReg]Revert of change: 7d5dfab

Add AnnotateUniformAllocas pass - second attempt.

Change-Id: I0d88c7dd5a36c39122c211a5813a58ce0d8ccf81

Author: grey-eminence

IGC/Compiler/CISACodeGen/AnnotateUniformAllocas.cpp

@@ -4,7 +4,6 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
 set(IGC_BUILD__SRC__CISACodeGen_Common
     "${CMAKE_CURRENT_SOURCE_DIR}/AdvCodeMotion.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/AdvMemOpt.cpp"
-    "${CMAKE_CURRENT_SOURCE_DIR}/AnnotateUniformAllocas.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/BlockCoalescing.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/CheckInstrTypes.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/CISABuilder.cpp"
@@ -95,7 +94,6 @@ set(IGC_BUILD__SRC__Compiler_CISACodeGen
 set(IGC_BUILD__HDR__CISACodeGen_Common
     "${CMAKE_CURRENT_SOURCE_DIR}/AdvCodeMotion.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/AdvMemOpt.h"
-    "${CMAKE_CURRENT_SOURCE_DIR}/AnnotateUniformAllocas.h"
     "${CMAKE_CURRENT_SOURCE_DIR}/BlockCoalescing.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/CheckInstrTypes.hpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/CISABuilder.hpp"

IGC/Compiler/CISACodeGen/AnnotateUniformAllocas.h

@@ -27,6 +27,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Compiler/CodeGenContextWrapper.hpp"
 #include "Compiler/MetaDataUtilsWrapper.h"
 #include "Compiler/CISACodeGen/RegisterPressureEstimate.hpp"
+#include "Compiler/CISACodeGen/WIAnalysis.hpp"
 #include "common/LLVMUtils.h"
 #include "Compiler/CISACodeGen/LowerGEPForPrivMem.hpp"
 #include "Compiler/CodeGenPublic.h"
@@ -69,6 +70,7 @@ namespace IGC {
             AU.addRequired<RegisterPressureEstimate>();
             AU.addRequired<MetaDataUtilsWrapper>();
             AU.addRequired<CodeGenContextWrapper>();
+            AU.addRequired<WIAnalysis>();
             AU.addRequired<DominatorTreeWrapperPass>();
             AU.setPreservesCFG();
         }
@@ -250,7 +252,14 @@ bool LowerGEPForPrivMem::IsNativeType(Type* type)
 
 bool LowerGEPForPrivMem::CheckIfAllocaPromotable(llvm::AllocaInst* pAlloca)
 {
-    bool isUniformAlloca = pAlloca->getMetadata("uniform") != nullptr;
+    auto WI = &getAnalysis<WIAnalysis>();
+    bool isUniformAlloca = WI->whichDepend(pAlloca) == WIAnalysis::UNIFORM;
+    if (isUniformAlloca)
+    {
+        IRBuilder<> builder(pAlloca);
+        MDNode* node = MDNode::get(pAlloca->getContext(), ConstantAsMetadata::get(builder.getInt1(true)));
+        pAlloca->setMetadata("uniform", node);
+    }
     unsigned int allocaSize = extractAllocaSize(pAlloca);
     unsigned int allowedAllocaSizeInBytes = MAX_ALLOCA_PROMOTE_GRF_NUM * 4;
 

IGC/Compiler/CISACodeGen/CMakeLists.txt

@@ -161,7 +161,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Compiler/Optimizer/IGCInstCombiner/IGCInstructionCombining.hpp"
 #include "DebugInfo.hpp"
 #include "Compiler/CISACodeGen/HalfPromotion.h"
-#include "Compiler/CISACodeGen/AnnotateUniformAllocas.h"
 #include "Probe/Assertion.h"
 
 /***********************************************************************************
@@ -461,17 +460,14 @@ namespace IGC
         // Resolve the Private memory to register pass
         if (!isOptDisabled)
         {
-            mpm.add(createBreakCriticalEdgesPass());
-            mpm.add(createAnnotateUniformAllocasPass());
-
             if (IGC_IS_FLAG_DISABLED(DisablePromotePrivMem) &&
                 ctx.m_instrTypes.hasNonPrimitiveAlloca &&
                 ctx.m_retryManager.AllowPromotePrivateMemory())
             {
+                mpm.add(createBreakCriticalEdgesPass());
                 mpm.add(createPromotePrivateArrayToReg());
+                mpm.add(createCFGSimplificationPass());
             }
-
-            mpm.add(createCFGSimplificationPass());
             mpm.add(createPromoteMemoryToRegisterPass());
         }
         else

IGC/Compiler/CISACodeGen/LowerGEPForPrivMem.cpp

@@ -32,7 +32,6 @@ namespace llvm {
 // The following declarations are placed according to alphabetic order for simplicity
 void initializeAddImplicitArgsPass(llvm::PassRegistry&);
 void initializeAddressSpaceAliasAnalysisPass(llvm::PassRegistry&);
-void initializeAnnotateUniformAllocasPass(llvm::PassRegistry&);
 void initializeAggregateArgumentsAnalysisPass(llvm::PassRegistry&);
 void initializeAlignmentAnalysisPass(llvm::PassRegistry&);
 void initializePreBIImportAnalysisPass(llvm::PassRegistry&);