33 files changed, 20 insertions, 8 deletions
diff --git a/llvm/test/Verifier/test_copy.mir b/llvm/test/MachineVerifier/test_copy.mir
index e234f45287e..e234f45287e 100644
--- a/llvm/test/Verifier/test_copy.mir
+++ b/llvm/test/MachineVerifier/test_copy.mir
diff --git a/llvm/test/Verifier/test_copy_mismatch_types.mir b/llvm/test/MachineVerifier/test_copy_mismatch_types.mir
index 905977938d5..905977938d5 100644
--- a/llvm/test/Verifier/test_copy_mismatch_types.mir
+++ b/llvm/test/MachineVerifier/test_copy_mismatch_types.mir
diff --git a/llvm/test/Verifier/test_g_add.mir b/llvm/test/MachineVerifier/test_g_add.mir
index 9cd990bb8cc..9cd990bb8cc 100644
--- a/llvm/test/Verifier/test_g_add.mir
+++ b/llvm/test/MachineVerifier/test_g_add.mir
diff --git a/llvm/test/Verifier/test_g_addrspacecast.mir b/llvm/test/MachineVerifier/test_g_addrspacecast.mir
index 44504108132..44504108132 100644
--- a/llvm/test/Verifier/test_g_addrspacecast.mir
+++ b/llvm/test/MachineVerifier/test_g_addrspacecast.mir
diff --git a/llvm/test/Verifier/test_g_bitcast.mir b/llvm/test/MachineVerifier/test_g_bitcast.mir
index 3446d5fc86e..3446d5fc86e 100644
--- a/llvm/test/Verifier/test_g_bitcast.mir
+++ b/llvm/test/MachineVerifier/test_g_bitcast.mir
diff --git a/llvm/test/Verifier/gisel-g_build_vector.mir b/llvm/test/MachineVerifier/test_g_build_vector.mir
index a40942ef47b..ad2742c4dff 100644
--- a/llvm/test/Verifier/gisel-g_build_vector.mir
+++ b/llvm/test/MachineVerifier/test_g_build_vector.mir
@@ -1,9 +1,9 @@
 #RUN: not 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_build_vector() {
     ret i32 0
   }
@@ -15,9 +15,9 @@ legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
-registers:       
+registers:
   - { id: 0, class: _, preferred-register: '' }
-liveins:         
+liveins:
 body:             |
   bb.0:
     ; CHECK: Bad machine code: G_BUILD_VECTOR src operands total size don't match dest size
diff --git a/llvm/test/Verifier/gisel-g_build_vector_trunc.mir b/llvm/test/MachineVerifier/test_g_build_vector_trunc.mir
index 3b9b304b667..d73e37e1e6e 100644
--- a/llvm/test/Verifier/gisel-g_build_vector_trunc.mir
+++ b/llvm/test/MachineVerifier/test_g_build_vector_trunc.mir
@@ -1,9 +1,9 @@
 #RUN: not 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_build_vector_trunc() {
     ret i32 0
   }
@@ -15,9 +15,9 @@ legalized:       true
 regBankSelected: false
 selected:        false
 tracksRegLiveness: true
-registers:       
+registers:
   - { id: 0, class: _, preferred-register: '' }
-liveins:         
+liveins:
 body:             |
   bb.0:
     ; CHECK: Bad machine code: G_BUILD_VECTOR_TRUNC source operand types are not larger than dest elt type
