Revert of:

Tessellation factors padding in URB header

Change-Id: Ie58b1746b72a0442131c28d067dbfbdf15d83153

Author: lfilipko

IGC/Compiler/CISACodeGen/HullShaderLowering.cpp

@@ -52,7 +52,7 @@ class HullShaderLowering : public llvm::FunctionPass
 private:
     void LowerIntrinsicInputOutput(llvm::Function &F);
 
-    unsigned int GetDomainType();
+    unsigned int GetDomainType(llvm::BasicBlock * bb, unsigned & numTEFactorsInDomain);
 
     llvm::GenIntrinsicInst* AddURBWriteControlPointOutputs(
         Value* mask,
@@ -126,15 +126,16 @@ void HullShaderLowering::LowerIntrinsicInputOutput(Function& F)
 {
     SmallVector<Instruction*, 10> instructionToRemove;
 
-    IRBuilder<> builder(F.getContext());
+    IRBuilder<> builder(F.getContext());    
 
     IGC::CodeGenContext* ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
 
     for(auto BI = F.begin(), BE = F.end(); BI != BE; BI++)
     {
         m_pControlPointOutputs.clear();
-
+        
         bool isTEFactorURBMsgPadded = false;
+        unsigned int numTEFactorsInDomain = 0;
 
         for(auto II = BI->begin(), IE = BI->end(); II!=IE; II++)
         {
@@ -240,25 +241,43 @@ void HullShaderLowering::LowerIntrinsicInputOutput(Function& F)
                     instructionToRemove.push_back(inst);
                 }
 
-                if ((IID == GenISAIntrinsic::GenISA_OuterScalarTessFactors) ||
-                    (IID == GenISAIntrinsic::GenISA_InnerScalarTessFactors))
+                // Apply URB padding for TE factors.
+                if (IGC_IS_FLAG_ENABLED(EnableTEFactorsPadding) &&
+                    ctx->platform.applyTEFactorsPadding() &&
+                    ((IID == GenISAIntrinsic::GenISA_OuterScalarTessFactors) ||
+                     (IID == GenISAIntrinsic::GenISA_InnerScalarTessFactors)))
                 {
-                    // Apply URB padding for TE factors.
-                    if (IGC_IS_FLAG_ENABLED(EnableTEFactorsPadding) && ctx->platform.applyTEFactorsPadding())
+                    if (!isTEFactorURBMsgPadded)
                     {
-                        if (!isTEFactorURBMsgPadded)
+                        // Parse all instructions within BB and count the Inner,Outer ScalarTessFactors factors
+                        // and get the domain type.
+                        BasicBlock* bb = dyn_cast<BasicBlock>(BI);
+                        uint32_t tessShaderDomain = GetDomainType(bb, numTEFactorsInDomain);
+
+                        if ((numTEFactorsInDomain == 2 && tessShaderDomain == USC::TESSELLATOR_DOMAIN_ISOLINE) ||
+                            (numTEFactorsInDomain == 4 && tessShaderDomain == USC::TESSELLATOR_DOMAIN_TRI) ||
+                            (numTEFactorsInDomain == 6 && tessShaderDomain == USC::TESSELLATOR_DOMAIN_QUAD))
                         {
+
+                            // Adjust the mask value based on the TE factors number.
+                            unsigned int mask = (1 << (8 - numTEFactorsInDomain)) - 1;
+
                             Value* undef = llvm::UndefValue::get(Type::getFloatTy(F.getContext()));
                             Value* data[8] = { undef,undef,undef,undef,undef,undef,undef,undef };
-                            // Add padding at offset 0
-                            AddURBWrite(builder.getInt32(0), builder.getInt32(0xF), data, inst);
-                            // Add padding at offset 1
-                            AddURBWrite(builder.getInt32(1), builder.getInt32(0xF), data, inst);
+                            AddURBWrite(
+                                builder.getInt32(0),    // offset
+                                builder.getInt32(mask),
+                                data,
+                                inst);
 
                             isTEFactorURBMsgPadded = true;
                         }
                     }
+                }
 
+                if ((IID == GenISAIntrinsic::GenISA_OuterScalarTessFactors) ||
+                    (IID == GenISAIntrinsic::GenISA_InnerScalarTessFactors))
+                {
                     // The URB Location for tessellation factors spans the first two offsets
                     // offset 0 and 1. The tessellation factors occupy the two offsets as mentioned below
                     // Quad domain has 4 outer and 2 inner tessellation factors
@@ -284,7 +303,17 @@ void HullShaderLowering::LowerIntrinsicInputOutput(Function& F)
                     //| 			        |  					        | 	             |                |
                     //------------------------------------------------------------------------------------
 
-                    unsigned int tessShaderDomain = GetDomainType();
+                    uint32_t tessShaderDomain = USC::TESSELLATOR_DOMAIN_ISOLINE;
+                    llvm::NamedMDNode *pMetaData = m_module->getOrInsertNamedMetadata("TessellationShaderDomain");
+                    if (pMetaData && (pMetaData->getNumOperands() == 1))
+                    {
+                        llvm::MDNode* pTessShaderDomain = pMetaData->getOperand(0);
+                        if (pTessShaderDomain)
+                        {
+                            tessShaderDomain = int_cast<uint32_t>(
+                                mdconst::dyn_extract<ConstantInt>(pTessShaderDomain->getOperand(0))->getZExtValue());
+                        }
+                    }
 
                     // offset into URB is 1 for outerScalarTessFactors and
                     // 1 if its triangle domain and inner scalar tessellation factor
@@ -372,17 +401,29 @@ void HullShaderLowering::LowerIntrinsicInputOutput(Function& F)
     }
 }
 
-unsigned int HullShaderLowering::GetDomainType()
+unsigned int HullShaderLowering::GetDomainType(llvm::BasicBlock* bb, unsigned &numTEFactorsInDomain)
 {
     unsigned int tessShaderDomain = USC::TESSELLATOR_DOMAIN_ISOLINE;
-    llvm::NamedMDNode *pMetaData = m_module->getOrInsertNamedMetadata("TessellationShaderDomain");
-    if (pMetaData && (pMetaData->getNumOperands() == 1))
+    for (auto II = bb->begin(), IE = bb->end(); II != IE; II++)
     {
-        llvm::MDNode* pTessShaderDomain = pMetaData->getOperand(0);
-        if (pTessShaderDomain)
+        if (GenIntrinsicInst* inst = dyn_cast<GenIntrinsicInst>(II))
         {
-            tessShaderDomain = int_cast<uint32_t>(
-                mdconst::dyn_extract<ConstantInt>(pTessShaderDomain->getOperand(0))->getZExtValue());
+            GenISAIntrinsic::ID IID = inst->getIntrinsicID();
+            if ((IID == GenISAIntrinsic::GenISA_OuterScalarTessFactors) ||
+                (IID == GenISAIntrinsic::GenISA_InnerScalarTessFactors))
+            {
+                llvm::NamedMDNode *pMetaData = m_module->getOrInsertNamedMetadata("TessellationShaderDomain");
+                if (pMetaData && (pMetaData->getNumOperands() == 1))
+                {
+                    llvm::MDNode* pTessShaderDomain = pMetaData->getOperand(0);
+                    if (pTessShaderDomain)
+                    {
+                        tessShaderDomain = int_cast<uint32_t>(
+                            mdconst::dyn_extract<ConstantInt>(pTessShaderDomain->getOperand(0))->getZExtValue());
+                    }
+                }
+                numTEFactorsInDomain++;
+            }
         }
     }
     return tessShaderDomain;