Skip to content

Commit 7251243

Browse files
authored
[CodeGen][Passes] Move CodeGenPassBuilder.h to Passes (#79242)
`CodeGenPassBuilder` is not very tightly coupled to CodeGen, it may need to reference some method in pass builder in future, so move `CodeGenPassBuilder.h` to Passes.
1 parent baba7e4 commit 7251243

File tree

9 files changed

+17
-20
lines changed

9 files changed

+17
-20
lines changed

llvm/include/llvm/CodeGen/CodeGenPassBuilder.h renamed to llvm/include/llvm/Passes/CodeGenPassBuilder.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
///
1313
//===----------------------------------------------------------------------===//
1414

15-
#ifndef LLVM_CODEGEN_CODEGENPASSBUILDER_H
16-
#define LLVM_CODEGEN_CODEGENPASSBUILDER_H
15+
#ifndef LLVM_PASSES_CODEGENPASSBUILDER_H
16+
#define LLVM_PASSES_CODEGENPASSBUILDER_H
1717

1818
#include "llvm/ADT/SmallVector.h"
1919
#include "llvm/ADT/StringRef.h"
@@ -116,7 +116,7 @@ namespace llvm {
116116
} \
117117
static AnalysisKey Key; \
118118
};
119-
#include "llvm/CodeGen/MachinePassRegistry.def"
119+
#include "llvm/Passes/MachinePassRegistry.def"
120120

