From d4c50f7326a063e073b380c4a7a5c10dd02a5e5d Mon Sep 17 00:00:00 2001 From: Taewook Oh Date: Wed, 14 Aug 2019 07:11:09 +0000 Subject: [PATCH] [NewPM][PassInstrumentation] IR printing support from clang driver Summary: https://reviews.llvm.org/D50923 enabled the IR printing support for the new pass manager, but only for the case when `opt` tool is used as a driver. This patch is to enable the IR printing when `clang` is used as a driver. Reviewers: fedor.sergeev, philip.pfaffe Subscribers: cfe-commits, yamauchi, llvm-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D65975 llvm-svn: 368804 --- clang/lib/CodeGen/BackendUtil.cpp | 6 +++++- clang/test/Misc/printer.c | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 clang/test/Misc/printer.c diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index cb38056..2023ced 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -37,6 +37,7 @@ #include "llvm/MC/SubtargetFeature.h" #include "llvm/Passes/PassBuilder.h" #include "llvm/Passes/PassPlugin.h" +#include "llvm/Passes/StandardInstrumentations.h" #include "llvm/Support/BuryPointer.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/MemoryBuffer.h" @@ -1063,7 +1064,10 @@ void EmitAssemblyHelper::EmitAssemblyWithNewPassManager( PTO.LoopVectorization = CodeGenOpts.VectorizeLoop; PTO.SLPVectorization = CodeGenOpts.VectorizeSLP; - PassBuilder PB(TM.get(), PTO, PGOOpt); + PassInstrumentationCallbacks PIC; + StandardInstrumentations SI; + SI.registerCallbacks(PIC); + PassBuilder PB(TM.get(), PTO, PGOOpt, &PIC); // Attempt to load pass plugins and register their callbacks with PB. for (auto &PluginFN : CodeGenOpts.PassPlugins) { diff --git a/clang/test/Misc/printer.c b/clang/test/Misc/printer.c new file mode 100644 index 0000000..085e02c --- /dev/null +++ b/clang/test/Misc/printer.c @@ -0,0 +1,5 @@ +// RUN: %clang_cc1 -emit-llvm -fexperimental-new-pass-manager -mllvm -print-before-all %s -o %t 2>&1 | FileCheck %s --check-prefix=CHECK-BEFORE +// RUN: %clang_cc1 -emit-llvm -fexperimental-new-pass-manager -mllvm -print-after-all %s -o %t 2>&1 | FileCheck %s --check-prefix=CHECK-AFTER +// CHECK-BEFORE: *** IR Dump Before AlwaysInlinerPass *** +// CHECK-AFTER: *** IR Dump After AlwaysInlinerPass *** +void foo() {} -- 2.7.4