Skip to content

Commit 132bf4a

Browse files
authored
[mlir][aarch64] Remove LIT config for lli (#89545)
This change will only affect MLIR integration tests to be run on AArch64. When originally introduced, these tests would run with `lli`. Those tests has since been updated to use `mlir-cpu-runner` instead, see e.g.: * https://reviews.llvm.org/D155405 * https://reviews.llvm.org/D146917 This patch removes all the leftover `lli` configuration in LIT that's currently not needed (and is unlikely to be needed any time soon).
1 parent b467c6b commit 132bf4a

File tree

1 file changed

+8
-38
lines changed

1 file changed

+8
-38
lines changed

mlir/test/Integration/lit.local.cfg

Lines changed: 8 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ if not config.mlir_include_integration_tests:
44
config.unsupported = True
55

66

7-
def configure_aarch64_lli_and_mcr_cmd():
8-
lli_cmd = "lli"
7+
def configure_aarch64_mcr_cmd():
98
mcr_cmd = "mlir-cpu-runner"
109

1110
# NOTE: If the SVE tests are disabled and the SME tests are enabled to run
1211
# under emulation, the SVE specific RUN lines in the SparseTensor tests
1312
# will run under emulation.
1413
if not (config.mlir_run_arm_sve_tests or config.mlir_run_arm_sme_tests):
15-
return (lli_cmd, mcr_cmd)
14+
return mcr_cmd
1615

1716
config.substitutions.append(
1817
(
@@ -22,20 +21,6 @@ def configure_aarch64_lli_and_mcr_cmd():
2221
)
2322

2423
if config.arm_emulator_executable:
25-
if config.arm_emulator_lli_executable:
26-
lli_cmd = config.arm_emulator_lli_executable
27-
else:
28-
# Top-level lit config adds llvm_tools_dir to PATH but this is lost
29-
# when running under an emulator. If the user didn't specify an lli
30-
# executable, use absolute path %llvm_tools_dir/lli.
31-
lli_cmd = llvm_config.use_llvm_tool(
32-
"lli",
33-
search_env="LLI",
34-
required=True,
35-
search_paths=[config.llvm_tools_dir],
36-
use_installed=False,
37-
)
38-
3924
if config.arm_emulator_mlir_cpu_runner_executable:
4025
mcr_cmd = config.arm_emulator_mlir_cpu_runner_executable
4126
else:
@@ -56,35 +41,20 @@ def configure_aarch64_lli_and_mcr_cmd():
5641
f"{config.arm_emulator_executable} {config.arm_emulator_options}"
5742
)
5843

59-
lli_cmd = f"{emulation_cmd} {lli_cmd}"
6044
mcr_cmd = f"{emulation_cmd} {mcr_cmd}"
6145

62-
return (lli_cmd, mcr_cmd)
46+
return mcr_cmd
6347

6448

65-
aarch64_lli_cmd, aarch64_mcr_cmd = configure_aarch64_lli_and_mcr_cmd()
49+
aarch64_mcr_cmd = configure_aarch64_mcr_cmd()
6650

67-
# Configure the following AArch64 substitutions:
68-
#
69-
# * %lli_aarch64_cmd - Invokes lli. For tests that _will_ run on AArch64 (ArmSVE, ArmSME).
70-
# * %lli_host_or_aarch64_cmd - Invokes lli. For tests that _may_ run on AArch64 (SparseTensor).
71-
# * %mcr_aarch64_cmd - Invokes mlir-cpu-runner. For tests that _will_
72-
# run on AArch64. May invoke mlir-cpu-runner under
73-
# an AArch64 emulator (when
74-
# `config.arm_emulator_executable` is set).
75-
#
7651
# AArch64 tests will run under emulation if configured at build time by the
7752
# following CMake options:
7853
#
7954
# * ARM_EMULATOR_EXECUTABLE - emulator to use.
8055
# * ARM_EMULATOR_OPTIONS - options for emulator.
81-
# * ARM_EMULATOR_LLI_EXECUTABLE - AArch64 native lli to support cross-compilation.
82-
# * ARM_EMULATOR_UTILS_LIB_DIR - AArch64 native utilites library to support cross-compilation.
83-
#
84-
# Functionally the two substitutions are equivalent, i.e. %lli_aarch64_cmd
85-
# could be used in the SparseTensor tests where necessary, but the meaning
86-
# conveyed by the substitution name would be a misnomer if the host target
87-
# is not AArch64 and MLIR_RUN_ARM_SVE_TESTS=OFF.
88-
config.substitutions.append(("%lli_aarch64_cmd", aarch64_lli_cmd))
89-
config.substitutions.append(("%lli_host_or_aarch64_cmd", aarch64_lli_cmd))
56+
# * ARM_EMULATOR_MLIR_CPU_RUNNER_EXECUTABLE - AArch64 native mlir-cpu-runner to
57+
# support cross-compilation
58+
# * ARM_EMULATOR_UTILS_LIB_DIR - AArch64 native utilites library to support
59+
# cross-compilation.
9060
config.substitutions.append(("%mcr_aarch64_cmd", aarch64_mcr_cmd))

0 commit comments

Comments
 (0)