Index: llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir
===================================================================
--- llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir
+++ llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir
@@ -1,6 +1,5 @@
 # RUN: not llc -mtriple=aarch64-apple-ios -run-pass none -o - %s 2>&1 \
 # RUN:        | FileCheck %s --check-prefix=ERR
-# REQUIRES: global-isel
 # This test ensures that the MIR parser errors out when
 # generic virtual register definitions are not correct.
 
Index: llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir
===================================================================
--- llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir
+++ llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir
@@ -1,6 +1,5 @@
 # RUN: not llc -mtriple=aarch64-apple-ios -run-pass none -o - %s 2>&1 \
 # RUN:        | FileCheck %s --check-prefix=ERR
-# REQUIRES: global-isel
 # This test ensures that the MIR parser errors out when
 # generic virtual register definitions are not correct.
 # In that case, it is defined by a register bank.
Index: llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir
===================================================================
--- llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir
+++ llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir
@@ -1,5 +1,4 @@
 # RUN: llc -o - %s -mtriple=aarch64-- -run-pass=none | FileCheck %s
-# REQUIRES: global-isel
 # Test various aspects of register bank specification on machine operands.
 --- |
   define void @func() { ret void }
Index: llvm/test/CodeGen/MIR/X86/generic-instr-type.mir
===================================================================
--- llvm/test/CodeGen/MIR/X86/generic-instr-type.mir
+++ llvm/test/CodeGen/MIR/X86/generic-instr-type.mir
@@ -1,5 +1,4 @@
 # RUN: llc -march=x86-64 -run-pass none -o - %s | FileCheck %s
-# REQUIRES: global-isel
 # Test that the MIR parser parses types on generic instructions correctly.
 
 --- |
Index: llvm/test/MachineVerifier/test_copy.mir
===================================================================
--- llvm/test/MachineVerifier/test_copy.mir
+++ llvm/test/MachineVerifier/test_copy.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 --- |
   ; ModuleID = 'test.ll'
   source_filename = "test.ll"
Index: llvm/test/MachineVerifier/test_copy_mismatch_types.mir
===================================================================
--- llvm/test/MachineVerifier/test_copy_mismatch_types.mir
+++ llvm/test/MachineVerifier/test_copy_mismatch_types.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 --- |
   ; ModuleID = 'test.ll'
   source_filename = "test.ll"
Index: llvm/test/MachineVerifier/test_g_add.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_add.mir
+++ llvm/test/MachineVerifier/test_g_add.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -march=aarch64 -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_add
Index: llvm/test/MachineVerifier/test_g_addrspacecast.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_addrspacecast.mir
+++ llvm/test/MachineVerifier/test_g_addrspacecast.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_addrspacecast
Index: llvm/test/MachineVerifier/test_g_bitcast.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_bitcast.mir
+++ llvm/test/MachineVerifier/test_g_bitcast.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, amdgpu-registered-target
+# REQUIRES: amdgpu-registered-target
 
 ---
 name:            test_bitcast
Index: llvm/test/MachineVerifier/test_g_brjt.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_brjt.mir
+++ llvm/test/MachineVerifier/test_g_brjt.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -march=aarch64 -o /dev/null -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_jump_table
Index: llvm/test/MachineVerifier/test_g_concat_vectors.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_concat_vectors.mir
+++ llvm/test/MachineVerifier/test_g_concat_vectors.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 --- |
   target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
   target triple = "aarch64-unknown-unknown"
Index: llvm/test/MachineVerifier/test_g_constant.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_constant.mir
+++ llvm/test/MachineVerifier/test_g_constant.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -march=aarch64 -o /dev/null -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_constant
Index: llvm/test/MachineVerifier/test_g_extract.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_extract.mir
+++ llvm/test/MachineVerifier/test_g_extract.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -march=aarch64 -o /dev/null -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_extract
Index: llvm/test/MachineVerifier/test_g_fcmp.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_fcmp.mir
+++ llvm/test/MachineVerifier/test_g_fcmp.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_fcmp
Index: llvm/test/MachineVerifier/test_g_fconstant.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_fconstant.mir
+++ llvm/test/MachineVerifier/test_g_fconstant.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -march=aarch64 -o /dev/null -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_fconstant
Index: llvm/test/MachineVerifier/test_g_icmp.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_icmp.mir
+++ llvm/test/MachineVerifier/test_g_icmp.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_icmp
Index: llvm/test/MachineVerifier/test_g_insert.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_insert.mir
+++ llvm/test/MachineVerifier/test_g_insert.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -march=aarch64 -o /dev/null -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_insert
Index: llvm/test/MachineVerifier/test_g_inttoptr.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_inttoptr.mir
+++ llvm/test/MachineVerifier/test_g_inttoptr.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_inttoptr
Index: llvm/test/MachineVerifier/test_g_jump_table.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_jump_table.mir
+++ llvm/test/MachineVerifier/test_g_jump_table.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -march=aarch64 -o /dev/null -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_jump_table
Index: llvm/test/MachineVerifier/test_g_load.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_load.mir
+++ llvm/test/MachineVerifier/test_g_load.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_load
Index: llvm/test/MachineVerifier/test_g_phi.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_phi.mir
+++ llvm/test/MachineVerifier/test_g_phi.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 --- |
   ; ModuleID = 'test.ll'
   source_filename = "test.ll"
Index: llvm/test/MachineVerifier/test_g_ptr_add.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_ptr_add.mir
+++ llvm/test/MachineVerifier/test_g_ptr_add.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_gep
Index: llvm/test/MachineVerifier/test_g_ptrtoint.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_ptrtoint.mir
+++ llvm/test/MachineVerifier/test_g_ptrtoint.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -o - -march=arm64 -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_ptrtoint
Index: llvm/test/MachineVerifier/test_g_select.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_select.mir
+++ llvm/test/MachineVerifier/test_g_select.mir
@@ -1,5 +1,5 @@
 #RUN: not --crash llc -march=aarch64 -run-pass=none -verify-machineinstrs -o /dev/null %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_select
