Back out "Configs for different initial region selection BC budget and inline callee region BC budget"

Summary:
Original commit changeset: c907197edb3d

Original Phabricator Diff: D70253888

Reviewed By: mdko

Differential Revision: D71201663

fbshipit-source-id: 3872710a8c4c431abe84589d165bc1ec7044b796

Author: jaewie

hphp/doc/configs.specification

@@ -1648,8 +1648,6 @@ The format can be found in hphp/tools/configs/generate_configs.rs
 - int64_t Jit.MaxRequestTranslationTime = -1, UNKNOWN
 - uint32_t Jit.MaxRegionInstrs = 3000, UNKNOWN
 - uint32_t Jit.MaxLiveRegionInstrs = 50, UNKNOWN
-- uint32_t Jit.MaxInitialRegionInstrs = 3000, UNKNOWN
-- uint32_t Jit.MaxInlineRegionInstrs = 3000, UNKNOWN
 - uint32_t Jit.MaxAwaitAllUnroll = 8, UNKNOWN
 - bool Jit.ProfileWarmupRequests = false, UNKNOWN
 - uint32_t Jit.ProfileRequests, UNKNOWN

hphp/runtime/vm/jit/inlining-decider.cpp

@@ -811,7 +811,7 @@ irgen::RegionAndLazyUnit selectCalleeRegion(const irgen::IRGS& irgs,
 
   if (profData()) {
     auto region = selectCalleeCFG(callerSk, entry, ctxType, inputTypes,
-                                  Cfg::Jit::MaxInlineRegionInstrs, annotationsPtr);
+                                  Cfg::Jit::MaxRegionInstrs, annotationsPtr);
     if (region) return {callerSk, region};
     // Special case: even if we don't have prof data for this func, if
     // it takes no arguments and returns a constant, it might be a
@@ -826,7 +826,7 @@ irgen::RegionAndLazyUnit selectCalleeRegion(const irgen::IRGS& irgs,
   }
 
   auto region = selectCalleeTracelet(entry, ctxType, inputTypes,
-                                     Cfg::Jit::MaxInlineRegionInstrs);
+                                     Cfg::Jit::MaxRegionInstrs);
   return {callerSk, region};
 }
 

hphp/runtime/vm/jit/region-selection.cpp

@@ -920,7 +920,7 @@ RegionDescPtr selectRegion(const RegionContext& context,
         case RegionMode::Tracelet: {
           auto const maxBCInstrs = kind == TransKind::Live
             ? Cfg::Jit::MaxLiveRegionInstrs
-            : Cfg::Jit::MaxInitialRegionInstrs;
+            : Cfg::Jit::MaxRegionInstrs;
           return selectTracelet(context, kind, maxBCInstrs);
         }
       }
@@ -941,7 +941,7 @@ RegionDescPtr selectRegion(const RegionContext& context,
   if (region) {
     FTRACE(3, "{}", show(*region));
     always_assert(
-      region->instrSize() <= std::max(Cfg::Jit::MaxInitialRegionInstrs,
+      region->instrSize() <= std::max(Cfg::Jit::MaxRegionInstrs,
                                       Cfg::Jit::MaxLiveRegionInstrs)
     );
   } else {
@@ -963,7 +963,7 @@ RegionDescPtr selectHotRegion(TransID transId) {
   ctx.cfg = &cfg;
   ctx.profData = profData;
   ctx.entries = {transId};
-  ctx.maxBCInstrs = Cfg::Jit::MaxInitialRegionInstrs;
+  ctx.maxBCInstrs = Cfg::Jit::MaxRegionInstrs;
   switch (pgoRegionMode(func)) {
     case PGORegionMode::Hottrace:
       region = selectHotTrace(ctx);
@@ -994,7 +994,7 @@ RegionDescPtr selectHotRegion(TransID transId) {
            dotFileName, region ? show(*region) : std::string("empty region"));
   }
 
-  always_assert(region->instrSize() <= Cfg::Jit::MaxInitialRegionInstrs);
+  always_assert(region->instrSize() <= Cfg::Jit::MaxRegionInstrs);
 
   if (region->empty()) return nullptr;
   return region;

hphp/runtime/vm/jit/regionize-func.cpp

@@ -389,7 +389,7 @@ RegionVec regionizeFunc(const Func* func, std::string& transCFGAnnot) {
       ctx.cfg = &cfg;
       ctx.profData = profData;
       ctx.entries = {newHead};
-      ctx.maxBCInstrs = Cfg::Jit::MaxInitialRegionInstrs;
+      ctx.maxBCInstrs = Cfg::Jit::MaxRegionInstrs;
       switch (regionMode) {
         case PGORegionMode::Hottrace:
           region = selectHotTrace(ctx);

hphp/test/slow/exit/IterNext0.php.opts

@@ -1,2 +1 @@
 -vEval.JitMaxRegionInstrs=2
--vEval.JitMaxInitialRegionInstrs=2