MIR: cancel modify on vector fma

Author: Leakbox258

lib/mir/passes/pass_builder.cpp

@@ -5,14 +5,13 @@
 #include "mir/passes/pass_manager.hpp"
 
 // Analysis
-#include "mir/passes/analysis/liveanalysis.hpp"
-#include "mir/passes/analysis/loop_analysis.hpp"
 #include "mir/passes/analysis/branch_freq_analysis.hpp"
 #include "mir/passes/analysis/domtree_analysis.hpp"
+#include "mir/passes/analysis/liveanalysis.hpp"
+#include "mir/passes/analysis/loop_analysis.hpp"
 
 // Transforms
 #include "mir/passes/transforms/CFGsimplify.hpp"
-#include "mir/passes/transforms/codelayout.hpp"
 #include "mir/passes/transforms/CopyPropagation.hpp"
 #include "mir/passes/transforms/FusedAddr.hpp"
 #include "mir/passes/transforms/ICF_TailDup.hpp"
@@ -21,6 +20,7 @@
 #include "mir/passes/transforms/PreRAlegalize.hpp"
 #include "mir/passes/transforms/RA.hpp"
 #include "mir/passes/transforms/RedundantLoadEli.hpp"
+#include "mir/passes/transforms/codelayout.hpp"
 #include "mir/passes/transforms/isel.hpp"
 #include "mir/passes/transforms/licm.hpp"
 #include "mir/passes/transforms/lowering.hpp"

lib/mir/passes/transforms/peephole.cpp

@@ -6,6 +6,7 @@
 #include "mir/armv8/base.hpp"
 #include "mir/info.hpp"
 #include "mir/tools.hpp"
+#include "utils/logger.hpp"
 #include <cstdint>
 #include <iterator>
 #include <optional>
@@ -518,7 +519,7 @@ bool GenericPeepholeImpl::MA(MatchInfo &info) {
 
         ///@warning https://ilinuxkernel.com/?p=1546
         if (!inSet(minst->opcode<OpC>(), OpC::InstAdd, OpC::InstSub, OpC::InstVAdd,
-                   OpC::InstVSub /* OpC::InstFAdd, OpC::InstFSub */)) {
+                   OpC::InstVSub /* OpC::InstFAdd, OpC::InstFSub, OpC::InstVFAdd, OpC::InstVFSub */)) {
             return false;
         }
 
@@ -530,11 +531,6 @@ bool GenericPeepholeImpl::MA(MatchInfo &info) {
             return false;
         }
 
-        if (inSet(newOpC, ARMOpC::MLA_V, ARMOpC::MLS_V) &&
-            inSet(minst->ensureDef()->type(), OpT::Floatvec2, OpT::Floatvec4)) {
-            return false;
-        }
-
         return true;
     };