[BOLT] LongJmp: Use per-function alignment values

[yota9]

Summary

The per-function alignment values must be used in order to create
tentative layout.

[yota9]

Remove unused extern opts

[rafauler]

LGTM, thanks!

bolt/lib/Passes/LongJmp.cpp

 #define DEBUG_TYPE "longjmp"
 
 using namespace llvm;
 
 namespace opts {
 extern cl::OptionCategory BoltOptCategory;
 
 extern cl::opt<bool> UseOldText;
-extern cl::opt<unsigned> AlignFunctions;
-extern cl::opt<unsigned> AlignFunctionsMaxBytes;
 extern cl::opt<bool> HotFunctionsAtEnd;
 
 static cl::opt<bool>
 GroupStubs("group-stubs",
   cl::desc("share stubs across functions"),
   cl::init(true),
   cl::ZeroOrMore,
   cl::cat(BoltOptCategory));

 uint64_t LongJmpPass::tentativeLayoutRelocColdPart(
     const BinaryContext &BC, std::vector<BinaryFunction *> &SortedFunctions,
     uint64_t DotAddress) {
   for (BinaryFunction *Func : SortedFunctions) {
     if (!Func->isSplit())
       continue;
     DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign);
     uint64_t Pad =
-        offsetToAlignment(DotAddress, llvm::Align(opts::AlignFunctions));
-    if (Pad <= opts::AlignFunctionsMaxBytes)
+        offsetToAlignment(DotAddress, llvm::Align(Func->getAlignment()));
+    if (Pad <= Func->getMaxColdAlignmentBytes())
       DotAddress += Pad;
     ColdAddresses[Func] = DotAddress;
     LLVM_DEBUG(dbgs() << Func->getPrintName() << " cold tentative: "
                       << Twine::utohexstr(DotAddress) << "\n");
     DotAddress += Func->estimateColdSize();
     DotAddress += Func->estimateConstantIslandSize();
   }
   return DotAddress;
if (!ColdLayoutDone && CurrentIndex >= LastHotIndex) {
           tentativeLayoutRelocColdPart(BC, SortedFunctions, DotAddress);
       ColdLayoutDone = true;
       if (opts::HotFunctionsAtEnd)
         DotAddress = alignTo(DotAddress, BC.PageAlign);
     }
 
     DotAddress = alignTo(DotAddress, BinaryFunction::MinAlign);
     uint64_t Pad =
-        offsetToAlignment(DotAddress, llvm::Align(opts::AlignFunctions));
-    if (Pad <= opts::AlignFunctionsMaxBytes)
+        offsetToAlignment(DotAddress, llvm::Align(Func->getAlignment()));
+    if (Pad <= Func->getMaxAlignmentBytes())
       DotAddress += Pad;
     HotAddresses[Func] = DotAddress;
     LLVM_DEBUG(dbgs() << Func->getPrintName() << " tentative: "
                       << Twine::utohexstr(DotAddress) << "\n");
     if (!Func->isSplit())
       DotAddress += Func->estimateSize();
     else
       DotAddress += Func->estimateHotSize();