diff --git a/llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir b/llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir --- a/llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-error.mir +++ b/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. diff --git a/llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir b/llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir --- a/llvm/test/CodeGen/MIR/AArch64/generic-virtual-registers-with-regbank-error.mir +++ b/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. diff --git a/llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir b/llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir --- a/llvm/test/CodeGen/MIR/AArch64/register-operand-bank.mir +++ b/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 } diff --git a/llvm/test/CodeGen/MIR/X86/generic-instr-type.mir b/llvm/test/CodeGen/MIR/X86/generic-instr-type.mir --- a/llvm/test/CodeGen/MIR/X86/generic-instr-type.mir +++ b/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. --- | diff --git a/llvm/test/MachineVerifier/test_copy.mir b/llvm/test/MachineVerifier/test_copy.mir --- a/llvm/test/MachineVerifier/test_copy.mir +++ b/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" diff --git a/llvm/test/MachineVerifier/test_copy_mismatch_types.mir b/llvm/test/MachineVerifier/test_copy_mismatch_types.mir --- a/llvm/test/MachineVerifier/test_copy_mismatch_types.mir +++ b/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" diff --git a/llvm/test/MachineVerifier/test_g_add.mir b/llvm/test/MachineVerifier/test_g_add.mir --- a/llvm/test/MachineVerifier/test_g_add.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_addrspacecast.mir b/llvm/test/MachineVerifier/test_g_addrspacecast.mir --- a/llvm/test/MachineVerifier/test_g_addrspacecast.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_bitcast.mir b/llvm/test/MachineVerifier/test_g_bitcast.mir --- a/llvm/test/MachineVerifier/test_g_bitcast.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_brjt.mir b/llvm/test/MachineVerifier/test_g_brjt.mir --- a/llvm/test/MachineVerifier/test_g_brjt.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_concat_vectors.mir b/llvm/test/MachineVerifier/test_g_concat_vectors.mir --- a/llvm/test/MachineVerifier/test_g_concat_vectors.mir +++ b/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" diff --git a/llvm/test/MachineVerifier/test_g_constant.mir b/llvm/test/MachineVerifier/test_g_constant.mir --- a/llvm/test/MachineVerifier/test_g_constant.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_extract.mir b/llvm/test/MachineVerifier/test_g_extract.mir --- a/llvm/test/MachineVerifier/test_g_extract.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_fcmp.mir b/llvm/test/MachineVerifier/test_g_fcmp.mir --- a/llvm/test/MachineVerifier/test_g_fcmp.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_fconstant.mir b/llvm/test/MachineVerifier/test_g_fconstant.mir --- a/llvm/test/MachineVerifier/test_g_fconstant.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_icmp.mir b/llvm/test/MachineVerifier/test_g_icmp.mir --- a/llvm/test/MachineVerifier/test_g_icmp.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_insert.mir b/llvm/test/MachineVerifier/test_g_insert.mir --- a/llvm/test/MachineVerifier/test_g_insert.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_inttoptr.mir b/llvm/test/MachineVerifier/test_g_inttoptr.mir --- a/llvm/test/MachineVerifier/test_g_inttoptr.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_jump_table.mir b/llvm/test/MachineVerifier/test_g_jump_table.mir --- a/llvm/test/MachineVerifier/test_g_jump_table.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_load.mir b/llvm/test/MachineVerifier/test_g_load.mir --- a/llvm/test/MachineVerifier/test_g_load.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_phi.mir b/llvm/test/MachineVerifier/test_g_phi.mir --- a/llvm/test/MachineVerifier/test_g_phi.mir +++ b/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" diff --git a/llvm/test/MachineVerifier/test_g_ptr_add.mir b/llvm/test/MachineVerifier/test_g_ptr_add.mir --- a/llvm/test/MachineVerifier/test_g_ptr_add.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_ptrtoint.mir b/llvm/test/MachineVerifier/test_g_ptrtoint.mir --- a/llvm/test/MachineVerifier/test_g_ptrtoint.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_select.mir b/llvm/test/MachineVerifier/test_g_select.mir --- a/llvm/test/MachineVerifier/test_g_select.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_sext_inreg.mir b/llvm/test/MachineVerifier/test_g_sext_inreg.mir --- a/llvm/test/MachineVerifier/test_g_sext_inreg.mir +++ b/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 --- | diff --git a/llvm/test/MachineVerifier/test_g_sextload.mir b/llvm/test/MachineVerifier/test_g_sextload.mir --- a/llvm/test/MachineVerifier/test_g_sextload.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_store.mir b/llvm/test/MachineVerifier/test_g_store.mir --- a/llvm/test/MachineVerifier/test_g_store.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_trunc.mir b/llvm/test/MachineVerifier/test_g_trunc.mir --- a/llvm/test/MachineVerifier/test_g_trunc.mir +++ b/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 diff --git a/llvm/test/MachineVerifier/test_g_zextload.mir b/llvm/test/MachineVerifier/test_g_zextload.mir --- a/llvm/test/MachineVerifier/test_g_zextload.mir +++ b/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 diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py --- a/llvm/test/lit.cfg.py +++ b/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'] diff --git a/llvm/test/tools/llvm-config/booleans.test b/llvm/test/tools/llvm-config/booleans.test --- a/llvm/test/tools/llvm-config/booleans.test +++ b/llvm/test/tools/llvm-config/booleans.test @@ -1,6 +1,5 @@ # 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 diff --git a/llvm/tools/llvm-config/BuildVariables.inc.in b/llvm/tools/llvm-config/BuildVariables.inc.in --- a/llvm/tools/llvm-config/BuildVariables.inc.in +++ b/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@" diff --git a/llvm/tools/llvm-config/CMakeLists.txt b/llvm/tools/llvm-config/CMakeLists.txt --- a/llvm/tools/llvm-config/CMakeLists.txt +++ b/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) diff --git a/llvm/tools/llvm-config/llvm-config.cpp b/llvm/tools/llvm-config/llvm-config.cpp --- a/llvm/tools/llvm-config/llvm-config.cpp +++ b/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") {