diff --git a/llvm/test/Verifier/gisel-g_concat_vector.mir b/llvm/test/MachineVerifier/test_g_concat_vectors.mir
index 640c4a4ceed..640c4a4ceed 100644
--- a/llvm/test/Verifier/gisel-g_concat_vector.mir
+++ b/llvm/test/MachineVerifier/test_g_concat_vectors.mir
diff --git a/llvm/test/Verifier/test_g_constant.mir b/llvm/test/MachineVerifier/test_g_constant.mir
index fa5daff870b..fa5daff870b 100644
--- a/llvm/test/Verifier/test_g_constant.mir
+++ b/llvm/test/MachineVerifier/test_g_constant.mir
diff --git a/llvm/test/Verifier/test_g_extract.mir b/llvm/test/MachineVerifier/test_g_extract.mir
index 62064ae8021..62064ae8021 100644
--- a/llvm/test/Verifier/test_g_extract.mir
+++ b/llvm/test/MachineVerifier/test_g_extract.mir
diff --git a/llvm/test/Verifier/test_g_fcmp.mir b/llvm/test/MachineVerifier/test_g_fcmp.mir
index baaa2483536..baaa2483536 100644
--- a/llvm/test/Verifier/test_g_fcmp.mir
+++ b/llvm/test/MachineVerifier/test_g_fcmp.mir
diff --git a/llvm/test/Verifier/test_g_fconstant.mir b/llvm/test/MachineVerifier/test_g_fconstant.mir
index d917d9c846f..d917d9c846f 100644
--- a/llvm/test/Verifier/test_g_fconstant.mir
+++ b/llvm/test/MachineVerifier/test_g_fconstant.mir
diff --git a/llvm/test/Verifier/test_g_gep.mir b/llvm/test/MachineVerifier/test_g_gep.mir
index 5e34625d1e7..5e34625d1e7 100644
--- a/llvm/test/Verifier/test_g_gep.mir
+++ b/llvm/test/MachineVerifier/test_g_gep.mir
diff --git a/llvm/test/Verifier/test_g_icmp.mir b/llvm/test/MachineVerifier/test_g_icmp.mir
index e2d9d6419cc..e2d9d6419cc 100644
--- a/llvm/test/Verifier/test_g_icmp.mir
+++ b/llvm/test/MachineVerifier/test_g_icmp.mir
diff --git a/llvm/test/Verifier/test_g_inttoptr.mir b/llvm/test/MachineVerifier/test_g_inttoptr.mir
index f3a201147f1..f3a201147f1 100644
--- a/llvm/test/Verifier/test_g_inttoptr.mir
+++ b/llvm/test/MachineVerifier/test_g_inttoptr.mir
diff --git a/llvm/test/Verifier/test_g_load.mir b/llvm/test/MachineVerifier/test_g_load.mir
index 4378e862f0e..4378e862f0e 100644
--- a/llvm/test/Verifier/test_g_load.mir
+++ b/llvm/test/MachineVerifier/test_g_load.mir
diff --git a/llvm/test/Verifier/test_g_phi.mir b/llvm/test/MachineVerifier/test_g_phi.mir
index c108ea61354..c108ea61354 100644
--- a/llvm/test/Verifier/test_g_phi.mir
+++ b/llvm/test/MachineVerifier/test_g_phi.mir
diff --git a/llvm/test/Verifier/test_g_ptrtoint.mir b/llvm/test/MachineVerifier/test_g_ptrtoint.mir
index c6a969a9c37..c6a969a9c37 100644
--- a/llvm/test/Verifier/test_g_ptrtoint.mir
+++ b/llvm/test/MachineVerifier/test_g_ptrtoint.mir
diff --git a/llvm/test/Verifier/test_g_select.mir b/llvm/test/MachineVerifier/test_g_select.mir
index d40b276c9ba..d40b276c9ba 100644
--- a/llvm/test/Verifier/test_g_select.mir
+++ b/llvm/test/MachineVerifier/test_g_select.mir
diff --git a/llvm/test/Verifier/test_g_sextload.mir b/llvm/test/MachineVerifier/test_g_sextload.mir
index b195481d1e6..b195481d1e6 100644
--- a/llvm/test/Verifier/test_g_sextload.mir
+++ b/llvm/test/MachineVerifier/test_g_sextload.mir
diff --git a/llvm/test/Verifier/test_g_store.mir b/llvm/test/MachineVerifier/test_g_store.mir
index 8cf144f1e31..8cf144f1e31 100644
--- a/llvm/test/Verifier/test_g_store.mir
+++ b/llvm/test/MachineVerifier/test_g_store.mir
diff --git a/llvm/test/Verifier/test_g_trunc.mir b/llvm/test/MachineVerifier/test_g_trunc.mir
index 3a196bb7bbd..3a196bb7bbd 100644
--- a/llvm/test/Verifier/test_g_trunc.mir
+++ b/llvm/test/MachineVerifier/test_g_trunc.mir
diff --git a/llvm/test/Verifier/test_g_zextload.mir b/llvm/test/MachineVerifier/test_g_zextload.mir
index a2bd321bfa3..a2bd321bfa3 100644
--- a/llvm/test/Verifier/test_g_zextload.mir
+++ b/llvm/test/MachineVerifier/test_g_zextload.mir
diff --git a/llvm/test/Verifier/test_phis_precede_nonphis.mir b/llvm/test/MachineVerifier/test_phis_precede_nonphis.mir
index fa69b40fddf..fa69b40fddf 100644
--- a/llvm/test/Verifier/test_phis_precede_nonphis.mir
+++ b/llvm/test/MachineVerifier/test_phis_precede_nonphis.mir
diff --git a/llvm/test/CodeGen/X86/verifier-generic-extend-truncate.mir b/llvm/test/MachineVerifier/verifier-generic-extend-truncate.mir
index 28bca8845ce..8390d9bf3ce 100644
--- a/llvm/test/CodeGen/X86/verifier-generic-extend-truncate.mir
+++ b/llvm/test/MachineVerifier/verifier-generic-extend-truncate.mir
@@ -1,4 +1,5 @@
 # RUN: not llc -o - %s -mtriple=x86_64-- -verify-machineinstrs -run-pass=none 2>&1 | FileCheck %s
+# REQUIRES: x86-registered-target
 
 # CHECK: Bad machine code: Generic extend/truncate can not operate on pointers
 # CHECK-NEXT: - function:    bad_generic_extends_and_truncates
