Skip to content

Commit 3027e3a

Browse files
kuhargiacs-epic
authored andcommitted
Integrate llvm-project at be81df25178f4e301df9e4de75c5cbbd6f773891 (iree-org#19338)
Still carrying a revert for 1004865f1ca41a9581da8747f34b29862d3ebc3d and a cherry pick for llvm/llvm-project#116650. Signed-off-by: Jakub Kuderski <[email protected]> Signed-off-by: Giacomo Serafini <[email protected]>
1 parent b6064bf commit 3027e3a

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

compiler/src/iree/compiler/Codegen/Common/GPU/test/gpu_vector_distribution.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ func.func @distribute_scf_for_0d(%a: vector<i32>, %b: vector<i32>) -> vector<i32
8585
// CHECK: iter_args(%[[ARG0:.*]] = %[[ROOT]]) -> (vector<i32>)
8686
%out = scf.for %i = %c0 to %c128 step %c1 iter_args(%arg0 = %rootl) -> (vector<i32>) {
8787
// CHECK-DAG: %[[B:.*]] = iree_vector_ext.to_simt %{{.*}} : vector<i32> -> vector<i32>
88-
// CHECK-DAG: %[[C:.*]] = arith.muli %[[ARG0]], %[[B]] {{.*}} : vector<i32>
88+
// CHECK-DAG: %[[C:.*]] = arith.muli %[[ARG0]], %[[B]] : vector<i32>
8989
%c = arith.muli %arg0, %b : vector<i32>
9090
// CHECK-DAG: %[[A:.*]] = iree_vector_ext.to_simt %{{.*}} : vector<i32> -> vector<i32>
91-
// CHECK-DAG: %[[D:.*]] = arith.addi %[[C]], %[[A]] {{.*}} : vector<i32>
91+
// CHECK-DAG: %[[D:.*]] = arith.addi %[[C]], %[[A]] : vector<i32>
9292
%d = arith.addi %c, %a : vector<i32>
9393
// CHECK: scf.yield %[[D]] : vector<i32>
9494
scf.yield %d : vector<i32>

compiler/src/iree/compiler/Dialect/Flow/Conversion/MeshToFlow/test/channel_creation.mlir

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,9 @@ module @static_1d_mesh_grouping_along_axis_0 {
1717
module @static_2d_mesh_grouping_along_axis_1 {
1818
// CHECK: util.global private @_mesh_mesh_2d_axes_1 {inlining_policy = #util.inline.never} : !flow.channel
1919
// CHECK: util.initializer {
20-
// CHECK-DAG: %[[AXIS_1_SIZE:.+]] = arith.constant 4 : index
21-
// CHECK-DAG: %[[AXIS_0_SIZE:.+]] = arith.constant 3 : index
2220
// CHECK-DAG: %[[DEFAULT_CHANNEL:.+]] = flow.channel.default : !flow.channel
2321
// CHECK: %[[CHANNEL_RANK:.+]] = flow.channel.rank %[[DEFAULT_CHANNEL]] : index
24-
// CHECK: %[[COLOR_AND_KEY:.+]]:2 = affine.delinearize_index %[[CHANNEL_RANK]] into
25-
// CHECK-SAME: (%[[AXIS_0_SIZE]], %[[AXIS_1_SIZE]]) : index, index
22+
// CHECK: %[[COLOR_AND_KEY:.+]]:2 = affine.delinearize_index %[[CHANNEL_RANK]] into (3, 4) : index, index
2623
// CHECK: %[[CHANNEL:.+]] = flow.channel.split
2724
// CHECK-SAME: %[[DEFAULT_CHANNEL]], %[[COLOR_AND_KEY]]#0, %[[COLOR_AND_KEY]]#1 : !flow.channel -> !flow.channel
2825
// CHECK: util.global.store %[[CHANNEL]], @_mesh_mesh_2d_axes_1 : !flow.channel
@@ -42,13 +39,10 @@ module @static_4d_mesh_grouping_along_axes_2_1 {
4239
// CHECK: util.global private @_mesh_mesh_4d_axes_2_1 {inlining_policy = #util.inline.never} : !flow.channel
4340
// CHECK: util.initializer {
4441
// CHECK-DAG: %[[AXIS_3_SIZE:.+]] = arith.constant 6 : index
45-
// CHECK-DAG: %[[AXIS_2_SIZE:.+]] = arith.constant 5 : index
4642
// CHECK-DAG: %[[AXIS_1_SIZE:.+]] = arith.constant 4 : index
47-
// CHECK-DAG: %[[AXIS_0_SIZE:.+]] = arith.constant 3 : index
4843
// CHECK-DAG: %[[DEFAULT_CHANNEL:.+]] = flow.channel.default : !flow.channel
49-
// CHECK: %[[CHANNEL_RANK:.+]] = flow.channel.rank %[[DEFAULT_CHANNEL]] : index
50-
// CHECK: %[[DEVICE_MULTI_IDX:.+]]:4 = affine.delinearize_index %[[CHANNEL_RANK]] into
51-
// CHECK-SAME: (%[[AXIS_0_SIZE]], %[[AXIS_1_SIZE]], %[[AXIS_2_SIZE]], %[[AXIS_3_SIZE]]) : index, index, index, index
44+
// CHECK: %[[CHANNEL_RANK:.+]] = flow.channel.rank %[[DEFAULT_CHANNEL]]
45+
// CHECK: %[[DEVICE_MULTI_IDX:.+]]:4 = affine.delinearize_index %[[CHANNEL_RANK]] into (3, 4, 5, 6) : index
5246
// CHECK: %[[IN_GROUP_IDX:.+]] = affine.apply
5347
// CHECK-SAME: #map()[%[[DEVICE_MULTI_IDX]]#2, %[[AXIS_1_SIZE]], %[[DEVICE_MULTI_IDX]]#1]
5448
// CHECK: %[[GROUP_IDX:.+]] = affine.apply

third_party/llvm-project

Submodule llvm-project updated 291 files

0 commit comments

Comments
 (0)