Commit 2fcf7691 authored by Brian Gesiak's avatar Brian Gesiak
Browse files

[Coroutines] Rename "legacy" passes (NFC) 

A series of patches beginning with https://reviews.llvm.org/D71898
propose to add an implementation of the coroutine passes to the new pass
manager. As part of these changes, the coroutine passes that implement
the legacy pass manager interface are renamed, to `<PassName>Legacy`.
This mirrors similar changes that have been made to many other passes in
LLVM as they've been transitioned to support both old and new pass
managers.

This commit splits out the renaming portion of that patch and commits it
in advance as an NFC (no functional change intended) commit. It renames:

* `CoroEarly` => `CoroEarlyLegacy`
* `CoroSplit` => `CoroSplitLegacy`
* `CoroElide` => `CoroElideLegacy`
* `CoroCleanup` => `CoroCleanupLegacy`
parent e6c7ed6d

llvm/include/llvm-c/Transforms/Coroutines.h

+4 −4
Original line number Diff line number Diff line
@@ -31,16 +31,16 @@ LLVM_C_EXTERN_C_BEGIN 
 * @{

 */



/** See llvm::createCoroEarlyPass function. */

/** See llvm::createCoroEarlyLegacyPass function. */

void LLVMAddCoroEarlyPass(LLVMPassManagerRef PM);



/** See llvm::createCoroSplitPass function. */

/** See llvm::createCoroSplitLegacyPass function. */

void LLVMAddCoroSplitPass(LLVMPassManagerRef PM);



/** See llvm::createCoroElidePass function. */

/** See llvm::createCoroElideLegacyPass function. */

void LLVMAddCoroElidePass(LLVMPassManagerRef PM);



/** See llvm::createCoroCleanupPass function. */

/** See llvm::createCoroCleanupLegacyPass function. */

void LLVMAddCoroCleanupPass(LLVMPassManagerRef PM);



/**

llvm/include/llvm/Transforms/Coroutines.h

+4 −4
Original line number Diff line number Diff line
@@ -20,17 +20,17 @@ class PassManagerBuilder; 
void addCoroutinePassesToExtensionPoints(PassManagerBuilder &Builder);



/// Lower coroutine intrinsics that are not needed by later passes.

Pass *createCoroEarlyPass();

Pass *createCoroEarlyLegacyPass();



/// Split up coroutines into multiple functions driving their state machines.

Pass *createCoroSplitPass();

Pass *createCoroSplitLegacyPass();



/// Analyze coroutines use sites, devirtualize resume/destroy calls and elide

/// heap allocation for coroutine frame where possible.

Pass *createCoroElidePass();

Pass *createCoroElideLegacyPass();



/// Lower all remaining coroutine intrinsics.

Pass *createCoroCleanupPass();

Pass *createCoroCleanupLegacyPass();



}

llvm/lib/Transforms/Coroutines/CoroCleanup.cpp

+6 −6
Original line number Diff line number Diff line
@@ -99,11 +99,11 @@ bool Lowerer::lowerRemainingCoroIntrinsics(Function &F) { 


namespace {



struct CoroCleanup : FunctionPass {

struct CoroCleanupLegacy : FunctionPass {

  static char ID; // Pass identification, replacement for typeid



  CoroCleanup() : FunctionPass(ID) {

    initializeCoroCleanupPass(*PassRegistry::getPassRegistry());

  CoroCleanupLegacy() : FunctionPass(ID) {

    initializeCoroCleanupLegacyPass(*PassRegistry::getPassRegistry());

  }



  std::unique_ptr<Lowerer> L;
@@ -132,8 +132,8 @@ struct CoroCleanup : FunctionPass { 
};

}



char CoroCleanup::ID = 0;

INITIALIZE_PASS(CoroCleanup, "coro-cleanup",

char CoroCleanupLegacy::ID = 0;

INITIALIZE_PASS(CoroCleanupLegacy, "coro-cleanup",

                "Lower all coroutine related intrinsics", false, false)



Pass *llvm::createCoroCleanupPass() { return new CoroCleanup(); }
 
Pass *llvm::createCoroCleanupLegacyPass() { return new CoroCleanupLegacy(); }

llvm/lib/Transforms/Coroutines/CoroEarly.cpp

+8 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ using namespace llvm; 
#define DEBUG_TYPE "coro-early"



namespace {

// Created on demand if CoroEarly pass has work to do.

// Created on demand if the coro-early pass has work to do.

class Lowerer : public coro::LowererBase {

  IRBuilder<> Builder;

  PointerType *const AnyResumeFnPtrTy;
@@ -225,10 +225,10 @@ bool Lowerer::lowerEarlyIntrinsics(Function &F) { 


namespace {



struct CoroEarly : public FunctionPass {

struct CoroEarlyLegacy : public FunctionPass {

  static char ID; // Pass identification, replacement for typeid.

  CoroEarly() : FunctionPass(ID) {

    initializeCoroEarlyPass(*PassRegistry::getPassRegistry());

  CoroEarlyLegacy() : FunctionPass(ID) {

    initializeCoroEarlyLegacyPass(*PassRegistry::getPassRegistry());

  }



  std::unique_ptr<Lowerer> L;
@@ -267,8 +267,8 @@ struct CoroEarly : public FunctionPass { 
};

}



char CoroEarly::ID = 0;

INITIALIZE_PASS(CoroEarly, "coro-early", "Lower early coroutine intrinsics",

                false, false)

char CoroEarlyLegacy::ID = 0;

INITIALIZE_PASS(CoroEarlyLegacy, "coro-early",

                "Lower early coroutine intrinsics", false, false)



Pass *llvm::createCoroEarlyPass() { return new CoroEarly(); }
 
Pass *llvm::createCoroEarlyLegacyPass() { return new CoroEarlyLegacy(); }

llvm/lib/Transforms/Coroutines/CoroElide.cpp

+8 −8
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ using namespace llvm; 
#define DEBUG_TYPE "coro-elide"



namespace {

// Created on demand if CoroElide pass has work to do.

// Created on demand if the coro-elide pass has work to do.

struct Lowerer : coro::LowererBase {

  SmallVector<CoroIdInst *, 4> CoroIds;

  SmallVector<CoroBeginInst *, 1> CoroBegins;
@@ -277,10 +277,10 @@ static bool replaceDevirtTrigger(Function &F) { 
//===----------------------------------------------------------------------===//



namespace {

struct CoroElide : FunctionPass {

struct CoroElideLegacy : FunctionPass {

  static char ID;

  CoroElide() : FunctionPass(ID) {

    initializeCoroElidePass(*PassRegistry::getPassRegistry());

  CoroElideLegacy() : FunctionPass(ID) {

    initializeCoroElideLegacyPass(*PassRegistry::getPassRegistry());

  }



  std::unique_ptr<Lowerer> L;
@@ -330,15 +330,15 @@ struct CoroElide : FunctionPass { 
};

}



char CoroElide::ID = 0;

char CoroElideLegacy::ID = 0;

INITIALIZE_PASS_BEGIN(

    CoroElide, "coro-elide",

    CoroElideLegacy, "coro-elide",

    "Coroutine frame allocation elision and indirect calls replacement", false,

    false)

INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass)

INITIALIZE_PASS_END(

    CoroElide, "coro-elide",

    CoroElideLegacy, "coro-elide",

    "Coroutine frame allocation elision and indirect calls replacement", false,

    false)



Pass *llvm::createCoroElidePass() { return new CoroElide(); }
 
Pass *llvm::createCoroElideLegacyPass() { return new CoroElideLegacy(); }