[Autobackout][FuncReg]Revert of change: d1908ed

Remove extra casts from half to float when we find a fadd that has fmul
as one if its arguments. If the arguments from fadd or fmul are fptrunc,
we will use the input to the fptrunc so that we can drop the fptrunc
later. All other operands will be cast from half to float so that we can
create new float copies of the fadd and fmul. This will allow for less
packing of the half input for mad later on.

Change-Id: I2398115d0d8482026d7c24522f036f8a33fa83cc

Author: Henry Estela

IGC/Compiler/CustomSafeOptPass.cpp

@@ -956,20 +956,10 @@ bool CustomSafeOptPass::isEmulatedAdd(BinaryOperator& I)
 //  We can remove the extra casts in this case.
 //  This becomes:
 //  %41 = fadd fast float %34, %33
-// Can also do matches with fadd/fmul that will later become an mad instruction.
-// mad example:
-//  %.prec70.i = fptrunc float %273 to half
-//  %.prec78.i = fptrunc float %276 to half
-//  %279 = fmul fast half %233, %.prec70.i
-//  %282 = fadd fast half %279, %.prec78.i
-//  %.prec84.i = fpext half %282 to float
-// This becomes:
-//  %279 = fpext half %233 to float
-//  %280 = fmul fast float %273, %279
-//  %281 = fadd fast float %280, %276
 void CustomSafeOptPass::removeHftoFCast(Instruction& I)
 {
     // Skip if mix mode is supported
+
     CodeGenContext* Ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
     if (Ctx->platform.supportMixMode())
         return;
@@ -981,7 +971,6 @@ void CustomSafeOptPass::removeHftoFCast(Instruction& I)
     if (!I.hasOneUse())
         return;
 
-    // Check if this instruction is used in a single FPExtInst
     FPExtInst* castInst = NULL;
     User* U = *I.user_begin();
     if (FPExtInst* inst = dyn_cast<FPExtInst>(U))
@@ -994,79 +983,6 @@ void CustomSafeOptPass::removeHftoFCast(Instruction& I)
     if (!castInst)
       return;
 
-    // Check for fmad pattern
-    if (I.getOpcode() == Instruction::FAdd)
-    {
-        Value* src0 = nullptr, * src1 = nullptr, * src2 = nullptr;
-
-        // CodeGenPatternMatch::MatchMad matches the first fmul.
-        Instruction* fmulInst = nullptr;
-        for (uint i = 0; i < 2; i++)
-        {
-            fmulInst = dyn_cast<Instruction>(I.getOperand(i));
-            if (fmulInst && fmulInst->getNumOperands() == 2)
-            {
-                src0 = fmulInst->getOperand(0);
-                src1 = fmulInst->getOperand(1);
-                src2 = I.getOperand(1 - i);
-                break;
-            }
-        }
-        if (fmulInst)
-        {
-            // Used to get the new float operands for the new instructions
-            auto getFloatValue = [](Value* operand, Instruction* I, Type* type)
-            {
-                if (FPTruncInst* inst = dyn_cast<FPTruncInst>(operand))
-                {
-                    // Use the float input of the FPTrunc
-                    if (inst->getOperand(0)->getType()->isFloatTy())
-                    {
-                        return inst->getOperand(0);
-                    }
-                    else
-                    {
-                        return (Value*)NULL;
-                    }
-                }
-                else if (Instruction* inst = dyn_cast<Instruction>(operand))
-                {
-                    // Cast the result of this operand to a float
-                    return dyn_cast<Value>(new FPExtInst(inst, type, "", I));
-                }
-                return (Value*)NULL;
-            };
-
-            int convertCount = 0;
-            if (dyn_cast<FPTruncInst>(src0))
-                convertCount++;
-            if (dyn_cast<FPTruncInst>(src1))
-                convertCount++;
-            if (dyn_cast<FPTruncInst>(src2))
-                convertCount++;
-            if (convertCount >= 2)
-            {
-                // Conversion for the hf values
-                auto floatTy = castInst->getType();
-                src0 = getFloatValue(src0, fmulInst, floatTy);
-                src1 = getFloatValue(src1, fmulInst, floatTy);
-                src2 = getFloatValue(src2, &I, floatTy);
-
-                // Create new float fmul and fadd instructions
-                Value* newFmul = BinaryOperator::Create(Instruction::FMul, src0, src1, "", &I);
-                Value* newFadd = BinaryOperator::Create(Instruction::FAdd, newFmul, src2, "", &I);
-
-                // Copy fast math flags
-                Instruction* fmulInst = dyn_cast<Instruction>(newFmul);
-                Instruction* faddInst = dyn_cast<Instruction>(newFadd);
-                fmulInst->copyFastMathFlags(fmulInst);
-                faddInst->copyFastMathFlags(&I);
-                castInst->replaceAllUsesWith(faddInst);
-                return;
-            }
-        }
-    }
-
     // Check if operands come from a Float to HF Cast
     Value *S1 = NULL, *S2 = NULL;
     if (FPTruncInst* inst = dyn_cast<FPTruncInst>(I.getOperand(0)))