From 0ceba86874c359a23d81a234f57c27d01f45d905 Mon Sep 17 00:00:00 2001 From: James Newling Date: Wed, 28 Aug 2024 11:45:48 -0700 Subject: [PATCH] squashed commit --- .../plugins/target/AMD-AIE/aie/AIEDialect.cpp | 5 ++- .../AMD-AIE/iree-amd-aie/IR/AMDAIEDialect.cpp | 23 ++++++++++++-- .../iree-amd-aie/IR/test/canonicalize.mlir | 31 +++++++++++++++++++ .../test/convert_core_forall_to_for.mlir | 30 +++++++++++------- .../Transforms/test/core_loop_unroll.mlir | 6 ++-- .../iree-amd-aie/Transforms/test/test.mlir | 12 +++++++ 6 files changed, 89 insertions(+), 18 deletions(-) create mode 100644 compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/test.mlir diff --git a/compiler/plugins/target/AMD-AIE/aie/AIEDialect.cpp b/compiler/plugins/target/AMD-AIE/aie/AIEDialect.cpp index 353ed177f..af05998aa 100644 --- a/compiler/plugins/target/AMD-AIE/aie/AIEDialect.cpp +++ b/compiler/plugins/target/AMD-AIE/aie/AIEDialect.cpp @@ -148,13 +148,16 @@ void AIEDialect::printType(Type type, DialectAsmPrinter &printer) const { /// without this, canonicalize/cse/etc will lift eg constants out of core ops /// causing eg lower-to-aie to fail to converge +/// +/// There's no way to do this is tablegen, so unfortunately it must be hidden +/// away here struct AIEDialectFoldInterface : DialectFoldInterface { using DialectFoldInterface::DialectFoldInterface; /// Registered hook to check if the given region, which is attached to an /// operation that is *not* isolated from above, should be used when /// materializing constants. - bool shouldMaterializeInto(Region *region) const final override { + bool shouldMaterializeInto(Region *region) const final { // If this is an AIE::CoreOp region, then insert into it. return isa(region->getParentOp()); } diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/AMDAIEDialect.cpp b/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/AMDAIEDialect.cpp index 7d6093e70..6e51fb981 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/AMDAIEDialect.cpp +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/AMDAIEDialect.cpp @@ -8,8 +8,9 @@ #include "iree-amd-aie/IR/AMDAIEAttrs.h" #include "iree-amd-aie/IR/AMDAIEDialect.cpp.inc" -#include "iree-amd-aie/IR/AMDAIETypes.h" -#include "mlir/IR/DialectImplementation.h" +#include "iree-amd-aie/IR/AMDAIEOps.h" +#include "mlir/Interfaces/FoldInterfaces.h" +#include "mlir/Transforms/InliningUtils.h" namespace mlir::iree_compiler::AMDAIE { @@ -24,11 +25,29 @@ struct AMDAIEDialectOpAsmInterface : public OpAsmDialectInterface { } }; +/// without this, canonicalize/cse/etc will lift eg constants out of core ops +/// at every opportunity, causing problems when lowering to AIE. +/// +/// There's no way to do this is tablegen, so unfortunately it must be hidden +/// away here +struct AMDAIEDialectFoldInterface : DialectFoldInterface { + using DialectFoldInterface::DialectFoldInterface; + + /// Registered hook to check if the given region, which is attached to an + /// operation that is *not* isolated from above, should be used when + /// materializing constants. + bool shouldMaterializeInto(Region *region) const final { + // If this is an AMDAIE::CoreOp region, then insert into it. + return isa(region->getParentOp()); + } +}; + void AMDAIEDialect::initialize() { initializeAMDAIEAttrs(); initializeAMDAIEOps(); initializeAMDAIETypes(); addInterfaces(); + addInterfaces(); } } // namespace mlir::iree_compiler::AMDAIE diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/test/canonicalize.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/test/canonicalize.mlir index 281912c29..a7442359b 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/test/canonicalize.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/IR/test/canonicalize.mlir @@ -24,3 +24,34 @@ func.func @logicalobjectfifo_from_memref(%arg0: memref<1x1x8x16xi32, 1>) { %1 = amdaie.dma_cpy_nd(%0[][][], %0[][][]) : (!amdaie.logicalobjectfifo>, !amdaie.logicalobjectfifo>) return } + +// ----- + + +// A test of AMDAIEDialectFoldInterface. Don't move ops out of cores. + +// CHECK-LABEL: func @isolated_cores +// CHECK-NOT: arith.constant 3 +// CHECK: amdaie.core +// CHECK: arith.constant 3 +// CHECK: amdaie.core +// CHECK: arith.constant 3 +func.func @isolated_cores() { + %c0 = arith.constant 0 : index + %c1 = arith.constant 1 : index + %tile_0 = amdaie.tile(%c0, %c0) + %tile_1 = amdaie.tile(%c0, %c1) + %0 = amdaie.core(%tile_0, in : [], out : []) { + %c3 = arith.constant 3 : index + %alloc = memref.alloc() : memref<2x2xindex> + linalg.fill ins(%c3 : index) outs(%alloc : memref<2x2xindex>) + amdaie.end + } + %1 = amdaie.core(%tile_1, in : [], out : []) { + %c3 = arith.constant 3 : index + %alloc = memref.alloc() : memref<2x2xindex> + linalg.fill ins(%c3 : index) outs(%alloc : memref<2x2xindex>) + amdaie.end + } + return +} diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/convert_core_forall_to_for.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/convert_core_forall_to_for.mlir index bf1072159..39be67374 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/convert_core_forall_to_for.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/convert_core_forall_to_for.mlir @@ -5,8 +5,8 @@ // CHECK-DAG: %[[C1:.+]] = arith.constant 1 : index // CHECK-DAG: %[[C2:.+]] = arith.constant 2 : index // CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index -// CHECK: amdaie.core -// CHECK-DAG: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C4]] step %[[C1]] { +// CHECK-DAG: amdaie.core +// CHECK: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C4]] step %[[C1]] { // CHECK-DAG: %[[REM:.+]] = arith.remsi %[[ARG0]], %[[C2]] : index // CHECK-DAG: %[[DIV:.+]] = arith.divsi %[[ARG0]], %[[C2]] : index // CHECK-DAG: func.call @callee(%[[DIV]], %[[REM]]) : (index, index) -> () @@ -14,8 +14,10 @@ module @test_single { func.func private @callee(%i: index, %j: index) %c0 = arith.constant 0 : index %c2 = arith.constant 2 : index - %tile_0_2 = amdaie.tile(%c0, %c2) - %core_0_2 = amdaie.core(%tile_0_2, in : [], out : []) { + %c7 = arith.constant 7 : index + %c11 = arith.constant 11 : index + %tile_7_11 = amdaie.tile(%c7, %c11) + %core_7_11 = amdaie.core(%tile_7_11, in : [], out : []) { scf.forall (%i, %j) in (2, 2) { func.call @callee(%i, %j) : (index, index) -> () } @@ -31,8 +33,8 @@ module @test_single { // CHECK-DAG: %[[C2:.+]] = arith.constant 2 : index // CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index // CHECK-DAG: %[[C16:.+]] = arith.constant 16 : index -// CHECK: amdaie.core -// CHECK-DAG: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C4]] step %[[C1]] { +// CHECK-DAG: amdaie.core +// CHECK: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C4]] step %[[C1]] { // CHECK-DAG: %[[REM:.+]] = arith.remsi %[[ARG0]], %[[C2]] : index // CHECK-DAG: %[[DIV:.+]] = arith.divsi %[[ARG0]], %[[C2]] : index // CHECK-DAG: func.call @callee(%[[DIV]], %[[REM]]) : (index, index) -> () @@ -44,8 +46,10 @@ module @test_multi { func.func private @callee(%i: index, %j: index) %c0 = arith.constant 0 : index %c2 = arith.constant 2 : index - %tile_0_2 = amdaie.tile(%c0, %c2) - %core_0_2 = amdaie.core(%tile_0_2, in : [], out : []) { + %c7 = arith.constant 7 : index + %c11 = arith.constant 11 : index + %tile_7_11 = amdaie.tile(%c7, %c11) + %core_7_11 = amdaie.core(%tile_7_11, in : [], out : []) { scf.forall (%i, %j) in (2, 2) { func.call @callee(%i, %j) : (index, index) -> () } @@ -64,8 +68,8 @@ module @test_multi { // CHECK-DAG: %[[C2:.+]] = arith.constant 2 : index // CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index // CHECK-DAG: %[[C16:.+]] = arith.constant 16 : index -// CHECK: amdaie.core -// CHECK-DAG: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C16]] step %[[C1]] { +// CHECK-DAG: amdaie.core +// CHECK: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C16]] step %[[C1]] { // CHECK-DAG: %[[REM0:.+]] = arith.remsi %[[ARG0]], %[[C4]] : index // CHECK-DAG: %[[DIV0:.+]] = arith.divsi %[[ARG0]], %[[C4]] : index // CHECK-DAG: scf.for %[[ARG1:.+]] = %[[C0]] to %[[C4]] step %[[C1]] { @@ -76,8 +80,10 @@ module @test_nested { func.func private @callee(%i: index, %j: index, %k: index, %l: index) %c0 = arith.constant 0 : index %c2 = arith.constant 2 : index - %tile_0_2 = amdaie.tile(%c0, %c2) - %core_0_2 = amdaie.core(%tile_0_2, in : [], out : []) { + %c7 = arith.constant 7 : index + %c11 = arith.constant 11 : index + %tile_7_11 = amdaie.tile(%c7, %c11) + %core_7_11 = amdaie.core(%tile_7_11, in : [], out : []) { scf.forall (%i, %j) in (4, 4) { scf.forall (%k, %l) in (2, 2) { func.call @callee(%i, %j, %k, %l) : (index, index, index, index) -> () diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/core_loop_unroll.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/core_loop_unroll.mlir index d93f9c82e..4bb7ccd22 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/core_loop_unroll.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/core_loop_unroll.mlir @@ -6,7 +6,7 @@ // CHECK-DAG: %[[C0:.+]] = arith.constant 0 : index // CHECK-DAG: %[[C1:.+]] = arith.constant 1 : index // CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index -// CHECK: amdaie.core +// CHECK-DAG: amdaie.core // CHECK: scf.for %{{.+}} = %[[C0]] to %[[C4]] step %[[C1]] { // CHECK: amdaie.logicalobjectfifo.acquire // CHECK: amdaie.logicalobjectfifo.access @@ -54,7 +54,7 @@ module attributes {hal.executable.target = #executable_target_amdaie_xclbin_fb} // CHECK-DAG: %[[C0:.+]] = arith.constant 0 : index // CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index // CHECK-DAG: %[[C8:.+]] = arith.constant 8 : index -// CHECK: amdaie.core +// CHECK-DAG: amdaie.core // CHECK: scf.for %{{.+}} = %[[C0]] to %[[C8]] step %[[C4]] { // CHECK: amdaie.logicalobjectfifo.acquire // CHECK: amdaie.logicalobjectfifo.access @@ -111,7 +111,7 @@ module attributes {hal.executable.target = #executable_target_amdaie_xclbin_fb} // CHECK-DAG: %[[C8:.+]] = arith.constant 8 : index // CHECK-DAG: %[[C17:.+]] = arith.constant 17 : index // CHECK-DAG: %[[C21:.+]] = arith.constant 21 : index -// CHECK: amdaie.core +// CHECK-DAG: amdaie.core // CHECK: scf.for %[[ARG0:.+]] = %[[C1]] to %[[C17]] step %[[C8]] { // CHECK: amdaie.logicalobjectfifo.acquire // CHECK: amdaie.logicalobjectfifo.access diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/test.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/test.mlir new file mode 100644 index 000000000..8f85cf767 --- /dev/null +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/test.mlir @@ -0,0 +1,12 @@ +module @test_single { + func.func private @callee(%i: index, %j: index) + %c0 = arith.constant 0 : index + %c2 = arith.constant 2 : index + %tile_0_2 = amdaie.tile(%c0, %c2) + %core_0_2 = amdaie.core(%tile_0_2, in : [], out : []) { + scf.forall (%i, %j) in (2, 2) { + func.call @callee(%i, %j) : (index, index) -> () + } + amdaie.end + } +}