Changes in code.

Change-Id: I0a44674c39dfb31369427abde0ba896215d8e35e

Author: pmochock

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -321,9 +321,6 @@ namespace IGC
         ctx.m_instrTypes.numSample = numSample;
         ctx.m_instrTypes.numInsts = numInsts;
         ctx.m_instrTypes.hasLoadStore = true;
-
-        // Always allocate private as global stateless when there are calls
-        ctx.setForceGlobalMemoryAllocation(ctx.m_instrTypes.hasCall);
     }
 
     // forward declaration

IGC/Compiler/CodeGenContext.cpp

@@ -526,13 +526,6 @@ namespace IGC
         return m_InternalOptions.IntelForceGlobalMemoryAllocation;
     }
 
-    void OpenCLProgramContext::setForceGlobalMemoryAllocation(bool value)
-    {
-        // This flag can be updated by other conditions apart from user input
-        // e.g. presence of stack calls
-        m_InternalOptions.IntelForceGlobalMemoryAllocation |= value;
-    }
-
     bool OpenCLProgramContext::hasNoLocalToGenericCast() const
     {
         return m_InternalOptions.hasNoLocalToGeneric;

IGC/Compiler/CodeGenPublic.h

@@ -865,7 +865,6 @@ namespace IGC
         virtual uint32_t getNumThreadsPerEU() const;
         virtual uint32_t getNumGRFPerThread() const;
         virtual bool forceGlobalMemoryAllocation() const;
-        virtual void setForceGlobalMemoryAllocation(bool value) {};
         virtual bool hasNoLocalToGenericCast() const;
         virtual int16_t getVectorCoalescingControl() const;
         bool isPOSH() const;
@@ -1197,7 +1196,7 @@ namespace IGC
         // output: shader information
         iOpenCL::CGen8OpenCLProgram m_programOutput;
         SOpenCLProgramInfo m_programInfo;
-        InternalOptions m_InternalOptions;
+        const InternalOptions m_InternalOptions;
         const Options m_Options;
         bool isSpirV;
         float m_ProfilingTimerResolution;
@@ -1226,7 +1225,6 @@ namespace IGC
         uint32_t getNumGRFPerThread() const override;
         uint32_t getNumThreadsPerEU() const override;
         bool forceGlobalMemoryAllocation() const override;
-        void setForceGlobalMemoryAllocation(bool value) override;
         bool hasNoLocalToGenericCast() const override;
         int16_t getVectorCoalescingControl() const override;
     private:

IGC/Compiler/Optimizer/OpenCLPasses/GenericAddressResolution/GenericAddressDynamicResolution.cpp

@@ -269,24 +269,21 @@ void GenericAddressDynamicResolution::resolveGAS(Instruction& I, Value* pointerO
 
 
     // Private branch
-    if (!m_ctx->forceGlobalMemoryAllocation())
+    privateBlock = BasicBlock::Create(I.getContext(), "PrivateBlock", convergeBlock->getParent(), convergeBlock);
     {
-        privateBlock = BasicBlock::Create(I.getContext(), "PrivateBlock", convergeBlock->getParent(), convergeBlock);
-        {
-            IRBuilder<> privateBuilder(privateBlock);
-            PointerType* ptrType = pointerType->getElementType()->getPointerTo(ADDRESS_SPACE_PRIVATE);
-            Value* privatePtr = privateBuilder.CreateAddrSpaceCast(pointerOperand, ptrType);
+        IRBuilder<> privateBuilder(privateBlock);
+        PointerType* ptrType = pointerType->getElementType()->getPointerTo(ADDRESS_SPACE_PRIVATE);
+        Value* privatePtr = privateBuilder.CreateAddrSpaceCast(pointerOperand, ptrType);
 
-            if (LoadInst* LI = dyn_cast<LoadInst>(&I))
-            {
-                privateLoad = privateBuilder.CreateAlignedLoad(privatePtr, LI->getAlignment(), LI->isVolatile(), "privateLoad");
-            }
-            else if (StoreInst* SI = dyn_cast<StoreInst>(&I))
-            {
-                privateBuilder.CreateAlignedStore(I.getOperand(0), privatePtr, SI->getAlignment(), SI->isVolatile());
-            }
-            privateBuilder.CreateBr(convergeBlock);
+        if (LoadInst* LI = dyn_cast<LoadInst>(&I))
+        {
+            privateLoad = privateBuilder.CreateAlignedLoad(privatePtr, LI->getAlignment(), LI->isVolatile(), "privateLoad");
+        }
+        else if (StoreInst* SI = dyn_cast<StoreInst>(&I))
+        {
+            privateBuilder.CreateAlignedStore(I.getOperand(0), privatePtr, SI->getAlignment(), SI->isVolatile());
         }
+        privateBuilder.CreateBr(convergeBlock);
     }
 
     // Local Branch
@@ -314,14 +311,12 @@ void GenericAddressDynamicResolution::resolveGAS(Instruction& I, Value* pointerO
     globalBlock = BasicBlock::Create(I.getContext(), "GlobalBlock", convergeBlock->getParent(), convergeBlock);
     {
         IRBuilder<> globalBuilder(globalBlock);
-        PointerType* ptrType = pointerType->getElementType()->getPointerTo(
-            m_ctx->forceGlobalMemoryAllocation() ? ADDRESS_SPACE_GLOBAL_OR_PRIVATE : ADDRESS_SPACE_GLOBAL);
+        PointerType* ptrType = pointerType->getElementType()->getPointerTo(ADDRESS_SPACE_GLOBAL);
         Value* globalPtr = globalBuilder.CreateAddrSpaceCast(pointerOperand, ptrType);
 
         if (LoadInst* LI = dyn_cast<LoadInst>(&I))
         {
-            globalLoad = globalBuilder.CreateAlignedLoad(globalPtr, LI->getAlignment(), LI->isVolatile(),
-                m_ctx->forceGlobalMemoryAllocation() ? "privateOrGlobalLoad" : "globalLoad");
+            globalLoad = globalBuilder.CreateAlignedLoad(globalPtr, LI->getAlignment(), LI->isVolatile(), "globalLoad");
         }
         else if (StoreInst* SI = dyn_cast<StoreInst>(&I))
         {
@@ -333,26 +328,9 @@ void GenericAddressDynamicResolution::resolveGAS(Instruction& I, Value* pointerO
     currentBlock->getTerminator()->eraseFromParent();
     builder.SetInsertPoint(currentBlock);
 
-
-    // Private branch can be saved if private mem is allocated in global stateless
-    if (m_ctx->forceGlobalMemoryAllocation())
-    {
-        SwitchInst* switchTag = builder.CreateSwitch(tag, globalBlock, 1);
-        // Based on tag there are two cases 010: local, 000/111: global
-        switchTag->addCase(localTag, localBlock);
-
-        if ((localLoad != nullptr) && (globalLoad != nullptr))
-        {
-            IRBuilder<> phiBuilder(&(*convergeBlock->begin()));
-            PHINode* phi = phiBuilder.CreatePHI(I.getType(), 2, I.getName());
-            phi->addIncoming(localLoad, localBlock);
-            phi->addIncoming(globalLoad, globalBlock);
-            I.replaceAllUsesWith(phi);
-        }
-    }
-    else if (m_ctx->hasNoLocalToGenericCast())
+    // Local branch can be saved if there are no local to generic casts
+    if (m_ctx->hasNoLocalToGenericCast())
     {
-        // Local branch can be saved if there are no local to generic casts
         SwitchInst* switchTag = builder.CreateSwitch(tag, globalBlock, 1);
         // Based on tag there are two cases 001: private, 000/111: global
         switchTag->addCase(privateTag, privateBlock);
@@ -369,7 +347,7 @@ void GenericAddressDynamicResolution::resolveGAS(Instruction& I, Value* pointerO
     else
     {
         SwitchInst* switchTag = builder.CreateSwitch(tag, globalBlock, 2);
-        // Based on tag there are three cases 001: private, 010: local, 000/111: global
+        // Based on tag there are two cases 001: private, 010: local, 000/111: global
         switchTag->addCase(privateTag, privateBlock);
         switchTag->addCase(localTag, localBlock);
 
@@ -394,7 +372,7 @@ void GenericAddressDynamicResolution::resolveGASWithoutBranches(Instruction& I,
 
     Value* nonLocalLoad = nullptr;
 
-    PointerType* ptrType = pointerType->getElementType()->getPointerTo(ADDRESS_SPACE_GLOBAL_OR_PRIVATE);
+    PointerType* ptrType = pointerType->getElementType()->getPointerTo(ADDRESS_SPACE_GLOBAL);
     Value* globalPtr = builder.CreateAddrSpaceCast(pointerOperand, ptrType);
 
     if (LoadInst* LI = dyn_cast<LoadInst>(&I))