From e6e79b3f0b2a2fd2b22ed8aa9267a6c915782632 Mon Sep 17 00:00:00 2001 From: Aart Bik Date: Thu, 15 Jul 2021 08:40:31 -0700 Subject: [PATCH] [mlir][sparse] remove linalg-to-loops from integration tests With the migration from linalg.copy to memref.copy, this pass (which was there solely to handle the linalg.copy op) is no longer required for the end-to-end path for sparse compilation. Reviewed By: ftynse Differential Revision: https://reviews.llvm.org/D106073 --- mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir | 2 +- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir | 2 +- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir | 2 +- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir | 2 +- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir | 2 +- .../Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir | 2 +- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir | 2 +- mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir index 644553f..f88b370 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/dense_output.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir index db2b5b7..0d5ff99 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_flatten.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir index 039ca3c..362f980 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_matvec.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir index 538d169..d2f5db7 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_mttkrp.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir index 29fedaf..2d0be8b 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_out_simple.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir index 1ed0b0b..f09c7b1 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sampled_matmul.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir index 35d875d..38aad44 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_spmm.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ diff --git a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir index 96bddef..a5d9505 100644 --- a/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir +++ b/mlir/test/Integration/Dialect/SparseTensor/CPU/sparse_sum.mlir @@ -1,6 +1,6 @@ // RUN: mlir-opt %s \ // RUN: --sparsification --sparse-tensor-conversion \ -// RUN: --convert-linalg-to-loops --convert-vector-to-scf --convert-scf-to-std \ +// RUN: --convert-vector-to-scf --convert-scf-to-std \ // RUN: --func-bufferize --tensor-constant-bufferize --tensor-bufferize \ // RUN: --std-bufferize --finalizing-bufferize \ // RUN: --convert-vector-to-llvm --convert-memref-to-llvm --convert-std-to-llvm | \ -- 2.7.4