Try to organize MachineVerifier tests

The Verifier is separate from the MachineVerifier, so move it to a
different directory. Some other verifier tests were scattered in
target codegen tests as well (although I'm sure I missed some). Work
towards using a more consistent naming scheme to make it clearer where
the gaps still are for generic instructions.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@354138 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Verifier/test_copy.mir b/test/MachineVerifier/test_copy.mir
similarity index 100%
rename from test/Verifier/test_copy.mir
rename to test/MachineVerifier/test_copy.mir

diff --git a/test/Verifier/test_copy_mismatch_types.mir b/test/MachineVerifier/test_copy_mismatch_types.mir
similarity index 100%
rename from test/Verifier/test_copy_mismatch_types.mir
rename to test/MachineVerifier/test_copy_mismatch_types.mir

diff --git a/test/Verifier/test_g_add.mir b/test/MachineVerifier/test_g_add.mir
similarity index 100%
rename from test/Verifier/test_g_add.mir
rename to test/MachineVerifier/test_g_add.mir

diff --git a/test/Verifier/test_g_addrspacecast.mir b/test/MachineVerifier/test_g_addrspacecast.mir
similarity index 100%
rename from test/Verifier/test_g_addrspacecast.mir
rename to test/MachineVerifier/test_g_addrspacecast.mir

diff --git a/test/Verifier/test_g_bitcast.mir b/test/MachineVerifier/test_g_bitcast.mir
similarity index 100%
rename from test/Verifier/test_g_bitcast.mir
rename to test/MachineVerifier/test_g_bitcast.mir

diff --git a/test/Verifier/gisel-g_build_vector.mir b/test/MachineVerifier/test_g_build_vector.mir
similarity index 87%
rename from test/Verifier/gisel-g_build_vector.mir
rename to test/MachineVerifier/test_g_build_vector.mir
index a40942ef47bc35e146b2c64e20731e3c5ce82b91..ad2742c4dff16a20f02f319b8c4b28c59a66cd55 100644 (file)
--- a/test/Verifier/gisel-g_build_vector.mir
+++ b/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/test/Verifier/gisel-g_build_vector_trunc.mir b/test/MachineVerifier/test_g_build_vector_trunc.mir
similarity index 88%
rename from test/Verifier/gisel-g_build_vector_trunc.mir
rename to test/MachineVerifier/test_g_build_vector_trunc.mir
index 3b9b304b6673de4c4252cf2ed04c49925102082b..d73e37e1e6e3088a1360e795338adf1cefbaba3f 100644 (file)
--- a/test/Verifier/gisel-g_build_vector_trunc.mir
+++ b/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/test/Verifier/gisel-g_concat_vector.mir b/test/MachineVerifier/test_g_concat_vectors.mir
similarity index 100%
rename from test/Verifier/gisel-g_concat_vector.mir
rename to test/MachineVerifier/test_g_concat_vectors.mir

diff --git a/test/Verifier/test_g_constant.mir b/test/MachineVerifier/test_g_constant.mir
similarity index 100%
rename from test/Verifier/test_g_constant.mir
rename to test/MachineVerifier/test_g_constant.mir

diff --git a/test/Verifier/test_g_extract.mir b/test/MachineVerifier/test_g_extract.mir
similarity index 100%
rename from test/Verifier/test_g_extract.mir
rename to test/MachineVerifier/test_g_extract.mir

diff --git a/test/Verifier/test_g_fcmp.mir b/test/MachineVerifier/test_g_fcmp.mir
similarity index 100%
rename from test/Verifier/test_g_fcmp.mir
rename to test/MachineVerifier/test_g_fcmp.mir

diff --git a/test/Verifier/test_g_fconstant.mir b/test/MachineVerifier/test_g_fconstant.mir
similarity index 100%
rename from test/Verifier/test_g_fconstant.mir
rename to test/MachineVerifier/test_g_fconstant.mir

diff --git a/test/Verifier/test_g_gep.mir b/test/MachineVerifier/test_g_gep.mir
similarity index 100%
rename from test/Verifier/test_g_gep.mir
rename to test/MachineVerifier/test_g_gep.mir

diff --git a/test/Verifier/test_g_icmp.mir b/test/MachineVerifier/test_g_icmp.mir
similarity index 100%
rename from test/Verifier/test_g_icmp.mir
rename to test/MachineVerifier/test_g_icmp.mir

diff --git a/test/Verifier/test_g_inttoptr.mir b/test/MachineVerifier/test_g_inttoptr.mir
similarity index 100%
rename from test/Verifier/test_g_inttoptr.mir
rename to test/MachineVerifier/test_g_inttoptr.mir

diff --git a/test/Verifier/test_g_load.mir b/test/MachineVerifier/test_g_load.mir
similarity index 100%
rename from test/Verifier/test_g_load.mir
rename to test/MachineVerifier/test_g_load.mir

diff --git a/test/Verifier/test_g_phi.mir b/test/MachineVerifier/test_g_phi.mir
similarity index 100%
rename from test/Verifier/test_g_phi.mir
rename to test/MachineVerifier/test_g_phi.mir

diff --git a/test/Verifier/test_g_ptrtoint.mir b/test/MachineVerifier/test_g_ptrtoint.mir
similarity index 100%
rename from test/Verifier/test_g_ptrtoint.mir
rename to test/MachineVerifier/test_g_ptrtoint.mir

diff --git a/test/Verifier/test_g_select.mir b/test/MachineVerifier/test_g_select.mir
similarity index 100%
rename from test/Verifier/test_g_select.mir
rename to test/MachineVerifier/test_g_select.mir

diff --git a/test/Verifier/test_g_sextload.mir b/test/MachineVerifier/test_g_sextload.mir
similarity index 100%
rename from test/Verifier/test_g_sextload.mir
rename to test/MachineVerifier/test_g_sextload.mir

diff --git a/test/Verifier/test_g_store.mir b/test/MachineVerifier/test_g_store.mir
similarity index 100%
rename from test/Verifier/test_g_store.mir
rename to test/MachineVerifier/test_g_store.mir

diff --git a/test/Verifier/test_g_trunc.mir b/test/MachineVerifier/test_g_trunc.mir
similarity index 100%
rename from test/Verifier/test_g_trunc.mir
rename to test/MachineVerifier/test_g_trunc.mir

diff --git a/test/Verifier/test_g_zextload.mir b/test/MachineVerifier/test_g_zextload.mir
similarity index 100%
rename from test/Verifier/test_g_zextload.mir
rename to test/MachineVerifier/test_g_zextload.mir

diff --git a/test/Verifier/test_phis_precede_nonphis.mir b/test/MachineVerifier/test_phis_precede_nonphis.mir
similarity index 100%
rename from test/Verifier/test_phis_precede_nonphis.mir
rename to test/MachineVerifier/test_phis_precede_nonphis.mir

diff --git a/test/CodeGen/X86/verifier-generic-extend-truncate.mir b/test/MachineVerifier/verifier-generic-extend-truncate.mir
similarity index 98%
rename from test/CodeGen/X86/verifier-generic-extend-truncate.mir
rename to test/MachineVerifier/verifier-generic-extend-truncate.mir
index 28bca8845ce05389d72f19c750c0973ecfa52c40..8390d9bf3ce18d8a464481470eb9de0b01bbf178 100644 (file)
--- a/test/CodeGen/X86/verifier-generic-extend-truncate.mir
+++ b/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/test/CodeGen/X86/verifier-generic-types-1.mir b/test/MachineVerifier/verifier-generic-types-1.mir
similarity index 95%
rename from test/CodeGen/X86/verifier-generic-types-1.mir
rename to test/MachineVerifier/verifier-generic-types-1.mir
index 61a512df9fc002a76e9939798c13e8f294bf69dc..bc2d2580ed170862ee63a9f9796aa1be1be2eb24 100644 (file)
--- a/test/CodeGen/X86/verifier-generic-types-1.mir
+++ b/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/test/CodeGen/X86/verifier-generic-types-2.mir b/test/MachineVerifier/verifier-generic-types-2.mir
similarity index 96%
rename from test/CodeGen/X86/verifier-generic-types-2.mir
rename to test/MachineVerifier/verifier-generic-types-2.mir
index 625c5eb59059ca2a0ea264728adf91b70cf4a718..27a14c222c6e5c8360bb2c50858c751806a1ad27 100644 (file)
--- a/test/CodeGen/X86/verifier-generic-types-2.mir
+++ b/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/test/CodeGen/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir b/test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir
similarity index 94%
rename from test/CodeGen/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir
rename to test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir
index 6efd03c35baeea2913c2f069bdbeb40863aa0acb..06aad1fb1541a2ef62edce50759b894c27afd570 100644 (file)
--- a/test/CodeGen/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir
+++ b/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/test/CodeGen/X86/verifier-phi-fail0.mir b/test/MachineVerifier/verifier-phi-fail0.mir
similarity index 95%
rename from test/CodeGen/X86/verifier-phi-fail0.mir
rename to test/MachineVerifier/verifier-phi-fail0.mir
index bb707e4d45ca760e88490e430e506312b5d4bfa1..3f13aabb004fa95b0d7af9ab8e2df3feb52fd202 100644 (file)
--- a/test/CodeGen/X86/verifier-phi-fail0.mir
+++ b/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/test/CodeGen/X86/verifier-phi.mir b/test/MachineVerifier/verifier-phi.mir
similarity index 95%
rename from test/CodeGen/X86/verifier-phi.mir
rename to test/MachineVerifier/verifier-phi.mir
index 81a4cb0e7911eec9d23e67735c846f24b4def045..87f2efcc82d038372ea0ba7f4cb0063c3cbbfaef 100644 (file)
--- a/test/CodeGen/X86/verifier-phi.mir
+++ b/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/test/CodeGen/AMDGPU/verifier-pseudo-terminators.mir b/test/MachineVerifier/verifier-pseudo-terminators.mir
similarity index 94%
rename from test/CodeGen/AMDGPU/verifier-pseudo-terminators.mir
rename to test/MachineVerifier/verifier-pseudo-terminators.mir
index d9e8aa71f32aebf95ada14bf04e0f76f85e85861..b501aacf9673729fb7c52eb0d5ac32111c73f7d2 100644 (file)
--- a/test/CodeGen/AMDGPU/verifier-pseudo-terminators.mir
+++ b/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/test/CodeGen/AArch64/GlobalISel/verify-regbankselected.mir b/test/MachineVerifier/verify-regbankselected.mir
similarity index 93%
rename from test/CodeGen/AArch64/GlobalISel/verify-regbankselected.mir
rename to test/MachineVerifier/verify-regbankselected.mir
index c5586932b527da208d30a818ebfa3d687758c90d..027fc6664573d3f246c39cec3c3f467543f0ed98 100644 (file)
--- a/test/CodeGen/AArch64/GlobalISel/verify-regbankselected.mir
+++ b/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/test/CodeGen/AArch64/GlobalISel/verify-selected.mir b/test/MachineVerifier/verify-selected.mir
similarity index 95%
rename from test/CodeGen/AArch64/GlobalISel/verify-selected.mir
rename to test/MachineVerifier/verify-selected.mir
index ad17fa930151599a13b8ee841e4fbe05d25376bd..a38f67ca6e67ecbca0b45b923ec3ef1681bfce1c 100644 (file)
--- a/test/CodeGen/AArch64/GlobalISel/verify-selected.mir
+++ b/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
 
 --- |