From 7dd42572d085180cb134754171ce914eddbf722c Mon Sep 17 00:00:00 2001 From: yzhang93 Date: Thu, 14 Nov 2024 21:02:24 -0800 Subject: [PATCH] Bump IREE to 5318fce9dcc809b13420ab9ff22c4c4320e26746 --- .../Transforms/test/convert_core_forall_to_for.mlir | 13 +++++-------- .../test/distribute_cores_and_objectfifos.mlir | 3 +-- third_party/iree | 2 +- third_party/mlir-air | 2 +- 4 files changed, 8 insertions(+), 12 deletions(-) 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 8ca613178..40bd7520a 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 @@ -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) @@ -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) @@ -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) diff --git a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/distribute_cores_and_objectfifos.mlir b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/distribute_cores_and_objectfifos.mlir index b00ccb6b0..3a9e583bc 100644 --- a/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/distribute_cores_and_objectfifos.mlir +++ b/compiler/plugins/target/AMD-AIE/iree-amd-aie/Transforms/test/distribute_cores_and_objectfifos.mlir @@ -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 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> diff --git a/third_party/iree b/third_party/iree index 8e5f218a1..5318fce9d 160000 --- a/third_party/iree +++ b/third_party/iree @@ -1 +1 @@ -Subproject commit 8e5f218a1d73c39ccdebb4a1d19225d5329cc6f0 +Subproject commit 5318fce9dcc809b13420ab9ff22c4c4320e26746 diff --git a/third_party/mlir-air b/third_party/mlir-air index 8fe05179d..3bab1025d 160000 --- a/third_party/mlir-air +++ b/third_party/mlir-air @@ -1 +1 @@ -Subproject commit 8fe05179d83f04cf56965ae55da0f476ec7431ed +Subproject commit 3bab1025d02ffd2b14c0e887bb3749b4836936b2