[Mlir-commits] [mlir] 99b0032 - Move the MLIR integration tests as a subdirectory of test (NFC)
Mehdi Amini
llvmlistbot at llvm.org
Mon Feb 22 21:55:58 PST 2021
Author: Mehdi Amini
Date: 2021-02-23T05:55:47Z
New Revision: 99b0032ce0b8afa67a36da2b8c02cfcacdc561d1
URL: https://github.com/llvm/llvm-project/commit/99b0032ce0b8afa67a36da2b8c02cfcacdc561d1
DIFF: https://github.com/llvm/llvm-project/commit/99b0032ce0b8afa67a36da2b8c02cfcacdc561d1.diff
LOG: Move the MLIR integration tests as a subdirectory of test (NFC)
This does not change the behavior directly: the tests only run when
`-DMLIR_INCLUDE_INTEGRATION_TESTS=ON` is configured. However running
`ninja check-mlir` will not run all the tests within a single
lit invocation. The previous behavior would wait for all the integration
tests to complete before starting to run the first regular test. The
test results were also reported separately. This change is unifying all
of this and allow concurrent execution of the integration tests with
regular non-regression and unit-tests.
Differential Revision: https://reviews.llvm.org/D97241
Added:
mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg
mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir
mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir
mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir
mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg
mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir
mlir/test/Integration/Dialect/LLVMIR/CPU/lit.local.cfg
mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir
mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir
mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul.mlir
mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_column_major.mlir
mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_column_major_as_row_major.mlir
mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_i8_i8_i32.mlir
mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir
mlir/test/Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-input-ncw-filter-wcf-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-input-nwc-filter-wcf-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-ncw-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-input-nchw-filter-hwcf-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-input-nhwc-filter-hwcf-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nchw-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-input-ncdhw-filter-dhwcf-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-input-ndhwc-filter-dhwcf-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ncdhw-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-call.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-elementwise.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir
mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir
mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir
mlir/test/Integration/Dialect/Standard/CPU/test_subview.mlir
mlir/test/Integration/Dialect/Vector/CPU/AVX512/lit.local.cfg
mlir/test/Integration/Dialect/Vector/CPU/AVX512/test-vp2intersect-i32.mlir
mlir/test/Integration/Dialect/Vector/CPU/lit.local.cfg
mlir/test/Integration/Dialect/Vector/CPU/test-broadcast.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-compress.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-constant-mask.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-contraction.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-create-mask.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-expand.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-extract-slices.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-fma.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-gather.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-insert-slices.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-maskedload.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-maskedstore.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-print-int.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i32.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i4.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i64.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-si4.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-scatter.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-shape-cast.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-shuffle.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-transfer-write.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-transpose.mlir
mlir/test/Integration/Dialect/Vector/CPU/test-vector-distribute.mlir
mlir/test/Integration/Sparse/CPU/frostt-example.mlir
mlir/test/Integration/Sparse/CPU/lit.local.cfg
mlir/test/Integration/Sparse/CPU/matrix-market-example.mlir
mlir/test/Integration/Sparse/CPU/sparse_sampled_matmul.mlir
mlir/test/Integration/Sparse/CPU/sparse_sum.mlir
mlir/test/Integration/data/test.mtx
mlir/test/Integration/data/test.tns
mlir/test/Integration/lit.local.cfg
Modified:
mlir/CMakeLists.txt
mlir/test/CMakeLists.txt
mlir/test/lit.cfg.py
mlir/test/lit.site.cfg.py.in
Removed:
mlir/integration_test/CMakeLists.txt
mlir/integration_test/Dialect/Async/CPU/lit.local.cfg
mlir/integration_test/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir
mlir/integration_test/Dialect/Async/CPU/test-async-parallel-for-1d.mlir
mlir/integration_test/Dialect/Async/CPU/test-async-parallel-for-2d.mlir
mlir/integration_test/Dialect/LLVMIR/CPU/X86/lit.local.cfg
mlir/integration_test/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir
mlir/integration_test/Dialect/LLVMIR/CPU/lit.local.cfg
mlir/integration_test/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir
mlir/integration_test/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir
mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul.mlir
mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_column_major.mlir
mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_column_major_as_row_major.mlir
mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_i8_i8_i32.mlir
mlir/integration_test/Dialect/Linalg/CPU/matmul-vs-matvec.mlir
mlir/integration_test/Dialect/Linalg/CPU/rank-reducing-subview.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-input-ncw-filter-wcf-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-input-nwc-filter-wcf-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-ncw-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-nwc-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-input-nchw-filter-hwcf-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-input-nhwc-filter-hwcf-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-nchw-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-nhwc-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-input-ncdhw-filter-dhwcf-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-input-ndhwc-filter-dhwcf-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-ncdhw-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-ndhwc-call.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-elementwise.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-subtensor-insert.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-tensor-e2e.mlir
mlir/integration_test/Dialect/Linalg/CPU/test-tensor-matmul.mlir
mlir/integration_test/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir
mlir/integration_test/Dialect/Standard/CPU/test_subview.mlir
mlir/integration_test/Dialect/Vector/CPU/AVX512/lit.local.cfg
mlir/integration_test/Dialect/Vector/CPU/AVX512/test-vp2intersect-i32.mlir
mlir/integration_test/Dialect/Vector/CPU/lit.local.cfg
mlir/integration_test/Dialect/Vector/CPU/test-broadcast.mlir
mlir/integration_test/Dialect/Vector/CPU/test-compress.mlir
mlir/integration_test/Dialect/Vector/CPU/test-constant-mask.mlir
mlir/integration_test/Dialect/Vector/CPU/test-contraction.mlir
mlir/integration_test/Dialect/Vector/CPU/test-create-mask-v4i1.mlir
mlir/integration_test/Dialect/Vector/CPU/test-create-mask.mlir
mlir/integration_test/Dialect/Vector/CPU/test-expand.mlir
mlir/integration_test/Dialect/Vector/CPU/test-extract-slices.mlir
mlir/integration_test/Dialect/Vector/CPU/test-extract-strided-slice.mlir
mlir/integration_test/Dialect/Vector/CPU/test-flat-transpose-col.mlir
mlir/integration_test/Dialect/Vector/CPU/test-flat-transpose-row.mlir
mlir/integration_test/Dialect/Vector/CPU/test-fma.mlir
mlir/integration_test/Dialect/Vector/CPU/test-gather.mlir
mlir/integration_test/Dialect/Vector/CPU/test-insert-slices.mlir
mlir/integration_test/Dialect/Vector/CPU/test-insert-strided-slice.mlir
mlir/integration_test/Dialect/Vector/CPU/test-maskedload.mlir
mlir/integration_test/Dialect/Vector/CPU/test-maskedstore.mlir
mlir/integration_test/Dialect/Vector/CPU/test-matrix-multiply-col.mlir
mlir/integration_test/Dialect/Vector/CPU/test-matrix-multiply-row.mlir
mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-f32.mlir
mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir
mlir/integration_test/Dialect/Vector/CPU/test-print-int.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-f32.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-f64.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-i32.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-i4.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-i64.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-si4.mlir
mlir/integration_test/Dialect/Vector/CPU/test-reductions-ui4.mlir
mlir/integration_test/Dialect/Vector/CPU/test-scatter.mlir
mlir/integration_test/Dialect/Vector/CPU/test-shape-cast.mlir
mlir/integration_test/Dialect/Vector/CPU/test-shuffle.mlir
mlir/integration_test/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir
mlir/integration_test/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir
mlir/integration_test/Dialect/Vector/CPU/test-transfer-read-2d.mlir
mlir/integration_test/Dialect/Vector/CPU/test-transfer-read.mlir
mlir/integration_test/Dialect/Vector/CPU/test-transfer-to-loops.mlir
mlir/integration_test/Dialect/Vector/CPU/test-transfer-write.mlir
mlir/integration_test/Dialect/Vector/CPU/test-transpose.mlir
mlir/integration_test/Dialect/Vector/CPU/test-vector-distribute.mlir
mlir/integration_test/Sparse/CPU/frostt-example.mlir
mlir/integration_test/Sparse/CPU/lit.local.cfg
mlir/integration_test/Sparse/CPU/matrix-market-example.mlir
mlir/integration_test/Sparse/CPU/sparse_sampled_matmul.mlir
mlir/integration_test/Sparse/CPU/sparse_sum.mlir
mlir/integration_test/data/test.mtx
mlir/integration_test/data/test.tns
mlir/integration_test/lit.cfg.py
mlir/integration_test/lit.site.cfg.py.in
################################################################################
diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt
index dc0375605326..7385e6b17222 100644
--- a/mlir/CMakeLists.txt
+++ b/mlir/CMakeLists.txt
@@ -141,13 +141,6 @@ if (MLIR_INCLUDE_TESTS)
endif()
add_subdirectory(test)
endif()
-if (MLIR_INCLUDE_INTEGRATION_TESTS)
- set(INTEL_SDE_EXECUTABLE "" CACHE STRING
- "If set, arch-specific integration tests are run with Intel SDE.")
- option(MLIR_RUN_AVX512_TESTS "Run AVX512 tests.")
- add_definitions(-DMLIR_INCLUDE_INTEGRATION_TESTS)
- add_subdirectory(integration_test)
-endif()
# Tools needs to come late to ensure that MLIR_ALL_LIBS is populated.
# Generally things after this point may depend on MLIR_ALL_LIBS or libMLIR.so.
add_subdirectory(tools)
diff --git a/mlir/integration_test/CMakeLists.txt b/mlir/integration_test/CMakeLists.txt
deleted file mode 100644
index 81f7c8e7b2c6..000000000000
--- a/mlir/integration_test/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-# Passed to lit.site.cfg.py.in to set up the path where to find the libraries.
-set(MLIR_INTEGRATION_TEST_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
-
-set(MLIR_INTEGRATION_TEST_DEPENDS
- FileCheck count not
- lli
- mlir-cpu-runner
- mlir-opt
- mlir_runner_utils
- mlir_c_runner_utils
- )
-
-configure_lit_site_cfg(
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
- ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
- ${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py
- )
-
-add_lit_testsuite(check-mlir-integration "Running the MLIR integration tests"
- ${CMAKE_CURRENT_BINARY_DIR}
- DEPENDS ${MLIR_INTEGRATION_TEST_DEPENDS}
- )
-set_target_properties(check-mlir-integration PROPERTIES FOLDER "integration_test")
-
-# Let target "check-mlir" imply the target "check-mlir-integration" as well,
-# provided that MLIR_INCLUDE_INTEGRATION_TESTS=ON during the initial setup.
-add_dependencies(check-mlir check-mlir-integration)
-
-add_lit_testsuites(MLIR_INTEGRATION ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS ${MLIR_INTEGRATION_TEST_DEPENDS}
- )
-
-# Copy test data over.
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/data/test.mtx
- ${CMAKE_CURRENT_SOURCE_DIR}/data/test.tns
- DESTINATION ${MLIR_INTEGRATION_TEST_DIR}/data/)
diff --git a/mlir/integration_test/lit.cfg.py b/mlir/integration_test/lit.cfg.py
deleted file mode 100644
index 106bfcd3c59b..000000000000
--- a/mlir/integration_test/lit.cfg.py
+++ /dev/null
@@ -1,58 +0,0 @@
-# -*- Python -*-
-
-import os
-import platform
-import re
-import subprocess
-import tempfile
-
-import lit.formats
-import lit.util
-
-from lit.llvm import llvm_config
-from lit.llvm.subst import ToolSubst
-
-# Configuration file for the 'lit' integration test runner.
-
-# name: The name of this integration test suite.
-config.name = 'MLIR_INTEGRATION'
-
-config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
-
-# suffixes: A list of file extensions to treat as integration test files.
-config.suffixes = ['.mlir']
-
-# test_source_root: The root path where integration tests are located.
-config.test_source_root = os.path.dirname(__file__)
-
-# test_exec_root: The root path where integration tests should be run.
-config.test_exec_root = os.path.join(config.mlir_obj_root, 'integration_test')
-
-config.substitutions.append(('%PATH%', config.environment['PATH']))
-config.substitutions.append(('%shlibext', config.llvm_shlib_ext))
-config.substitutions.append(('%mlir_src_root', config.mlir_src_root))
-
-llvm_config.with_system_environment(['HOME', 'INCLUDE', 'LIB', 'TMP', 'TEMP'])
-
-llvm_config.use_default_substitutions()
-
-# excludes: A list of directories to exclude from the integration testsuite.
-config.excludes = ['CMakeLists.txt', 'README.txt', 'LICENSE.txt']
-
-# Tweak the PATH to include the tools dir.
-llvm_config.with_environment('PATH', config.llvm_tools_dir, append_path=True)
-tool_dirs = [config.mlir_tools_dir, config.llvm_tools_dir]
-tools = [
- 'mlir-opt',
- 'mlir-cpu-runner',
-]
-
-# The following tools are optional.
-tools.extend([
- ToolSubst(
- '%mlir_integration_test_dir',
- config.mlir_integration_test_dir,
- unresolved='ignore'),
-])
-
-llvm_config.add_tool_substitutions(tools, tool_dirs)
diff --git a/mlir/integration_test/lit.site.cfg.py.in b/mlir/integration_test/lit.site.cfg.py.in
deleted file mode 100644
index 16340f32e89a..000000000000
--- a/mlir/integration_test/lit.site.cfg.py.in
+++ /dev/null
@@ -1,54 +0,0 @@
- at LIT_SITE_CFG_IN_HEADER@
-
-import sys
-
-config.host_triple = "@LLVM_HOST_TRIPLE@"
-config.target_triple = "@TARGET_TRIPLE@"
-config.llvm_src_root = "@LLVM_SOURCE_DIR@"
-config.llvm_obj_root = "@LLVM_BINARY_DIR@"
-config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
-config.llvm_lib_dir = "@LLVM_LIBS_DIR@"
-config.llvm_shlib_dir = "@SHLIBDIR@"
-config.llvm_shlib_ext = "@SHLIBEXT@"
-config.llvm_exe_ext = "@EXEEXT@"
-config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
-config.python_executable = "@PYTHON_EXECUTABLE@"
-config.gold_executable = "@GOLD_EXECUTABLE@"
-config.ld64_executable = "@LD64_EXECUTABLE@"
-config.enable_shared = @ENABLE_SHARED@
-config.enable_assertions = @ENABLE_ASSERTIONS@
-config.targets_to_build = "@TARGETS_TO_BUILD@"
-config.native_target = "@LLVM_NATIVE_ARCH@"
-config.llvm_bindings = "@LLVM_BINDINGS@".split(' ')
-config.host_os = "@HOST_OS@"
-config.host_cc = "@HOST_CC@"
-config.host_cxx = "@HOST_CXX@"
-config.host_cmake = "@CMAKE_COMMAND@"
-# Note: ldflags can contain double-quoted paths, so must use single quotes here.
-config.host_ldflags = '@HOST_LDFLAGS@'
-config.llvm_use_sanitizer = "@LLVM_USE_SANITIZER@"
-config.llvm_host_triple = '@LLVM_HOST_TRIPLE@'
-config.host_arch = "@HOST_ARCH@"
-config.mlir_src_root = "@MLIR_SOURCE_DIR@"
-config.mlir_obj_root = "@MLIR_BINARY_DIR@"
-config.mlir_tools_dir = "@MLIR_TOOLS_DIR@"
-config.mlir_integration_test_dir = "@MLIR_INTEGRATION_TEST_DIR@"
-config.intel_sde_executable = "@INTEL_SDE_EXECUTABLE@"
-config.mlir_run_avx512_tests = "@MLIR_RUN_AVX512_TESTS@"
-
-# Support substitution of the tools_dir with user parameters. This is
-# used when we can't determine the tool dir at configuration time.
-try:
- config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
- config.llvm_lib_dir = config.llvm_lib_dir % lit_config.params
- config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
-except KeyError:
- e = sys.exc_info()[1]
- key, = e.args
- lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
-
-import lit.llvm
-lit.llvm.initialize(lit_config, config)
-
-# Let the main config do the real work.
-lit_config.load_config(config, "@MLIR_SOURCE_DIR@/integration_test/lit.cfg.py")
diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt
index 9a45b297b474..f5cb00472bef 100644
--- a/mlir/test/CMakeLists.txt
+++ b/mlir/test/CMakeLists.txt
@@ -27,6 +27,19 @@ set(MLIR_ROCM_WRAPPER_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
set(MLIR_SPIRV_WRAPPER_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
set(MLIR_VULKAN_WRAPPER_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+if (MLIR_INCLUDE_INTEGRATION_TESTS)
+ set(INTEL_SDE_EXECUTABLE "" CACHE STRING
+ "If set, arch-specific integration tests are run with Intel SDE.")
+ option(MLIR_RUN_AVX512_TESTS "Run AVX512 tests.")
+ # Passed to lit.site.cfg.py.in to set up the path where to find the libraries.
+ set(MLIR_INTEGRATION_TEST_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+
+ # Copy test data over.
+ file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/test.mtx
+ ${CMAKE_CURRENT_SOURCE_DIR}/Integration/data/test.tns
+ DESTINATION ${MLIR_INTEGRATION_TEST_DIR}/data/)
+endif()
+
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.py.in
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg.py
diff --git a/mlir/integration_test/Dialect/Async/CPU/lit.local.cfg b/mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg
similarity index 100%
rename from mlir/integration_test/Dialect/Async/CPU/lit.local.cfg
rename to mlir/test/Integration/Dialect/Async/CPU/lit.local.cfg
diff --git a/mlir/integration_test/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir b/mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir
rename to mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir
diff --git a/mlir/integration_test/Dialect/Async/CPU/test-async-parallel-for-1d.mlir b/mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Async/CPU/test-async-parallel-for-1d.mlir
rename to mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir
diff --git a/mlir/integration_test/Dialect/Async/CPU/test-async-parallel-for-2d.mlir b/mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Async/CPU/test-async-parallel-for-2d.mlir
rename to mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir
diff --git a/mlir/integration_test/Dialect/LLVMIR/CPU/X86/lit.local.cfg b/mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg
similarity index 100%
rename from mlir/integration_test/Dialect/LLVMIR/CPU/X86/lit.local.cfg
rename to mlir/test/Integration/Dialect/LLVMIR/CPU/X86/lit.local.cfg
diff --git a/mlir/integration_test/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir b/mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir
rename to mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm.mlir
diff --git a/mlir/integration_test/Dialect/LLVMIR/CPU/lit.local.cfg b/mlir/test/Integration/Dialect/LLVMIR/CPU/lit.local.cfg
similarity index 100%
rename from mlir/integration_test/Dialect/LLVMIR/CPU/lit.local.cfg
rename to mlir/test/Integration/Dialect/LLVMIR/CPU/lit.local.cfg
diff --git a/mlir/integration_test/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir b/mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir
rename to mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-fp.mlir
diff --git a/mlir/integration_test/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir b/mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir
rename to mlir/test/Integration/Dialect/LLVMIR/CPU/test-vector-reductions-int.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_column_major.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_column_major.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_column_major.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_column_major.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_column_major_as_row_major.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_column_major_as_row_major.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_column_major_as_row_major.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_column_major_as_row_major.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_i8_i8_i32.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_i8_i8_i32.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/benchmark_matmul_i8_i8_i32.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/benchmark_matmul_i8_i8_i32.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/matmul-vs-matvec.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/matmul-vs-matvec.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/matmul-vs-matvec.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/rank-reducing-subview.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/rank-reducing-subview.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/rank-reducing-subview.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-input-ncw-filter-wcf-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-input-ncw-filter-wcf-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-input-ncw-filter-wcf-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-input-ncw-filter-wcf-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-input-nwc-filter-wcf-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-input-nwc-filter-wcf-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-input-nwc-filter-wcf-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-input-nwc-filter-wcf-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-ncw-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-ncw-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-ncw-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-ncw-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-nwc-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-1d-nwc-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-1d-nwc-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-input-nchw-filter-hwcf-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-input-nchw-filter-hwcf-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-input-nchw-filter-hwcf-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-input-nchw-filter-hwcf-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-input-nhwc-filter-hwcf-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-input-nhwc-filter-hwcf-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-input-nhwc-filter-hwcf-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-input-nhwc-filter-hwcf-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-nchw-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nchw-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-nchw-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nchw-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-nhwc-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-2d-nhwc-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-2d-nhwc-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-input-ncdhw-filter-dhwcf-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-input-ncdhw-filter-dhwcf-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-input-ncdhw-filter-dhwcf-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-input-ncdhw-filter-dhwcf-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-input-ndhwc-filter-dhwcf-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-input-ndhwc-filter-dhwcf-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-input-ndhwc-filter-dhwcf-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-input-ndhwc-filter-dhwcf-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-ncdhw-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ncdhw-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-ncdhw-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ncdhw-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-ndhwc-call.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-call.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-conv-3d-ndhwc-call.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-conv-3d-ndhwc-call.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-elementwise.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-elementwise.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-elementwise.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-elementwise.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert-multiple-uses.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-subtensor-insert.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-subtensor-insert.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-subtensor-insert.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-tensor-e2e.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-tensor-e2e.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-e2e.mlir
diff --git a/mlir/integration_test/Dialect/Linalg/CPU/test-tensor-matmul.mlir b/mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Linalg/CPU/test-tensor-matmul.mlir
rename to mlir/test/Integration/Dialect/Linalg/CPU/test-tensor-matmul.mlir
diff --git a/mlir/integration_test/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir b/mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir
rename to mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir
diff --git a/mlir/integration_test/Dialect/Standard/CPU/test_subview.mlir b/mlir/test/Integration/Dialect/Standard/CPU/test_subview.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Standard/CPU/test_subview.mlir
rename to mlir/test/Integration/Dialect/Standard/CPU/test_subview.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/AVX512/lit.local.cfg b/mlir/test/Integration/Dialect/Vector/CPU/AVX512/lit.local.cfg
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/AVX512/lit.local.cfg
rename to mlir/test/Integration/Dialect/Vector/CPU/AVX512/lit.local.cfg
diff --git a/mlir/integration_test/Dialect/Vector/CPU/AVX512/test-vp2intersect-i32.mlir b/mlir/test/Integration/Dialect/Vector/CPU/AVX512/test-vp2intersect-i32.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/AVX512/test-vp2intersect-i32.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/AVX512/test-vp2intersect-i32.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/lit.local.cfg b/mlir/test/Integration/Dialect/Vector/CPU/lit.local.cfg
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/lit.local.cfg
rename to mlir/test/Integration/Dialect/Vector/CPU/lit.local.cfg
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-broadcast.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-broadcast.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-broadcast.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-broadcast.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-compress.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-compress.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-compress.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-compress.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-constant-mask.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-constant-mask.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-constant-mask.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-constant-mask.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-contraction.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-contraction.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-contraction.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-contraction.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-create-mask-v4i1.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-create-mask-v4i1.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-create-mask-v4i1.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-create-mask.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-create-mask.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-create-mask.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-create-mask.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-expand.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-expand.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-expand.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-expand.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-extract-slices.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-extract-slices.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-extract-slices.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-extract-slices.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-extract-strided-slice.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-extract-strided-slice.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-extract-strided-slice.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-flat-transpose-col.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-flat-transpose-col.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-col.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-flat-transpose-row.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-flat-transpose-row.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-flat-transpose-row.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-fma.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-fma.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-fma.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-fma.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-gather.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-gather.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-gather.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-gather.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-insert-slices.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-insert-slices.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-insert-slices.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-insert-slices.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-insert-strided-slice.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-insert-strided-slice.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-insert-strided-slice.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-maskedload.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-maskedload.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-maskedload.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-maskedload.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-maskedstore.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-maskedstore.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-maskedstore.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-maskedstore.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-matrix-multiply-col.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-matrix-multiply-col.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-col.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-matrix-multiply-row.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-matrix-multiply-row.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-matrix-multiply-row.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-f32.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-f32.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-f32.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-outerproduct-i64.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-outerproduct-i64.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-print-int.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-print-int.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-print-int.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-print-int.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32-reassoc.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-f32.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-f32.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f32.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64-reassoc.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-f64.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-f64.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-f64.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-i32.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i32.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-i32.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i32.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-i4.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i4.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-i4.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i4.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-i64.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i64.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-i64.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-i64.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-si4.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-si4.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-si4.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-si4.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-reductions-ui4.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-reductions-ui4.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-reductions-ui4.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-scatter.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-scatter.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-scatter.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-scatter.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-shape-cast.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-shape-cast.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-shape-cast.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-shape-cast.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-shuffle.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-shuffle.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-shuffle.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-shuffle.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-sparse-dot-matvec.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-sparse-saxpy-jagged-matvec.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-transfer-read-2d.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-transfer-read-2d.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read-2d.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-transfer-read.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-transfer-read.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-transfer-read.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-transfer-to-loops.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-transfer-to-loops.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-transfer-to-loops.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-transfer-write.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-transfer-write.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-transfer-write.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-transfer-write.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-transpose.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-transpose.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-transpose.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-transpose.mlir
diff --git a/mlir/integration_test/Dialect/Vector/CPU/test-vector-distribute.mlir b/mlir/test/Integration/Dialect/Vector/CPU/test-vector-distribute.mlir
similarity index 100%
rename from mlir/integration_test/Dialect/Vector/CPU/test-vector-distribute.mlir
rename to mlir/test/Integration/Dialect/Vector/CPU/test-vector-distribute.mlir
diff --git a/mlir/integration_test/Sparse/CPU/frostt-example.mlir b/mlir/test/Integration/Sparse/CPU/frostt-example.mlir
similarity index 100%
rename from mlir/integration_test/Sparse/CPU/frostt-example.mlir
rename to mlir/test/Integration/Sparse/CPU/frostt-example.mlir
diff --git a/mlir/integration_test/Sparse/CPU/lit.local.cfg b/mlir/test/Integration/Sparse/CPU/lit.local.cfg
similarity index 100%
rename from mlir/integration_test/Sparse/CPU/lit.local.cfg
rename to mlir/test/Integration/Sparse/CPU/lit.local.cfg
diff --git a/mlir/integration_test/Sparse/CPU/matrix-market-example.mlir b/mlir/test/Integration/Sparse/CPU/matrix-market-example.mlir
similarity index 100%
rename from mlir/integration_test/Sparse/CPU/matrix-market-example.mlir
rename to mlir/test/Integration/Sparse/CPU/matrix-market-example.mlir
diff --git a/mlir/integration_test/Sparse/CPU/sparse_sampled_matmul.mlir b/mlir/test/Integration/Sparse/CPU/sparse_sampled_matmul.mlir
similarity index 100%
rename from mlir/integration_test/Sparse/CPU/sparse_sampled_matmul.mlir
rename to mlir/test/Integration/Sparse/CPU/sparse_sampled_matmul.mlir
diff --git a/mlir/integration_test/Sparse/CPU/sparse_sum.mlir b/mlir/test/Integration/Sparse/CPU/sparse_sum.mlir
similarity index 100%
rename from mlir/integration_test/Sparse/CPU/sparse_sum.mlir
rename to mlir/test/Integration/Sparse/CPU/sparse_sum.mlir
diff --git a/mlir/integration_test/data/test.mtx b/mlir/test/Integration/data/test.mtx
similarity index 100%
rename from mlir/integration_test/data/test.mtx
rename to mlir/test/Integration/data/test.mtx
diff --git a/mlir/integration_test/data/test.tns b/mlir/test/Integration/data/test.tns
similarity index 100%
rename from mlir/integration_test/data/test.tns
rename to mlir/test/Integration/data/test.tns
diff --git a/mlir/test/Integration/lit.local.cfg b/mlir/test/Integration/lit.local.cfg
new file mode 100644
index 000000000000..f428e2534065
--- /dev/null
+++ b/mlir/test/Integration/lit.local.cfg
@@ -0,0 +1,2 @@
+if config.mlir_include_integration_tests != 'ON':
+ config.unsupported = True
diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py
index bff478516ce0..d205b1efc039 100644
--- a/mlir/test/lit.cfg.py
+++ b/mlir/test/lit.cfg.py
@@ -81,8 +81,8 @@
ToolSubst('%rocm_wrapper_library_dir', config.rocm_wrapper_library_dir, unresolved='ignore'),
ToolSubst('%spirv_wrapper_library_dir', config.spirv_wrapper_library_dir, unresolved='ignore'),
ToolSubst('%vulkan_wrapper_library_dir', config.vulkan_wrapper_library_dir, unresolved='ignore'),
+ ToolSubst('%mlir_integration_test_dir', config.mlir_integration_test_dir, unresolved='ignore'),
])
-
llvm_config.add_tool_substitutions(tools, tool_dirs)
diff --git a/mlir/test/lit.site.cfg.py.in b/mlir/test/lit.site.cfg.py.in
index 91a67ae8884d..f8f7183e3480 100644
--- a/mlir/test/lit.site.cfg.py.in
+++ b/mlir/test/lit.site.cfg.py.in
@@ -46,6 +46,10 @@ config.enable_spirv_cpu_runner = @MLIR_SPIRV_CPU_RUNNER_ENABLED@
config.vulkan_wrapper_library_dir = "@MLIR_VULKAN_WRAPPER_LIBRARY_DIR@"
config.enable_vulkan_runner = @MLIR_VULKAN_RUNNER_ENABLED@
config.enable_bindings_python = @MLIR_BINDINGS_PYTHON_ENABLED@
+config.mlir_integration_test_dir = "@MLIR_INTEGRATION_TEST_DIR@"
+config.intel_sde_executable = "@INTEL_SDE_EXECUTABLE@"
+config.mlir_run_avx512_tests = "@MLIR_RUN_AVX512_TESTS@"
+config.mlir_include_integration_tests = "@MLIR_INCLUDE_INTEGRATION_TESTS@"
# Support substitution of the tools_dir with user parameters. This is
# used when we can't determine the tool dir at configuration time.
More information about the Mlir-commits
mailing list