Skip to content

Commit b03a09e

Browse files
matthias-springermatthias-springer
authored
[mlir] Fix integration tests after #120548 (#120706)
This should have been part of #120548.
1 parent 69ebac7 commit b03a09e

File tree

65 files changed

+123
-101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+123
-101
lines changed

‎mlir/lib/Dialect/SparseTensor/Pipelines/SparseTensorPipelines.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "mlir/Dialect/SparseTensor/Pipelines/Passes.h"
1010

11+
#include "mlir/Conversion/ArithToLLVM/ArithToLLVM.h"
1112
#include "mlir/Conversion/GPUToNVVM/GPUToNVVMPass.h"
1213
#include "mlir/Conversion/Passes.h"
1314
#include "mlir/Dialect/Arith/Transforms/Passes.h"
@@ -89,6 +90,7 @@ void mlir::sparse_tensor::buildSparsifier(OpPassManager &pm,
8990
pm.addPass(
9091
createConvertVectorToLLVMPass(options.convertVectorToLLVMOptions()));
9192
pm.addPass(createConvertFuncToLLVMPass());
93+
pm.addPass(createArithToLLVMConversionPass());
9294

9395
// Finalize GPU code generation.
9496
if (gpuCodegen) {

‎mlir/test/Integration/Dialect/Async/CPU/microbench-linalg-async-parallel-for.mlir

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
// RUN: -async-runtime-ref-counting \
66
// RUN: -async-runtime-ref-counting-opt \
77
// RUN: -convert-async-to-llvm \
8-
// RUN: -convert-scf-to-cf \
8+
// RUN: -convert-scf-to-cf \
99
// RUN: -arith-expand \
10-
// RUN: -memref-expand \
10+
// RUN: -memref-expand \
1111
// RUN: -convert-vector-to-llvm \
12-
// RUN: -finalize-memref-to-llvm \
13-
// RUN: -convert-func-to-llvm \
12+
// RUN: -finalize-memref-to-llvm \
13+
// RUN: -convert-func-to-llvm \
14+
// RUN: -convert-arith-to-llvm \
1415
// RUN: -reconcile-unrealized-casts \
1516
// RUN: | mlir-cpu-runner \
1617
// RUN: -e entry -entry-point-result=void -O3 \
@@ -21,10 +22,11 @@
2122

2223
// RUN: mlir-opt %s \
2324
// RUN: -convert-linalg-to-loops \
24-
// RUN: -convert-scf-to-cf \
25+
// RUN: -convert-scf-to-cf \
2526
// RUN: -convert-vector-to-llvm \
26-
// RUN: -finalize-memref-to-llvm \
27-
// RUN: -convert-func-to-llvm \
27+
// RUN: -finalize-memref-to-llvm \
28+
// RUN: -convert-func-to-llvm \
29+
// RUN: -convert-arith-to-llvm \
2830
// RUN: -reconcile-unrealized-casts \
2931
// RUN: | mlir-cpu-runner \
3032
// RUN: -e entry -entry-point-result=void -O3 \

‎mlir/test/Integration/Dialect/Async/CPU/microbench-scf-async-parallel-for.mlir

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
// RUN: -async-runtime-ref-counting-opt \
66
// RUN: -convert-async-to-llvm \
77
// RUN: -convert-linalg-to-loops \
8-
// RUN: -convert-scf-to-cf \
8+
// RUN: -convert-scf-to-cf \
99
// RUN: -arith-expand \
10-
// RUN: -memref-expand \
10+
// RUN: -memref-expand \
1111
// RUN: -convert-vector-to-llvm \
12-
// RUN: -finalize-memref-to-llvm \
13-
// RUN: -convert-func-to-llvm \
12+
// RUN: -finalize-memref-to-llvm \
13+
// RUN: -convert-func-to-llvm \
14+
// RUN: -convert-arith-to-llvm \
1415
// RUN: -reconcile-unrealized-casts \
1516
// RUN: | mlir-cpu-runner \
1617
// RUN: -e entry -entry-point-result=void -O3 \
@@ -26,12 +27,13 @@
2627
// RUN: -async-runtime-ref-counting-opt \
2728
// RUN: -convert-async-to-llvm \
2829
// RUN: -convert-linalg-to-loops \
29-
// RUN: -convert-scf-to-cf \
30+
// RUN: -convert-scf-to-cf \
3031
// RUN: -arith-expand \
31-
// RUN: -memref-expand \
32+
// RUN: -memref-expand \
3233
// RUN: -convert-vector-to-llvm \
33-
// RUN: -finalize-memref-to-llvm \
34-
// RUN: -convert-func-to-llvm \
34+
// RUN: -finalize-memref-to-llvm \
35+
// RUN: -convert-func-to-llvm \
36+
// RUN: -convert-arith-to-llvm \
3537
// RUN: -reconcile-unrealized-casts \
3638
// RUN: | mlir-cpu-runner \
3739
// RUN: -e entry -entry-point-result=void -O3 \
@@ -42,10 +44,11 @@
4244

4345
// RUN: mlir-opt %s \
4446
// RUN: -convert-linalg-to-loops \
45-
// RUN: -convert-scf-to-cf \
47+
// RUN: -convert-scf-to-cf \
4648
// RUN: -convert-vector-to-llvm \
47-
// RUN: -finalize-memref-to-llvm \
48-
// RUN: -convert-func-to-llvm \
49+
// RUN: -finalize-memref-to-llvm \
50+
// RUN: -convert-func-to-llvm \
51+
// RUN: -convert-arith-to-llvm \
4952
// RUN: -reconcile-unrealized-casts \
5053
// RUN: | mlir-cpu-runner \
5154
// RUN: -e entry -entry-point-result=void -O3 \

‎mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-1d.mlir

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// RUN: -async-runtime-ref-counting \
44
// RUN: -async-runtime-ref-counting-opt \
55
// RUN: -convert-async-to-llvm \
6-
// RUN: -convert-scf-to-cf \
7-
// RUN: -finalize-memref-to-llvm \
6+
// RUN: -convert-scf-to-cf \
7+
// RUN: -finalize-memref-to-llvm \
88
// RUN: -arith-expand \
9-
// RUN: -memref-expand \
10-
// RUN: -convert-func-to-llvm \
9+
// RUN: -memref-expand \
10+
// RUN: -convert-func-to-llvm \
11+
// RUN: -convert-arith-to-llvm \
1112
// RUN: -reconcile-unrealized-casts \
1213
// RUN: | mlir-cpu-runner \
1314
// RUN: -e entry -entry-point-result=void -O0 \
@@ -19,11 +20,12 @@
1920
// RUN: -async-to-async-runtime \
2021
// RUN: -async-runtime-policy-based-ref-counting \
2122
// RUN: -convert-async-to-llvm \
22-
// RUN: -convert-scf-to-cf \
23-
// RUN: -finalize-memref-to-llvm \
23+
// RUN: -convert-scf-to-cf \
24+
// RUN: -finalize-memref-to-llvm \
2425
// RUN: -arith-expand \
25-
// RUN: -memref-expand \
26-
// RUN: -convert-func-to-llvm \
26+
// RUN: -memref-expand \
27+
// RUN: -convert-func-to-llvm \
28+
// RUN: -convert-arith-to-llvm \
2729
// RUN: -reconcile-unrealized-casts \
2830
// RUN: | mlir-cpu-runner \
2931
// RUN: -e entry -entry-point-result=void -O0 \
@@ -38,11 +40,12 @@
3840
// RUN: -async-runtime-ref-counting \
3941
// RUN: -async-runtime-ref-counting-opt \
4042
// RUN: -convert-async-to-llvm \
41-
// RUN: -convert-scf-to-cf \
42-
// RUN: -finalize-memref-to-llvm \
43+
// RUN: -convert-scf-to-cf \
44+
// RUN: -finalize-memref-to-llvm \
4345
// RUN: -arith-expand \
44-
// RUN: -memref-expand \
45-
// RUN: -convert-func-to-llvm \
46+
// RUN: -memref-expand \
47+
// RUN: -convert-func-to-llvm \
48+
// RUN: -convert-arith-to-llvm \
4649
// RUN: -reconcile-unrealized-casts \
4750
// RUN: | mlir-cpu-runner \
4851
// RUN: -e entry -entry-point-result=void -O0 \

‎mlir/test/Integration/Dialect/Async/CPU/test-async-parallel-for-2d.mlir

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
// RUN: -async-runtime-ref-counting-opt \
55
// RUN: -arith-expand \
66
// RUN: -convert-async-to-llvm \
7-
// RUN: -convert-scf-to-cf \
8-
// RUN: -finalize-memref-to-llvm \
9-
// RUN: -convert-func-to-llvm \
7+
// RUN: -convert-scf-to-cf \
8+
// RUN: -finalize-memref-to-llvm \
9+
// RUN: -convert-func-to-llvm \
10+
// RUN: -convert-arith-to-llvm \
1011
// RUN: -reconcile-unrealized-casts \
1112
// RUN: | mlir-cpu-runner \
1213
// RUN: -e entry -entry-point-result=void -O0 \
@@ -19,9 +20,10 @@
1920
// RUN: -async-runtime-policy-based-ref-counting \
2021
// RUN: -arith-expand \
2122
// RUN: -convert-async-to-llvm \
22-
// RUN: -convert-scf-to-cf \
23-
// RUN: -finalize-memref-to-llvm \
24-
// RUN: -convert-func-to-llvm \
23+
// RUN: -convert-scf-to-cf \
24+
// RUN: -finalize-memref-to-llvm \
25+
// RUN: -convert-func-to-llvm \
26+
// RUN: -convert-arith-to-llvm \
2527
// RUN: -reconcile-unrealized-casts \
2628
// RUN: | mlir-cpu-runner \
2729
// RUN: -e entry -entry-point-result=void -O0 \
@@ -37,9 +39,10 @@
3739
// RUN: -async-runtime-ref-counting-opt \
3840
// RUN: -arith-expand \
3941
// RUN: -convert-async-to-llvm \
40-
// RUN: -convert-scf-to-cf \
41-
// RUN: -finalize-memref-to-llvm \
42-
// RUN: -convert-func-to-llvm \
42+
// RUN: -convert-scf-to-cf \
43+
// RUN: -finalize-memref-to-llvm \
44+
// RUN: -convert-func-to-llvm \
45+
// RUN: -convert-arith-to-llvm \
4346
// RUN: -reconcile-unrealized-casts \
4447
// RUN: | mlir-cpu-runner \
4548
// RUN: -e entry -entry-point-result=void -O0 \

‎mlir/test/Integration/Dialect/Complex/CPU/correctness.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: -convert-scf-to-cf --convert-complex-to-standard \
44
// RUN: -finalize-memref-to-llvm -convert-math-to-llvm -convert-math-to-libm \
55
// RUN: -convert-vector-to-llvm -convert-complex-to-llvm \
6-
// RUN: -convert-func-to-llvm -reconcile-unrealized-casts |\
6+
// RUN: -convert-func-to-llvm -convert-arith-to-llvm -reconcile-unrealized-casts |\
77
// RUN: mlir-cpu-runner \
88
// RUN: -e entry -entry-point-result=void \
99
// RUN: -shared-libs=%mlir_c_runner_utils |\

‎mlir/test/Integration/Dialect/ControlFlow/assert.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mlir-opt %s -test-cf-assert \
2-
// RUN: -convert-func-to-llvm | \
2+
// RUN: -convert-func-to-llvm -convert-arith-to-llvm | \
33
// RUN: mlir-cpu-runner -e main -entry-point-result=void | \
44
// RUN: FileCheck %s
55

‎mlir/test/Integration/Dialect/LLVMIR/CPU/X86/test-inline-asm-vector.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \
1+
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -convert-arith-to-llvm -reconcile-unrealized-casts | \
22
// RUN: mlir-cpu-runner -e entry_point_with_all_constants -entry-point-result=void \
33
// RUN: -shared-libs=%mlir_c_runner_utils
44

‎mlir/test/Integration/Dialect/LLVMIR/CPU/test-vp-intrinsic.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-cf-to-llvm \
2-
// RUN: -convert-vector-to-llvm -convert-index-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm \
2+
// RUN: -convert-vector-to-llvm -convert-index-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -convert-arith-to-llvm \
33
// RUN: -reconcile-unrealized-casts | \
44
// RUN: mlir-translate -mlir-to-llvmir | \
55
// RUN: %lli --entry-function=entry \

‎mlir/test/Integration/Dialect/Linalg/CPU/runtime-verification.mlir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// RUN: -convert-index-to-llvm \
99
// RUN: -finalize-memref-to-llvm \
1010
// RUN: -convert-func-to-llvm \
11+
// RUN: -convert-arith-to-llvm \
1112
// RUN: -reconcile-unrealized-casts | \
1213
// RUN: mlir-cpu-runner -e main -entry-point-result=void \
1314
// RUN: -shared-libs=%mlir_runner_utils \

‎mlir/test/Integration/Dialect/MemRef/cast-runtime-verification.mlir

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// RUN: mlir-opt %s -generate-runtime-verification -finalize-memref-to-llvm \
22
// RUN: -test-cf-assert \
3-
// RUN: -convert-func-to-llvm -reconcile-unrealized-casts | \
3+
// RUN: -convert-func-to-llvm \
4+
// RUN: -convert-arith-to-llvm \
5+
// RUN: -reconcile-unrealized-casts | \
46
// RUN: mlir-cpu-runner -e main -entry-point-result=void \
57
// RUN: -shared-libs=%mlir_runner_utils 2>&1 | \
68
// RUN: FileCheck %s

‎mlir/test/Integration/Dialect/MemRef/load-runtime-verification.mlir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// RUN: -finalize-memref-to-llvm \
44
// RUN: -test-cf-assert \
55
// RUN: -convert-func-to-llvm \
6+
// RUN: -convert-arith-to-llvm \
67
// RUN: -reconcile-unrealized-casts | \
78
// RUN: mlir-cpu-runner -e main -entry-point-result=void \
89
// RUN: -shared-libs=%mlir_runner_utils 2>&1 | \

‎mlir/test/Integration/Dialect/MemRef/memref_abi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// Compile the MLIR file to LLVM:
55
// RUN: mlir-opt %t/input.mlir \
66
// RUN: -lower-affine -convert-scf-to-cf -finalize-memref-to-llvm \
7-
// RUN: -convert-func-to-llvm -reconcile-unrealized-casts \
7+
// RUN: -convert-func-to-llvm -convert-arith-to-llvm -reconcile-unrealized-casts \
88
// RUN: | mlir-translate --mlir-to-llvmir -o %t.ll
99

1010
// Generate an object file for the MLIR code

‎mlir/test/Integration/Dialect/MemRef/reinterpret-cast-runtime-verification.mlir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// RUN: -finalize-memref-to-llvm \
44
// RUN: -test-cf-assert \
55
// RUN: -convert-func-to-llvm \
6+
// RUN: -convert-arith-to-llvm \
67
// RUN: -reconcile-unrealized-casts | \
78
// RUN: mlir-cpu-runner -e main -entry-point-result=void \
89
// RUN: -shared-libs=%mlir_runner_utils 2>&1 | \

‎mlir/test/Integration/Dialect/MemRef/subview-runtime-verification.mlir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// RUN: -finalize-memref-to-llvm \
55
// RUN: -test-cf-assert \
66
// RUN: -convert-func-to-llvm \
7+
// RUN: -convert-arith-to-llvm \
78
// RUN: -reconcile-unrealized-casts | \
89
// RUN: mlir-cpu-runner -e main -entry-point-result=void \
910
// RUN: -shared-libs=%mlir_runner_utils 2>&1 | \

‎mlir/test/Integration/Dialect/Standard/CPU/test-ceil-floor-pos-neg.mlir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf,memref-expand,arith-expand),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \
1+
// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf,memref-expand,arith-expand),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,convert-arith-to-llvm,reconcile-unrealized-casts)" | \
22
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
33
// RUN: -shared-libs=%mlir_c_runner_utils | \
44
// RUN: FileCheck %s
5-
// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf,memref-expand,arith-expand),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts)" | \
5+
// RUN: mlir-opt %s -pass-pipeline="builtin.module(func.func(convert-vector-to-scf,lower-affine,convert-scf-to-cf,memref-expand,arith-expand),convert-vector-to-llvm,finalize-memref-to-llvm,convert-func-to-llvm,convert-arith-to-llvm,reconcile-unrealized-casts)" | \
66
// RUN: mlir-cpu-runner -e main -entry-point-result=void \
77
// RUN: -shared-libs=%mlir_c_runner_utils | \
88
// RUN: FileCheck %s --check-prefix=SCHECK

‎mlir/test/Integration/Dialect/Vector/CPU/0-d-vectors.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \
1+
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -finalize-memref-to-llvm -convert-func-to-llvm -convert-arith-to-llvm -reconcile-unrealized-casts | \
22
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
33
// RUN: -shared-libs=%mlir_c_runner_utils | \
44
// RUN: FileCheck %s

‎mlir/test/Integration/Dialect/Vector/CPU/broadcast.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -reconcile-unrealized-casts | \
1+
// RUN: mlir-opt %s -convert-vector-to-scf -convert-scf-to-cf -convert-vector-to-llvm -convert-func-to-llvm -convert-arith-to-llvm -reconcile-unrealized-casts | \
22
// RUN: mlir-cpu-runner -e entry -entry-point-result=void \
33
// RUN: -shared-libs=%mlir_c_runner_utils | \
44
// RUN: FileCheck %s

0 commit comments

Comments
 (0)