diff --git a/llvm/test/CodeGen/X86/verifier-generic-types-1.mir b/llvm/test/MachineVerifier/verifier-generic-types-1.mir
index 61a512df9fc..bc2d2580ed1 100644
--- a/llvm/test/CodeGen/X86/verifier-generic-types-1.mir
+++ b/llvm/test/MachineVerifier/verifier-generic-types-1.mir
@@ -1,4 +1,5 @@
 # RUN: not llc -o - %s -mtriple=x86_64-- -verify-machineinstrs -run-pass=none 2>&1 | FileCheck %s
+# REQUIRES: x86-registered-target
 
 # CHECK-NOT: Type mismatch
 
diff --git a/llvm/test/CodeGen/X86/verifier-generic-types-2.mir b/llvm/test/MachineVerifier/verifier-generic-types-2.mir
index 625c5eb5905..27a14c222c6 100644
--- a/llvm/test/CodeGen/X86/verifier-generic-types-2.mir
+++ b/llvm/test/MachineVerifier/verifier-generic-types-2.mir
@@ -1,4 +1,5 @@
 # RUN: not llc -o - %s -mtriple=x86_64-- -verify-machineinstrs -run-pass=none 2>&1 | FileCheck %s
+# REQUIRES: x86-registered-target
 
 # CHECK: Bad machine code: Generic instruction is missing a virtual register type
 # CHECK-NEXT: - function:    first_type_of_a_type_index_missing_and_a_mismatch
diff --git a/llvm/test/CodeGen/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir b/llvm/test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir
index 6efd03c35ba..06aad1fb154 100644
--- a/llvm/test/CodeGen/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir
+++ b/llvm/test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir
@@ -1,4 +1,5 @@
 # RUN: not llc -mtriple=amdgcn-amd-amdhsa -verify-machineinstrs -o /dev/null %s 2>&1 | FileCheck -check-prefix=ERROR %s
+# REQUIRES: amdgpu-registered-target
 
 # When the verifier was detecting the invalid liveness for vcc, it would assert when trying to iterate the subregisters of the implicit virtual register use.
 
diff --git a/llvm/test/CodeGen/X86/verifier-phi-fail0.mir b/llvm/test/MachineVerifier/verifier-phi-fail0.mir
index bb707e4d45c..3f13aabb004 100644
--- a/llvm/test/CodeGen/X86/verifier-phi-fail0.mir
+++ b/llvm/test/MachineVerifier/verifier-phi-fail0.mir
@@ -1,4 +1,6 @@
 # RUN: not llc -o - %s -mtriple=x86_64-- -verify-machineinstrs -run-pass=none 2>&1 | FileCheck %s
+# REQUIRES: x86-registered-target
+
 ---
 # CHECK: Bad machine code: PHI operand is not live-out from predecessor
 # CHECK: - function:    func0
diff --git a/llvm/test/CodeGen/X86/verifier-phi.mir b/llvm/test/MachineVerifier/verifier-phi.mir
index 81a4cb0e791..87f2efcc82d 100644
--- a/llvm/test/CodeGen/X86/verifier-phi.mir
+++ b/llvm/test/MachineVerifier/verifier-phi.mir
@@ -1,4 +1,6 @@
 # RUN: llc -o - %s -mtriple=x86_64-- -verify-machineinstrs -run-pass=none | FileCheck %s
+# REQUIRES: x86-registered-target
+
 # This should cleanly pass the machine verifier
 ---
 # CHECK-LABEL: name: func0
diff --git a/llvm/test/CodeGen/AMDGPU/verifier-pseudo-terminators.mir b/llvm/test/MachineVerifier/verifier-pseudo-terminators.mir
index d9e8aa71f32..b501aacf967 100644
--- a/llvm/test/CodeGen/AMDGPU/verifier-pseudo-terminators.mir
+++ b/llvm/test/MachineVerifier/verifier-pseudo-terminators.mir
@@ -1,4 +1,6 @@
 # RUN: not llc -march=amdgcn -run-pass=verify %s 2>&1 | FileCheck %s
+# REQUIRES: amdgpu-registered-target
+
 # Make sure that mismatched successors are caught when a _term
 # instruction is used
 
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/verify-regbankselected.mir b/llvm/test/MachineVerifier/verify-regbankselected.mir
index c5586932b52..027fc666457 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/verify-regbankselected.mir
+++ b/llvm/test/MachineVerifier/verify-regbankselected.mir
@@ -1,4 +1,5 @@
 # RUN: not llc -verify-machineinstrs -run-pass none -o /dev/null %s 2>&1 | FileCheck %s
+# REQUIRES: aarch64-registered-target
 
 --- |
 
diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/verify-selected.mir b/llvm/test/MachineVerifier/verify-selected.mir
index ad17fa93015..a38f67ca6e6 100644
--- a/llvm/test/CodeGen/AArch64/GlobalISel/verify-selected.mir
+++ b/llvm/test/MachineVerifier/verify-selected.mir
@@ -1,4 +1,5 @@
 # RUN: not llc -verify-machineinstrs -run-pass none -o /dev/null %s 2>&1 | FileCheck %s
+# REQUIRES: aarch64-registered-target
 
 --- |