Skip to content

Commit

Permalink
Bump IREE to 5318fce9dcc809b13420ab9ff22c4c4320e26746
Browse files Browse the repository at this point in the history
  • Loading branch information
@yzhang93
yzhang93 committed Nov 15, 2024
1 parent f07a535 commit cbda310
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
13 changes: 5 additions & 8 deletions compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/convert_core_forall_to_for.mlir
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
// CHECK-DAG: amdaie.core
// CHECK-DAG: %[[C0:.+]] = arith.constant 0 : index
// CHECK-DAG: %[[C1:.+]] = arith.constant 1 : index
// CHECK-DAG: %[[C2:.+]] = arith.constant 2 : index
// CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index
// CHECK: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C4]] step %[[C1]] {
// CHECK-DAG: %[[D:.+]]:2 = affine.delinearize_index %[[ARG0]] into (%[[C2]], %[[C2]]) : index, index
// CHECK-DAG: %[[D:.+]]:2 = affine.delinearize_index %[[ARG0]] into (2, 2) : index, index
// CHECK-DAG: func.call @callee(%[[D]]#0, %[[D]]#1) : (index, index) -> ()
module @test_single {
func.func private @callee(%i: index, %j: index)
Expand All @@ -30,14 +29,13 @@ module @test_single {
// CHECK-DAG: amdaie.core
// CHECK-DAG: %[[C0:.+]] = arith.constant 0 : index
// CHECK-DAG: %[[C1:.+]] = arith.constant 1 : index
// CHECK-DAG: %[[C2:.+]] = arith.constant 2 : index
// CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index
// CHECK-DAG: %[[C16:.+]] = arith.constant 16 : index
// CHECK: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C4]] step %[[C1]] {
// CHECK-DAG: %[[D:.+]]:2 = affine.delinearize_index %[[ARG0]] into (%[[C2]], %[[C2]]) : index, index
// CHECK-DAG: %[[D:.+]]:2 = affine.delinearize_index %[[ARG0]] into (2, 2) : index, index
// CHECK-DAG: func.call @callee(%[[D]]#0, %[[D]]#1) : (index, index) -> ()
// CHECK-DAG: scf.for %[[ARG1:.+]] = %[[C0]] to %[[C16]] step %[[C1]] {
// CHECK-DAG: %[[D:.+]]:2 = affine.delinearize_index %[[ARG0]] into (%[[C4]], %[[C4]]) : index, index
// CHECK-DAG: %[[D:.+]]:2 = affine.delinearize_index %[[ARG0]] into (4, 4) : index, index
// CHECK-DAG: func.call @callee(%[[D]]#0, %[[D]]#1) : (index, index) -> ()
module @test_multi {
func.func private @callee(%i: index, %j: index)
Expand All @@ -63,13 +61,12 @@ module @test_multi {
// CHECK-DAG: amdaie.core
// CHECK-DAG: %[[C0:.+]] = arith.constant 0 : index
// CHECK-DAG: %[[C1:.+]] = arith.constant 1 : index
// CHECK-DAG: %[[C2:.+]] = arith.constant 2 : index
// CHECK-DAG: %[[C4:.+]] = arith.constant 4 : index
// CHECK-DAG: %[[C16:.+]] = arith.constant 16 : index
// CHECK: scf.for %[[ARG0:.+]] = %[[C0]] to %[[C16]] step %[[C1]] {
// CHECK-DAG: %[[D1:.+]]:2 = affine.delinearize_index %[[ARG0]] into (%[[C4]], %[[C4]]) : index, index
// CHECK-DAG: %[[D1:.+]]:2 = affine.delinearize_index %[[ARG0]] into (4, 4) : index, index
// CHECK-DAG: scf.for %[[ARG1:.+]] = %[[C0]] to %[[C4]] step %[[C1]] {
// CHECK-DAG: %[[D2:.+]]:2 = affine.delinearize_index %[[ARG1]] into (%[[C2]], %[[C2]]) : index, index
// CHECK-DAG: %[[D2:.+]]:2 = affine.delinearize_index %[[ARG1]] into (2, 2) : index, index
// CHECK-DAG: func.call @callee(%[[D1]]#0, %[[D1]]#1, %[[D2]]#0, %[[D2]]#1) : (index, index, index, index) -> ()
module @test_nested {
func.func private @callee(%i: index, %j: index, %k: index, %l: index)
Expand Down
3 changes: 1 addition & 2 deletions ...plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/distribute_cores_and_objectfifos.mlir
View file
Original file line number Diff line number Diff line change
Expand Up @@ -987,9 +987,8 @@ module {
// CHECK-SAME: ins(%[[ACCESS_1]] : memref<4x4xi32, 2 : i32>) outs(%[[SUBVIEW:.*]] : memref<4x4xi32, strided<[4, 1]>, 2 : i32>) {

#map = affine_map<(d0, d1) -> (d0, d1)>
#translation = #iree_codegen.translation_info<Custom>
module {
func.func @mixed_alloc_subview_operands() attributes {translation_info = #translation} {
func.func @mixed_alloc_subview_operands() {
%c2 = arith.constant 2 : index
%c0_i32 = arith.constant 0 : i32
%alloc = memref.alloc() : memref<4x4xi32, 2 : i32>
Expand Down
2 changes: 1 addition & 1 deletion third_party/iree
Submodule iree updated 346 files
2 changes: 1 addition & 1 deletion third_party/mlir-air
Submodule mlir-air updated 24 files
+10 −2 mlir/include/air/Dialect/AIR/AIR.td
+11 −1 mlir/include/air/Util/Util.h
+1 −1 mlir/lib/Conversion/AIRLoweringPass.cpp
+1 −2 mlir/lib/Conversion/AIRRtToNpuPass.cpp
+1 −1 mlir/lib/Conversion/AIRToAIEPass.cpp
+68 −87 mlir/lib/Dialect/AIR/IR/AIRDialect.cpp
+7 −10 mlir/lib/Transform/AIRDependency.cpp
+356 −214 mlir/lib/Transform/AIRDependencyScheduleOpt.cpp
+16 −41 mlir/lib/Transform/AIRDmaToChannel.cpp
+20 −14 mlir/lib/Transform/AIRMiscPasses.cpp
+66 −48 mlir/lib/Util/Dependency.cpp
+3 −2 mlir/lib/Util/Runner.cpp
+2 −2 mlir/lib/Util/Runner/RunnerNode.cpp
+52 −16 mlir/lib/Util/Util.cpp
+189 −17 mlir/test/Transform/AIRDependencyScheduleOpt/isolate_async_dma_loop_nest.mlir
+39 −3 mlir/test/Transform/AIRDependencyScheduleOpt/specialize-channel-wrap-and-stride.mlir
+33 −6 programming_examples/vector_matrix_multiplication/block_quantized_i8/single_core/single_core.py
+13 −2 python/test/compiler/linalg_op_stats.py
+12 −1 python/test/compiler/linalg_to_air.py
+13 −3 python/test/compiler/run_transform.py
+13 −2 test/xrt/01_air_to_npu/aie.py
+13 −2 test/xrt/23_ctrlpkt_config/aie.py
+1 −1 utils/clone-llvm.sh
+1 −1 utils/clone-mlir-aie.sh

0 comments on commit cbda310

Please sign in to comment.