Remove leftover REQUIRES: global-isel

[russell.gallop]

Summary

As suggested here: https://reviews.llvm.org/D85199#2241931

[arsenm]

llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir

3

I assume something in lit is parsing and recognizing this? Should remove that too?

[russell.gallop]

I assume something in lit is parsing and recognizing this? Should remove that too?

Yes, there were a few bits left over in lit and llvm-config, so I've removed them.

I'm assuming BUILD.gn can take care of itself...

[russell.gallop]

Fix llvm-config test.

[arsenm]

I think somethings wrong. I'm now seeing this on all global isel tests:

UNSUPPORTED: LLVM :: CodeGen/AMDGPU/GlobalISel/regbankselect-umin.mir (704 of 740)

[arsenm]

In D86714#2242592, @arsenm wrote:

I think somethings wrong. I'm now seeing this on all global isel tests:

UNSUPPORTED: LLVM :: CodeGen/AMDGPU/GlobalISel/regbankselect-umin.mir (704 of 740)

Fixed leftover lit.local.cfgs in 9607ccf62617c9f025d182ddf137cf80e6d5c1f0

[russell.gallop]

Thanks for catching that.

llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir

 # 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.
 
 --- |
   define void @baz() { ret void }
 ...
 
 ---

llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir

 # 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.
 
 --- |
   define void @bar() { ret void }
 ...
 

llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir

 # 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 }
 ...
 ---
 # CHECK-LABEL: name: func
 # CHECK: registers:
 # CHECK:   - { id: 0, class: gpr, preferred-register: '' }

llvm/test/CodeGen/MIR/X86/generic-instr-type.mir

 # 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.
 
 --- |
   target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
   %type_alias = type <2 x i32>
   %structure_alias = type { i32, i16 }
   define void @test_vregs() {
     ret void

llvm/test/MachineVerifier/test_copy.mir

 #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"
   target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
   target triple = "aarch64-unknown-unknown"
   
   define i32 @test_copy(i32 %argc) {
     ret i32 0

llvm/test/MachineVerifier/test_copy_mismatch_types.mir

 #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"
   target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
   target triple = "aarch64-unknown-unknown"
   
   define i32 @test_copy(i32 %argc) {
     ret i32 0

llvm/test/MachineVerifier/test_g_add.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_addrspacecast.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_bitcast.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_brjt.mir

 # 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
 legalized:       true
 tracksRegLiveness: true
 jumpTable:
   kind:            block-address
   entries:

llvm/test/MachineVerifier/test_g_concat_vectors.mir

 #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"
   
   define i32 @g_concat_vectors() {
     ret i32 0
   }
 

llvm/test/MachineVerifier/test_g_constant.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_extract.mir

 # 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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_fcmp.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_fconstant.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_icmp.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_insert.mir

 # 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
 legalized:       true
 tracksRegLiveness: true
 liveins:
 body:             |
   bb.0:

llvm/test/MachineVerifier/test_g_inttoptr.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_jump_table.mir

 # 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
 legalized:       true
 tracksRegLiveness: true
 jumpTable:
   kind:            block-address
   entries:

llvm/test/MachineVerifier/test_g_load.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_phi.mir

 #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"
   target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128"
   target triple = "aarch64-unknown-unknown"
   
   define i32 @test_phi(i32 %argc) {
   entry:

llvm/test/MachineVerifier/test_g_ptr_add.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_ptrtoint.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_select.mir

 #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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_sext_inreg.mir

 # 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
 
 --- |
 
   target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
   target triple = "aarch64--"
   define void @test() { ret void }
 
 ...

llvm/test/MachineVerifier/test_g_sextload.mir

 # 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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_store.mir

 # 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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_trunc.mir

 # 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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/MachineVerifier/test_g_zextload.mir

 # 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
 legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
 liveins:

llvm/test/lit.cfg.py

if 'ld64' not in ld_out or 'LTO' not in ld_out:
         return False
 
     return True
 
 
 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']
     sysctl_cmd = subprocess.Popen(cmd, stdout=subprocess.PIPE)
 
     # Non zero return, probably a permission issue
     if sysctl_cmd.wait():
         print(

llvm/test/tools/llvm-config/booleans.test

 # Check whether boolean options are consistently normalized to ON/OFF.
 RUN: llvm-config --assertion-mode 2>&1 | FileCheck --check-prefix=CHECK-ONOFF %s
-RUN: llvm-config --has-global-isel 2>&1 | FileCheck --check-prefix=CHECK-ONOFF %s
 CHECK-ONOFF: {{ON|OFF}}
 CHECK-ONOFF-NOT: error:
 CHECK-ONOFF-NOT: warning
 
 # ...or to YES/NO.
 RUN: llvm-config --has-rtti 2>&1 | FileCheck --check-prefix=CHECK-YESNO %s
 CHECK-YESNO: {{YES|NO}}
 CHECK-YESNO-NOT: error:

llvm/tools/llvm-config/BuildVariables.inc.in

 #define LLVM_SYSTEM_LIBS "@LLVM_SYSTEM_LIBS@"
 #define LLVM_BUILD_SYSTEM "@LLVM_BUILD_SYSTEM@"
 #define LLVM_HAS_RTTI @LLVM_HAS_RTTI@
 #define LLVM_ENABLE_DYLIB @LLVM_BUILD_LLVM_DYLIB@
 #define LLVM_LINK_DYLIB @LLVM_LINK_LLVM_DYLIB@
 #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@"

llvm/tools/llvm-config/CMakeLists.txt

 set(LLVM_CPPFLAGS "${LLVM_DEFINITIONS}")
 set(LLVM_CFLAGS "${LLVM_C_STD_FLAG} ${LLVM_DEFINITIONS}")
 # The language standard potentially affects the ABI/API of LLVM, so we want
 # to make sure it is reported by llvm-config.
 set(LLVM_CXXFLAGS "${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION} ${LLVM_CXX_STDLIB_FLAG} ${COMPILE_FLAGS} ${LLVM_DEFINITIONS}")
 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}")
 set(LLVM_BUILDMODE ${CMAKE_BUILD_TYPE})
 set(LLVM_SYSTEM_LIBS ${SYSTEM_LIBS})
 string(REPLACE ";" " " LLVM_TARGETS_BUILT "${LLVM_TARGETS_TO_BUILD}")
 llvm_canonicalize_cmake_booleans(
   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)
 
 # Set build-time environment(s).
 add_definitions(-DCMAKE_CFG_INTDIR="${CMAKE_CFG_INTDIR}")
 
 if(LLVM_ENABLE_MODULES)

llvm/tools/llvm-config/llvm-config.cpp

Options:\n\
   --libfiles        Fully qualified library filenames for makefile depends.\n\
   --components      List of all possible components.\n\
   --targets-built   List of all targets currently built.\n\
   --host-target     Target triple used to configure LLVM.\n\
   --build-mode      Print build mode of LLVM tree (e.g. Debug or Release).\n\
   --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\
   --ignore-libllvm  Ignore libLLVM and link component libraries instead.\n\
 Typical components:\n\
   all               All LLVM libraries (default).\n\
   engine            Either a native JIT or a bitcode interpreter.\n";
   exit(1);
#if defined(NDEBUG)
         OS << "OFF\n";
 #else
         OS << "ON\n";
 #endif
       } else if (Arg == "--build-system") {
         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") {
         OS << ActivePrefix << '\n';
       } else if (Arg == "--src-root") {
         OS << LLVM_SRC_ROOT << '\n';
       } else if (Arg == "--ignore-libllvm") {
         LinkDyLib = false;