[X86][GlobalISel] Move GlobalISel source files to a dedicated subdir

[MaskRay]

Summary

Similar to D81116 (AArch64): separate the GISel components for
organization purposes and match other targets.

[pengfei]

llvm/lib/Target/X86/CMakeLists.txt

87–90

Move them to the top to keep alphabetical order.

[RKSimon]

Since only AArch64 + RiscV currently use a subdir - why not just move them up instead?

[MaskRay]

In D158489#4605997, @RKSimon wrote:

Since only AArch64 + RiscV currently use a subdir - why not just move them up instead?

I am confused. {AArch64,M68k,PowerPC,RISCV}/GISel are present. This patch creates X86/GISel/. What do you suggest?

llvm/lib/Target/X86/CMakeLists.txt

87–90

My reasoning is that placing files before directories is also an order, but I can move GISel if you are strong about it...

[RKSimon]

In D158489#4607468, @MaskRay wrote:

In D158489#4605997, @RKSimon wrote:

Since only AArch64 + RiscV currently use a subdir - why not just move them up instead?

I am confused. {AArch64,M68k,PowerPC,RISCV}/GISel are present. This patch creates X86/GISel/. What do you suggest?

I'm confused too :) If the plan is to eventually just have GISel why have them in a subdir?

[MaskRay]

In D158489#4607498, @RKSimon wrote:

In D158489#4607468, @MaskRay wrote:

In D158489#4605997, @RKSimon wrote:

Since only AArch64 + RiscV currently use a subdir - why not just move them up instead?

I am confused. {AArch64,M68k,PowerPC,RISCV}/GISel are present. This patch creates X86/GISel/. What do you suggest?

I'm confused too :) If the plan is to eventually just have GISel why have them in a subdir?

This X86/GISel directory makes it clear what files are GlobalISel related. X86/ contains other files (Subtarget,TargetMachine,X86-specific codegen optimizations,etc) and some SelectionDAG related files.
If eventually we can get rid of SelectionDAG (not sure how feasible it is, but looks like a project of 10+ years), we would still have some X86/ files.
This X86/GISel directory would still be useful to separate GlobalISel related files.

[RKSimon]

OK