121121
/// This class provides access to building LLVM's passes.
122122
///
@@ -676,7 +676,7 @@ CodeGenPassBuilder<Derived>::getPassNameFromLegacyName(StringRef Name) const {
676676
#define DUMMY_MACHINE_FUNCTION_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
677677
if (Name == NAME) \
678678
Ret = {#PASS_NAME, true};
679-
#include "llvm/CodeGen/MachinePassRegistry.def"
679+
#include "llvm/Passes/MachinePassRegistry.def"
680680

681681
if (Ret.first.empty())
682682
Ret = derived().getTargetPassNameFromLegacyName(Name);
@@ -1235,4 +1235,4 @@ void CodeGenPassBuilder<Derived>::addBlockPlacement(
12351235

12361236
} // namespace llvm
12371237

1238-
#endif // LLVM_CODEGEN_CODEGENPASSBUILDER_H
1238+
#endif // LLVM_PASSES_CODEGENPASSBUILDER_H

llvm/include/module.modulemap

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,8 @@ module LLVM_Backend {
4646
exclude header "llvm/CodeGen/LinkAllAsmWriterComponents.h"
4747
exclude header "llvm/CodeGen/LinkAllCodegenComponents.h"
4848

49-
exclude header "llvm/CodeGen/CodeGenPassBuilder.h"
50-
5149
// These are intended for (repeated) textual inclusion.
5250
textual header "llvm/CodeGen/DIEValue.def"
53-
textual header "llvm/CodeGen/MachinePassRegistry.def"
5451
}
5552
}
5653

llvm/lib/CodeGen/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ add_llvm_component_library(LLVMCodeGen
5656
CFIInstrInserter.cpp
5757
CodeGen.cpp
5858
CodeGenCommonISel.cpp
59-
CodeGenPassBuilder.cpp
6059
CodeGenPrepare.cpp
6160
CommandFlags.cpp
6261
ComplexDeinterleavingPass.cpp

llvm/lib/Passes/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
add_llvm_component_library(LLVMPasses
2+
CodeGenPassBuilder.cpp
23
OptimizationLevel.cpp
34
PassBuilder.cpp
45
PassBuilderBindings.cpp

llvm/lib/CodeGen/CodeGenPassBuilder.cpp renamed to llvm/lib/Passes/CodeGenPassBuilder.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
//
1212
//===---------------------------------------------------------------------===//
1313

14-
#include "llvm/CodeGen/CodeGenPassBuilder.h"
14+
#include "llvm/Passes/CodeGenPassBuilder.h"
1515

1616
using namespace llvm;
1717

1818
namespace llvm {
1919
#define DUMMY_MACHINE_MODULE_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
2020
MachinePassKey PASS_NAME::Key;
21-
#include "llvm/CodeGen/MachinePassRegistry.def"
21+
#include "llvm/Passes/MachinePassRegistry.def"
2222
#define DUMMY_MACHINE_FUNCTION_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
2323
MachinePassKey PASS_NAME::Key;
2424
#define DUMMY_MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \
2525
AnalysisKey PASS_NAME::Key;
26-
#include "llvm/CodeGen/MachinePassRegistry.def"
26+
#include "llvm/Passes/MachinePassRegistry.def"
2727
} // namespace llvm

llvm/lib/Passes/PassBuilder.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ PassBuilder::PassBuilder(TargetMachine *TM, PipelineTuningOptions PTO,
400400
PIC->addClassToPassName(PASS_NAME::name(), NAME);
401401
#define MACHINE_FUNCTION_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
402402
PIC->addClassToPassName(PASS_NAME::name(), NAME);
403-
#include "llvm/CodeGen/MachinePassRegistry.def"
403+
#include "llvm/Passes/MachinePassRegistry.def"
404404
}
405405
}
406406

@@ -441,7 +441,7 @@ void PassBuilder::registerMachineFunctionAnalyses(
441441

442442
#define MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \
443443
MFAM.registerPass([&] { return PASS_NAME(); });
444-
#include "llvm/CodeGen/MachinePassRegistry.def"
444+
#include "llvm/Passes/MachinePassRegistry.def"
445445

446446
for (auto &C : MachineFunctionAnalysisRegistrationCallbacks)
447447
C(MFAM);
@@ -1868,7 +1868,7 @@ Error PassBuilder::parseMachinePass(MachineFunctionPassManager &MFPM,
18681868
MFPM.addPass(PASS_NAME()); \
18691869
return Error::success(); \
18701870
}
1871-
#include "llvm/CodeGen/MachinePassRegistry.def"
1871+
#include "llvm/Passes/MachinePassRegistry.def"
18721872

18731873
for (auto &C : MachinePipelineParsingCallbacks)
18741874
if (C(Name, MFPM))
@@ -2179,17 +2179,17 @@ void PassBuilder::printPassNames(raw_ostream &OS) {
21792179
OS << "Machine module passes (WIP):\n";
21802180
#define MACHINE_MODULE_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
21812181
printPassName(NAME, OS);
2182-
#include "llvm/CodeGen/MachinePassRegistry.def"
2182+
#include "llvm/Passes/MachinePassRegistry.def"
21832183

21842184
OS << "Machine function passes (WIP):\n";
21852185
#define MACHINE_FUNCTION_PASS(NAME, PASS_NAME, CONSTRUCTOR) \
21862186
printPassName(NAME, OS);
2187-
#include "llvm/CodeGen/MachinePassRegistry.def"
2187+
#include "llvm/Passes/MachinePassRegistry.def"
21882188

21892189
OS << "Machine function analyses (WIP):\n";
21902190
#define MACHINE_FUNCTION_ANALYSIS(NAME, PASS_NAME, CONSTRUCTOR) \
21912191
printPassName(NAME, OS);
2192-
#include "llvm/CodeGen/MachinePassRegistry.def"
2192+
#include "llvm/Passes/MachinePassRegistry.def"
21932193
}
21942194

21952195
void PassBuilder::registerParseTopLevelPipelineCallback(

llvm/lib/Target/X86/X86CodeGenPassBuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "X86TargetMachine.h"
1414

15-
#include "llvm/CodeGen/CodeGenPassBuilder.h"
1615
#include "llvm/MC/MCStreamer.h"
16+
#include "llvm/Passes/CodeGenPassBuilder.h"
1717

1818
using namespace llvm;
1919

llvm/tools/llc/NewPMDriver.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "NewPMDriver.h"
1616
#include "llvm/Analysis/CGSCCPassManager.h"
1717
#include "llvm/Analysis/TargetLibraryInfo.h"
18-
#include "llvm/CodeGen/CodeGenPassBuilder.h"
1918
#include "llvm/CodeGen/CommandFlags.h"
2019
#include "llvm/CodeGen/MIRParser/MIRParser.h"
2120
#include "llvm/CodeGen/MIRPrinter.h"
@@ -30,6 +29,7 @@
3029
#include "llvm/IR/PassManager.h"
3130
#include "llvm/IR/Verifier.h"
3231
#include "llvm/IRReader/IRReader.h"
32+
#include "llvm/Passes/CodeGenPassBuilder.h" // TODO: Include pass headers properly.
3333
#include "llvm/Passes/PassBuilder.h"
3434
#include "llvm/Passes/StandardInstrumentations.h"
3535
#include "llvm/Support/CommandLine.h"

0 commit comments

Comments
 (0)