[BOLT] Add --print flags for PointerAuthCFI* passes

Author: bgergely0

bolt/include/bolt/Passes/PointerAuthCFIAnalyzer.h

@@ -24,7 +24,8 @@ class PointerAuthCFIAnalyzer : public BinaryFunctionPass {
   std::mutex IgnoreMutex;
 
 public:
-  explicit PointerAuthCFIAnalyzer() : BinaryFunctionPass(false) {}
+  explicit PointerAuthCFIAnalyzer(const cl::opt<bool> &PrintPass)
+      : BinaryFunctionPass(PrintPass) {}
 
   const char *getName() const override { return "pointer-auth-cfi-analyzer"; }
 

bolt/include/bolt/Passes/PointerAuthCFIFixup.h

@@ -19,7 +19,8 @@ namespace bolt {
 
 class PointerAuthCFIFixup : public BinaryFunctionPass {
 public:
-  explicit PointerAuthCFIFixup() : BinaryFunctionPass(false) {}
+  explicit PointerAuthCFIFixup(const cl::opt<bool> &PrintPass)
+      : BinaryFunctionPass(PrintPass) {}
 
   const char *getName() const override { return "pointer-auth-cfi-fixup"; }
 

bolt/lib/Rewrite/BinaryPassManager.cpp

@@ -134,6 +134,15 @@ static cl::opt<bool> PrintAArch64Relaxation(
     cl::desc("print functions after ADR/LDR Relaxation pass"), cl::Hidden,
     cl::cat(BoltOptCategory));
 
+cl::opt<bool> PrintPAuthCFIAnalyzer(
+    "print-pointer-auth-cfi-analyzer",
+    cl::desc("print functions after PointerAuthCFIAnalyzer pass"), cl::Hidden,
+    cl::cat(BoltOptCategory));
+static cl::opt<bool> PrintPAuthCFIFixup(
+    "print-pointer-auth-cfi-fixup",
+    cl::desc("print functions after PointerAuthCFIFixup pass"), cl::Hidden,
+    cl::cat(BoltOptCategory));
+
 static cl::opt<bool>
     PrintLongJmp("print-longjmp",
                  cl::desc("print functions after longjmp pass"), cl::Hidden,
@@ -362,7 +371,8 @@ Error BinaryFunctionPassManager::runAllPasses(BinaryContext &BC) {
   BinaryFunctionPassManager Manager(BC);
 
   if (BC.isAArch64())
-    Manager.registerPass(std::make_unique<PointerAuthCFIAnalyzer>());
+    Manager.registerPass(
+        std::make_unique<PointerAuthCFIAnalyzer>(PrintPAuthCFIAnalyzer));
 
   Manager.registerPass(
       std::make_unique<EstimateEdgeCounts>(PrintEstimateEdgeCounts));
@@ -524,7 +534,8 @@ Error BinaryFunctionPassManager::runAllPasses(BinaryContext &BC) {
     // relocations out of range and crash during linking.
     Manager.registerPass(std::make_unique<LongJmpPass>(PrintLongJmp));
 
-    Manager.registerPass(std::make_unique<PointerAuthCFIFixup>());
+    Manager.registerPass(
+        std::make_unique<PointerAuthCFIFixup>(PrintPAuthCFIFixup));
   }
 
   // This pass should always run last.*

bolt/unittests/Passes/PointerAuthCFIFixup.cpp

@@ -17,6 +17,7 @@
 #include "bolt/Passes/PointerAuthCFIFixup.h"
 #include "bolt/Rewrite/BinaryPassManager.h"
 #include "bolt/Rewrite/RewriteInstance.h"
+#include "bolt/Utils/CommandLineOpts.h"
 #include "llvm/BinaryFormat/ELF.h"
 #include "llvm/MC/MCDwarf.h"
 #include "llvm/MC/MCInstBuilder.h"
@@ -28,6 +29,10 @@ using namespace llvm::object;
 using namespace llvm::ELF;
 using namespace bolt;
 
+namespace opts {
+extern cl::opt<bool> PrintPAuthCFIAnalyzer;
+} // namespace opts
+
 namespace {
 struct PassTester : public testing::TestWithParam<Triple::ArchType> {
   void SetUp() override {
@@ -83,7 +88,8 @@ struct PassTester : public testing::TestWithParam<Triple::ArchType> {
                             BC->MRI.get(), BC->STI.get())));
 
     PassManager = std::make_unique<BinaryFunctionPassManager>(*BC);
-    PassManager->registerPass(std::make_unique<PointerAuthCFIFixup>());
+    PassManager->registerPass(
+        std::make_unique<PointerAuthCFIFixup>(opts::PrintPAuthCFIAnalyzer));
 
     TextSection = &BC->registerOrUpdateSection(
         ".text", ELF::SHT_PROGBITS, ELF::SHF_ALLOC | ELF::SHF_EXECINSTR,