intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-21 20:53:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reapply "[mlir][transform] Support symlinks in module loading. Reorganize tests. (#69329)"

Browse Source 
This reverts commit c122b9727a but fixes
tests that were added between submitting #69329 for review and landing
it for the first time.
This commit is contained in:
Ingo Müller
2023-10-19 08:52:16 +00:00
parent ba47bc7fd4
commit 3517b67ef0
16 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mlir/lib/Dialect/Transform/Transforms/TransformInterpreterUtils.cpp
View File

@@ -61,7 +61,8 @@ LogicalResult transform::detail::expandPathsToMLIRFiles(
it != itEnd && !ec; it.increment(ec)) {
const std::string &fileName = it->path();
if (it->type() != llvm::sys::fs::file_type::regular_file) {
if (it->type() != llvm::sys::fs::file_type::regular_file &&
it->type() != llvm::sys::fs::file_type::symlink_file) {
LLVM_DEBUG(DBGS() << " Skipping non-regular file '" << fileName
<< "'\n");
continue;

2
mlir/test/Dialect/LLVM/lower-to-llvm-e2e-with-top-level-named-sequence.mlir
View File

@@ -3,7 +3,7 @@
// RUN: mlir-opt %s -test-lower-to-llvm -cse | FileCheck %s
// RUN: mlir-opt %s \
// RUN: -transform-preload-library=transform-library-paths=%p/../Transform/Library/lower-to-llvm.mlir \
// RUN: -transform-preload-library=transform-library-paths=%p/../Transform/include/Library/lower-to-llvm.mlir \
// RUN: -transform-interpreter="entry-point=entry_point" \
// RUN: -test-transform-dialect-erase-schedule \
// RUN: -cse \

1
mlir/test/Dialect/Transform/Library/lower-to-llvm.mlir → mlir/test/Dialect/Transform/include/Library/lower-to-llvm.mlir
View File

@@ -1,4 +1,5 @@
// RUN: mlir-opt %s
// No need to check anything else than parsing here, this is being used by another test as data.
/// Schedule to lower to LLVM.
module @lower_module_to_llvm attributes { transform.with_named_sequence } {

0
mlir/test/Dialect/Transform/test-interpreter-external-concurrent-source.mlir → mlir/test/Dialect/Transform/include/test-interpreter-external-concurrent-source.mlir
View File

0
mlir/test/Dialect/Transform/test-interpreter-external-source.mlir → mlir/test/Dialect/Transform/include/test-interpreter-external-source.mlir
View File

0
mlir/test/Dialect/Transform/test-interpreter-external-symbol-def-invalid.mlir → mlir/test/Dialect/Transform/include/test-interpreter-external-symbol-def-invalid.mlir
View File

1
mlir/test/Dialect/Transform/test-interpreter-library/definitions-self-contained.mlir → mlir/test/Dialect/Transform/include/test-interpreter-library/definitions-self-contained.mlir
View File

@@ -1,4 +1,5 @@
// RUN: mlir-opt %s
// No need to check anything else than parsing here, this is being used by another test as data.
module attributes {transform.with_named_sequence} {
transform.named_sequence private @private_helper(%arg0: !transform.any_op {transform.readonly}) {

1
mlir/test/Dialect/Transform/test-interpreter-library/definitions-with-unresolved.mlir → mlir/test/Dialect/Transform/include/test-interpreter-library/definitions-with-unresolved.mlir
View File

@@ -1,4 +1,5 @@
// RUN: mlir-opt %s
// No need to check anything else than parsing here, this is being used by another test as data.
module attributes {transform.with_named_sequence} {
transform.named_sequence @print_message(%arg0: !transform.any_op {transform.readonly})

2
mlir/test/Dialect/Transform/preload-library.mlir
View File

@@ -1,5 +1,5 @@
// RUN: mlir-opt %s \
// RUN: -transform-preload-library=transform-library-paths=%p%{fs-sep}test-interpreter-library \
// RUN: -transform-preload-library=transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library \
// RUN: -transform-interpreter=entry-point=private_helper \
// RUN: -split-input-file -verify-diagnostics

2
mlir/test/Dialect/Transform/test-interpreter-external-concurrent.mlir
View File

@@ -1,4 +1,4 @@
// RUN: mlir-opt %s --pass-pipeline="builtin.module(func.func(test-transform-dialect-interpreter{transform-file-name=%p/test-interpreter-external-concurrent-source.mlir}))" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(func.func(test-transform-dialect-interpreter{transform-file-name=%p%{fs-sep}include%{fs-sep}test-interpreter-external-concurrent-source.mlir}))" \
// RUN: --verify-diagnostics
// Exercising the pass on multiple functions of different lengths that may be

4
mlir/test/Dialect/Transform/test-interpreter-external-symbol-decl-and-schedule.mlir
View File

@@ -1,7 +1,7 @@
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-file-name=%p/test-interpreter-external-symbol-decl.mlir transform-library-paths=%p/test-interpreter-library/definitions-self-contained.mlir})" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-file-name=%p%{fs-sep}test-interpreter-external-symbol-decl.mlir transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-self-contained.mlir})" \
// RUN: --verify-diagnostics
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-file-name=%p/test-interpreter-external-symbol-decl.mlir transform-library-paths=%p/test-interpreter-library/definitions-self-contained.mlir}, test-transform-dialect-interpreter{transform-file-name=%p/test-interpreter-external-symbol-decl.mlir transform-library-paths=%p/test-interpreter-library/definitions-self-contained.mlir})" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-file-name=%p%{fs-sep}test-interpreter-external-symbol-decl.mlir transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-self-contained.mlir}, test-transform-dialect-interpreter{transform-file-name=%p%{fs-sep}test-interpreter-external-symbol-decl.mlir transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-self-contained.mlir})" \
// RUN: --verify-diagnostics
// The external transform script has a declaration to the named sequence @foo,

6
mlir/test/Dialect/Transform/test-interpreter-external-symbol-decl-dir.mlir
View File

@@ -1,10 +1,10 @@
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}test-interpreter-library})" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library})" \
// RUN: --verify-diagnostics --split-input-file | FileCheck %s
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}test-interpreter-library/definitions-self-contained.mlir,%p%{fs-sep}test-interpreter-library/definitions-with-unresolved.mlir})" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-self-contained.mlir,%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-with-unresolved.mlir})" \
// RUN: --verify-diagnostics --split-input-file | FileCheck %s
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}test-interpreter-library}, test-transform-dialect-interpreter)" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library}, test-transform-dialect-interpreter)" \
// RUN: --verify-diagnostics --split-input-file | FileCheck %s
// The definition of the @foo named sequence is provided in another file. It

