diff options
34 files changed, 63 insertions, 59 deletions
diff --git a/mlir/g3doc/Passes.md b/mlir/g3doc/Passes.md index baf585a5669..4a4391aa286 100644 --- a/mlir/g3doc/Passes.md +++ b/mlir/g3doc/Passes.md @@ -76,7 +76,7 @@ value is returned, packed into an LLVM IR struct type. Function calls and returns are updated accordingly. Block argument types are updated to use LLVM IR types. -## DMA generation (`-dma-generate`) +## DMA generation (`-affine-dma-generate`) Replaces all loads and stores on memref's living in 'slowMemorySpace' by introducing DMA operations (strided DMA if necessary) to transfer data to/from @@ -143,22 +143,22 @@ func @loop_nest_tiled() -> memref<256x1024xf32> { } ``` -## Loop tiling (`-loop-tile`) +## Loop tiling (`-affine-loop-tile`) Performs tiling or blocking of loop nests. It currently works on perfect loop nests. -## Loop unroll (`-loop-unroll`) +## Loop unroll (`-affine-loop-unroll`) This pass implements loop unrolling. It is able to unroll loops with arbitrary bounds, and generate a cleanup loop when necessary. -## Loop unroll and jam (`-loop-unroll-jam`) +## Loop unroll and jam (`-affine-loop-unroll-jam`) This pass implements unroll and jam for loops. It works on both perfect or imperfect loop nests. -## Loop fusion (`-loop-fusion`) +## Loop fusion (`-affine-loop-fusion`) Performs fusion of loop nests using a slicing-based approach. The fused loop nests, when possible, are rewritten to access significantly smaller local @@ -245,7 +245,7 @@ test/Transforms/memref-dataflow-opt.mlir:232:7: note: dependence from 2 to 1 at store %cf9, %m[%idx] : memref<10xf32> ``` -## Pipeline data transfer (`-pipeline-data-transfer`) +## Pipeline data transfer (`-affine-pipeline-data-transfer`) This pass performs a transformation to overlap non-blocking DMA operations in a loop with computations through double buffering. This is achieved by advancing diff --git a/mlir/lib/Transforms/DmaGeneration.cpp b/mlir/lib/Transforms/DmaGeneration.cpp index c70b218e36d..f58905353ef 100644 --- a/mlir/lib/Transforms/DmaGeneration.cpp +++ b/mlir/lib/Transforms/DmaGeneration.cpp @@ -34,7 +34,7 @@ #include "llvm/Support/Debug.h" #include <algorithm> -#define DEBUG_TYPE "dma-generate" +#define DEBUG_TYPE "affine-dma-generate" using namespace mlir; using llvm::SmallMapVector; @@ -773,4 +773,4 @@ void DmaGeneration::runOnFunction() { } static PassRegistration<DmaGeneration> - pass("dma-generate", "Generate DMAs for memory operations"); + pass("affine-dma-generate", "Generate DMAs for memory operations"); diff --git a/mlir/lib/Transforms/LoopFusion.cpp b/mlir/lib/Transforms/LoopFusion.cpp index a69836c8653..f8db53a3216 100644 --- a/mlir/lib/Transforms/LoopFusion.cpp +++ b/mlir/lib/Transforms/LoopFusion.cpp @@ -41,7 +41,7 @@ #include <iomanip> #include <sstream> -#define DEBUG_TYPE "loop-fusion" +#define DEBUG_TYPE "affine-loop-fusion" using llvm::SetVector; @@ -2271,4 +2271,5 @@ void LoopFusion::runOnFunction() { .run(); } -static PassRegistration<LoopFusion> pass("loop-fusion", "Fuse loop nests"); +static PassRegistration<LoopFusion> pass("affine-loop-fusion", + "Fuse loop nests"); diff --git a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp index 13e9cda2407..b03a3c70a17 100644 --- a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp +++ b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp @@ -126,5 +126,5 @@ void LoopInvariantCodeMotion::runOnFunction() { } static PassRegistration<LoopInvariantCodeMotion> - pass("loop-invariant-code-motion", + pass("affine-loop-invariant-code-motion", "Hoist loop invariant instructions outside of the loop"); diff --git a/mlir/lib/Transforms/LoopTiling.cpp b/mlir/lib/Transforms/LoopTiling.cpp index 11f2468b1a9..4eb1ce22008 100644 --- a/mlir/lib/Transforms/LoopTiling.cpp +++ b/mlir/lib/Transforms/LoopTiling.cpp @@ -36,7 +36,7 @@ using namespace mlir; -#define DEBUG_TYPE "loop-tile" +#define DEBUG_TYPE "affine-loop-tile" static llvm::cl::OptionCategory clOptionsCategory(DEBUG_TYPE " options"); @@ -413,4 +413,4 @@ void LoopTiling::runOnFunction() { constexpr unsigned LoopTiling::kDefaultTileSize; constexpr uint64_t LoopTiling::kDefaultCacheMemCapacity; -static PassRegistration<LoopTiling> pass("loop-tile", "Tile loop nests"); +static PassRegistration<LoopTiling> pass("affine-loop-tile", "Tile loop nests"); diff --git a/mlir/lib/Transforms/LoopUnroll.cpp b/mlir/lib/Transforms/LoopUnroll.cpp index 1e92ebec655..236ef81ebd2 100644 --- a/mlir/lib/Transforms/LoopUnroll.cpp +++ b/mlir/lib/Transforms/LoopUnroll.cpp @@ -34,7 +34,7 @@ using namespace mlir; -#define DEBUG_TYPE "loop-unroll" +#define DEBUG_TYPE "affine-loop-unroll" static llvm::cl::OptionCategory clOptionsCategory(DEBUG_TYPE " options"); @@ -188,4 +188,4 @@ FunctionPassBase *mlir::createLoopUnrollPass( unrollFull == -1 ? None : Optional<bool>(unrollFull), getUnrollFactor); } -static PassRegistration<LoopUnroll> pass("loop-unroll", "Unroll loops"); +static PassRegistration<LoopUnroll> pass("affine-loop-unroll", "Unroll loops"); diff --git a/mlir/lib/Transforms/LoopUnrollAndJam.cpp b/mlir/lib/Transforms/LoopUnrollAndJam.cpp index a3a24f6c0f7..366a7ede5eb 100644 --- a/mlir/lib/Transforms/LoopUnrollAndJam.cpp +++ b/mlir/lib/Transforms/LoopUnrollAndJam.cpp @@ -56,7 +56,7 @@ using namespace mlir; -#define DEBUG_TYPE "loop-unroll-jam" +#define DEBUG_TYPE "affine-loop-unroll-jam" static llvm::cl::OptionCategory clOptionsCategory(DEBUG_TYPE " options"); @@ -240,5 +240,5 @@ LogicalResult mlir::loopUnrollJamByFactor(AffineForOp forOp, return success(); } -static PassRegistration<LoopUnrollAndJam> pass("loop-unroll-jam", +static PassRegistration<LoopUnrollAndJam> pass("affine-loop-unroll-jam", "Unroll and jam loops"); diff --git a/mlir/lib/Transforms/LowerVectorTransfers.cpp b/mlir/lib/Transforms/LowerVectorTransfers.cpp index a1048b763e0..f0990e47313 100644 --- a/mlir/lib/Transforms/LowerVectorTransfers.cpp +++ b/mlir/lib/Transforms/LowerVectorTransfers.cpp @@ -85,7 +85,7 @@ using namespace mlir; -#define DEBUG_TYPE "lower-vector-transfers" +#define DEBUG_TYPE "affine-lower-vector-transfers" namespace { @@ -380,5 +380,6 @@ FunctionPassBase *mlir::createLowerVectorTransfersPass() { } static PassRegistration<LowerVectorTransfersPass> - pass("lower-vector-transfers", "Materializes vector transfer ops to a " - "proper abstraction for the hardware"); + pass("affine-lower-vector-transfers", + "Materializes vector transfer ops to a " + "proper abstraction for the hardware"); diff --git a/mlir/lib/Transforms/MaterializeVectors.cpp b/mlir/lib/Transforms/MaterializeVectors.cpp index 76dbdafb08d..2f06a9aa3bf 100644 --- a/mlir/lib/Transforms/MaterializeVectors.cpp +++ b/mlir/lib/Transforms/MaterializeVectors.cpp @@ -772,7 +772,8 @@ mlir::createMaterializeVectorsPass(llvm::ArrayRef<int64_t> vectorSize) { } static PassRegistration<MaterializeVectorsPass> - pass("materialize-vectors", "Materializes super-vectors to vectors of the " - "proper size for the hardware"); + pass("affine-materialize-vectors", + "Materializes super-vectors to vectors of the " + "proper size for the hardware"); #undef DEBUG_TYPE diff --git a/mlir/lib/Transforms/PipelineDataTransfer.cpp b/mlir/lib/Transforms/PipelineDataTransfer.cpp index 0ad24e6a711..66fbf4a1306 100644 --- a/mlir/lib/Transforms/PipelineDataTransfer.cpp +++ b/mlir/lib/Transforms/PipelineDataTransfer.cpp @@ -32,7 +32,7 @@ #include "mlir/Transforms/Utils.h" #include "llvm/ADT/DenseMap.h" #include "llvm/Support/Debug.h" -#define DEBUG_TYPE "pipeline-data-transfer" +#define DEBUG_TYPE "affine-pipeline-data-transfer" using namespace mlir; @@ -379,6 +379,6 @@ void PipelineDataTransfer::runOnAffineForOp(AffineForOp forOp) { } static PassRegistration<PipelineDataTransfer> pass( - "pipeline-data-transfer", + "affine-pipeline-data-transfer", "Pipeline non-blocking data transfers between explicitly managed levels of " "the memory hierarchy"); diff --git a/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp b/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp index b8640f05590..ecb391c1dbc 100644 --- a/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp +++ b/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp @@ -36,7 +36,7 @@ #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -#define DEBUG_TYPE "vectorizer-test" +#define DEBUG_TYPE "affine-vectorizer-test" using namespace mlir; @@ -306,6 +306,7 @@ FunctionPassBase *mlir::createVectorizerTestPass() { } static PassRegistration<VectorizerTestPass> - pass("vectorizer-test", "Tests vectorizer standalone functionality."); + pass("affine-vectorizer-test", + "Tests vectorizer standalone functionality."); #undef DEBUG_TYPE diff --git a/mlir/lib/Transforms/Vectorize.cpp b/mlir/lib/Transforms/Vectorize.cpp index d36dca8eca9..e135e95f30a 100644 --- a/mlir/lib/Transforms/Vectorize.cpp +++ b/mlir/lib/Transforms/Vectorize.cpp @@ -1262,5 +1262,5 @@ mlir::createVectorizePass(llvm::ArrayRef<int64_t> virtualVectorSize) { } static PassRegistration<Vectorize> - pass("vectorize", + pass("affine-vectorize", "Vectorize to a target independent n-D vector abstraction"); diff --git a/mlir/test/Transforms/Vectorize/compose_maps.mlir b/mlir/test/Transforms/Vectorize/compose_maps.mlir index 0f1c599be3b..0b2b16aab58 100644 --- a/mlir/test/Transforms/Vectorize/compose_maps.mlir +++ b/mlir/test/Transforms/Vectorize/compose_maps.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorizer-test -compose-maps 2>&1 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorizer-test -compose-maps 2>&1 | FileCheck %s // For all these cases, the test traverses the `test_affine_map` ops and // composes them in order one-by-one. diff --git a/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir b/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir index f1ea8f46761..6331c38e9a4 100644 --- a/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir +++ b/mlir/test/Transforms/Vectorize/lower_vector_transfers.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -lower-vector-transfers | FileCheck %s +// RUN: mlir-opt %s -affine-lower-vector-transfers | FileCheck %s // CHECK: #[[ADD:map[0-9]+]] = (d0, d1) -> (d0 + d1) // CHECK: #[[SUB:map[0-9]+]] = ()[s0] -> (s0 - 1) diff --git a/mlir/test/Transforms/Vectorize/materialize.mlir b/mlir/test/Transforms/Vectorize/materialize.mlir index 09f62a4cc16..40460e1b9b3 100644 --- a/mlir/test/Transforms/Vectorize/materialize.mlir +++ b/mlir/test/Transforms/Vectorize/materialize.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -materialize-vectors -vector-size=4 -vector-size=4 | FileCheck %s +// RUN: mlir-opt %s -affine-materialize-vectors -vector-size=4 -vector-size=4 | FileCheck %s // CHECK-DAG: #[[ID1:map[0-9]+]] = (d0) -> (d0) // CHECK-DAG: #[[D0D1D2D3TOD1D0:map[0-9]+]] = (d0, d1, d2, d3) -> (d1, d0) diff --git a/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir b/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir index e3023764c74..318373af381 100644 --- a/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir +++ b/mlir/test/Transforms/Vectorize/materialize_vectors_1d_to_1d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 32 --test-fastest-varying=0 -materialize-vectors -vector-size=8 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 32 --test-fastest-varying=0 -affine-materialize-vectors -vector-size=8 | FileCheck %s // vector<32xf32> -> vector<8xf32> // CHECK-DAG: [[ID1:#.*]] = (d0) -> (d0) diff --git a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir index b655790b271..e5034e41f74 100644 --- a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir +++ b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_1d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 3 -virtual-vector-size 16 --test-fastest-varying=1 --test-fastest-varying=0 -materialize-vectors -vector-size=8 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 3 -virtual-vector-size 16 --test-fastest-varying=1 --test-fastest-varying=0 -affine-materialize-vectors -vector-size=8 | FileCheck %s // vector<3x16xf32> -> vector<8xf32> // CHECK-DAG: [[ID1:#.*]] = (d0) -> (d0) diff --git a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir index bb48cda0907..ea1353db73c 100644 --- a/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir +++ b/mlir/test/Transforms/Vectorize/materialize_vectors_2d_to_2d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 3 -virtual-vector-size 32 --test-fastest-varying=1 --test-fastest-varying=0 -materialize-vectors -vector-size=3 -vector-size=16 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 3 -virtual-vector-size 32 --test-fastest-varying=1 --test-fastest-varying=0 -affine-materialize-vectors -vector-size=3 -vector-size=16 | FileCheck %s // vector<3x32xf32> -> vector<3x16xf32> // CHECK-DAG: [[ID1:#.*]] = (d0) -> (d0) diff --git a/mlir/test/Transforms/Vectorize/normalize_maps.mlir b/mlir/test/Transforms/Vectorize/normalize_maps.mlir index 076d2c75633..e7b08b70cce 100644 --- a/mlir/test/Transforms/Vectorize/normalize_maps.mlir +++ b/mlir/test/Transforms/Vectorize/normalize_maps.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorizer-test -normalize-maps | FileCheck %s +// RUN: mlir-opt %s -affine-vectorizer-test -normalize-maps | FileCheck %s // CHECK-DAG: #[[ZERO:[a-zA-Z0-9]+]] = () -> (0) // CHECK-DAG: #[[ID1:[a-zA-Z0-9]+]] = (d0) -> (d0) diff --git a/mlir/test/Transforms/Vectorize/vector_utils.mlir b/mlir/test/Transforms/Vectorize/vector_utils.mlir index ad35b67e549..ceb295b3784 100644 --- a/mlir/test/Transforms/Vectorize/vector_utils.mlir +++ b/mlir/test/Transforms/Vectorize/vector_utils.mlir @@ -1,5 +1,5 @@ -// RUN: mlir-opt %s -vectorizer-test -vector-shape-ratio 4 -vector-shape-ratio 8 2>&1 | FileCheck %s -// RUN: mlir-opt %s -vectorizer-test -vector-shape-ratio 2 -vector-shape-ratio 5 -vector-shape-ratio 2 2>&1 | FileCheck %s -check-prefix=TEST-3x4x5x8 +// RUN: mlir-opt %s -affine-vectorizer-test -vector-shape-ratio 4 -vector-shape-ratio 8 2>&1 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorizer-test -vector-shape-ratio 2 -vector-shape-ratio 5 -vector-shape-ratio 2 2>&1 | FileCheck %s -check-prefix=TEST-3x4x5x8 func @vector_add_2d(%arg0: index, %arg1: index) -> f32 { // Nothing should be matched in this first block. diff --git a/mlir/test/Transforms/Vectorize/vectorize_1d.mlir b/mlir/test/Transforms/Vectorize/vectorize_1d.mlir index bd1337b5a7f..5a0fab1b715 100644 --- a/mlir/test/Transforms/Vectorize/vectorize_1d.mlir +++ b/mlir/test/Transforms/Vectorize/vectorize_1d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 128 --test-fastest-varying=0 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 128 --test-fastest-varying=0 | FileCheck %s // Permutation maps used in vectorization. // CHECK: #[[map_proj_d0d1_0:map[0-9]+]] = (d0, d1) -> (0) diff --git a/mlir/test/Transforms/Vectorize/vectorize_2d.mlir b/mlir/test/Transforms/Vectorize/vectorize_2d.mlir index 5c6819502ae..217c7a6b39e 100644 --- a/mlir/test/Transforms/Vectorize/vectorize_2d.mlir +++ b/mlir/test/Transforms/Vectorize/vectorize_2d.mlir @@ -1,5 +1,5 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 4 -virtual-vector-size 8 | FileCheck %s -check-prefix=VECT -// RUN: mlir-opt %s -vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=1 --test-fastest-varying=0 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 4 -virtual-vector-size 8 | FileCheck %s -check-prefix=VECT +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=1 --test-fastest-varying=0 | FileCheck %s // Permutation maps used in vectorization. // CHECK-DAG: #[[map_id1:map[0-9]+]] = (d0) -> (d0) diff --git a/mlir/test/Transforms/Vectorize/vectorize_3d.mlir b/mlir/test/Transforms/Vectorize/vectorize_3d.mlir index 5b0e9f1de20..3f766ea9ac4 100644 --- a/mlir/test/Transforms/Vectorize/vectorize_3d.mlir +++ b/mlir/test/Transforms/Vectorize/vectorize_3d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 32 -virtual-vector-size 64 -virtual-vector-size 256 --test-fastest-varying=2 --test-fastest-varying=1 --test-fastest-varying=0 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 32 -virtual-vector-size 64 -virtual-vector-size 256 --test-fastest-varying=2 --test-fastest-varying=1 --test-fastest-varying=0 | FileCheck %s // Permutation maps used in vectorization. // CHECK: #[[map_proj_d0d1d2_d0d1d2:map[0-9]+]] = (d0, d1, d2) -> (d0, d1, d2) diff --git a/mlir/test/Transforms/Vectorize/vectorize_outer_loop_2d.mlir b/mlir/test/Transforms/Vectorize/vectorize_outer_loop_2d.mlir index 3db78be439a..2a50c426f12 100644 --- a/mlir/test/Transforms/Vectorize/vectorize_outer_loop_2d.mlir +++ b/mlir/test/Transforms/Vectorize/vectorize_outer_loop_2d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=2 --test-fastest-varying=0 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=2 --test-fastest-varying=0 | FileCheck %s // Permutation maps used in vectorization. // CHECK: #[[map_proj_d0d1d2_d0d2:map[0-9]+]] = (d0, d1, d2) -> (d0, d2) diff --git a/mlir/test/Transforms/Vectorize/vectorize_outer_loop_transpose_2d.mlir b/mlir/test/Transforms/Vectorize/vectorize_outer_loop_transpose_2d.mlir index 8f335e607df..63e98ab795d 100644 --- a/mlir/test/Transforms/Vectorize/vectorize_outer_loop_transpose_2d.mlir +++ b/mlir/test/Transforms/Vectorize/vectorize_outer_loop_transpose_2d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=0 --test-fastest-varying=2 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=0 --test-fastest-varying=2 | FileCheck %s // Permutation maps used in vectorization. // CHECK: #[[map_proj_d0d1d2_d2d0:map[0-9]+]] = (d0, d1, d2) -> (d2, d0) diff --git a/mlir/test/Transforms/Vectorize/vectorize_transpose_2d.mlir b/mlir/test/Transforms/Vectorize/vectorize_transpose_2d.mlir index 3e4e5ade50f..280ded81d2f 100644 --- a/mlir/test/Transforms/Vectorize/vectorize_transpose_2d.mlir +++ b/mlir/test/Transforms/Vectorize/vectorize_transpose_2d.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=0 --test-fastest-varying=1 | FileCheck %s +// RUN: mlir-opt %s -affine-vectorize -virtual-vector-size 32 -virtual-vector-size 256 --test-fastest-varying=0 --test-fastest-varying=1 | FileCheck %s // Permutation maps used in vectorization. // CHECK-DAG: #[[map_proj_d0d1d2_d2d1:map[0-9]+]] = (d0, d1, d2) -> (d2, d1) diff --git a/mlir/test/Transforms/dma-generate.mlir b/mlir/test/Transforms/dma-generate.mlir index 99fa581c026..19c7a637e4d 100644 --- a/mlir/test/Transforms/dma-generate.mlir +++ b/mlir/test/Transforms/dma-generate.mlir @@ -1,5 +1,5 @@ -// RUN: mlir-opt %s -split-input-file -dma-generate -dma-skip-non-unit-stride-loops -verify | FileCheck %s -// RUN: mlir-opt %s -split-input-file -dma-generate -dma-fast-mem-capacity=16 -dma-fast-mem-space=2 | FileCheck %s --check-prefix FAST-MEM-16KB +// RUN: mlir-opt %s -split-input-file -affine-dma-generate -dma-skip-non-unit-stride-loops -verify | FileCheck %s +// RUN: mlir-opt %s -split-input-file -affine-dma-generate -dma-fast-mem-capacity=16 -dma-fast-mem-space=2 | FileCheck %s --check-prefix FAST-MEM-16KB // We run most test cases with -dma-skip-non-unit-stride-loops to allow testing // DMA generation at inner levels easily - since the DMA generation would diff --git a/mlir/test/Transforms/loop-fusion.mlir b/mlir/test/Transforms/loop-fusion.mlir index 91b0d040890..4a5eebb4dd8 100644 --- a/mlir/test/Transforms/loop-fusion.mlir +++ b/mlir/test/Transforms/loop-fusion.mlir @@ -1,5 +1,5 @@ -// RUN: mlir-opt %s -loop-fusion -split-input-file -verify | FileCheck %s -// RUN: mlir-opt %s -loop-fusion -fusion-maximal -split-input-file -verify | FileCheck %s --check-prefix=MAXIMAL +// RUN: mlir-opt %s -affine-loop-fusion -split-input-file -verify | FileCheck %s +// RUN: mlir-opt %s -affine-loop-fusion -fusion-maximal -split-input-file -verify | FileCheck %s --check-prefix=MAXIMAL // TODO(andydavis) Add more tests: // *) Add nested fusion test cases when non-constant loop bound support is diff --git a/mlir/test/Transforms/loop-invariant-code-motion.mlir b/mlir/test/Transforms/loop-invariant-code-motion.mlir index f2276d8d83c..af9560bf0f8 100644 --- a/mlir/test/Transforms/loop-invariant-code-motion.mlir +++ b/mlir/test/Transforms/loop-invariant-code-motion.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -loop-invariant-code-motion -split-input-file -verify | FileCheck %s +// RUN: mlir-opt %s -affine-loop-invariant-code-motion -split-input-file -verify | FileCheck %s func @nested_loops_both_having_invariant_code() { %m = alloc() : memref<10xf32> diff --git a/mlir/test/Transforms/loop-tiling.mlir b/mlir/test/Transforms/loop-tiling.mlir index c65f3ae8be9..4686ff5bdb9 100644 --- a/mlir/test/Transforms/loop-tiling.mlir +++ b/mlir/test/Transforms/loop-tiling.mlir @@ -1,5 +1,5 @@ -// RUN: mlir-opt %s -split-input-file -loop-tile -tile-size=32 | FileCheck %s -// RUN: mlir-opt %s -split-input-file -loop-tile -tile-cache-size=512 | FileCheck %s --check-prefix=MODEL +// RUN: mlir-opt %s -split-input-file -affine-loop-tile -tile-size=32 | FileCheck %s +// RUN: mlir-opt %s -split-input-file -affine-loop-tile -tile-cache-size=512 | FileCheck %s --check-prefix=MODEL // ----- diff --git a/mlir/test/Transforms/pipeline-data-transfer.mlir b/mlir/test/Transforms/pipeline-data-transfer.mlir index 9fafab6c4e6..30e6be82e2a 100644 --- a/mlir/test/Transforms/pipeline-data-transfer.mlir +++ b/mlir/test/Transforms/pipeline-data-transfer.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -pipeline-data-transfer | FileCheck %s +// RUN: mlir-opt %s -affine-pipeline-data-transfer | FileCheck %s // CHECK-DAG: [[MOD_2:#map[0-9]+]] = (d0) -> (d0 mod 2) // CHECK-DAG: [[FLOOR_MOD_2:#map[0-9]+]] = (d0) -> ((d0 floordiv 4) mod 2) diff --git a/mlir/test/Transforms/slicing_utils.mlir b/mlir/test/Transforms/slicing_utils.mlir index 79b8771d946..07e1a509987 100644 --- a/mlir/test/Transforms/slicing_utils.mlir +++ b/mlir/test/Transforms/slicing_utils.mlir @@ -1,6 +1,6 @@ -// RUN: mlir-opt %s -vectorizer-test -forward-slicing=true 2>&1 | FileCheck %s --check-prefix=FWD -// RUN: mlir-opt %s -vectorizer-test -backward-slicing=true 2>&1 | FileCheck %s --check-prefix=BWD -// RUN: mlir-opt %s -vectorizer-test -slicing=true 2>&1 | FileCheck %s --check-prefix=FWDBWD +// RUN: mlir-opt %s -affine-vectorizer-test -forward-slicing=true 2>&1 | FileCheck %s --check-prefix=FWD +// RUN: mlir-opt %s -affine-vectorizer-test -backward-slicing=true 2>&1 | FileCheck %s --check-prefix=BWD +// RUN: mlir-opt %s -affine-vectorizer-test -slicing=true 2>&1 | FileCheck %s --check-prefix=FWDBWD /// 1 2 3 4 /// |_______| |______| diff --git a/mlir/test/Transforms/unroll-jam.mlir b/mlir/test/Transforms/unroll-jam.mlir index 6ea152f48d1..1d04792ff8b 100644 --- a/mlir/test/Transforms/unroll-jam.mlir +++ b/mlir/test/Transforms/unroll-jam.mlir @@ -1,4 +1,4 @@ -// RUN: mlir-opt %s -loop-unroll-jam -unroll-jam-factor=2 | FileCheck %s +// RUN: mlir-opt %s -affine-loop-unroll-jam -unroll-jam-factor=2 | FileCheck %s // CHECK-DAG: [[MAP_PLUS_1:#map[0-9]+]] = (d0) -> (d0 + 1) // CHECK-DAG: [[M1:#map[0-9]+]] = ()[s0] -> (s0 + 8) diff --git a/mlir/test/Transforms/unroll.mlir b/mlir/test/Transforms/unroll.mlir index 9fd00886b3f..5dc6637cd7f 100644 --- a/mlir/test/Transforms/unroll.mlir +++ b/mlir/test/Transforms/unroll.mlir @@ -1,7 +1,7 @@ -// RUN: mlir-opt %s -loop-unroll -unroll-full | FileCheck %s --check-prefix UNROLL-FULL -// RUN: mlir-opt %s -loop-unroll -unroll-full -unroll-full-threshold=2 | FileCheck %s --check-prefix SHORT -// RUN: mlir-opt %s -loop-unroll -unroll-factor=4 | FileCheck %s --check-prefix UNROLL-BY-4 -// RUN: mlir-opt %s -loop-unroll -unroll-factor=1 | FileCheck %s --check-prefix UNROLL-BY-1 +// RUN: mlir-opt %s -affine-loop-unroll -unroll-full | FileCheck %s --check-prefix UNROLL-FULL +// RUN: mlir-opt %s -affine-loop-unroll -unroll-full -unroll-full-threshold=2 | FileCheck %s --check-prefix SHORT +// RUN: mlir-opt %s -affine-loop-unroll -unroll-factor=4 | FileCheck %s --check-prefix UNROLL-BY-4 +// RUN: mlir-opt %s -affine-loop-unroll -unroll-factor=1 | FileCheck %s --check-prefix UNROLL-BY-1 // UNROLL-FULL-DAG: [[MAP0:#map[0-9]+]] = (d0) -> (d0 + 1) // UNROLL-FULL-DAG: [[MAP1:#map[0-9]+]] = (d0) -> (d0 + 2) |
