address fmt

Author: mustartt

llvm/lib/Transforms/Scalar/LoopIdiomRecognize.cpp

@@ -135,13 +135,17 @@ static cl::opt<bool, true>
                       cl::location(DisableLIRP::Strlen), cl::init(false),
                       cl::ReallyHidden);
 
+/// Some target libraries have a significant call overhead for `wcslen`,
+/// which can degrade performance when the input string is not long enough
+/// to justify the cost. To avoid unnecessary performance penalties,
+/// we disable it by default.
 bool DisableLIRP::Wcslen;
 static cl::opt<bool, true>
-    DisableLIRPWcslen("disable-loop-idiom-wcslen",
-                      cl::desc("Proceed with loop idiom recognize pass, but do "
-                               "not convert loop(s) to wcslen."),
-                      cl::location(DisableLIRP::Wcslen), cl::init(false),
-                      cl::ReallyHidden);
+    EnableLIRPWcslen("enable-loop-idiom-wcslen",
+                     cl::desc("Proceed with loop idiom recognize pass, "
+                              "enable conversion of loop(s) to wcslen."),
+                     cl::location(DisableLIRP::Wcslen), cl::init(true),
+                     cl::ReallyHidden);
 
 static cl::opt<bool> UseLIRCodeSizeHeurs(
     "use-lir-code-size-heurs",
@@ -1670,8 +1674,8 @@ class StrlenVerifier {
         return false;
 
       // We only want RecAddExpr with recurrence step that is constant. This
-      // is good enough for all the idioms we want to recognize. Later we expand and materialize
-      // the recurrence as {base,+,a} -> (base + a * strlen)
+      // is good enough for all the idioms we want to recognize. Later we expand
+      // and materialize the recurrence as {base,+,a} -> (base + a * strlen)
       if (!dyn_cast<SCEVConstant>(AddRecEv->getStepRecurrence(*SE)))
         return false;
     }
@@ -1764,7 +1768,8 @@ bool LoopIdiomRecognize::recognizeAndInsertStrLen() {
   BasicBlock *LoopExitBB = CurLoop->getExitBlock();
 
   IRBuilder<> Builder(Preheader->getTerminator());
-  SCEVExpander Expander(*SE, Preheader->getModule()->getDataLayout(), "strlen_idiom");
+  SCEVExpander Expander(*SE, Preheader->getModule()->getDataLayout(),
+                        "strlen_idiom");
   Value *MaterialzedBase = Expander.expandCodeFor(
       Verifier.LoadBaseEv, Verifier.LoadBaseEv->getType(),
       Builder.GetInsertPoint());
@@ -1810,7 +1815,7 @@ bool LoopIdiomRecognize::recognizeAndInsertStrLen() {
 
   // All LCSSA Loop Phi are dead, the left over dead loop body can be cleaned
   // up by later passes
-  for (PHINode *PN : Cleanup) 
+  for (PHINode *PN : Cleanup)
     RecursivelyDeleteDeadPHINode(PN);
   SE->forgetLoop(CurLoop);
 

llvm/test/Transforms/LoopIdiom/wcslen16.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
-; RUN: opt -passes='loop(loop-idiom),verify' < %s -S | FileCheck %s
+; RUN: opt -passes='loop(loop-idiom),verify' -enable-loop-idiom-wcslen < %s -S | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"

llvm/test/Transforms/LoopIdiom/wcslen32.ll

@@ -1,5 +1,5 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
-; RUN: opt -passes='loop-idiom' < %s -S | FileCheck %s
+; RUN: opt -passes='loop(loop-idiom),verify' -enable-loop-idiom-wcslen < %s -S | FileCheck %s
 
 target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128"
 target triple = "x86_64-unknown-linux-gnu"