diff --git a/llvm/test/MachineVerifier/AMDGPU/lit.local.cfg b/llvm/test/MachineVerifier/AMDGPU/lit.local.cfg new file mode 100644 index 000000000000..7c492428aec7 --- /dev/null +++ b/llvm/test/MachineVerifier/AMDGPU/lit.local.cfg @@ -0,0 +1,2 @@ +if not "AMDGPU" in config.root.targets: + config.unsupported = True diff --git a/llvm/test/MachineVerifier/register-killed-inside-loop.mir b/llvm/test/MachineVerifier/AMDGPU/register-killed-inside-loop.mir similarity index 95% rename from llvm/test/MachineVerifier/register-killed-inside-loop.mir rename to llvm/test/MachineVerifier/AMDGPU/register-killed-inside-loop.mir index a89d0da0fa73..697a699e6c1d 100644 --- a/llvm/test/MachineVerifier/register-killed-inside-loop.mir +++ b/llvm/test/MachineVerifier/AMDGPU/register-killed-inside-loop.mir @@ -1,6 +1,5 @@ # FIXME: This should fail the verifier # XFAIL: * -# REQUIRES: amdgpu-registered-target # RUN: not --crash llc -o - -mtriple=amdgcn-amd-amdhsa -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s # %1 is live out of %bb.1 through the loop edge, and therefore the kill flag is invalid. diff --git a/llvm/test/MachineVerifier/test_g_bitcast.mir b/llvm/test/MachineVerifier/AMDGPU/test_g_bitcast.mir similarity index 96% rename from llvm/test/MachineVerifier/test_g_bitcast.mir rename to llvm/test/MachineVerifier/AMDGPU/test_g_bitcast.mir index abb66e984061..2095bf73c2cc 100644 --- a/llvm/test/MachineVerifier/test_g_bitcast.mir +++ b/llvm/test/MachineVerifier/AMDGPU/test_g_bitcast.mir @@ -1,5 +1,4 @@ #RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -o - -global-isel -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s -# REQUIRES: amdgpu-registered-target --- name: test_bitcast diff --git a/llvm/test/MachineVerifier/test_g_intrinsic.mir b/llvm/test/MachineVerifier/AMDGPU/test_g_intrinsic.mir similarity index 96% rename from llvm/test/MachineVerifier/test_g_intrinsic.mir rename to llvm/test/MachineVerifier/AMDGPU/test_g_intrinsic.mir index fd03e0432c32..f96a8e9f0bdd 100644 --- a/llvm/test/MachineVerifier/test_g_intrinsic.mir +++ b/llvm/test/MachineVerifier/AMDGPU/test_g_intrinsic.mir @@ -1,5 +1,4 @@ # RUN: not --crash llc -o - -mtriple=amdgcn -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s -# REQUIRES: amdgpu-registered-target --- name: test_intrinsic diff --git a/llvm/test/MachineVerifier/test_g_intrinsic_w_side_effects.mir b/llvm/test/MachineVerifier/AMDGPU/test_g_intrinsic_w_side_effects.mir similarity index 96% rename from llvm/test/MachineVerifier/test_g_intrinsic_w_side_effects.mir rename to llvm/test/MachineVerifier/AMDGPU/test_g_intrinsic_w_side_effects.mir index 0d72de03ab8a..9b4dda14c027 100644 --- a/llvm/test/MachineVerifier/test_g_intrinsic_w_side_effects.mir +++ b/llvm/test/MachineVerifier/AMDGPU/test_g_intrinsic_w_side_effects.mir @@ -1,5 +1,4 @@ # RUN: not --crash llc -o - -mtriple=amdgcn -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s -# REQUIRES: amdgpu-registered-target --- name: test_intrinsic_w_side_effects diff --git a/llvm/test/MachineVerifier/undef-should-only-be-set-on-subreg-defs.mir b/llvm/test/MachineVerifier/AMDGPU/undef-should-only-be-set-on-subreg-defs.mir similarity index 93% rename from llvm/test/MachineVerifier/undef-should-only-be-set-on-subreg-defs.mir rename to llvm/test/MachineVerifier/AMDGPU/undef-should-only-be-set-on-subreg-defs.mir index dc5b467aa73c..89d2e76c7fed 100644 --- a/llvm/test/MachineVerifier/undef-should-only-be-set-on-subreg-defs.mir +++ b/llvm/test/MachineVerifier/AMDGPU/undef-should-only-be-set-on-subreg-defs.mir @@ -1,4 +1,3 @@ -# REQUIRES: amdgpu-registered-target # RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -run-pass=none -o /dev/null %s 2>&1 | FileCheck %s --- diff --git a/llvm/test/MachineVerifier/undef-virt-reg-entry-block.mir b/llvm/test/MachineVerifier/AMDGPU/undef-virt-reg-entry-block.mir similarity index 87% rename from llvm/test/MachineVerifier/undef-virt-reg-entry-block.mir rename to llvm/test/MachineVerifier/AMDGPU/undef-virt-reg-entry-block.mir index de4edeaa57c8..5a1dedde1e8a 100644 --- a/llvm/test/MachineVerifier/undef-virt-reg-entry-block.mir +++ b/llvm/test/MachineVerifier/AMDGPU/undef-virt-reg-entry-block.mir @@ -1,5 +1,4 @@ # XFAIL: * -# REQUIRES: amdgpu-registered-target # RUN: not --crash llc -o - -mtriple=amdgcn-amd-amdhsa -run-pass=none -verify-machineinstrs %s # FIXME: This should catch the undefined use of %0 diff --git a/llvm/test/MachineVerifier/undef-virt-reg-nonentry-block.mir b/llvm/test/MachineVerifier/AMDGPU/undef-virt-reg-nonentry-block.mir similarity index 91% rename from llvm/test/MachineVerifier/undef-virt-reg-nonentry-block.mir rename to llvm/test/MachineVerifier/AMDGPU/undef-virt-reg-nonentry-block.mir index 38073fb0b73e..ad66be0ac56f 100644 --- a/llvm/test/MachineVerifier/undef-virt-reg-nonentry-block.mir +++ b/llvm/test/MachineVerifier/AMDGPU/undef-virt-reg-nonentry-block.mir @@ -1,6 +1,5 @@ # FIXME: This should fail the verifier # XFAIL: * -# REQUIRES: amdgpu-registered-target # RUN: not --crash llc -o - -mtriple=amdgcn-amd-amdhsa -run-pass=none -verify-machineinstrs %s 2>&1 | FileCheck %s # CHECK: *** Bad machine code: Virtual register defs don't dominate all uses. *** diff --git a/llvm/test/MachineVerifier/verifier-ec-subreg-liveness.mir b/llvm/test/MachineVerifier/AMDGPU/verifier-ec-subreg-liveness.mir similarity index 96% rename from llvm/test/MachineVerifier/verifier-ec-subreg-liveness.mir rename to llvm/test/MachineVerifier/AMDGPU/verifier-ec-subreg-liveness.mir index 5f14d577224e..d2a57afb440a 100644 --- a/llvm/test/MachineVerifier/verifier-ec-subreg-liveness.mir +++ b/llvm/test/MachineVerifier/AMDGPU/verifier-ec-subreg-liveness.mir @@ -1,5 +1,4 @@ # RUN: llc -mtriple amdgcn-amd-amdhsa -run-pass=liveintervals,pipeliner -verify-machineinstrs -o - %s | FileCheck %s -# REQUIRES: amdgpu-registered-target # This test checks that the verifier doesn't crash on early clobbered subreg arguments. diff --git a/llvm/test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir b/llvm/test/MachineVerifier/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir similarity index 94% rename from llvm/test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir rename to llvm/test/MachineVerifier/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir index a723ee205ef0..a790a55f19bd 100644 --- a/llvm/test/MachineVerifier/verifier-implicit-virtreg-invalid-physreg-liveness.mir +++ b/llvm/test/MachineVerifier/AMDGPU/verifier-implicit-virtreg-invalid-physreg-liveness.mir @@ -1,5 +1,4 @@ # RUN: not --crash 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/MachineVerifier/verifier-pseudo-terminators.mir b/llvm/test/MachineVerifier/AMDGPU/verifier-pseudo-terminators.mir similarity index 95% rename from llvm/test/MachineVerifier/verifier-pseudo-terminators.mir rename to llvm/test/MachineVerifier/AMDGPU/verifier-pseudo-terminators.mir index 0d79656ce93a..9b200ec77f83 100644 --- a/llvm/test/MachineVerifier/verifier-pseudo-terminators.mir +++ b/llvm/test/MachineVerifier/AMDGPU/verifier-pseudo-terminators.mir @@ -1,5 +1,4 @@ # RUN: not --crash llc -mtriple=amdgcn -run-pass=verify -o - %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/MachineVerifier/verify-implicit-def.mir b/llvm/test/MachineVerifier/AMDGPU/verify-implicit-def.mir similarity index 96% rename from llvm/test/MachineVerifier/verify-implicit-def.mir rename to llvm/test/MachineVerifier/AMDGPU/verify-implicit-def.mir index 8ca6f2dc75c0..324e424d563f 100644 --- a/llvm/test/MachineVerifier/verify-implicit-def.mir +++ b/llvm/test/MachineVerifier/AMDGPU/verify-implicit-def.mir @@ -1,4 +1,3 @@ -# REQUIRES: amdgpu-registered-target # RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -run-pass=none -o /dev/null %s 2>&1 | FileCheck %s --- diff --git a/llvm/test/MachineVerifier/verify-reg-sequence.mir b/llvm/test/MachineVerifier/AMDGPU/verify-reg-sequence.mir similarity index 98% rename from llvm/test/MachineVerifier/verify-reg-sequence.mir rename to llvm/test/MachineVerifier/AMDGPU/verify-reg-sequence.mir index 4ce6f70c6651..59625cd81ec3 100644 --- a/llvm/test/MachineVerifier/verify-reg-sequence.mir +++ b/llvm/test/MachineVerifier/AMDGPU/verify-reg-sequence.mir @@ -1,4 +1,3 @@ -# REQUIRES: amdgpu-registered-target # RUN: not --crash llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx900 -run-pass=none -o /dev/null %s 2>&1 | FileCheck %s --- diff --git a/llvm/test/MachineVerifier/writelane_m0.mir b/llvm/test/MachineVerifier/AMDGPU/writelane_m0.mir similarity index 96% rename from llvm/test/MachineVerifier/writelane_m0.mir rename to llvm/test/MachineVerifier/AMDGPU/writelane_m0.mir index 270528e55bb5..2db6f47a4223 100644 --- a/llvm/test/MachineVerifier/writelane_m0.mir +++ b/llvm/test/MachineVerifier/AMDGPU/writelane_m0.mir @@ -7,8 +7,6 @@ # RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1100 -verify-machineinstrs -run-pass=none -o - %s | FileCheck %s # RUN: llc -mtriple=amdgcn-amd-amdhsa -mcpu=gfx1200 -verify-machineinstrs -run-pass=none -o - %s | FileCheck %s -# REQUIRES: amdgpu-registered-target - --- name: writelane_m0