Index: llvm/test/MachineVerifier/test_g_sext_inreg.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_sext_inreg.mir
+++ llvm/test/MachineVerifier/test_g_sext_inreg.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -verify-machineinstrs -run-pass none -o /dev/null %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 --- |
 
Index: llvm/test/MachineVerifier/test_g_sextload.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_sextload.mir
+++ llvm/test/MachineVerifier/test_g_sextload.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -o - -march=arm64 -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_sextload
Index: llvm/test/MachineVerifier/test_g_store.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_store.mir
+++ llvm/test/MachineVerifier/test_g_store.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -o - -march=arm64 -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_store
Index: llvm/test/MachineVerifier/test_g_trunc.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_trunc.mir
+++ llvm/test/MachineVerifier/test_g_trunc.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -o - -march=arm64 -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_trunc
Index: llvm/test/MachineVerifier/test_g_zextload.mir
===================================================================
--- llvm/test/MachineVerifier/test_g_zextload.mir
+++ llvm/test/MachineVerifier/test_g_zextload.mir
@@ -1,5 +1,5 @@
 # RUN: not --crash llc -o - -march=arm64 -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s
-# REQUIRES: global-isel, aarch64-registered-target
+# REQUIRES: aarch64-registered-target
 
 ---
 name:            test_zextload
Index: llvm/test/lit.cfg.py
===================================================================
--- llvm/test/lit.cfg.py
+++ llvm/test/lit.cfg.py
@@ -328,10 +328,9 @@
 if have_ld64_plugin_support():
     config.available_features.add('ld64_plugin')
 
-# Ask llvm-config about asserts and global-isel.
+# Ask llvm-config about asserts
 llvm_config.feature_config(
-    [('--assertion-mode', {'ON': 'asserts'}),
-     ('--has-global-isel', {'ON': 'global-isel'})])
+    [('--assertion-mode', {'ON': 'asserts'})])
 
 if 'darwin' == sys.platform:
     cmd = ['sysctl', 'hw.optional.fma']
Index: llvm/tools/llvm-config/BuildVariables.inc.in
===================================================================
--- llvm/tools/llvm-config/BuildVariables.inc.in
+++ llvm/tools/llvm-config/BuildVariables.inc.in
@@ -32,5 +32,4 @@
 #define LLVM_ENABLE_SHARED @BUILD_SHARED_LIBS@
 #define LLVM_DYLIB_COMPONENTS "@LLVM_DYLIB_COMPONENTS_expanded@"
 #define LLVM_DYLIB_VERSION "@LLVM_DYLIB_VERSION@"
-#define LLVM_HAS_GLOBAL_ISEL @LLVM_HAS_GLOBAL_ISEL@
 #define LLVM_TOOLS_INSTALL_DIR "@LLVM_TOOLS_INSTALL_DIR@"
Index: llvm/tools/llvm-config/CMakeLists.txt
===================================================================
--- llvm/tools/llvm-config/CMakeLists.txt
+++ llvm/tools/llvm-config/CMakeLists.txt
@@ -50,7 +50,6 @@
 set(LLVM_BUILD_SYSTEM cmake)
 set(LLVM_HAS_RTTI ${LLVM_CONFIG_HAS_RTTI})
 set(LLVM_DYLIB_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_SUFFIX}")
-set(LLVM_HAS_GLOBAL_ISEL "ON")
 
 # Use the C++ link flags, since they should be a superset of C link flags.
 set(LLVM_LDFLAGS "${CMAKE_CXX_LINK_FLAGS}")
@@ -61,7 +60,6 @@
   LLVM_BUILD_LLVM_DYLIB
   LLVM_LINK_LLVM_DYLIB
   LLVM_HAS_RTTI
-  LLVM_HAS_GLOBAL_ISEL
   BUILD_SHARED_LIBS)
 llvm_expand_pseudo_components(LLVM_DYLIB_COMPONENTS_expanded "${LLVM_DYLIB_COMPONENTS}")
 configure_file(${BUILDVARIABLES_SRCPATH} ${BUILDVARIABLES_OBJPATH} @ONLY)
Index: llvm/tools/llvm-config/llvm-config.cpp
===================================================================
--- llvm/tools/llvm-config/llvm-config.cpp
+++ llvm/tools/llvm-config/llvm-config.cpp
@@ -235,7 +235,6 @@
   --assertion-mode  Print assertion mode of LLVM tree (ON or OFF).\n\
   --build-system    Print the build system used to build LLVM (always cmake).\n\
   --has-rtti        Print whether or not LLVM was built with rtti (YES or NO).\n\
-  --has-global-isel Print whether or not LLVM was built with global-isel support (ON or OFF).\n\
   --shared-mode     Print how the provided components can be collectively linked (`shared` or `static`).\n\
   --link-shared     Link the components as shared libraries.\n\
   --link-static     Link the component libraries statically.\n\
@@ -579,8 +578,6 @@
         OS << LLVM_BUILD_SYSTEM << '\n';
       } else if (Arg == "--has-rtti") {
         OS << (LLVM_HAS_RTTI ? "YES" : "NO") << '\n';
-      } else if (Arg == "--has-global-isel") {
-        OS << (LLVM_HAS_GLOBAL_ISEL ? "ON" : "OFF") << '\n';
       } else if (Arg == "--shared-mode") {
         PrintSharedMode = true;
       } else if (Arg == "--obj-root") {