From 3ff5a7c9334dcf4c70985b4401e83adef417aabf Mon Sep 17 00:00:00 2001
From: linma <lma1@futurewei.com>
Date: Thu, 25 Nov 2021 19:03:37 -0800
Subject: [PATCH] lfoloopvec: enable small trip count doloop to do
 vectorization and fix an issue

---
 src/mapleall/maple_me/src/lfo_loop_vec.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/mapleall/maple_me/src/lfo_loop_vec.cpp b/src/mapleall/maple_me/src/lfo_loop_vec.cpp
index 41612b2c7e..8c0dd5ab5b 100644
--- a/src/mapleall/maple_me/src/lfo_loop_vec.cpp
+++ b/src/mapleall/maple_me/src/lfo_loop_vec.cpp
@@ -160,8 +160,8 @@ bool LoopTransPlan::Generate(DoloopNode *doloop, DoloopInfo* li, bool enableDebu
 
     // check opnd0 of condNode is an expression not a variable
     // upperbound formula doesn't handle this case now
-    if (condOpnd0->GetOpCode() != OP_dread ||
-        condOpnd0->GetOpCode() != OP_regread) {
+    if ((condOpnd0->GetOpCode() != OP_dread) &&
+        (condOpnd0->GetOpCode() != OP_regread)) {
       if (enableDebug) {
         LogInfo::MapleLogger() << "NOT VECTORIZABLE because of doloop condition compare is complex \n";
       }
@@ -181,11 +181,18 @@ bool LoopTransPlan::Generate(DoloopNode *doloop, DoloopInfo* li, bool enableDebu
       if (condOpHasEqual) {
         upvalue += 1;
       }
-      if (((upvalue - lowvalue) / (incrConst->GetValue())) < vecLanes) {
-        if (enableDebug) {
-          LogInfo::MapleLogger() << "NOT VECTORIZABLE because of doloop trip count is small \n";
+      int tripCount = (upvalue - lowvalue) / (incrConst->GetValue());
+      if (tripCount < vecLanes) {
+        tripCount = (tripCount / 4 * 4); // get closest 2^n
+        if (tripCount * vecInfo->smallestTypeSize < 64) {
+          if (enableDebug) {
+            LogInfo::MapleLogger() << "NOT VECTORIZABLE because of doloop trip count is small \n";
+          }
+          return false;
+        } else {
+          vecLanes = tripCount;
+          vecFactor = tripCount;
         }
-        return false;
       }
     }
   }
-- 
Gitee