just skip the mlir tests on i386

This commit is contained in:
Sylvestre Ledru 2022-10-31 08:38:33 +01:00
parent 7ebec9d7f9
commit 32a70e59af
3 changed files with 4 additions and 197 deletions

View File

@ -1,196 +0,0 @@
Index: llvm-toolchain-snapshot_16~++20221029101856+b203511c4fc1/mlir/test/mlir-cpu-runner/async-error.mlir
===================================================================
--- llvm-toolchain-snapshot_16~++20221029101856+b203511c4fc1.orig/mlir/test/mlir-cpu-runner/async-error.mlir
+++ llvm-toolchain-snapshot_16~++20221029101856+b203511c4fc1/mlir/test/mlir-cpu-runner/async-error.mlir
@@ -1,105 +0,0 @@
-// RUN: mlir-opt %s -pass-pipeline="async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-linalg-to-loops,convert-scf-to-cf),convert-linalg-to-llvm,convert-vector-to-llvm,func.func(convert-arith-to-llvm),convert-func-to-llvm,reconcile-unrealized-casts" \
-// RUN: | mlir-cpu-runner \
-// RUN: -e main -entry-point-result=void -O0 \
-// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \
-// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
-// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
-// RUN: | FileCheck %s --dump-input=always
-
-// FIXME: https://github.com/llvm/llvm-project/issues/57231
-// UNSUPPORTED: hwasan
-
-func.func @main() {
- %false = arith.constant 0 : i1
-
- // ------------------------------------------------------------------------ //
- // Check that simple async region completes without errors.
- // ------------------------------------------------------------------------ //
- %token0 = async.execute {
- async.yield
- }
- async.runtime.await %token0 : !async.token
-
- // CHECK: 0
- %err0 = async.runtime.is_error %token0 : !async.token
- vector.print %err0 : i1
-
- // ------------------------------------------------------------------------ //
- // Check that assertion in the async region converted to async error.
- // ------------------------------------------------------------------------ //
- %token1 = async.execute {
- cf.assert %false, "error"
- async.yield
- }
- async.runtime.await %token1 : !async.token
-
- // CHECK: 1
- %err1 = async.runtime.is_error %token1 : !async.token
- vector.print %err1 : i1
-
- // ------------------------------------------------------------------------ //
- // Check error propagation from the nested region.
- // ------------------------------------------------------------------------ //
- %token2 = async.execute {
- %token = async.execute {
- cf.assert %false, "error"
- async.yield
- }
- async.await %token : !async.token
- async.yield
- }
- async.runtime.await %token2 : !async.token
-
- // CHECK: 1
- %err2 = async.runtime.is_error %token2 : !async.token
- vector.print %err2 : i1
-
- // ------------------------------------------------------------------------ //
- // Check error propagation from the nested region with async values.
- // ------------------------------------------------------------------------ //
- %token3, %value3 = async.execute -> !async.value<f32> {
- %token, %value = async.execute -> !async.value<f32> {
- cf.assert %false, "error"
- %0 = arith.constant 123.45 : f32
- async.yield %0 : f32
- }
- %ret = async.await %value : !async.value<f32>
- async.yield %ret : f32
- }
- async.runtime.await %token3 : !async.token
- async.runtime.await %value3 : !async.value<f32>
-
- // CHECK: 1
- // CHECK: 1
- %err3_0 = async.runtime.is_error %token3 : !async.token
- %err3_1 = async.runtime.is_error %value3 : !async.value<f32>
- vector.print %err3_0 : i1
- vector.print %err3_1 : i1
-
- // ------------------------------------------------------------------------ //
- // Check error propagation from a token to the group.
- // ------------------------------------------------------------------------ //
-
- %c2 = arith.constant 2 : index
- %group0 = async.create_group %c2 : !async.group
-
- %token4 = async.execute {
- async.yield
- }
-
- %token5 = async.execute {
- cf.assert %false, "error"
- async.yield
- }
-
- %idx0 = async.add_to_group %token4, %group0 : !async.token
- %idx1 = async.add_to_group %token5, %group0 : !async.token
-
- async.runtime.await %group0 : !async.group
-
- // CHECK: 1
- %err4 = async.runtime.is_error %group0 : !async.group
- vector.print %err4 : i1
-
- return
-}
Index: llvm-toolchain-snapshot_16~++20221029101856+b203511c4fc1/mlir/test/mlir-cpu-runner/async-value.mlir
===================================================================
--- llvm-toolchain-snapshot_16~++20221029101856+b203511c4fc1.orig/mlir/test/mlir-cpu-runner/async-value.mlir
+++ llvm-toolchain-snapshot_16~++20221029101856+b203511c4fc1/mlir/test/mlir-cpu-runner/async-value.mlir
@@ -1,81 +0,0 @@
-// RUN: mlir-opt %s -pass-pipeline="async-to-async-runtime,func.func(async-runtime-ref-counting,async-runtime-ref-counting-opt),convert-async-to-llvm,func.func(convert-arith-to-llvm),convert-vector-to-llvm,convert-memref-to-llvm,convert-func-to-llvm,reconcile-unrealized-casts" \
-// RUN: | mlir-cpu-runner \
-// RUN: -e main -entry-point-result=void -O0 \
-// RUN: -shared-libs=%mlir_lib_dir/libmlir_c_runner_utils%shlibext \
-// RUN: -shared-libs=%mlir_lib_dir/libmlir_runner_utils%shlibext \
-// RUN: -shared-libs=%mlir_lib_dir/libmlir_async_runtime%shlibext \
-// RUN: | FileCheck %s --dump-input=always
-
-// FIXME: https://github.com/llvm/llvm-project/issues/57231
-// UNSUPPORTED: hwasan
-
-func.func @main() {
-
- // ------------------------------------------------------------------------ //
- // Blocking async.await outside of the async.execute.
- // ------------------------------------------------------------------------ //
- %token, %result = async.execute -> !async.value<f32> {
- %0 = arith.constant 123.456 : f32
- async.yield %0 : f32
- }
- %1 = async.await %result : !async.value<f32>
-
- // CHECK: 123.456
- vector.print %1 : f32
-
- // ------------------------------------------------------------------------ //
- // Non-blocking async.await inside the async.execute
- // ------------------------------------------------------------------------ //
- %token0, %result0 = async.execute -> !async.value<f32> {
- %token1, %result2 = async.execute -> !async.value<f32> {
- %2 = arith.constant 456.789 : f32
- async.yield %2 : f32
- }
- %3 = async.await %result2 : !async.value<f32>
- async.yield %3 : f32
- }
- %4 = async.await %result0 : !async.value<f32>
-
- // CHECK: 456.789
- vector.print %4 : f32
-
- // ------------------------------------------------------------------------ //
- // Memref allocated inside async.execute region.
- // ------------------------------------------------------------------------ //
- %token2, %result2 = async.execute[%token0] -> !async.value<memref<f32>> {
- %5 = memref.alloc() : memref<f32>
- %c0 = arith.constant 0.25 : f32
- memref.store %c0, %5[]: memref<f32>
- async.yield %5 : memref<f32>
- }
- %6 = async.await %result2 : !async.value<memref<f32>>
- %7 = memref.cast %6 : memref<f32> to memref<*xf32>
-
- // CHECK: Unranked Memref
- // CHECK-SAME: rank = 0 offset = 0 sizes = [] strides = []
- // CHECK-NEXT: [0.25]
- call @printMemrefF32(%7): (memref<*xf32>) -> ()
-
- // ------------------------------------------------------------------------ //
- // Memref passed as async.execute operand.
- // ------------------------------------------------------------------------ //
- %token3 = async.execute(%result2 as %unwrapped : !async.value<memref<f32>>) {
- %8 = memref.load %unwrapped[]: memref<f32>
- %9 = arith.addf %8, %8 : f32
- memref.store %9, %unwrapped[]: memref<f32>
- async.yield
- }
- async.await %token3 : !async.token
-
- // CHECK: Unranked Memref
- // CHECK-SAME: rank = 0 offset = 0 sizes = [] strides = []
- // CHECK-NEXT: [0.5]
- call @printMemrefF32(%7): (memref<*xf32>) -> ()
-
- memref.dealloc %6 : memref<f32>
-
- return
-}
-
-func.func private @printMemrefF32(memref<*xf32>)
- attributes { llvm.emit_c_interface }

View File

@ -150,4 +150,3 @@ revert-update-doc.diff
unwind-force-pthread-dl.diff
force-sse2-compiler-rt.diff
bolt-disable-emit-relocs.patch
mlir-disable-test.diff

4
debian/rules vendored
View File

@ -1153,7 +1153,11 @@ endif
ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true
# MLIR
ifeq (,$(filter $(DEB_HOST_ARCH), i386))
# Do not run MLIR test on i386 because of
# https://github.com/llvm/llvm-project/issues/58357
ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-mlir || true
endif
ifeq ($(LLVM_SPIRV_INSTALLED),yes)
# Libclc