[NFC] Move CPU materialize_encoding tests to Common/CPU/test (#15376)
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/Passes.td b/compiler/src/iree/compiler/Codegen/Common/CPU/Passes.td
index f1cc23c..e86d90d 100644
--- a/compiler/src/iree/compiler/Codegen/Common/CPU/Passes.td
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/Passes.td
@@ -14,13 +14,13 @@
//===---------------------------------------------------------------------===//
def CPUMaterializeEncoding :
- Pass<"iree-cpu-materialize-encoding", "func::FuncOp"> {
+ Pass<"iree-codegen-cpu-materialize-encoding", "func::FuncOp"> {
let summary = "Materialize the encoding for tensor as specified by the backend";
let constructor = "mlir::iree_compiler::createCPUMaterializeEncodingPass()";
}
def CPUMaterializeUpperBoundTileSize :
- InterfacePass<"iree-cpu-materialize-upper-bound-tile-size", "mlir::FunctionOpInterface"> {
+ InterfacePass<"iree-codegen-cpu-materialize-upper-bound-tile-size", "mlir::FunctionOpInterface"> {
let summary = "Materialize upper_bound_tile_size to constants.";
let constructor = "mlir::iree_compiler::createCPUMaterializeUpperBoundTileSizePass()";
}
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/test/BUILD.bazel b/compiler/src/iree/compiler/Codegen/Common/CPU/test/BUILD.bazel
new file mode 100644
index 0000000..3046374
--- /dev/null
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/test/BUILD.bazel
@@ -0,0 +1,32 @@
+# Copyright 2023 The IREE Authors
+#
+# Licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# Tests for common transforms.
+
+load("//build_tools/bazel:iree_lit_test.bzl", "iree_lit_test_suite")
+load("//build_tools/bazel:enforce_glob.bzl", "enforce_glob")
+
+package(
+ features = ["layering_check"],
+ licenses = ["notice"], # Apache 2.0
+)
+
+iree_lit_test_suite(
+ name = "lit",
+ srcs = enforce_glob(
+ # keep sorted
+ [
+ "llvmcpu_materialize_encoding.mlir",
+ "vmvx_materialize_encoding.mlir",
+ ],
+ include = ["*.mlir"],
+ ),
+ cfg = "//compiler:lit.cfg.py",
+ tools = [
+ "//tools:iree-opt",
+ "@llvm-project//llvm:FileCheck",
+ ],
+)
diff --git a/compiler/src/iree/compiler/Codegen/Common/CPU/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/Common/CPU/test/CMakeLists.txt
new file mode 100644
index 0000000..f423a73
--- /dev/null
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+################################################################################
+# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from #
+# compiler/src/iree/compiler/Codegen/Common/CPU/test/BUILD.bazel #
+# #
+# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary #
+# CMake-only content. #
+# #
+# To disable autogeneration for this file entirely, delete this header. #
+################################################################################
+
+iree_add_all_subdirs()
+
+iree_lit_test_suite(
+ NAME
+ lit
+ SRCS
+ "llvmcpu_materialize_encoding.mlir"
+ "vmvx_materialize_encoding.mlir"
+ TOOLS
+ FileCheck
+ iree-opt
+)
+
+### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ###
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/materialize_encoding.mlir b/compiler/src/iree/compiler/Codegen/Common/CPU/test/llvmcpu_materialize_encoding.mlir
similarity index 99%
rename from compiler/src/iree/compiler/Codegen/LLVMCPU/test/materialize_encoding.mlir
rename to compiler/src/iree/compiler/Codegen/Common/CPU/test/llvmcpu_materialize_encoding.mlir
index 6c921b3..f8349eb 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/materialize_encoding.mlir
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/test/llvmcpu_materialize_encoding.mlir
@@ -1,4 +1,4 @@
-// RUN: iree-opt --iree-cpu-materialize-encoding --canonicalize --cse --split-input-file %s | FileCheck %s
+// RUN: iree-opt --iree-codegen-cpu-materialize-encoding --canonicalize --cse --split-input-file %s | FileCheck %s
func.func @set_encoding_7x7x7_matmul_LHS() attributes {
hal.executable.target = #hal.executable.target<"xyz", "xyz", {target_triple="x86_64-xyz-xyz", cpu_features="+avx,+avx2,+fma"}>
diff --git a/compiler/src/iree/compiler/Codegen/VMVX/test/materialize_encoding.mlir b/compiler/src/iree/compiler/Codegen/Common/CPU/test/vmvx_materialize_encoding.mlir
similarity index 97%
rename from compiler/src/iree/compiler/Codegen/VMVX/test/materialize_encoding.mlir
rename to compiler/src/iree/compiler/Codegen/Common/CPU/test/vmvx_materialize_encoding.mlir
index 7b9b0ab..66001ba 100644
--- a/compiler/src/iree/compiler/Codegen/VMVX/test/materialize_encoding.mlir
+++ b/compiler/src/iree/compiler/Codegen/Common/CPU/test/vmvx_materialize_encoding.mlir
@@ -1,4 +1,4 @@
-// RUN: iree-opt --iree-cpu-materialize-encoding --canonicalize --cse --split-input-file %s | FileCheck %s
+// RUN: iree-opt --iree-codegen-cpu-materialize-encoding --canonicalize --cse --split-input-file %s | FileCheck %s
func.func @matmul_lowering_i8i8i32_vmvx_ukernel() attributes {
hal.executable.target = #hal.executable.target<"vmvx", "vmvx-bytecode-fb", {ukernels = true}>
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD.bazel b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD.bazel
index 9784944..d970278 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/BUILD.bazel
@@ -38,7 +38,6 @@
"lower_to_ukernel_ops.mlir",
"materialize_aarch64_launch_configuration.mlir",
"materialize_configuration_without_distribution.mlir",
- "materialize_encoding.mlir",
"materialize_riscv_launch_configuration.mlir",
"materialize_vmvx_launch_configuration.mlir",
"materialize_x86_64_launch_configuration.mlir",
diff --git a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt
index 2add8b7..57b0d75 100644
--- a/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/LLVMCPU/test/CMakeLists.txt
@@ -33,7 +33,6 @@
"lower_to_ukernel_ops.mlir"
"materialize_aarch64_launch_configuration.mlir"
"materialize_configuration_without_distribution.mlir"
- "materialize_encoding.mlir"
"materialize_riscv_launch_configuration.mlir"
"materialize_vmvx_launch_configuration.mlir"
"materialize_x86_64_launch_configuration.mlir"
diff --git a/compiler/src/iree/compiler/Codegen/VMVX/test/BUILD.bazel b/compiler/src/iree/compiler/Codegen/VMVX/test/BUILD.bazel
index 298db78..7e99ed8 100644
--- a/compiler/src/iree/compiler/Codegen/VMVX/test/BUILD.bazel
+++ b/compiler/src/iree/compiler/Codegen/VMVX/test/BUILD.bazel
@@ -22,7 +22,6 @@
"assign_constant_ordinals.mlir",
"link_executables.mlir",
"lower_linalg_microkernels.mlir",
- "materialize_encoding.mlir",
"pipeline.mlir",
],
include = ["*.mlir"],
diff --git a/compiler/src/iree/compiler/Codegen/VMVX/test/CMakeLists.txt b/compiler/src/iree/compiler/Codegen/VMVX/test/CMakeLists.txt
index 8057b4b..4417648 100644
--- a/compiler/src/iree/compiler/Codegen/VMVX/test/CMakeLists.txt
+++ b/compiler/src/iree/compiler/Codegen/VMVX/test/CMakeLists.txt
@@ -17,7 +17,6 @@
"assign_constant_ordinals.mlir"
"link_executables.mlir"
"lower_linalg_microkernels.mlir"
- "materialize_encoding.mlir"
"pipeline.mlir"
TOOLS
FileCheck
