Skip to content

Commit 77e2e3f

Browse files
authored
[mlir][memref] Update tests to use memref.assume_alignment properly. (#142358)
With ffb9bbf, memref.assume_alignment op returns a result value. The revision updates the tests to reflect the change: - Update all the lit tests to use the result of memref.assume_alignment, if it is present. - Capture the result of the op in lit tests. --------- Signed-off-by: hanhanW <[email protected]>
1 parent 5c28af4 commit 77e2e3f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

mlir/test/Conversion/MemRefToLLVM/memref-to-llvm.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ func.func @assume_alignment(%0 : memref<4x4xf16>) {
189189
// CHECK-NEXT: %[[ALIGN:.*]] = llvm.mlir.constant(16 : index) : i64
190190
// CHECK-NEXT: llvm.intr.assume %[[TRUE]] ["align"(%[[PTR]], %[[ALIGN]] : !llvm.ptr, i64)] : i1
191191
// CHECK-INTERFACE: llvm.intr.assume
192-
memref.assume_alignment %0, 16 : memref<4x4xf16>
192+
%1 = memref.assume_alignment %0, 16 : memref<4x4xf16>
193193
return
194194
}
195195

@@ -205,7 +205,7 @@ func.func @assume_alignment_w_offset(%0 : memref<4x4xf16, strided<[?, ?], offset
205205
// CHECK-DAG: %[[ALIGN:.*]] = llvm.mlir.constant(16 : index) : i64
206206
// CHECK-NEXT: llvm.intr.assume %[[TRUE]] ["align"(%[[BUFF_ADDR]], %[[ALIGN]] : !llvm.ptr, i64)] : i1
207207
// CHECK-INTERFACE: llvm.intr.assume
208-
memref.assume_alignment %0, 16 : memref<4x4xf16, strided<[?, ?], offset: ?>>
208+
%1 = memref.assume_alignment %0, 16 : memref<4x4xf16, strided<[?, ?], offset: ?>>
209209
return
210210
}
211211
// -----

mlir/test/Dialect/MemRef/emulate-narrow-type.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func.func @memref_load_i4(%arg0: index) -> i4 {
6363

6464
func.func @memref_load_i4_rank2(%arg0: index, %arg1: index) -> i4 {
6565
%0 = memref.alloc() : memref<3x125xi4>
66-
%align0 =memref.assume_alignment %0, 64 : memref<3x125xi4>
66+
%align0 = memref.assume_alignment %0, 64 : memref<3x125xi4>
6767
%1 = memref.load %align0[%arg0,%arg1] : memref<3x125xi4>
6868
return %1 : i4
6969
}

mlir/test/Dialect/MemRef/ops.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func.func @memref_view(%arg0 : index, %arg1 : index, %arg2 : index) {
283283
// CHECK-LABEL: func @assume_alignment
284284
// CHECK-SAME: %[[MEMREF:.*]]: memref<4x4xf16>
285285
func.func @assume_alignment(%0: memref<4x4xf16>) {
286-
// CHECK: memref.assume_alignment %[[MEMREF]], 16 : memref<4x4xf16>
286+
// CHECK: %{{.*}} = memref.assume_alignment %[[MEMREF]], 16 : memref<4x4xf16>
287287
%1 = memref.assume_alignment %0, 16 : memref<4x4xf16>
288288
return
289289
}

mlir/test/Integration/GPU/CUDA/sm90/gemm_f32_f16_f16_128x128x128.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func.func @main() {
120120
threads(%arg3, %arg4, %arg5) in (%arg9 = %hc128, %arg10 = %hc1, %arg11 = %hc1)
121121
dynamic_shared_memory_size %shmemSize
122122
{
123-
memref.assume_alignment %matrixD, 16 : memref<128x128xf32>
123+
%align_matrixD = memref.assume_alignment %matrixD, 16 : memref<128x128xf32>
124124

125125
%c256 = arith.constant 256 : index
126126
%c10000000 = arith.constant 10000000 : index
@@ -226,7 +226,7 @@ func.func @main() {
226226
scf.for %arg12 = %17 to %c128 step %c4 {
227227
%19 = arith.muli %18, %c4 : index
228228
%20 = vector.load %accShmemPtr[%arg12, %19] : memref<128x128xf32, 3>, vector<4xf32>
229-
vector.store %20, %matrixD[%arg12, %19] : memref<128x128xf32>, vector<4xf32>
229+
vector.store %20, %align_matrixD[%arg12, %19] : memref<128x128xf32>, vector<4xf32>
230230
}
231231
gpu.terminator
232232
}

mlir/test/Integration/GPU/CUDA/sm90/gemm_pred_f32_f16_f16_128x128x128.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func.func @main() {
120120
threads(%arg3, %arg4, %arg5) in (%arg9 = %hc128, %arg10 = %hc1, %arg11 = %hc1)
121121
dynamic_shared_memory_size %shmemSize
122122
{
123-
memref.assume_alignment %matrixD, 16 : memref<128x128xf32>
123+
%align_matrixD = memref.assume_alignment %matrixD, 16 : memref<128x128xf32>
124124

125125
%c256 = arith.constant 256 : index
126126
%c10000000 = arith.constant 10000000 : index
@@ -234,7 +234,7 @@ func.func @main() {
234234
scf.for %arg12 = %17 to %c128 step %c4 {
235235
%19 = arith.muli %18, %c4 : index
236236
%20 = vector.load %accShmemPtr[%arg12, %19] : memref<128x128xf32, 3>, vector<4xf32>
237-
vector.store %20, %matrixD[%arg12, %19] : memref<128x128xf32>, vector<4xf32>
237+
vector.store %20, %align_matrixD[%arg12, %19] : memref<128x128xf32>, vector<4xf32>
238238
}
239239
gpu.terminator
240240
}

0 commit comments

Comments
 (0)