Commit 24ab9b53 authored by serge_sans_paille's avatar serge_sans_paille Committed by serge-sans-paille
Browse files

Generalize the pass registration mechanism used by Polly to any third-party tool 

There's quite a lot of references to Polly in the LLVM CMake codebase. However
the registration pattern used by Polly could be useful to other external
projects: thanks to that mechanism it would be possible to develop LLVM
extension without touching the LLVM code base.

This patch has two effects:

1. Remove all code specific to Polly in the llvm/clang codebase, replaicing it
   with a generic mechanism

2. Provide a generic mechanism to register compiler extensions.

A compiler extension is similar to a pass plugin, with the notable difference
that the compiler extension can be configured to be built dynamically (like
plugins) or statically (like regular passes).

As a result, people willing to add extra passes to clang/opt can do it using a
separate code repo, but still have their pass be linked in clang/opt as built-in
passes.

Differential Revision: https://reviews.llvm.org/D61446
parent 8d7ecc16

clang/lib/CodeGen/BackendUtil.cpp

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ 
using namespace clang;

using namespace llvm;



#define HANDLE_EXTENSION(Ext)                                                  \

  llvm::PassPluginLibraryInfo get##Ext##PluginInfo();

#include "llvm/Support/Extension.def"



namespace {



// Default filename used for profile generation.
@@ -1076,6 +1080,9 @@ void EmitAssemblyHelper::EmitAssemblyWithNewPassManager( 
          << PluginFN << toString(PassPlugin.takeError());

    }

  }

#define HANDLE_EXTENSION(Ext)                                                  \

  get##Ext##PluginInfo().RegisterPassBuilderCallbacks(PB);

#include "llvm/Support/Extension.def"



  LoopAnalysisManager LAM(CodeGenOpts.DebugPassManager);

  FunctionAnalysisManager FAM(CodeGenOpts.DebugPassManager);

clang/lib/CodeGen/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ add_clang_library(clangCodeGen 
  TargetInfo.cpp

  VarBypassDetector.cpp



  ENABLE_PLUGINS



  DEPENDS

  ${codegen_deps}

clang/tools/driver/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -122,7 +122,3 @@ if(CLANG_ORDER_FILE AND 
    set_target_properties(clang PROPERTIES LINK_DEPENDS ${CLANG_ORDER_FILE})

  endif()

endif()
 


if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)

  target_link_libraries(clang PRIVATE Polly)

endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS)

clang/tools/driver/cc1_main.cpp

+0 −11
Original line number Diff line number Diff line
@@ -72,12 +72,6 @@ static void LLVMErrorHandler(void *UserData, const std::string &Message, 
  exit(GenCrashDiag ? 70 : 1);

}



#ifdef LINK_POLLY_INTO_TOOLS

namespace polly {

void initializePollyPasses(llvm::PassRegistry &Registry);

}

#endif



#ifdef CLANG_HAVE_RLIMITS

#if defined(__linux__) && defined(__PIE__)

static size_t getCurrentStackAllocation() {
@@ -203,11 +197,6 @@ int cc1_main(ArrayRef<const char *> Argv, const char *Argv0, void *MainAddr) { 
  llvm::InitializeAllAsmPrinters();

  llvm::InitializeAllAsmParsers();



#ifdef LINK_POLLY_INTO_TOOLS

  llvm::PassRegistry &Registry = *llvm::PassRegistry::getPassRegistry();

  polly::initializePollyPasses(Registry);

#endif



  // Buffer diagnostics from argument parsing so that we can output them using a

  // well formed diagnostic object.

  IntrusiveRefCntPtr<DiagnosticOptions> DiagOpts = new DiagnosticOptions();

llvm/CMakeLists.txt

+2 −23
Original line number Diff line number Diff line
@@ -465,29 +465,6 @@ set(LLVM_LIB_FUZZING_ENGINE "" CACHE PATH 
option(LLVM_USE_SPLIT_DWARF

  "Use -gsplit-dwarf when compiling llvm." OFF)



option(LLVM_POLLY_LINK_INTO_TOOLS "Statically link Polly into tools (if available)" ON)

option(LLVM_POLLY_BUILD "Build LLVM with Polly" ON)



if (EXISTS ${LLVM_MAIN_SRC_DIR}/tools/polly/CMakeLists.txt)

  set(POLLY_IN_TREE TRUE)

elseif(LLVM_EXTERNAL_POLLY_SOURCE_DIR)

  set(POLLY_IN_TREE TRUE)

else()

  set(POLLY_IN_TREE FALSE)

endif()



if (LLVM_POLLY_BUILD AND POLLY_IN_TREE)

  set(WITH_POLLY ON)

else()

  set(WITH_POLLY OFF)

endif()



if (LLVM_POLLY_LINK_INTO_TOOLS AND WITH_POLLY)

  set(LINK_POLLY_INTO_TOOLS ON)

else()

  set(LINK_POLLY_INTO_TOOLS OFF)

endif()



# Define an option controlling whether we should build for 32-bit on 64-bit

# platforms, where supported.

if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
@@ -1112,3 +1089,5 @@ endif() 
if (LLVM_INCLUDE_UTILS AND LLVM_INCLUDE_TOOLS)

  add_subdirectory(utils/llvm-locstats)

endif()



process_llvm_pass_plugins()