2
mlir/test/Dialect/Transform/test-interpreter-external-symbol-decl-invalid.mlir
View File

@@ -1,4 +1,4 @@
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p/test-interpreter-external-symbol-def-invalid.mlir}, test-transform-dialect-interpreter)" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-external-symbol-def-invalid.mlir}, test-transform-dialect-interpreter)" \
// RUN: --verify-diagnostics --split-input-file
// The definition of the @print_message named sequence is provided in another file. It

4
mlir/test/Dialect/Transform/test-interpreter-external-symbol-decl.mlir
View File

@@ -1,7 +1,7 @@
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p/test-interpreter-library/definitions-self-contained.mlir})" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-self-contained.mlir})" \
// RUN: --verify-diagnostics --split-input-file | FileCheck %s
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p/test-interpreter-library/definitions-self-contained.mlir}, test-transform-dialect-interpreter)" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-library-paths=%p%{fs-sep}include%{fs-sep}test-interpreter-library/definitions-self-contained.mlir}, test-transform-dialect-interpreter)" \
// RUN: --verify-diagnostics --split-input-file | FileCheck %s
// The definition of the @print_message named sequence is provided in another

2
mlir/test/Dialect/Transform/test-interpreter-external.mlir
View File

@@ -1,4 +1,4 @@
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-file-name=%p/test-interpreter-external-source.mlir})" \
// RUN: mlir-opt %s --pass-pipeline="builtin.module(test-transform-dialect-interpreter{transform-file-name=%p%{fs-sep}include%{fs-sep}test-interpreter-external-source.mlir})" \
// RUN: --verify-diagnostics
// The schedule in the separate file emits remarks at the payload root.

15
utils/bazel/llvm-project-overlay/mlir/test/Dialect/BUILD.bazel
View File

@@ -18,11 +18,7 @@ package(default_visibility = ["//visibility:public"])
] + glob([
"IRDL/*.irdl.mlir",
"LLVM/*-symbol-def.mlir",
"Transform/*-source.mlir",
"Transform/*-symbol-def.mlir",
"Transform/*-symbol-decl-and-schedule.mlir",
"Transform/Library/*.mlir",
"Transform/test-interpreter-library/*.mlir",
"Transform/include/**/*.mlir",
]),
)
for src in glob(
@@ -30,15 +26,8 @@ package(default_visibility = ["//visibility:public"])
exclude = [
"IRDL/*.irdl.mlir",
"LLVM/*-symbol-def.mlir",
"Transform/*-source.mlir",
"Transform/*-symbol-def.mlir",
"Transform/*-symbol-decl-and-schedule.mlir",
"Transform/*-symbol-decl-dir.mlir",
"Transform/*-symbol-decl-invalid.mlir",
"Transform/Library/*.mlir",
"Transform/preload-library.mlir",
"Transform/test-interpreter-library/*.mlir",
"Transform/test-repro-dump.mlir",
"Transform/include/**/*.mlir",
],
)
]