diff --git a/llvm/lib/Target/X86/CMakeLists.txt b/llvm/lib/Target/X86/CMakeLists.txt
--- a/llvm/lib/Target/X86/CMakeLists.txt
+++ b/llvm/lib/Target/X86/CMakeLists.txt
@@ -28,7 +28,6 @@
   X86AvoidTrailingCall.cpp
   X86CallFrameOptimization.cpp
   X86CallingConv.cpp
-  X86CallLowering.cpp
   X86CmovConversion.cpp
   X86DomainReassignment.cpp
   X86DiscriminateMemOps.cpp
@@ -52,7 +51,6 @@
   X86FlagsCopyLowering.cpp
   X86FloatingPoint.cpp
   X86FrameLowering.cpp
-  X86InstructionSelector.cpp
   X86ISelDAGToDAG.cpp
   X86ISelLowering.cpp
   X86ISelLoweringCall.cpp
@@ -65,7 +63,6 @@
   X86InstrFoldTables.cpp
   X86InstrInfo.cpp
   X86EvexToVex.cpp
-  X86LegalizerInfo.cpp
   X86LoadValueInjectionLoadHardening.cpp
   X86LoadValueInjectionRetHardening.cpp
   X86MCInstLower.cpp
@@ -74,7 +71,6 @@
   X86OptimizeLEAs.cpp
   X86PadShortFunction.cpp
   X86PartialReduction.cpp
-  X86RegisterBankInfo.cpp
   X86RegisterInfo.cpp
   X86ReturnThunks.cpp
   X86SelectionDAGInfo.cpp
@@ -88,6 +84,10 @@
   X86VZeroUpper.cpp
   X86WinEHState.cpp
   X86InsertWait.cpp
+  GISel/X86CallLowering.cpp
+  GISel/X86InstructionSelector.cpp
+  GISel/X86LegalizerInfo.cpp
+  GISel/X86RegisterBankInfo.cpp
   )
 
 add_llvm_target(X86CodeGen ${sources}
diff --git a/llvm/lib/Target/X86/X86CallLowering.h b/llvm/lib/Target/X86/GISel/X86CallLowering.h
rename from llvm/lib/Target/X86/X86CallLowering.h
rename to llvm/lib/Target/X86/GISel/X86CallLowering.h
diff --git a/llvm/lib/Target/X86/X86CallLowering.cpp b/llvm/lib/Target/X86/GISel/X86CallLowering.cpp
rename from llvm/lib/Target/X86/X86CallLowering.cpp
rename to llvm/lib/Target/X86/GISel/X86CallLowering.cpp
diff --git a/llvm/lib/Target/X86/X86InstructionSelector.cpp b/llvm/lib/Target/X86/GISel/X86InstructionSelector.cpp
rename from llvm/lib/Target/X86/X86InstructionSelector.cpp
rename to llvm/lib/Target/X86/GISel/X86InstructionSelector.cpp
diff --git a/llvm/lib/Target/X86/X86LegalizerInfo.h b/llvm/lib/Target/X86/GISel/X86LegalizerInfo.h
rename from llvm/lib/Target/X86/X86LegalizerInfo.h
rename to llvm/lib/Target/X86/GISel/X86LegalizerInfo.h
diff --git a/llvm/lib/Target/X86/X86LegalizerInfo.cpp b/llvm/lib/Target/X86/GISel/X86LegalizerInfo.cpp
rename from llvm/lib/Target/X86/X86LegalizerInfo.cpp
rename to llvm/lib/Target/X86/GISel/X86LegalizerInfo.cpp
diff --git a/llvm/lib/Target/X86/X86RegisterBankInfo.h b/llvm/lib/Target/X86/GISel/X86RegisterBankInfo.h
rename from llvm/lib/Target/X86/X86RegisterBankInfo.h
rename to llvm/lib/Target/X86/GISel/X86RegisterBankInfo.h
diff --git a/llvm/lib/Target/X86/X86RegisterBankInfo.cpp b/llvm/lib/Target/X86/GISel/X86RegisterBankInfo.cpp
rename from llvm/lib/Target/X86/X86RegisterBankInfo.cpp
rename to llvm/lib/Target/X86/GISel/X86RegisterBankInfo.cpp
diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp
--- a/llvm/lib/Target/X86/X86Subtarget.cpp
+++ b/llvm/lib/Target/X86/X86Subtarget.cpp
@@ -11,12 +11,12 @@
 //===----------------------------------------------------------------------===//
 
 #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"
diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
--- a/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/X86/BUILD.gn
@@ -70,13 +70,17 @@
     "//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",
@@ -106,9 +110,7 @@
     "X86InstrFMA3Info.cpp",
     "X86InstrFoldTables.cpp",
     "X86InstrInfo.cpp",
-    "X86InstructionSelector.cpp",
     "X86InterleavedAccess.cpp",
-    "X86LegalizerInfo.cpp",
     "X86LoadValueInjectionLoadHardening.cpp",
     "X86LoadValueInjectionRetHardening.cpp",
     "X86LowerAMXIntrinsics.cpp",
@@ -122,7 +124,6 @@
     "X86PartialReduction.cpp",
     "X86PreAMXConfig.cpp",
     "X86PreTileConfig.cpp",
-    "X86RegisterBankInfo.cpp",
     "X86RegisterInfo.cpp",
     "X86ReturnThunks.cpp",
     "X86SelectionDAGInfo.cpp",