[Autobackout][FunctionalRegression]Revert of change: 0fe2acf: src2 acc support

For single precision float instruction only

Author: sys-igc

visa/G4_IR.cpp

@@ -7336,24 +7336,6 @@ bool G4_INST::canDstBeAcc() const {
   }
 }
 
-bool G4_INST::relaxAccInSrc2 () const {
-  if (getNumSrc() != 3)
-    return false;
-
-  if (builder.canUseAccInSrc2ForFloat3SourcesInst()) {
-    if ((getDst() && !IS_FTYPE(getDst()->getType())) ||
-        (getSrc(2) && !IS_FTYPE(getSrc(2)->getType())) ||
-        (getSrc(0) && !IS_FTYPE(getSrc(0)->getType())) ||
-        (getSrc(1) && !IS_FTYPE(getSrc(1)->getType()))) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  return false;
-}
-
 // returns true if src0/1/2 may be replaced by an explicit acc
 // in addition to opcode-specific checks, we require
 // -- contiguous regions
@@ -7366,8 +7348,7 @@ bool G4_INST::canSrcBeAccBeforeHWConform(Gen4_Operand_Number opndNum) const {
 
   if (!builder.relaxedACCRestrictions3() &&
       !builder.removedAccRestrictionsAsGRF() && srcId == 2) {
-    if (!relaxAccInSrc2())
-      return false;
+    return false;
   }
 
   if (getSrc(srcId) == nullptr || !getSrc(srcId)->isSrcRegRegion()) {

visa/G4_IR.hpp

@@ -878,8 +878,6 @@ class G4_INST {
 
   bool canSrcBeAccBeforeHWConform(Gen4_Operand_Number opndNum) const;
 
-  bool relaxAccInSrc2() const;
-
   bool canSrcBeAccAfterHWConform(Gen4_Operand_Number opndNum) const;
 
   TARGET_PLATFORM getPlatform() const;

visa/HWCaps.inc

@@ -810,11 +810,6 @@ bool removedAccRestrictionsAsGRF() const {
   return false;
 }
 
-// when all source and dst are float data type, Src2 can be accumulator
-bool canUseAccInSrc2ForFloat3SourcesInst() const {
-  return getPlatform() >= Xe2;
-}
-
 
 bool needBothAcc(G4_Operand *opnd) const {
   switch (opnd->getType()) {

visa/Passes/AccSubstitution.cpp

@@ -508,9 +508,6 @@ bool AccSubPass::isAccCandidate(G4_INST *inst, int &lastUse, bool &mustBeAcc0,
       threeSrcUses.push_back(useInst);
       switch (opndNum) {
       case Opnd_src2:
-        if (inst->relaxAccInSrc2()) { // No need to swap
-          break;
-        }
         if (!kernel.fg.builder->relaxedACCRestrictions3() &&
             !kernel.fg.builder->removedAccRestrictionsAsGRF()) {
           // If swapAccSub is disabled, skip further checking on src2.
@@ -572,15 +569,13 @@ bool AccSubPass::isAccCandidate(G4_INST *inst, int &lastUse, bool &mustBeAcc0,
         if (!kernel.fg.builder->relaxedACCRestrictions3() &&
             !kernel.fg.builder->removedAccRestrictionsAsGRF() && SwappableUses &&
             isCommutativeOnSrc12(useInst)) {
-          if (!useInst->relaxAccInSrc2()) {
-            // As src2 cannot use acc, acc substitution is only
-            // feasible if src1 and src2 are different.
-            auto *def2 = useInst->getSingleDef(Opnd_src2);
-            // If the single-def on src2 is the same as this use-inst,
-            // the acc substitution is infeasible.
-            if (def2 && def2 == inst)
-              return false;
-          }
+          // As src2 cannot use acc, acc substitution is only
+          // feasible if src1 and src2 are different.
+          auto *def2 = useInst->getSingleDef(Opnd_src2);
+          // If the single-def on src2 is the same as this use-inst,
+          // the acc substitution is infeasible.
+          if (def2 && def2 == inst)
+            return false;
           // CHECK: source modifier on itself & src2 on TGLLP.
           if (builder.getPlatform() == GENX_TGLLP) {
             switch (useInst->getSrc(1)->asSrcRegRegion()->getModifier()) {
@@ -690,8 +685,7 @@ bool AccSubPass::isAccCandidate(G4_INST *inst, int &lastUse, bool &mustBeAcc0,
     // ternary instruction, says 'mad'.
     if (SwappableUses) {
       if (isCommutativeOnSrc12(useInst) && useInst->getNumSrc() == 3 &&
-          (opndNum == Opnd_src1 || opndNum == Opnd_src2) &&
-          !useInst->relaxAccInSrc2()) {
+          (opndNum == Opnd_src1 || opndNum == Opnd_src2)) {
         SwappableUses->push_back(use);
       }
     }