From 1d96f8ad7425a3268d9b8d47f47b8de335b38722 Mon Sep 17 00:00:00 2001 From: yzhang93 Date: Wed, 28 Aug 2024 21:56:56 -0700 Subject: [PATCH] Some change --- build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh | 2 -- .../plugins/target/AMD-AIE/iree-amd-aie/Transforms/Passes.td | 2 +- tests/samples/matmul_elementwise_pack_peel_air_e2e.mlir | 2 +- tests/samples/matmul_pack_peel_air_e2e.mlir | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh b/build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh index 5abb56a24..6e6d912fe 100755 --- a/build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh +++ b/build_tools/ci/print_ir_aie2xclbin/print_ir_aie2xclbin.sh @@ -122,8 +122,6 @@ ${SOURCE_MLIR_FILE} \ --mlir-print-ir-after-all \ --mlir-print-ir-module-scope \ --mlir-disable-threading \ ---iree-amdaie-tile-pipeline=pad-pack \ ---iree-amdaie-lower-to-aie-pipeline=air \ -o ${OUTPUT}/test_artefact.vmfb \ --iree-amd-aie-show-invoked-commands" 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 a08fbde45..c1ec4c15c 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 @@ -322,7 +322,7 @@ def AMDAIELoweringStrategy : )}]>, Option<"useLowerToAIEPipeline", "use-lower-to-aie-pipeline", "mlir::iree_compiler::AMDAIE::LowerToAIEPassPipeline", - /*default=*/"mlir::iree_compiler::AMDAIE::LowerToAIEPassPipeline::AIR", + /*default=*/"mlir::iree_compiler::AMDAIE::LowerToAIEPassPipeline::ObjectFifo", "Lowering pass pipeline to use", [{::llvm::cl::values( clEnumValN(mlir::iree_compiler::AMDAIE::LowerToAIEPassPipeline::ObjectFifo, "objectFifo", diff --git a/tests/samples/matmul_elementwise_pack_peel_air_e2e.mlir b/tests/samples/matmul_elementwise_pack_peel_air_e2e.mlir index e2ac7dd5c..2f666db91 100644 --- a/tests/samples/matmul_elementwise_pack_peel_air_e2e.mlir +++ b/tests/samples/matmul_elementwise_pack_peel_air_e2e.mlir @@ -1,4 +1,4 @@ -// RUN: iree-compile --iree-hal-target-backends=amd-aie --compile-to=executable-sources %s | iree-opt --pass-pipeline="builtin.module(hal.executable(hal.executable.variant(iree-hal-translate-target-executable-variants{target=amd-aie})))" --iree-amdaie-tile-pipeline=pack-peel --iree-amdaie-lower-to-aie-pipeline=air --iree-amdaie-matmul-elementwise-fusion --split-input-file | FileCheck %s +// RUN: iree-compile --iree-hal-target-backends=amd-aie --compile-to=executable-sources %s | iree-opt --pass-pipeline="builtin.module(hal.executable(hal.executable.variant(iree-hal-translate-target-executable-variants{target=amd-aie})))" --iree-amdaie-lower-to-aie-pipeline=air --iree-amdaie-tile-pipeline=pack-peel --iree-amdaie-matmul-elementwise-fusion --split-input-file | FileCheck %s func.func @matmul_elementwise_i32(%lhs: tensor<1024x512xi32>, %rhs: tensor<512x1024xi32>, %ele: tensor<1024x1024xi32>) -> tensor<1024x1024xi32> { diff --git a/tests/samples/matmul_pack_peel_air_e2e.mlir b/tests/samples/matmul_pack_peel_air_e2e.mlir index d86645b48..e29ded73e 100644 --- a/tests/samples/matmul_pack_peel_air_e2e.mlir +++ b/tests/samples/matmul_pack_peel_air_e2e.mlir @@ -1,4 +1,4 @@ -// RUN: iree-compile --iree-hal-target-backends=amd-aie --compile-to=executable-sources %s | iree-opt --pass-pipeline="builtin.module(hal.executable(hal.executable.variant(iree-hal-translate-target-executable-variants{target=amd-aie})))" --iree-amdaie-tile-pipeline=pack-peel --iree-amdaie-lower-to-aie-pipeline=air --split-input-file | FileCheck %s +// RUN: iree-compile --iree-hal-target-backends=amd-aie --compile-to=executable-sources %s | iree-opt --pass-pipeline="builtin.module(hal.executable(hal.executable.variant(iree-hal-translate-target-executable-variants{target=amd-aie})))" --iree-amdaie-lower-to-aie-pipeline=air --iree-amdaie-tile-pipeline=pack-peel --split-input-file | FileCheck %s func.func @matmul_i8_i32(%lhs: tensor<32x16xi8>, %rhs: tensor<16x32xi8>) -> tensor<32x32xi32> {