Merge branch 'vhls-opt' into main

kumasento · Sep 11, 2021 · f0fcfb0 · f0fcfb0
2 parents f731c7a + 1006587
commit f0fcfb0
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/lib/llvm/Transforms/VhlsLLVMRewriter.cc b/lib/llvm/Transforms/VhlsLLVMRewriter.cc
@@ -969,6 +969,20 @@ struct XilinxRewriteMathInstPass : public ModulePass {
 
 } // namespace
 
+static void unrollLoop(Loop *loop) {
+  LLVMContext &Context = loop->getHeader()->getContext();
+  MDNode *EnableUnrollMD =
+      MDNode::get(Context, MDString::get(Context, "llvm.loop.unroll.full"));
+  MDNode *LoopID = loop->getLoopID();
+  MDNode *NewLoopID = makePostTransformationMetadata(
+      Context, LoopID, {"llvm.loop.unroll."}, {EnableUnrollMD});
+  loop->setLoopID(NewLoopID);
+
+  if (!loop->isInnermost())
+    for (auto &subloop : loop->getSubLoops())
+      unrollLoop(subloop);
+}
+
 namespace {
 
 /// Unroll all the loops in a specified function for Xilinx Vitis.
@@ -983,15 +997,8 @@ struct XilinxUnrollPass : public ModulePass {
         auto DT = llvm::DominatorTree(F);
         LoopInfo LI(DT);
 
-        for (auto &loop : LI) {
-          LLVMContext &Context = loop->getHeader()->getContext();
-          MDNode *EnableUnrollMD = MDNode::get(
-              Context, MDString::get(Context, "llvm.loop.unroll.full"));
-          MDNode *LoopID = loop->getLoopID();
-          MDNode *NewLoopID = makePostTransformationMetadata(
-              Context, LoopID, {"llvm.loop.unroll."}, {EnableUnrollMD});
-          loop->setLoopID(NewLoopID);
-        }
+        for (auto &loop : LI)
+          unrollLoop(loop);
       }
 
     return false;