TMP

Author: sjoerdmeijer

llvm/lib/Transforms/Scalar/LoopInterchange.cpp

@@ -123,9 +123,9 @@ static cl::list<RuleTy> Profitabilities(
 // FIXME: this option exists mainly for a couple of tests that check some
 // corner cases that is more difficult to trigger otherwise; these tests should
 // be rewritten and this option removed if possible.
-static cl::opt<bool> SkipLoopsWithZeroBTC(
-    "loop-interchange-skip-zero-btc", cl::init(true), cl::Hidden,
-    cl::desc("Do not consider loops with a backedge taken count of 0"));
+//static cl::opt<bool> SkipLoopsWithZeroBTC(
+//    "loop-interchange-skip-zero-btc", cl::init(true), cl::Hidden,
+//    cl::desc("Do not consider loops with a backedge taken count of 0"));
 
 #ifndef NDEBUG
 static bool noDuplicateRulesAndIgnore(ArrayRef<RuleTy> Rules) {
@@ -438,9 +438,10 @@ static bool isComputableLoopNest(ScalarEvolution *SE,
     // A loop with a backedge that isn't taken, e.g. an unconditional branch
     // true, isn't really a loop and we don't want to consider it as a
     // candidate.
-    if (ExitCountOuter && SkipLoopsWithZeroBTC && ExitCountOuter->isZero()) {
+    if (ExitCountOuter && /*SkipLoopsWithZeroBTC && */ExitCountOuter->isZero()) {
       LLVM_DEBUG(dbgs() << "The loop back-edge isn't taken, rejecting single "
                            "iteration loop\n");
+      LLVM_DEBUG(L->dump());
       return false;
     }
     if (L->getNumBackEdges() != 1) {

llvm/test/Transforms/LoopInterchange/interchanged-loop-nest-4.ll

@@ -1,5 +1,5 @@
 ; REQUIRES: asserts
-; RUN: opt < %s -passes="loop(loop-interchange,loop-interchange)" -cache-line-size=8 -verify-dom-info -verify-loop-info -loop-interchange-skip-zero-btc=false \
+; RUN: opt < %s -passes="loop(loop-interchange,loop-interchange)" -cache-line-size=8 -verify-dom-info -verify-loop-info \
 ; RUN:  -debug-only=loop-interchange 2>&1 | FileCheck %s
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"

llvm/test/Transforms/LoopInterchange/lcssa-phi-outer-latch.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 6
-; RUN: opt < %s -passes=loop-interchange -loop-interchange-skip-zero-btc=false -cache-line-size=64 -verify-dom-info -verify-loop-info -verify-scev -verify-loop-lcssa -S | FileCheck %s
+; RUN: opt < %s -passes=loop-interchange -cache-line-size=64 -verify-dom-info -verify-loop-info -verify-scev -verify-loop-lcssa -S | FileCheck %s
 
 ; This test is checking that blocks outer.body and outer.latch, where outer.body is the exit
 ; block of the inner loop and outer.latch the latch of the outer loop, correctly

llvm/test/Transforms/LoopInterchange/pr43176-move-to-new-latch.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
-; RUN: opt < %s -passes=loop-interchange -cache-line-size=64 -pass-remarks-missed='loop-interchange' -pass-remarks-output=%t -loop-interchange-skip-zero-btc=false -S
+; RUN: opt < %s -passes=loop-interchange -cache-line-size=64 -pass-remarks-missed='loop-interchange' -pass-remarks-output=%t -S
 ; RUN: FileCheck --input-file=%t %s
 
 @b = external dso_local global [5 x i32], align 16

llvm/test/Transforms/LoopInterchange/pr43326.ll

@@ -1,5 +1,5 @@
 ; RUN: opt < %s -passes=loop-interchange -cache-line-size=64 -pass-remarks-missed='loop-interchange' -pass-remarks-output=%t -S \
-; RUN:     -loop-interchange-skip-zero-btc=false -verify-dom-info -verify-loop-info -verify-loop-lcssa -stats 2>&1
+; RUN:     -verify-dom-info -verify-loop-info -verify-loop-lcssa -stats 2>&1
 ; RUN: FileCheck --input-file=%t --check-prefix=REMARKS %s
 
 @a = global i32 0