From 909836732d0fb47d1338df0b6762301ea4306452 Mon Sep 17 00:00:00 2001 From: "Mubashar.Ahmad@arm.com" Date: Fri, 7 Jun 2024 10:26:06 +0000 Subject: [PATCH] [mlir][vector] Remove Emulated Sub-directory The "Emulated" sub-directory under "ArmSVE" has been removed. Associated tests have been up a directory and now include the "REQUIRES" constraint for the arm-emulator. --- .../Dialect/Vector/CPU/ArmSVE/Emulated/lit.local.cfg | 5 ----- .../ArmSVE/{Emulated => }/test-scalable-deinterleave.mlir | 2 ++ .../Vector/CPU/ArmSVE/{Emulated => }/test-setArmVLBits.mlir | 2 ++ mlir/test/lit.cfg.py | 3 +++ 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/lit.local.cfg rename mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/{Emulated => }/test-scalable-deinterleave.mlir (96%) rename mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/{Emulated => }/test-setArmVLBits.mlir (97%) diff --git a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/lit.local.cfg b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/lit.local.cfg deleted file mode 100644 index 0d8ad605f598fb..00000000000000 --- a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/lit.local.cfg +++ /dev/null @@ -1,5 +0,0 @@ -# The tests in this folder assume full control of the hardware features, such as -# the vector length, so must be run under an emulator. - -if not config.arm_emulator_executable: - config.unsupported = True diff --git a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/test-scalable-deinterleave.mlir b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-scalable-deinterleave.mlir similarity index 96% rename from mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/test-scalable-deinterleave.mlir rename to mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-scalable-deinterleave.mlir index e6c561437132f6..f3c03ae7695c5c 100644 --- a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/test-scalable-deinterleave.mlir +++ b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-scalable-deinterleave.mlir @@ -1,3 +1,5 @@ +// REQUIRES: arm-emulator-executable + // DEFINE: %{entry_point} = entry // DEFINE: %{compile} = mlir-opt %s -test-lower-to-llvm // DEFINE: %{run} = %mcr_aarch64_cmd -march=aarch64 -mattr=+sve \ diff --git a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/test-setArmVLBits.mlir b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-setArmVLBits.mlir similarity index 97% rename from mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/test-setArmVLBits.mlir rename to mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-setArmVLBits.mlir index aa8d0e4d5104ab..f9ea381bf3f65c 100644 --- a/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/Emulated/test-setArmVLBits.mlir +++ b/mlir/test/Integration/Dialect/Vector/CPU/ArmSVE/test-setArmVLBits.mlir @@ -1,3 +1,5 @@ +// REQUIRES: arm-emulator-executable + // DEFINE: %{entry_point} = main // DEFINE: %{compile} = mlir-opt %s -test-lower-to-llvm // DEFINE: %{run} = %mcr_aarch64_cmd -march=aarch64 -mattr=+sve \ diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py index 9ed3a2efcb8f71..525feac8f9a149 100644 --- a/mlir/test/lit.cfg.py +++ b/mlir/test/lit.cfg.py @@ -250,3 +250,6 @@ def have_host_jit_feature_support(feature_name): if config.run_rocm_tests: config.available_features.add("host-supports-amdgpu") + +if config.arm_emulator_executable: + config.available_features.add("arm-emulator-executable")