llvm/lib/Target/X86/CMakeLists.txt

 add_public_tablegen_target(X86CommonTableGen)
 
 set(sources
   X86ArgumentStackSlotRebase.cpp
   X86AsmPrinter.cpp
   X86AvoidTrailingCall.cpp
   X86CallFrameOptimization.cpp
   X86CallingConv.cpp
-  X86CallLowering.cpp
   X86CmovConversion.cpp
   X86DomainReassignment.cpp
   X86DiscriminateMemOps.cpp
   X86LowerTileCopy.cpp
   X86LowerAMXType.cpp
   X86PreAMXConfig.cpp
   X86LowerAMXIntrinsics.cpp
   X86TileConfig.cpp
   X86FastPreTileConfig.cpp
   X86FastTileConfig.cpp
   X86PreTileConfig.cpp
   X86ExpandPseudo.cpp
   X86FastISel.cpp
   X86FixupBWInsts.cpp
   X86FixupLEAs.cpp
   X86FixupInstTuning.cpp
   X86FixupVectorConstants.cpp
   X86AvoidStoreForwardingBlocks.cpp
   X86DynAllocaExpander.cpp
   X86FixupSetCC.cpp
   X86FlagsCopyLowering.cpp
   X86FloatingPoint.cpp
   X86FrameLowering.cpp
-  X86InstructionSelector.cpp
   X86ISelDAGToDAG.cpp
   X86ISelLowering.cpp
   X86ISelLoweringCall.cpp
   X86IndirectBranchTracking.cpp
   X86IndirectThunks.cpp
   X86InterleavedAccess.cpp
   X86InsertPrefetch.cpp
   X86InstCombineIntrinsic.cpp
   X86InstrFMA3Info.cpp
   X86InstrFoldTables.cpp
   X86InstrInfo.cpp
   X86EvexToVex.cpp
-  X86LegalizerInfo.cpp
   X86LoadValueInjectionLoadHardening.cpp
   X86LoadValueInjectionRetHardening.cpp
   X86MCInstLower.cpp
   X86MachineFunctionInfo.cpp
   X86MacroFusion.cpp
   X86OptimizeLEAs.cpp
   X86PadShortFunction.cpp
   X86PartialReduction.cpp
-  X86RegisterBankInfo.cpp
   X86RegisterInfo.cpp
   X86ReturnThunks.cpp
   X86SelectionDAGInfo.cpp
   X86ShuffleDecodeConstantPool.cpp
   X86SpeculativeLoadHardening.cpp
   X86SpeculativeExecutionSideEffectSuppression.cpp
   X86Subtarget.cpp
   X86TargetMachine.cpp
   X86TargetObjectFile.cpp
   X86TargetTransformInfo.cpp
   X86VZeroUpper.cpp
   X86WinEHState.cpp
   X86InsertWait.cpp
+  GISel/X86CallLowering.cpp
+  GISel/X86InstructionSelector.cpp
+  GISel/X86LegalizerInfo.cpp
+  GISel/X86RegisterBankInfo.cpp
   )
 
 add_llvm_target(X86CodeGen ${sources}
   LINK_COMPONENTS
   Analysis
   AsmPrinter
   CFGuard
   CodeGen

llvm/lib/Target/X86/X86Subtarget.cpp

 //===-- X86Subtarget.cpp - X86 Subtarget Information ----------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements the X86 specific subclass of TargetSubtargetInfo.
 //
 //===----------------------------------------------------------------------===//
 
 #include "X86Subtarget.h"
+#include "GISel/X86CallLowering.h"
+#include "GISel/X86LegalizerInfo.h"
+#include "GISel/X86RegisterBankInfo.h"
 #include "MCTargetDesc/X86BaseInfo.h"
 #include "X86.h"
-#include "X86CallLowering.h"
-#include "X86LegalizerInfo.h"
 #include "X86MacroFusion.h"
-#include "X86RegisterBankInfo.h"
 #include "X86TargetMachine.h"
 #include "llvm/CodeGen/GlobalISel/CallLowering.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelect.h"
 #include "llvm/CodeGen/GlobalISel/InstructionSelector.h"
 #include "llvm/CodeGen/ScheduleDAGMutation.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm/IR/ConstantRange.h"
 #include "llvm/IR/Function.h"

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

deps = [
     "//llvm/lib/IR",
     "//llvm/lib/MC",
     "//llvm/lib/Support",
     "//llvm/lib/Target",
     "//llvm/lib/TargetParser",
     "//llvm/lib/Transforms/CFGuard",
     "//llvm/lib/Transforms/Instrumentation",
   ]
+  include_dirs = [ "." ]
   sources = [
+    "GISel/X86CallLowering.cpp",
+    "GISel/X86InstructionSelector.cpp",
+    "GISel/X86LegalizerInfo.cpp",
+    "GISel/X86RegisterBankInfo.cpp",
     "X86ArgumentStackSlotRebase.cpp",
     "X86AsmPrinter.cpp",
     "X86AvoidStoreForwardingBlocks.cpp",
     "X86AvoidTrailingCall.cpp",
     "X86CallFrameOptimization.cpp",
-    "X86CallLowering.cpp",
     "X86CallingConv.cpp",
     "X86CmovConversion.cpp",
     "X86DiscriminateMemOps.cpp",
     "X86DomainReassignment.cpp",
     "X86DynAllocaExpander.cpp",
     "X86EvexToVex.cpp",
     "X86ExpandPseudo.cpp",
     "X86FastISel.cpp",
sources = [
     "X86IndirectBranchTracking.cpp",
     "X86IndirectThunks.cpp",
     "X86InsertPrefetch.cpp",
     "X86InsertWait.cpp",
     "X86InstCombineIntrinsic.cpp",
     "X86InstrFMA3Info.cpp",
     "X86InstrFoldTables.cpp",
     "X86InstrInfo.cpp",
-    "X86InstructionSelector.cpp",
     "X86InterleavedAccess.cpp",
-    "X86LegalizerInfo.cpp",
     "X86LoadValueInjectionLoadHardening.cpp",
     "X86LoadValueInjectionRetHardening.cpp",
     "X86LowerAMXIntrinsics.cpp",
     "X86LowerAMXType.cpp",
     "X86LowerTileCopy.cpp",
     "X86MCInstLower.cpp",
     "X86MachineFunctionInfo.cpp",
     "X86MacroFusion.cpp",
     "X86OptimizeLEAs.cpp",
     "X86PadShortFunction.cpp",
     "X86PartialReduction.cpp",
     "X86PreAMXConfig.cpp",
     "X86PreTileConfig.cpp",
-    "X86RegisterBankInfo.cpp",
     "X86RegisterInfo.cpp",
     "X86ReturnThunks.cpp",
     "X86SelectionDAGInfo.cpp",
     "X86ShuffleDecodeConstantPool.cpp",
     "X86SpeculativeExecutionSideEffectSuppression.cpp",
     "X86SpeculativeLoadHardening.cpp",
     "X86Subtarget.cpp",
     "X86TargetMachine.cpp",