Skip to content

Commit 1c3f7f1

Browse files
committed
[X86][GlobalISel] Move GlobalISel source files to a dedicated subdir
Similar to D81116 (AArch64): separate the GISel components for organization purposes and match other targets ({AArch64,M68k,PowerPC,RISCV,X86}/GISel). Reviewed By: RKSimon Differential Revision: https://reviews.llvm.org/D158489
1 parent 22209a6 commit 1c3f7f1

File tree

10 files changed

+12
-11
lines changed

10 files changed

+12
-11
lines changed

llvm/lib/Target/X86/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ set(sources
2828
X86AvoidTrailingCall.cpp
2929
X86CallFrameOptimization.cpp
3030
X86CallingConv.cpp
31-
X86CallLowering.cpp
3231
X86CmovConversion.cpp
3332
X86DomainReassignment.cpp
3433
X86DiscriminateMemOps.cpp
@@ -52,7 +51,6 @@ set(sources
5251
X86FlagsCopyLowering.cpp
5352
X86FloatingPoint.cpp
5453
X86FrameLowering.cpp
55-
X86InstructionSelector.cpp
5654
X86ISelDAGToDAG.cpp
5755
X86ISelLowering.cpp
5856
X86ISelLoweringCall.cpp
@@ -65,7 +63,6 @@ set(sources
6563
X86InstrFoldTables.cpp
6664
X86InstrInfo.cpp
6765
X86EvexToVex.cpp
68-
X86LegalizerInfo.cpp
6966
X86LoadValueInjectionLoadHardening.cpp
7067
X86LoadValueInjectionRetHardening.cpp
7168
X86MCInstLower.cpp
@@ -74,7 +71,6 @@ set(sources
7471
X86OptimizeLEAs.cpp
7572
X86PadShortFunction.cpp
7673
X86PartialReduction.cpp
77-
X86RegisterBankInfo.cpp
7874
X86RegisterInfo.cpp
7975
X86ReturnThunks.cpp
8076
X86SelectionDAGInfo.cpp
@@ -88,6 +84,10 @@ set(sources
8884
X86VZeroUpper.cpp
8985
X86WinEHState.cpp
9086
X86InsertWait.cpp
87+
GISel/X86CallLowering.cpp
88+
GISel/X86InstructionSelector.cpp
89+
GISel/X86LegalizerInfo.cpp
90+
GISel/X86RegisterBankInfo.cpp
9191
)
9292

9393
add_llvm_target(X86CodeGen ${sources}

llvm/lib/Target/X86/X86Subtarget.cpp

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

1313
#include "X86Subtarget.h"
14+
#include "GISel/X86CallLowering.h"
15+
#include "GISel/X86LegalizerInfo.h"
16+
#include "GISel/X86RegisterBankInfo.h"
1417
#include "MCTargetDesc/X86BaseInfo.h"
1518
#include "X86.h"
16-
#include "X86CallLowering.h"
17-
#include "X86LegalizerInfo.h"
1819
#include "X86MacroFusion.h"
19-
#include "X86RegisterBankInfo.h"
2020
#include "X86TargetMachine.h"
2121
#include "llvm/CodeGen/GlobalISel/CallLowering.h"
2222
#include "llvm/CodeGen/GlobalISel/InstructionSelect.h"

llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,17 @@ static_library("LLVMX86CodeGen") {
7070
"//llvm/lib/Transforms/CFGuard",
7171
"//llvm/lib/Transforms/Instrumentation",
7272
]
73+
include_dirs = [ "." ]
7374
sources = [
75+
"GISel/X86CallLowering.cpp",
76+
"GISel/X86InstructionSelector.cpp",
77+
"GISel/X86LegalizerInfo.cpp",
78+
"GISel/X86RegisterBankInfo.cpp",
7479
"X86ArgumentStackSlotRebase.cpp",
7580
"X86AsmPrinter.cpp",
7681
"X86AvoidStoreForwardingBlocks.cpp",
7782
"X86AvoidTrailingCall.cpp",
7883
"X86CallFrameOptimization.cpp",
79-
"X86CallLowering.cpp",
8084
"X86CallingConv.cpp",
8185
"X86CmovConversion.cpp",
8286
"X86DiscriminateMemOps.cpp",
@@ -106,9 +110,7 @@ static_library("LLVMX86CodeGen") {
106110
"X86InstrFMA3Info.cpp",
107111
"X86InstrFoldTables.cpp",
108112
"X86InstrInfo.cpp",
109-
"X86InstructionSelector.cpp",
110113
"X86InterleavedAccess.cpp",
111-
"X86LegalizerInfo.cpp",
112114
"X86LoadValueInjectionLoadHardening.cpp",
113115
"X86LoadValueInjectionRetHardening.cpp",
114116
"X86LowerAMXIntrinsics.cpp",
@@ -122,7 +124,6 @@ static_library("LLVMX86CodeGen") {
122124
"X86PartialReduction.cpp",
123125
"X86PreAMXConfig.cpp",
124126
"X86PreTileConfig.cpp",
125-
"X86RegisterBankInfo.cpp",
126127
"X86RegisterInfo.cpp",
127128
"X86ReturnThunks.cpp",
128129
"X86SelectionDAGInfo.cpp",

0 commit comments

Comments
 (0)