From a86b904899205aadad2d890fe4e5195654596e2c Mon Sep 17 00:00:00 2001
From: William Chen <william.chen@futurewei.com>
Date: Fri, 18 Nov 2022 11:38:11 -0800
Subject: [PATCH] Add def dependency check for ssa A64PregCopyPattern

---
 .../include/cg/aarch64/aarch64_prop.h         |  1 +
 .../maple_be/src/cg/aarch64/aarch64_prop.cpp  | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/src/mapleall/maple_be/include/cg/aarch64/aarch64_prop.h b/src/mapleall/maple_be/include/cg/aarch64/aarch64_prop.h
index 551b2dfad8..d59e5f2802 100644
--- a/src/mapleall/maple_be/include/cg/aarch64/aarch64_prop.h
+++ b/src/mapleall/maple_be/include/cg/aarch64/aarch64_prop.h
@@ -468,6 +468,7 @@ class A64PregCopyPattern : public PropOptimizePattern {
   bool CheckValidDefInsn(const Insn *defInsn);
   bool CheckMultiUsePoints(const Insn *defInsn) const;
   bool CheckPhiCaseCondition(Insn &defInsn);
+  bool HasValidDefInsnDependency();
   bool DFSFindValidDefInsns(Insn *curDefInsn, std::vector<regno_t> &visitedPhiDefs,
                             std::unordered_map<uint32, bool> &visited);
   Insn &CreateNewPhiInsn(std::unordered_map<uint32, RegOperand*> &newPhiList, Insn *curInsn);
diff --git a/src/mapleall/maple_be/src/cg/aarch64/aarch64_prop.cpp b/src/mapleall/maple_be/src/cg/aarch64/aarch64_prop.cpp
index 619821c67d..108efd00f0 100644
--- a/src/mapleall/maple_be/src/cg/aarch64/aarch64_prop.cpp
+++ b/src/mapleall/maple_be/src/cg/aarch64/aarch64_prop.cpp
@@ -2515,6 +2515,28 @@ bool A64PregCopyPattern::CheckMultiUsePoints(const Insn *defInsn) const {
   return true;
 }
 
+bool A64PregCopyPattern::HasValidDefInsnDependency() {
+  /* Look for reg dependency between validDefInsns */
+  for (auto *ti : validDefInsns) {
+    const auto *md = &AArch64CG::kMd[ti->GetMachineOpcode()];
+    for (uint32 i = 0; i < ti->GetOperandSize(); i++) {
+      if (ti->GetOperand(i).IsRegister() && md->GetOpndDes(i)->IsRegUse() &&
+          static_cast<RegOperand&>(ti->GetOperand(i)).IsVirtualRegister()) {
+        regno_t regno = static_cast<RegOperand&>(ti->GetOperand(i)).GetRegisterNumber();
+        VRegVersion *useVersion = optSsaInfo->FindSSAVersion(regno);
+        Insn *def = FindDefInsn(useVersion);
+        if (def) {
+          auto it = find(validDefInsns.begin(), validDefInsns.end(), def);
+          if (it != validDefInsns.end()) {
+            return true;
+          }
+        }
+      }
+    }
+  }
+  return false;
+}
+
 bool A64PregCopyPattern::CheckPhiCaseCondition(Insn &defInsn) {
   std::unordered_map<uint32, bool> visited;
   std::vector<regno_t> visitedPhiDefs;
@@ -2576,6 +2598,9 @@ bool A64PregCopyPattern::CheckPhiCaseCondition(Insn &defInsn) {
   if (differIdx == -1) {
     return false;
   }
+  if (HasValidDefInsnDependency()) {
+    return false;
+  }
   return true;
 }
 
-- 
Gitee