[MLIR] Fix toy lit substitutions
authorChristian Sigg <csigg@google.com>
Wed, 14 Sep 2022 10:58:08 +0000 (12:58 +0200)
committerChristian Sigg <csigg@google.com>
Wed, 14 Sep 2022 13:59:24 +0000 (15:59 +0200)
The tools are called e.g. `toyc-ch1`, not `toy-ch1`.

Add missing toyc-ch6/7.

It turns out that the other substitutions are not needed more by specific circumstances rather than by design:
The lit test exec root is set to build/mlir/test, which is where all the test tools are placed by CMake and we wouldn't need to substitute them at all.
We shouldn't rely on this assumption though, because it will make things harder for standalone tests and other build systems.

Reviewed By: mehdi_amini

Differential Revision: https://reviews.llvm.org/D133842

mlir/test/lit.cfg.py

index 73405c3..151e333 100644 (file)
@@ -75,11 +75,13 @@ if config.enable_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('toyc-ch1', unresolved='ignore'),
+    ToolSubst('toyc-ch2', unresolved='ignore'),
+    ToolSubst('toyc-ch3', unresolved='ignore'),
+    ToolSubst('toyc-ch4', unresolved='ignore'),
+    ToolSubst('toyc-ch5', unresolved='ignore'),
+    ToolSubst('toyc-ch6', unresolved='ignore'),
+    ToolSubst('toyc-ch7', unresolved='ignore'),
     ToolSubst('%mlir_lib_dir', config.mlir_lib_dir, unresolved='ignore'),
     ToolSubst('%mlir_src_dir', config.mlir_src_root, unresolved='ignore'),
 ])