[mlir][test] Add emulator to the mlir-cpu-runner invocation

In https://reviews.llvm.org/D146917, MLIR's LIT configuration was
updated to allow us to use `mlir-cpu-runner` to run Arm SVE integration
tests. That update broke the following buildbot that doesn't support
SVE:

  https://lab.llvm.org/buildbot/#/builders/179/builds/6704

While that bot doesn't support SVE, it can run SVE tests under
emulation. This patch makes sure that whenever an Arm emulator is set
(via `RM_EMULATOR_EXECUTABLE` CMake variable), it is used to run both
`lli` _and_ `mlir-cpu-runner`.

I am sending this without a review as it's a rather trivial change and I
want to quickly fix the spurious bot failure.
This commit is contained in:
Andrzej Warzynski
2023-07-20 18:57:01 +00:00
parent 54aca3f33f
commit 64466b777b

View File

@@ -40,11 +40,13 @@ def configure_aarch64_lli_and_mcr_cmd():
emulation_cmd = (
f"{config.arm_emulator_executable} {config.arm_emulator_options}"
)
lli_cmd = f"{emulation_cmd} {lli_cmd}"
if config.arm_emulator_mlir_cpu_runner_executable:
mcr_cmd = config.arm_emulator_mlir_cpu_runner_executable
lli_cmd = f"{emulation_cmd} {lli_cmd}"
mcr_cmd = f"{emulation_cmd} {mcr_cmd}"
return (lli_cmd, mcr_cmd)