[MLIR] Only substitute `mlir-spirv-cpu-runner` tool if enabled

[csigg]

Summary

This tool is only used if MLIR_ENABLE_SPIRV_CPU_RUNNER was specified and should only be substituted in that case. Alternatively, we could make the substitution optional.

[mehdi_amini]

mlir/test/lit.cfg.py

65

I'm surprised we need these *-test as "tools"?

66

I think mlir-cpu-runner is also optional

90

This is how we handle the other "optional" things FYI (I don't mind if you prefer you current diff).

[csigg]

mlir/test/lit.cfg.py

65

I don't think we do. I will remove them in a separate change.

66

The tests that require this tool are not triggered by some specific CMake var. See e.g. mlir/test/mlir-cpu-runner/async.mlir.

90

I did see this, but my thinking was the current diff will report a slightly better log message.

mlir/test/lit.cfg.py

tools = [
     'mlir-translate',
     'mlir-lsp-server',
     'mlir-capi-execution-engine-test',
     'mlir-capi-ir-test',
     'mlir-capi-llvm-test',
     'mlir-capi-pass-test',
     'mlir-capi-sparse-tensor-test',
     'mlir-capi-quant-test',
     'mlir-capi-pdl-test',
     'mlir-cpu-runner',
     'mlir-linalg-ods-yaml-gen',
     'mlir-reduce',
-    'mlir-spirv-cpu-runner',
     'mlir-pdll',
     'not',
 ]
 
+if config.enable_spirv_cpu_runner:
+  tools.extend(['mlir-spirv-cpu-runner'])
+
 # The following tools are optional
 tools.extend([
     ToolSubst('toy-ch1', unresolved='ignore'),
     ToolSubst('toy-ch2', unresolved='ignore'),
     ToolSubst('toy-ch3', unresolved='ignore'),
     ToolSubst('toy-ch4', unresolved='ignore'),
     ToolSubst('toy-ch5', unresolved='ignore'),
     ToolSubst('%mlir_lib_dir', config.mlir_lib_dir, unresolved='ignore'),
     ToolSubst('%mlir_src_dir', config.mlir_src_root, unresolved='ignore'),
     # The substitutions below will be replaced by '%mlir_lib_dir' shortly.
     ToolSubst('%linalg_test_lib_dir', config.mlir_lib_dir, unresolved='ignore'),
     ToolSubst('%mlir_runner_utils_dir', config.mlir_lib_dir, unresolved='ignore'),
     ToolSubst('%spirv_wrapper_library_dir', config.mlir_lib_dir, unresolved='ignore'),
     ToolSubst('%vulkan_wrapper_library_dir', config.mlir_lib_dir, unresolved='ignore'),
     ToolSubst('%mlir_integration_test_dir', config.mlir_lib_dir, unresolved='ignore'),
 ])
 
 python_executable = config.python_executable
 # Python configuration with sanitizer requires some magic preloading. This will only work on clang/linux.
 # TODO: detect Darwin/Windows situation (or mark these tests as unsupported on these platforms).
 if "asan" in config.available_features and "Linux" in config.host_os:
   python_executable = f"LD_PRELOAD=$({config.host_cxx} -print-file-name=libclang_rt.asan-{config.host_arch}.so) {config.python_executable}"
 # On Windows the path to python could contains spaces in which case it needs to be provided in quotes.