From a53b7db77a4bc1f6771ee04026ae13c843d77518 Mon Sep 17 00:00:00 2001 From: Yu-Zhewen Date: Fri, 29 Nov 2024 15:58:57 +0000 Subject: [PATCH] renaming --- .../samples/matmul_pack_peel_objectfifo.mlir | 2 +- ...ToNpu.cpp => AMDAIEControlCodeLowering.cpp} | 13 +++++++------ ...pyNd.cpp => AMDAIENpuDmaToHalfDmaCpyNd.cpp} | 18 +++++++++--------- .../iree-amd-aie/Transforms/CMakeLists.txt | 4 ++-- .../iree-amd-aie/Transforms/PassDetail.h | 4 ++-- .../AMD-AIE/iree-amd-aie/Transforms/Passes.cpp | 4 ++-- .../AMD-AIE/iree-amd-aie/Transforms/Passes.h | 10 +++++----- .../AMD-AIE/iree-amd-aie/Transforms/Passes.td | 18 +++++++++--------- .../Transforms/test/CMakeLists.txt | 4 ++-- ...e_to_npu.mlir => controlcode_lowering.mlir} | 2 +- ...nd.mlir => npu_dma_to_half_dma_cpy_nd.mlir} | 2 +- 11 files changed, 41 insertions(+), 40 deletions(-) rename compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/{AMDAIEControlCodeToNpu.cpp => AMDAIEControlCodeLowering.cpp} (96%) rename compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/{AMDAIEControlCodeToHalfDmaCpyNd.cpp => AMDAIENpuDmaToHalfDmaCpyNd.cpp} (90%) rename compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/{controlcode_to_npu.mlir => controlcode_lowering.mlir} (99%) rename compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/{controlcode_to_half_dma_cpy_nd.mlir => npu_dma_to_half_dma_cpy_nd.mlir} (99%) diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Test/samples/matmul_pack_peel_objectfifo.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Test/samples/matmul_pack_peel_objectfifo.mlir index 3165f6ec1..3365e8e0c 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Test/samples/matmul_pack_peel_objectfifo.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Test/samples/matmul_pack_peel_objectfifo.mlir @@ -1,6 +1,6 @@ // This pipeline is obtained by going into Passes.cpp, and dumping the pass pipeline (at the end of addAMDAIEObjectFifoLoweringPasses) using `passManager.dump()`. This test is included, as it can be useful to have a reference in IR of all the passes that are run. -// RUN: iree-opt --pass-pipeline="builtin.module(fold-memref-alias-ops,iree-amdaie-distribute-l1-allocations,iree-amdaie-convert-to-dma,iree-amdaie-normalize-loop-bounds,iree-amdaie-insert-cores,iree-amdaie-localize-logicalobjectfifo,cse,iree-amdaie-distribute-cores-and-objectfifos,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-split-logical-objectfifos-for-connection-reuse,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-assign-tiles,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-to-circular-dma,func.func(iree-amdaie-create-aie-workgroup),cse,iree-amdaie-dma-cse,iree-amdaie-hoist-logical-objectfifo,iree-amdaie-canonicalize-doubly-strided-op{fold-single-dims=false},iree-amdaie-flatten-logicalobjectfifo,iree-amdaie-assign-logical-objectfifo-depth{l1-buffer-depth=2 l2-buffer-depth=2 l3-buffer-depth=1},iree-amdaie-access-to-acquire-release,iree-amdaie-none-access-to-temporary-buffer,iree-amdaie-assign-connection-types,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-composition{only-zero-stride-on-outer-dim=true},cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-cse,iree-amdaie-assign-npu-dma-bd-ids,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-controlcode-loop-unroll,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-cse,iree-amdaie-canonicalize-doubly-strided-op{fold-single-dims=false},canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-convert-core-forall-to-for,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-assign-channels,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-objfifo-bufferization,iree-amdaie-connection-to-flow,iree-amdaie-assign-packet-ids,iree-amdaie-controlcode-to-half-dma-cpy-nd,iree-amdaie-controlcode-to-npu,iree-amdaie-controlcode-to-transaction,iree-amdaie-acquire-release-to-use-lock,iree-amdaie-canonicalize-npu-dma-cpy-nd{nb-dimensions=4},canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-sink-into-core,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-lower-to-aie,iree-amdaie-remove-memoryspace)" --split-input-file %s | FileCheck %s +// RUN: iree-opt --pass-pipeline="builtin.module(fold-memref-alias-ops,iree-amdaie-distribute-l1-allocations,iree-amdaie-convert-to-dma,iree-amdaie-normalize-loop-bounds,iree-amdaie-insert-cores,iree-amdaie-localize-logicalobjectfifo,cse,iree-amdaie-distribute-cores-and-objectfifos,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-split-logical-objectfifos-for-connection-reuse,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-assign-tiles,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-to-circular-dma,func.func(iree-amdaie-create-aie-workgroup),cse,iree-amdaie-dma-cse,iree-amdaie-hoist-logical-objectfifo,iree-amdaie-canonicalize-doubly-strided-op{fold-single-dims=false},iree-amdaie-flatten-logicalobjectfifo,iree-amdaie-assign-logical-objectfifo-depth{l1-buffer-depth=2 l2-buffer-depth=2 l3-buffer-depth=1},iree-amdaie-access-to-acquire-release,iree-amdaie-none-access-to-temporary-buffer,iree-amdaie-assign-connection-types,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-composition{only-zero-stride-on-outer-dim=true},cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-cse,iree-amdaie-assign-npu-dma-bd-ids,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-controlcode-loop-unroll,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-dma-cse,iree-amdaie-canonicalize-doubly-strided-op{fold-single-dims=false},canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-convert-core-forall-to-for,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-assign-channels,cse,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-objfifo-bufferization,iree-amdaie-connection-to-flow,iree-amdaie-assign-packet-ids,iree-amdaie-npu-dma-to-half-dma-cpy-nd,iree-amdaie-controlcode-lowering,iree-amdaie-controlcode-to-transaction,iree-amdaie-acquire-release-to-use-lock,iree-amdaie-canonicalize-npu-dma-cpy-nd{nb-dimensions=4},canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-sink-into-core,canonicalize{ max-iterations=10 max-num-rewrites=-1 region-simplify=normal test-convergence=false top-down=true},iree-amdaie-lower-to-aie,iree-amdaie-remove-memoryspace)" --split-input-file %s | FileCheck %s diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToNpu.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeLowering.cpp similarity index 96% rename from compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToNpu.cpp rename to compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeLowering.cpp index dca1bdb48..c650f8196 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToNpu.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeLowering.cpp @@ -14,7 +14,7 @@ #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" -#define DEBUG_TYPE "iree-amdaie-controlcode-to-npu" +#define DEBUG_TYPE "iree-amdaie-controlcode-lowering" namespace mlir::iree_compiler::AMDAIE { @@ -216,8 +216,9 @@ struct HalfDmaCpyNdToNpuConverter final }; namespace { -class AMDAIEControlCodeToNpuPass - : public impl::AMDAIEControlCodeToNpuBase { +class AMDAIEControlCodeLoweringPass + : public impl::AMDAIEControlCodeLoweringBase< + AMDAIEControlCodeLoweringPass> { public: void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); @@ -225,7 +226,7 @@ class AMDAIEControlCodeToNpuPass void runOnOperation() override; }; -void AMDAIEControlCodeToNpuPass::runOnOperation() { +void AMDAIEControlCodeLoweringPass::runOnOperation() { Operation *parentOp = getOperation(); MLIRContext *context = &getContext(); @@ -254,8 +255,8 @@ void AMDAIEControlCodeToNpuPass::runOnOperation() { } // namespace -std::unique_ptr createAMDAIEControlCodeToNpuPass() { - return std::make_unique(); +std::unique_ptr createAMDAIEControlCodeLoweringPass() { + return std::make_unique(); } } // namespace mlir::iree_compiler::AMDAIE diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToHalfDmaCpyNd.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIENpuDmaToHalfDmaCpyNd.cpp similarity index 90% rename from compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToHalfDmaCpyNd.cpp rename to compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIENpuDmaToHalfDmaCpyNd.cpp index 436b751bd..fa16b3c2a 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIEControlCodeToHalfDmaCpyNd.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/AMDAIENpuDmaToHalfDmaCpyNd.cpp @@ -14,11 +14,11 @@ #include "mlir/Transforms/DialectConversion.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" -#define DEBUG_TYPE "iree-amdaie-controlcode-to-half-dma-cpy-nd" +#define DEBUG_TYPE "iree-amdaie-npu-dma-to-half-dma-cpy-nd" namespace mlir::iree_compiler::AMDAIE { -struct DmaCpyNdToHalfDmaCpyNdConverter final +struct NpuDmaToHalfDmaCpyNdConverter final : OpConversionPattern { using OpConversionPattern::OpConversionPattern; @@ -93,9 +93,9 @@ struct DmaCpyNdToHalfDmaCpyNdConverter final }; namespace { -class AMDAIEControlCodeToHalfDmaCpyNdPass - : public impl::AMDAIEControlCodeToHalfDmaCpyNdBase< - AMDAIEControlCodeToHalfDmaCpyNdPass> { +class AMDAIENpuDmaToHalfDmaCpyNdPass + : public impl::AMDAIENpuDmaToHalfDmaCpyNdBase< + AMDAIENpuDmaToHalfDmaCpyNdPass> { public: void getDependentDialects(DialectRegistry ®istry) const override { registry.insert(); @@ -103,14 +103,14 @@ class AMDAIEControlCodeToHalfDmaCpyNdPass void runOnOperation() override; }; -void AMDAIEControlCodeToHalfDmaCpyNdPass::runOnOperation() { +void AMDAIENpuDmaToHalfDmaCpyNdPass::runOnOperation() { Operation *parentOp = getOperation(); MLIRContext *context = &getContext(); RewritePatternSet patterns(context); ConversionTarget conversionTarget(*context); conversionTarget.addLegalDialect(); conversionTarget.addIllegalOp(); - patterns.insert(context); + patterns.insert(context); if (failed(applyPartialConversion(parentOp, conversionTarget, std::move(patterns)))) { return signalPassFailure(); @@ -119,8 +119,8 @@ void AMDAIEControlCodeToHalfDmaCpyNdPass::runOnOperation() { } // namespace -std::unique_ptr createAMDAIEControlCodeToHalfDmaCpyNdPass() { - return std::make_unique(); +std::unique_ptr createAMDAIENpuDmaToHalfDmaCpyNdPass() { + return std::make_unique(); } } // namespace mlir::iree_compiler::AMDAIE diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/CMakeLists.txt b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/CMakeLists.txt index 173276154..39e496baa 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/CMakeLists.txt +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/CMakeLists.txt @@ -60,8 +60,7 @@ iree_cc_library( "AMDAIEConnectionToFlow.cpp" "AMDAIEConvertToDma.cpp" "AMDAIEControlCodeForallToFor.cpp" - "AMDAIEControlCodeToHalfDmaCpyNd.cpp" - "AMDAIEControlCodeToNpu.cpp" + "AMDAIEControlCodeLowering.cpp" "AMDAIEControlCodeLoopUnroll.cpp" "AMDAIEControlCodeToTransaction.cpp" "AMDAIEConvertCoreForallToFor.cpp" @@ -96,6 +95,7 @@ iree_cc_library( "AMDAIEMapForallToCores.cpp" "AMDAIENoneAccessToTemporaryBuffer.cpp" "AMDAIENormalizeLoopBounds.cpp" + "AMDAIENpuDmaToHalfDmaCpyNd.cpp" "AMDAIEObjFifoBufferization.cpp" "AMDAIEPackAndTranspose.cpp" "AMDAIEPad.cpp" diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/PassDetail.h b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/PassDetail.h index 98b7253bf..f921f6d47 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/PassDetail.h +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/PassDetail.h @@ -37,8 +37,7 @@ namespace mlir::iree_compiler::AMDAIE { #define GEN_PASS_DEF_AMDAIECONNECTIONTOFLOW #define GEN_PASS_DEF_AMDAIECONTROLCODEFORALLTOFOR #define GEN_PASS_DEF_AMDAIECONTROLCODELOOPUNROLL -#define GEN_PASS_DEF_AMDAIECONTROLCODETOHALFDMACPYND -#define GEN_PASS_DEF_AMDAIECONTROLCODETONPU +#define GEN_PASS_DEF_AMDAIECONTROLCODELOWERING #define GEN_PASS_DEF_AMDAIECONTROLCODETOTRANSACTION #define GEN_PASS_DEF_AMDAIECONVERTCOREFORALLTOFOR #define GEN_PASS_DEF_AMDAIECREATEAIEWORKGROUP @@ -74,6 +73,7 @@ namespace mlir::iree_compiler::AMDAIE { #define GEN_PASS_DEF_AMDAIEMAPFORALLTOCORES #define GEN_PASS_DEF_AMDAIENONEACCESSTOTEMPORARYBUFFER #define GEN_PASS_DEF_AMDAIENORMALIZELOOPBOUNDS +#define GEN_PASS_DEF_AMDAIENPUDMATOHALFDMACPYND #define GEN_PASS_DEF_AMDAIEOBJFIFOBUFFERIZATION #define GEN_PASS_DEF_AMDAIEPACKANDTRANSPOSE #define GEN_PASS_DEF_AMDAIECONVERTTODMA diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp index 3b5d4d6bf..becd1333b 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.cpp @@ -664,8 +664,8 @@ void addAMDAIEObjectFifoLoweringPasses( passManager.addPass(createAMDAIEConnectionToFlowPass()); passManager.addPass(createAMDAIEAssignPacketIdsPass()); - passManager.addPass(createAMDAIEControlCodeToHalfDmaCpyNdPass()); - passManager.addPass(createAMDAIEControlCodeToNpuPass()); + passManager.addPass(createAMDAIENpuDmaToHalfDmaCpyNdPass()); + passManager.addPass(createAMDAIEControlCodeLoweringPass()); passManager.addPass(createAMDAIEControlCodeToTransactionPass()); addAMDAIEToAIEPasses(passManager, insertLoopAroundCoreBlock); diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.h b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.h index 67cb507fb..ba2e600e0 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.h +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.h @@ -121,12 +121,9 @@ std::unique_ptr createAMDAIEControlCodeForallToForPass(); /// Pass to unroll the loops within the control code regions. std::unique_ptr createAMDAIEControlCodeLoopUnrollPass(); -/// Pass to convert control code DMA operations into HalfDmaCpyNd -std::unique_ptr createAMDAIEControlCodeToHalfDmaCpyNdPass(); - /// Pass to convert control code HalfDmaCpyNd into NPU WriteBd, AddressPatch, -/// PushToQueue operations -std::unique_ptr createAMDAIEControlCodeToNpuPass(); +/// PushToQueue operations. +std::unique_ptr createAMDAIEControlCodeLoweringPass(); /// Pass to convert control code into a transaction binary. std::unique_ptr createAMDAIEControlCodeToTransactionPass( @@ -258,6 +255,9 @@ std::unique_ptr createAMDAIENoneAccessToTemporaryBufferPass(); /// Normalize the loop bounds of `scf.for` and `scf.forall`. std::unique_ptr createAMDAIENormalizeLoopBoundsPass(); +/// Pass to convert control code DMA operations into HalfDmaCpyNd. +std::unique_ptr createAMDAIENpuDmaToHalfDmaCpyNdPass(); + /// Create a pass to bufferize logical objectFifos. std::unique_ptr createAMDAIEObjFifoBufferizationPass(); diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.td b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.td index dafad1f27..8e0aab5ec 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.td +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.td @@ -165,16 +165,10 @@ def AMDAIEControlCodeLoopUnroll : let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIEControlCodeLoopUnrollPass()"; } -def AMDAIEControlCodeToHalfDmaCpyNd : - Pass<"iree-amdaie-controlcode-to-half-dma-cpy-nd", ""> { - let summary = "Lower control code ops to HalfDmaCpyNd operations"; - let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIEControlCodeToHalfDmaCpyNdPass()"; -} - -def AMDAIEControlCodeToNpu : - Pass<"iree-amdaie-controlcode-to-npu", ""> { +def AMDAIEControlCodeLowering : + Pass<"iree-amdaie-controlcode-lowering", ""> { let summary = "Lower control code ops to the most basic NPU write/sync/patch instructions"; - let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIEControlCodeToNpuPass()"; + let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIEControlCodeLoweringPass()"; } @@ -543,6 +537,12 @@ def AMDAIENormalizeLoopBounds : let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIENormalizeLoopBoundsPass()"; } +def AMDAIENpuDmaToHalfDmaCpyNd : + Pass<"iree-amdaie-npu-dma-to-half-dma-cpy-nd", ""> { + let summary = "Lower DmaCpNd ops to HalfDmaCpyNd ops"; + let constructor = "mlir::iree_compiler::AMDAIE::createAMDAIENpuDmaToHalfDmaCpyNdPass()"; +} + def AMDAIEObjFifoBufferization : Pass<"iree-amdaie-objfifo-bufferization", ""> { let summary = "Bufferize logical objectFifos."; diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt index 11d5a1ed7..941d065cf 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/CMakeLists.txt @@ -26,8 +26,7 @@ iree_lit_test_suite( "connection_to_flow.mlir" "controlcode_forall_to_for.mlir" "controlcode_loop_unrolling.mlir" - "controlcode_to_half_dma_cpy_nd.mlir" - "controlcode_to_npu.mlir" + "controlcode_lowering.mlir" "controlcode_to_transaction.mlir" "convert_core_forall_to_for.mlir" "create_aie_workgroup.mlir" @@ -65,6 +64,7 @@ iree_lit_test_suite( "map_forall_to_cores.mlir" "none_access_to_temporary_buffer.mlir" "normalize_loop_bounds.mlir" + "npu_dma_to_half_dma_cpy_nd.mlir" "obj_fifo_bufferization.mlir" "pack_and_transpose_level1.mlir" "pack_and_transpose_level2.mlir" diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_npu.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_lowering.mlir similarity index 99% rename from compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_npu.mlir rename to compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_lowering.mlir index 966e180f5..416288c9d 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_npu.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_lowering.mlir @@ -1,4 +1,4 @@ -// RUN: iree-opt --pass-pipeline="builtin.module(iree-amdaie-controlcode-to-npu)" --split-input-file --verify-diagnostics %s | FileCheck %s +// RUN: iree-opt --pass-pipeline="builtin.module(iree-amdaie-controlcode-lowering)" --split-input-file --verify-diagnostics %s | FileCheck %s // expected-error @+1 {{op has no AMDAIEDevice in the target attribute configuration}} module { diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_half_dma_cpy_nd.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/npu_dma_to_half_dma_cpy_nd.mlir similarity index 99% rename from compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_half_dma_cpy_nd.mlir rename to compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/npu_dma_to_half_dma_cpy_nd.mlir index 6373c1e0e..6e16c7a71 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/controlcode_to_half_dma_cpy_nd.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/npu_dma_to_half_dma_cpy_nd.mlir @@ -1,4 +1,4 @@ -// RUN: iree-opt --pass-pipeline="builtin.module(iree-amdaie-controlcode-to-half-dma-cpy-nd)" --split-input-file --verify-diagnostics %s | FileCheck %s +// RUN: iree-opt --pass-pipeline="builtin.module(iree-amdaie-npu-dma-to-half-dma-cpy-nd)" --split-input-file --verify-diagnostics %s | FileCheck %s // CHECK-LABEL: @no_amdaie_device module {