From 3cd8f57294ab29722ace5473ee7823e0dd9a8768 Mon Sep 17 00:00:00 2001
From: William Chen <william.chen@futurewei.com>
Date: Mon, 15 Nov 2021 17:18:46 -0800
Subject: [PATCH 1/2] call loop detection for strldr and use it for memprop.

---
 .../maple_be/src/cg/aarch64/aarch64_strldr.cpp     | 14 ++++++++++++++
 src/mapleall/maple_be/src/cg/strldr.cpp            |  1 +
 2 files changed, 15 insertions(+)

diff --git a/src/mapleall/maple_be/src/cg/aarch64/aarch64_strldr.cpp b/src/mapleall/maple_be/src/cg/aarch64/aarch64_strldr.cpp
index 4412abcefd..bc58d70f67 100644
--- a/src/mapleall/maple_be/src/cg/aarch64/aarch64_strldr.cpp
+++ b/src/mapleall/maple_be/src/cg/aarch64/aarch64_strldr.cpp
@@ -355,6 +355,20 @@ bool AArch64StoreLoadOpt::CheckReplaceReg(Insn &defInsn, Insn &currInsn, InsnSet
       tmpInsn = tmpInsn->GetNext();
     }
   } else {
+    regno_t defRegno = static_cast<AArch64RegOperand&>(defInsn.GetOperand(kInsnFirstOpnd)).GetRegisterNumber();
+    if (defRegno == replaceRegNo) {
+      uint32 defLoopId = 0;
+      uint32 curLoopId = 0;
+      if (defInsn.GetBB()->GetLoop()) {
+        defLoopId = defInsn.GetBB()->GetLoop()->GetHeader()->GetId();
+      }
+      if (currInsn.GetBB()->GetLoop()) {
+        curLoopId = currInsn.GetBB()->GetLoop()->GetHeader()->GetId();
+      }
+      if (defLoopId != curLoopId) {
+        return false;
+      }
+    }
     AArch64ReachingDefinition *a64RD = static_cast<AArch64ReachingDefinition*>(cgFunc.GetRD());
     if (a64RD->HasRegDefBetweenInsnGlobal(replaceRegNo, defInsn, currInsn)) {
       return false;
diff --git a/src/mapleall/maple_be/src/cg/strldr.cpp b/src/mapleall/maple_be/src/cg/strldr.cpp
index d30abcee83..f1334e4431 100644
--- a/src/mapleall/maple_be/src/cg/strldr.cpp
+++ b/src/mapleall/maple_be/src/cg/strldr.cpp
@@ -39,6 +39,7 @@ bool CgStoreLoadOpt::PhaseRun(maplebe::CGFunc &f) {
     GetAnalysisInfoHook()->ForceEraseAnalysisPhase(f.GetUniqueID(), &CgReachingDefinition::id);
     return false;
   }
+  GetAnalysisInfoHook()->ForceRunAnalysisPhase<MapleFunctionPhase<CGFunc>, CGFunc>(&CgLoopAnalysis::id, f);
 
   StoreLoadOpt *storeLoadOpt = nullptr;
 #if TARGAARCH64 || TARGRISCV64
-- 
Gitee


From db7fa39ad5fcb75db75514b915bf19193a5569f7 Mon Sep 17 00:00:00 2001
From: William Chen <william.chen@futurewei.com>
Date: Mon, 22 Nov 2021 16:44:48 -0800
Subject: [PATCH 2/2] Temporary turn off loop checking.  Waiting for real fix.

---
 src/mapleall/maple_be/src/cg/loop.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mapleall/maple_be/src/cg/loop.cpp b/src/mapleall/maple_be/src/cg/loop.cpp
index e3f6ca5173..66dc0b4f50 100644
--- a/src/mapleall/maple_be/src/cg/loop.cpp
+++ b/src/mapleall/maple_be/src/cg/loop.cpp
@@ -635,7 +635,7 @@ bool CgLoopAnalysis::PhaseRun(maplebe::CGFunc &f) {
     /* do dot gen after detection so the loop backedge can be properly colored using the loop info */
     DotGenerator::GenerateDot("buildloop", f, f.GetMirModule(), true, f.GetName());
   }
-#if DEBUG
+#if xDEBUG
   for (const auto *lp : f.GetLoops()) {
     lp->CheckLoops();
   }
-- 
Gitee