From 1bd938c9ba109f10522d9499e79be74c3e8c7ee4 Mon Sep 17 00:00:00 2001 From: Han-Chung Wang Date: Tue, 20 Apr 2021 00:30:53 +0800 Subject: [PATCH] Delete duplicated tests in iree/test/e2e/ (#5446) Also delete unnecessary flags in iree/test/e2e and iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest.mlir Part of https://github.com/google/iree/issues/5442 --- .../HAL/Target/LLVM/test/smoketest.mlir | 2 +- iree/test/e2e/cuda_specific/BUILD | 3 - iree/test/e2e/cuda_specific/CMakeLists.txt | 2 - iree/test/e2e/linalg_tensor_ops/BUILD | 66 ---------- .../test/e2e/linalg_tensor_ops/CMakeLists.txt | 43 ------- iree/test/e2e/linalg_tensor_ops/add.mlir | 90 -------------- iree/test/e2e/linalg_tensor_ops/matmul.mlir | 28 ----- iree/test/e2e/models/BUILD | 25 ---- iree/test/e2e/models/CMakeLists.txt | 33 ----- iree/test/e2e/models/edge_detection.mlir | 2 - iree/test/e2e/models/fragment_000.mlir | 2 - iree/test/e2e/models/fullyconnected.mlir | 2 - iree/test/e2e/models/mnist_fake_weights.mlir | 2 - iree/test/e2e/models/unidirectional_lstm.mlir | 2 - iree/test/e2e/regression/dynamic_abs.mlir | 1 - iree/test/e2e/regression/dynamic_add.mlir | 4 +- iree/test/e2e/regression/dynamic_dot.mlir | 2 +- .../dynamic_linalg_matmul_on_tensors.mlir | 2 +- ...namic_linalg_matmul_on_tensors_fuse_0.mlir | 2 +- ...namic_linalg_matmul_on_tensors_fuse_1.mlir | 2 +- ...namic_linalg_matmul_on_tensors_fuse_2.mlir | 2 +- iree/test/e2e/vulkan_specific/BUILD | 3 - iree/test/e2e/vulkan_specific/CMakeLists.txt | 3 - iree/test/e2e/xla_ops/BUILD | 27 +--- iree/test/e2e/xla_ops/CMakeLists.txt | 116 +----------------- iree/test/e2e/xla_ops/partial/BUILD | 2 - iree/test/e2e/xla_ops/partial/CMakeLists.txt | 2 - 27 files changed, 10 insertions(+), 460 deletions(-) delete mode 100644 iree/test/e2e/linalg_tensor_ops/BUILD delete mode 100644 iree/test/e2e/linalg_tensor_ops/CMakeLists.txt delete mode 100644 iree/test/e2e/linalg_tensor_ops/add.mlir delete mode 100644 iree/test/e2e/linalg_tensor_ops/matmul.mlir diff --git a/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest.mlir b/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest.mlir index 12b61f21083c..6e00924bf262 100644 --- a/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest.mlir +++ b/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest.mlir @@ -1,4 +1,4 @@ -// RUN: iree-opt -split-input-file -iree-hal-transformation-pipeline -iree-hal-target-backends=dylib-llvm-aot --iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors %s | IreeFileCheck %s +// RUN: iree-opt -split-input-file -iree-hal-transformation-pipeline -iree-hal-target-backends=dylib-llvm-aot %s | IreeFileCheck %s #map = affine_map<(d0) -> (d0)> flow.executable @add_dispatch_0 { diff --git a/iree/test/e2e/cuda_specific/BUILD b/iree/test/e2e/cuda_specific/BUILD index 351ac6f7436d..6da90c9fb9f9 100644 --- a/iree/test/e2e/cuda_specific/BUILD +++ b/iree/test/e2e/cuda_specific/BUILD @@ -28,9 +28,6 @@ iree_check_single_backend_test_suite( srcs = [ "dot.mlir", ], - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - ], driver = "cuda", tags = [ # CUDA cuInit fails with sanitizer on. diff --git a/iree/test/e2e/cuda_specific/CMakeLists.txt b/iree/test/e2e/cuda_specific/CMakeLists.txt index 960955441e96..a1ced9966b19 100644 --- a/iree/test/e2e/cuda_specific/CMakeLists.txt +++ b/iree/test/e2e/cuda_specific/CMakeLists.txt @@ -19,8 +19,6 @@ iree_check_single_backend_test_suite( "cuda" DRIVER "cuda" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" LABELS "noasan" "nomsan" diff --git a/iree/test/e2e/linalg_tensor_ops/BUILD b/iree/test/e2e/linalg_tensor_ops/BUILD deleted file mode 100644 index df5113f3b8d2..000000000000 --- a/iree/test/e2e/linalg_tensor_ops/BUILD +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 2019 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Tests of end-to-end IREE support for individual ops in the XLA HLO dialect. -# Each test file should have a name matching the corresponding XLA HLO op and test only the -# functionality of that op (though may make use of other ops where necessary). Tests should be -# written using the IREE Check framework and should always pass on the reference VMLA backend. -# See https://google.github.io/iree/TestingGuide#iree-core-end-to-end-tests. - -load("//build_tools/bazel:enforce_glob.bzl", "enforce_glob") -load("//build_tools/bazel:iree_check_test.bzl", "iree_check_single_backend_test_suite") - -package( - default_visibility = ["//visibility:public"], - features = ["layering_check"], - licenses = ["notice"], # Apache 2.0 -) - -ALL_SRCS = enforce_glob( - [ - "add.mlir", - "matmul.mlir", - ], - include = ["*.mlir"], -) - -iree_check_single_backend_test_suite( - name = "check_llvm-ir_llvm", - srcs = ALL_SRCS, - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-codegen-llvm-experimental-linalg-on-tensors", - ], - driver = "dylib", - target_backend = "dylib-llvm-aot", -) - -iree_check_single_backend_test_suite( - name = "check_vulkan-spirv_vulkan", - srcs = ALL_SRCS, - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-codegen-spirv-experimental-linalg-on-tensors", - ], - driver = "vulkan", - target_backend = "vulkan-spirv", -) - -test_suite( - name = "check", - tests = [ - ":check_llvm-ir_llvm", - ":check_vulkan-spirv_vulkan", - ], -) diff --git a/iree/test/e2e/linalg_tensor_ops/CMakeLists.txt b/iree/test/e2e/linalg_tensor_ops/CMakeLists.txt deleted file mode 100644 index f60e17c17766..000000000000 --- a/iree/test/e2e/linalg_tensor_ops/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# Autogenerated by build_tools/bazel_to_cmake/bazel_to_cmake.py from # -# iree/test/e2e/linalg_tensor_ops/BUILD # -# # -# Use iree_cmake_extra_content from iree/build_defs.oss.bzl to add arbitrary # -# CMake-only content. # -# # -# To disable autogeneration for this file entirely, delete this header. # -################################################################################ - -iree_add_all_subdirs() - -iree_check_single_backend_test_suite( - NAME - check_llvm-ir_llvm - SRCS - "add.mlir" - "matmul.mlir" - TARGET_BACKEND - "dylib-llvm-aot" - DRIVER - "dylib" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-codegen-llvm-experimental-linalg-on-tensors" -) - -iree_check_single_backend_test_suite( - NAME - check_vulkan-spirv_vulkan - SRCS - "add.mlir" - "matmul.mlir" - TARGET_BACKEND - "vulkan-spirv" - DRIVER - "vulkan" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-codegen-spirv-experimental-linalg-on-tensors" -) - -### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ### diff --git a/iree/test/e2e/linalg_tensor_ops/add.mlir b/iree/test/e2e/linalg_tensor_ops/add.mlir deleted file mode 100644 index 6d5265676d8c..000000000000 --- a/iree/test/e2e/linalg_tensor_ops/add.mlir +++ /dev/null @@ -1,90 +0,0 @@ -func @tensor() attributes { iree.module.export } { - %A = iree.unfoldable_constant dense< - [[1.0, 2.0, 3.0, 4.0, 5.0], - [6.0, 7.0, 8.0, 9.0, 10.0], - [11.0, 12.0, 13.0, 14.0, 15.0], - [16.0, 17.0, 18.0, 19.0, 20.0], - [21.0, 22.0, 23.0, 24.0, 25.0], - [26.0, 27.0, 28.0, 29.0, 30.0], - [31.0, 32.0, 33.0, 34.0, 35.0], - [36.0, 37.0, 38.0, 39.0, 40.0]]> : tensor<8x5xf32> - %B = iree.unfoldable_constant dense< - [11.0, 12.0, 13.0, 14.0, 15.0]> : tensor<5xf32> - %C = linalg.init_tensor [8, 5] : tensor<8x5xf32> - %D = linalg.generic { - indexing_maps = [affine_map<(d0, d1) -> (d0, d1)>, - affine_map<(d0, d1) -> (d1)>, - affine_map<(d0, d1) -> (d0, d1)>], - iterator_types = ["parallel", "parallel"]} - ins(%A, %B: tensor<8x5xf32>, tensor<5xf32>) - outs(%C: tensor<8x5xf32>) { - ^bb0(%arg0: f32, %arg1: f32, %arg2 : f32): - %0 = addf %arg0, %arg1 : f32 - linalg.yield %0 : f32 - } -> tensor<8x5xf32> - check.expect_almost_eq_const(%D, dense< - [[12.0, 14.0, 16.0, 18.0, 20.0], - [17.0, 19.0, 21.0, 23.0, 25.0], - [22.0, 24.0, 26.0, 28.0, 30.0], - [27.0, 29.0, 31.0, 33.0, 35.0], - [32.0, 34.0, 36.0, 38.0, 40.0], - [37.0, 39.0, 41.0, 43.0, 45.0], - [42.0, 44.0, 46.0, 48.0, 50.0], - [47.0, 49.0, 51.0, 53.0, 55.0]]> : tensor<8x5xf32>) : tensor<8x5xf32> - return -} - -func @tensor_large() attributes { iree.module.export } { - %lhs = iree.unfoldable_constant dense<20.0> : tensor<250x500xf32> - %rhs = iree.unfoldable_constant dense<22.0> : tensor<500xf32> - %init = linalg.init_tensor [500, 250] : tensor<500x250xf32> - %result = linalg.generic { - indexing_maps = [affine_map<(d0, d1) -> (d1, d0)>, - affine_map<(d0, d1) -> (d0)>, - affine_map<(d0, d1) -> (d0, d1)>], - iterator_types = ["parallel", "parallel"]} - ins(%lhs, %rhs: tensor<250x500xf32>, tensor<500xf32>) - outs(%init: tensor<500x250xf32>) { - ^bb0(%arg0: f32, %arg1: f32, %arg2 : f32): - %0 = addf %arg0, %arg1 : f32 - linalg.yield %0 : f32 - } -> tensor<500x250xf32> - check.expect_almost_eq_const(%result, dense<42.0> : tensor<500x250xf32>) : tensor<500x250xf32> - return -} - -func @tensor_4D() attributes { iree.module.export } { - %lhs = iree.unfoldable_constant dense<20.0> : tensor<10x20x30x40xf32> - %rhs = iree.unfoldable_constant dense<22.0> : tensor<10x20x30x40xf32> - %init = linalg.init_tensor [10, 20, 30, 40] : tensor<10x20x30x40xf32> - %result = linalg.generic { - indexing_maps = [affine_map<(d0, d1, d2, d3) -> (d0, d1, d2, d3)>, - affine_map<(d0, d1, d2, d3) -> (d0, d1, d2, d3)>, - affine_map<(d0, d1, d2, d3) -> (d0, d1, d2, d3)>], - iterator_types = ["parallel", "parallel", "parallel", "parallel"]} - ins(%lhs, %rhs: tensor<10x20x30x40xf32>, tensor<10x20x30x40xf32>) - outs(%init: tensor<10x20x30x40xf32>) { - ^bb0(%arg0: f32, %arg1: f32, %arg2 : f32): - %0 = addf %arg0, %arg1 : f32 - linalg.yield %0 : f32 - } -> tensor<10x20x30x40xf32> - check.expect_almost_eq_const(%result, dense<42.0> : tensor<10x20x30x40xf32>) : tensor<10x20x30x40xf32> - return -} - -func @cst_plus_tensor() attributes { iree.module.export } { - %c2 = constant 2 : i32 - %cst = constant dense<[[[1, 2, 3], [4, 5, 6]], [[7, 8, 9], [10, 11, 12]]]> : tensor<2x2x3xi32> - %0 = linalg.init_tensor [2, 2, 3] : tensor<2x2x3xi32> - %1 = linalg.generic - {indexing_maps = [affine_map<(d0, d1, d2) -> (d0, d1, d2)>, affine_map<(d0, d1, d2) -> (d0, d1, d2)>], - iterator_types = ["parallel", "parallel", "parallel"]} - ins(%cst : tensor<2x2x3xi32>) outs(%0 : tensor<2x2x3xi32>) { - ^bb0(%arg0 : i32, %arg1 : i32): - %2 = muli %arg0, %c2 : i32 - linalg.yield %2 : i32 - } -> tensor<2x2x3xi32> - check.expect_eq_const(%1, dense< - [[[2, 4, 6], [8, 10, 12]], [[14, 16, 18], [20, 22, 24]]]> : tensor<2x2x3xi32>) : tensor<2x2x3xi32> - return -} diff --git a/iree/test/e2e/linalg_tensor_ops/matmul.mlir b/iree/test/e2e/linalg_tensor_ops/matmul.mlir deleted file mode 100644 index eceac5cca08d..000000000000 --- a/iree/test/e2e/linalg_tensor_ops/matmul.mlir +++ /dev/null @@ -1,28 +0,0 @@ -func @tensor() attributes { iree.module.export } { - %A = iree.unfoldable_constant dense<[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]> : tensor<2x3xf32> - %B = iree.unfoldable_constant dense<[[1.0, 2.0, 3.0, 4.0], - [5.0, 6.0, 7.0, 8.0], - [9.0, 10.0, 11.0, 12.0]]> : tensor<3x4xf32> - %C = iree.unfoldable_constant dense<1000.0> : tensor<2x4xf32> - - %D = linalg.matmul ins(%A, %B: tensor<2x3xf32>, tensor<3x4xf32>) - outs(%C: tensor<2x4xf32>) -> tensor<2x4xf32> - - check.expect_almost_eq_const(%D, dense<[[1038.0, 1044.0, 1050.0, 1056.0], - [1083.0, 1098.0, 1113.0, 1128.0]]> : - tensor<2x4xf32>) : tensor<2x4xf32> - - return -} - - -func @large() attributes { iree.module.export } { - %lhs = iree.unfoldable_constant dense<1.0> : tensor<250x1024xf32> - %rhs = iree.unfoldable_constant dense<0.4> : tensor<1024x500xf32> - %init = iree.unfoldable_constant dense<0.2> : tensor<250x500xf32> - %res = linalg.matmul - ins(%lhs, %rhs : tensor<250x1024xf32>, tensor<1024x500xf32>) - outs(%init : tensor<250x500xf32>) -> tensor<250x500xf32> - check.expect_almost_eq_const(%res, dense<409.796> : tensor<250x500xf32>) : tensor<250x500xf32> - return -} diff --git a/iree/test/e2e/models/BUILD b/iree/test/e2e/models/BUILD index d744aa562c70..bbe0d3d0f703 100644 --- a/iree/test/e2e/models/BUILD +++ b/iree/test/e2e/models/BUILD @@ -62,28 +62,3 @@ iree_check_single_backend_test_suite( driver = "vmla", target_backend = "vmla", ) - -iree_check_single_backend_test_suite( - name = "check_linalg_on_tensors_vulkan-spirv_vulkan", - srcs = CHECK_FRAMEWORK_TESTS, - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-flow-inline-constants-max-byte-length=2048", - "-iree-codegen-spirv-experimental-linalg-on-tensors", - "-iree-spirv-enable-vectorization", - ], - driver = "vulkan", - target_backend = "vulkan-spirv", -) - -iree_check_single_backend_test_suite( - name = "check_linalg_on_tensors_dylib-llvm-aot_dylib", - srcs = CHECK_FRAMEWORK_TESTS, - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-flow-inline-constants-max-byte-length=2048", - "-iree-codegen-llvm-experimental-linalg-on-tensors", - ], - driver = "dylib", - target_backend = "dylib-llvm-aot", -) diff --git a/iree/test/e2e/models/CMakeLists.txt b/iree/test/e2e/models/CMakeLists.txt index 15875720a73f..3b3b9f66f57e 100644 --- a/iree/test/e2e/models/CMakeLists.txt +++ b/iree/test/e2e/models/CMakeLists.txt @@ -41,37 +41,4 @@ iree_check_single_backend_test_suite( "vmla" ) -iree_check_single_backend_test_suite( - NAME - check_linalg_on_tensors_vulkan-spirv_vulkan - SRCS - "bert_encoder_unrolled_fake_weights.mlir" - "mobilenetv2_fake_weights.mlir" - TARGET_BACKEND - "vulkan-spirv" - DRIVER - "vulkan" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-flow-inline-constants-max-byte-length=2048" - "-iree-codegen-spirv-experimental-linalg-on-tensors" - "-iree-spirv-enable-vectorization" -) - -iree_check_single_backend_test_suite( - NAME - check_linalg_on_tensors_dylib-llvm-aot_dylib - SRCS - "bert_encoder_unrolled_fake_weights.mlir" - "mobilenetv2_fake_weights.mlir" - TARGET_BACKEND - "dylib-llvm-aot" - DRIVER - "dylib" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-flow-inline-constants-max-byte-length=2048" - "-iree-codegen-llvm-experimental-linalg-on-tensors" -) - ### BAZEL_TO_CMAKE_PRESERVES_ALL_CONTENT_BELOW_THIS_LINE ### diff --git a/iree/test/e2e/models/edge_detection.mlir b/iree/test/e2e/models/edge_detection.mlir index 477f3e2b6d8e..57c9eaa932c6 100644 --- a/iree/test/e2e/models/edge_detection.mlir +++ b/iree/test/e2e/models/edge_detection.mlir @@ -1,8 +1,6 @@ // RUN: iree-run-mlir -export-all -iree-hal-target-backends=vmla %s -function-input="1x128x128x1xf32" | IreeFileCheck %s // RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s -function-input="1x128x128x1xf32" | IreeFileCheck %s) // RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv %s -function-input="1x128x128x1xf32" | IreeFileCheck %s) -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s -function-input="1x128x128x1xf32" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors | IreeFileCheck %s) -// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv %s -function-input="1x128x128x1xf32" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-spirv-experimental-linalg-on-tensors | IreeFileCheck %s) // Image edge detection module generated by iree/colab/edge_detection.ipynb. // diff --git a/iree/test/e2e/models/fragment_000.mlir b/iree/test/e2e/models/fragment_000.mlir index 4387da40a60f..a6b3a933f93a 100644 --- a/iree/test/e2e/models/fragment_000.mlir +++ b/iree/test/e2e/models/fragment_000.mlir @@ -1,8 +1,6 @@ // RUN: iree-run-mlir -export-all -iree-hal-target-backends=vmla %s -function-input="f32=0" -function-input="5x1xf32=[1][-2][-3][4][-5]" -function-input="f32=1" -function-input="5x5xf32=[3.46499 -7.64389 -5.72249 5.98053 17.6892][2.9707 -6.20734 -4.25962 4.76055 13.8784][2.47641 -4.77079 -2.79675 3.54056 10.0675][1.98212 -3.33424 -1.33388 2.32058 6.25666][1.48783 -1.8977 0.12899 1.1006 2.4458]" -function-input="5xf32=0 0 0 0 0" | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]" // RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s -function-input="f32=0" -function-input="5x1xf32=[1][-2][-3][4][-5]" -function-input="f32=1" -function-input="5x5xf32=[3.46499 -7.64389 -5.72249 5.98053 17.6892][2.9707 -6.20734 -4.25962 4.76055 13.8784][2.47641 -4.77079 -2.79675 3.54056 10.0675][1.98212 -3.33424 -1.33388 2.32058 6.25666][1.48783 -1.8977 0.12899 1.1006 2.4458]" -function-input="5xf32=0 0 0 0 0" | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") // RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv %s -function-input="f32=0" -function-input="5x1xf32=[1][-2][-3][4][-5]" -function-input="f32=1" -function-input="5x5xf32=[3.46499 -7.64389 -5.72249 5.98053 17.6892][2.9707 -6.20734 -4.25962 4.76055 13.8784][2.47641 -4.77079 -2.79675 3.54056 10.0675][1.98212 -3.33424 -1.33388 2.32058 6.25666][1.48783 -1.8977 0.12899 1.1006 2.4458]" -function-input="5xf32=0 0 0 0 0" | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s -function-input="f32=0" -function-input="5x1xf32=[1][-2][-3][4][-5]" -function-input="f32=1" -function-input="5x5xf32=[3.46499 -7.64389 -5.72249 5.98053 17.6892][2.9707 -6.20734 -4.25962 4.76055 13.8784][2.47641 -4.77079 -2.79675 3.54056 10.0675][1.98212 -3.33424 -1.33388 2.32058 6.25666][1.48783 -1.8977 0.12899 1.1006 2.4458]" -function-input="5xf32=0 0 0 0 0" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") -// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv %s -function-input="f32=0" -function-input="5x1xf32=[1][-2][-3][4][-5]" -function-input="f32=1" -function-input="5x5xf32=[3.46499 -7.64389 -5.72249 5.98053 17.6892][2.9707 -6.20734 -4.25962 4.76055 13.8784][2.47641 -4.77079 -2.79675 3.54056 10.0675][1.98212 -3.33424 -1.33388 2.32058 6.25666][1.48783 -1.8977 0.12899 1.1006 2.4458]" -function-input="5xf32=0 0 0 0 0" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-spirv-experimental-linalg-on-tensors | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") // CHECK-LABEL: EXEC @main_entry_dispatch_3 func @main_entry_dispatch_3( diff --git a/iree/test/e2e/models/fullyconnected.mlir b/iree/test/e2e/models/fullyconnected.mlir index 9f69e6f325b4..ba212e407f28 100644 --- a/iree/test/e2e/models/fullyconnected.mlir +++ b/iree/test/e2e/models/fullyconnected.mlir @@ -1,8 +1,6 @@ // RUN: iree-run-mlir -export-all %s -iree-hal-target-backends=vmla -function-input="1x5xf32=1,-2,-3,4,-5" -function-input="1x5x3x1xf32=15,14,13,12,11,10,9,8,7,6,5,4,3,2,1" | IreeFileCheck %s // RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all %s -iree-hal-target-backends=dylib-llvm-aot -function-input="1x5xf32=1,-2,-3,4,-5" -function-input="1x5x3x1xf32=15,14,13,12,11,10,9,8,7,6,5,4,3,2,1" | IreeFileCheck %s) // RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all %s -iree-hal-target-backends=vulkan-spirv -function-input="1x5xf32=1,-2,-3,4,-5" -function-input="1x5x3x1xf32=15,14,13,12,11,10,9,8,7,6,5,4,3,2,1" | IreeFileCheck %s) -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all %s -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors -function-input="1x5xf32=1,-2,-3,4,-5" -function-input="1x5x3x1xf32=15,14,13,12,11,10,9,8,7,6,5,4,3,2,1" | IreeFileCheck %s) -// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all %s -iree-hal-target-backends=vulkan-spirv -iree-flow-dispatch-linalg-on-tensors -iree-codegen-spirv-experimental-linalg-on-tensors -function-input="1x5xf32=1,-2,-3,4,-5" -function-input="1x5x3x1xf32=15,14,13,12,11,10,9,8,7,6,5,4,3,2,1" | IreeFileCheck %s) // CHECK-LABEL: EXEC @main func @main(%arg0: tensor<1x5xf32>, %arg1: tensor<1x5x3x1xf32>) -> tensor<5x1x5xf32> diff --git a/iree/test/e2e/models/mnist_fake_weights.mlir b/iree/test/e2e/models/mnist_fake_weights.mlir index 2b8fd273449b..0862335ac845 100644 --- a/iree/test/e2e/models/mnist_fake_weights.mlir +++ b/iree/test/e2e/models/mnist_fake_weights.mlir @@ -3,8 +3,6 @@ // RUN: iree-run-mlir -export-all -iree-hal-target-backends=vmla %s -function-input="1x28x28x1xf32" | IreeFileCheck %s // RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s -function-input="1x28x28x1xf32" | IreeFileCheck %s) // RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv %s -function-input="1x28x28x1xf32" | IreeFileCheck %s) -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s -function-input="1x28x28x1xf32" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors | IreeFileCheck %s) -// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv %s -function-input="1x28x28x1xf32" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-spirv-experimental-linalg-on-tensors | IreeFileCheck %s) module { flow.variable @"__iree_flow___sm_node17__model.layer-1.kernel" dense<1.000000e+00> : tensor<784x128xf32> attributes {noinline, sym_visibility = "private"} diff --git a/iree/test/e2e/models/unidirectional_lstm.mlir b/iree/test/e2e/models/unidirectional_lstm.mlir index b3551cc095c8..72509f35958e 100644 --- a/iree/test/e2e/models/unidirectional_lstm.mlir +++ b/iree/test/e2e/models/unidirectional_lstm.mlir @@ -3,8 +3,6 @@ // RUN: iree-run-mlir %s -iree-hal-target-backends=vmla -function-input="1x5xf32=[0,1,0,3,4]" -function-input="1x5x2x2xf32=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]" // RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir %s -iree-hal-target-backends=dylib-llvm-aot -function-input="1x5xf32=[0,1,0,3,4]" -function-input="1x5x2x2xf32=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") // RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir %s -iree-hal-target-backends=vulkan-spirv -function-input="1x5xf32=[0,1,0,3,4]" -function-input="1x5x2x2xf32=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir %s -iree-hal-target-backends=dylib-llvm-aot -function-input="1x5xf32=[0,1,0,3,4]" -function-input="1x5x2x2xf32=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") -// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir %s -iree-hal-target-backends=vulkan-spirv -function-input="1x5xf32=[0,1,0,3,4]" -function-input="1x5x2x2xf32=[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]" -iree-flow-dispatch-linalg-on-tensors -iree-codegen-spirv-experimental-linalg-on-tensors | IreeFileCheck %s --implicit-check-not="[" --implicit-check-not="]") // Exported via the XLA HLO Importer // The resulting MLIR was modified by hand by changing all large constants to be diff --git a/iree/test/e2e/regression/dynamic_abs.mlir b/iree/test/e2e/regression/dynamic_abs.mlir index b87ee1cf9fa8..67b3f4c8872f 100644 --- a/iree/test/e2e/regression/dynamic_abs.mlir +++ b/iree/test/e2e/regression/dynamic_abs.mlir @@ -1,6 +1,5 @@ // RUN: iree-run-mlir -export-all -iree-hal-target-backends=vmla %s | IreeFileCheck %s // RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s | IreeFileCheck %s) -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors %s | IreeFileCheck %s) // CHECK-LABEL: EXEC @dynamic_tensor func @dynamic_tensor() -> tensor attributes { iree.module.export } { diff --git a/iree/test/e2e/regression/dynamic_add.mlir b/iree/test/e2e/regression/dynamic_add.mlir index d1a5633040ed..57961afebc17 100644 --- a/iree/test/e2e/regression/dynamic_add.mlir +++ b/iree/test/e2e/regression/dynamic_add.mlir @@ -1,6 +1,6 @@ // RUN: iree-run-mlir -export-all -iree-hal-target-backends=vmla -function-input="2x4xf32=[[1.0, 2.0, 3.0, 4.0], [-1.0, -2.0, -3.0, -4.0]]" -function-input="2x4xf32=[[5.0, 6.0, 7.0, 8.0], [-5.0, -6.0, -7.0, -8.0]]" %s | IreeFileCheck %s -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors -function-input="2x4xf32=[[1.0, 2.0, 3.0, 4.0], [-1.0, -2.0, -3.0, -4.0]]" -function-input="2x4xf32=[[5.0, 6.0, 7.0, 8.0], [-5.0, -6.0, -7.0, -8.0]]" %s | IreeFileCheck %s) -// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv -iree-flow-dispatch-linalg-on-tensors -iree-codegen-spirv-experimental-linalg-on-tensors -function-input="2x4xf32=[[1.0, 2.0, 3.0, 4.0], [-1.0, -2.0, -3.0, -4.0]]" -function-input="2x4xf32=[[5.0, 6.0, 7.0, 8.0], [-5.0, -6.0, -7.0, -8.0]]" %s | IreeFileCheck %s) +// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot -function-input="2x4xf32=[[1.0, 2.0, 3.0, 4.0], [-1.0, -2.0, -3.0, -4.0]]" -function-input="2x4xf32=[[5.0, 6.0, 7.0, 8.0], [-5.0, -6.0, -7.0, -8.0]]" %s | IreeFileCheck %s) +// RUN: [[ $IREE_VULKAN_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=vulkan-spirv -function-input="2x4xf32=[[1.0, 2.0, 3.0, 4.0], [-1.0, -2.0, -3.0, -4.0]]" -function-input="2x4xf32=[[5.0, 6.0, 7.0, 8.0], [-5.0, -6.0, -7.0, -8.0]]" %s | IreeFileCheck %s) // CHECK: EXEC @main // CHECK: 2x4xf32=[6 8 10 12][-6 -8 -10 -12] diff --git a/iree/test/e2e/regression/dynamic_dot.mlir b/iree/test/e2e/regression/dynamic_dot.mlir index a7f341831780..175262c64227 100644 --- a/iree/test/e2e/regression/dynamic_dot.mlir +++ b/iree/test/e2e/regression/dynamic_dot.mlir @@ -1,5 +1,5 @@ // RUN: iree-run-mlir -export-all -iree-hal-target-backends=vmla %s | IreeFileCheck %s -// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-codegen-llvm-experimental-linalg-on-tensors %s | IreeFileCheck %s) +// RUN: [[ $IREE_LLVMAOT_DISABLE == 1 ]] || (iree-run-mlir -export-all -iree-hal-target-backends=dylib-llvm-aot %s | IreeFileCheck %s) // CHECK-LABEL: EXEC @dynamic_dot func @dynamic_dot() -> tensor attributes { iree.module.export } { diff --git a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors.mlir b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors.mlir index 9a68477a18e9..87ab31da57cb 100644 --- a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors.mlir +++ b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors.mlir @@ -1,4 +1,4 @@ -// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -iree-codegen-llvm-experimental-linalg-on-tensors -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s +// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s // CHECK: EXEC @main // CHECK: 2x4xf32=[1038 1044 1050 1056][1083 1098 1113 1128] diff --git a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_0.mlir b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_0.mlir index 928afd0f17b0..f737b6d1c801 100644 --- a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_0.mlir +++ b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_0.mlir @@ -1,4 +1,4 @@ -// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-flow-dispatch-linalg-on-tensors-enable-fusion -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -iree-codegen-llvm-experimental-linalg-on-tensors -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s +// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors-enable-fusion -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s // CHECK: EXEC @main // CHECK: 2x4xf32=[985 982 979 976][985 982 979 976] diff --git a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_1.mlir b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_1.mlir index 5b64fccd4efa..6c21061bc832 100644 --- a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_1.mlir +++ b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_1.mlir @@ -1,4 +1,4 @@ -// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors-enable-fusion=true -iree-flow-dispatch-linalg-on-tensors -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -iree-codegen-llvm-experimental-linalg-on-tensors -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s +// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors-enable-fusion=true -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s // CHECK: EXEC @main // CHECK: 2x4xf32=[994 994 994 994][985 985 985 985] diff --git a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_2.mlir b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_2.mlir index 6c4e132ba2db..1ade957584e0 100644 --- a/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_2.mlir +++ b/iree/test/e2e/regression/dynamic_linalg_matmul_on_tensors_fuse_2.mlir @@ -1,4 +1,4 @@ -// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors -iree-flow-dispatch-linalg-on-tensors-enable-fusion=true -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -iree-codegen-llvm-experimental-linalg-on-tensors -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s +// RUN: iree-run-mlir %s -export-all -iree-hal-target-backends=dylib-llvm-aot -iree-flow-dispatch-linalg-on-tensors-enable-fusion=true -iree-flow-dispatch-linalg-on-tensors-tile-sizes="1,1" -function-input="2x3xf32=[[1.0, 2.0, 3.0], [4.0, 5.0, 6.0]]" -function-input="3x4xf32=[[1.0, 2.0, 3.0, 4.0], [5.0, 6.0, 7.0, 8.0], [9.0, 10.0, 11.0, 12.0]]" -function-input="2x4xf32=[[1000.0, 1000.0, 1000.0, 1000.0], [1000.0, 1000.0, 1000.0, 1000.0]]" | IreeFileCheck %s // CHECK: EXEC @main // CHECK: 2x4xf32=[37 43 49 55][82 97 112 127] diff --git a/iree/test/e2e/vulkan_specific/BUILD b/iree/test/e2e/vulkan_specific/BUILD index 0f4c27f26447..ae9360fcc48f 100644 --- a/iree/test/e2e/vulkan_specific/BUILD +++ b/iree/test/e2e/vulkan_specific/BUILD @@ -62,9 +62,6 @@ iree_check_single_backend_test_suite( "vectorized_conv.mlir", ], compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-codegen-spirv-experimental-linalg-on-tensors", - "-iree-spirv-enable-vectorization", "-iree-vulkan-target-triple=valhall-g77-unknown-android10", ], driver = "vulkan", diff --git a/iree/test/e2e/vulkan_specific/CMakeLists.txt b/iree/test/e2e/vulkan_specific/CMakeLists.txt index 9e94d29d0a6c..59c300202355 100644 --- a/iree/test/e2e/vulkan_specific/CMakeLists.txt +++ b/iree/test/e2e/vulkan_specific/CMakeLists.txt @@ -51,9 +51,6 @@ iree_check_single_backend_test_suite( DRIVER "vulkan" COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-codegen-spirv-experimental-linalg-on-tensors" - "-iree-spirv-enable-vectorization" "-iree-vulkan-target-triple=valhall-g77-unknown-android10" ) diff --git a/iree/test/e2e/xla_ops/BUILD b/iree/test/e2e/xla_ops/BUILD index 323acd43b9e1..fc671365c224 100644 --- a/iree/test/e2e/xla_ops/BUILD +++ b/iree/test/e2e/xla_ops/BUILD @@ -146,29 +146,7 @@ iree_check_single_backend_test_suite( ) iree_check_single_backend_test_suite( - name = "check_linalg_on_tensors_dylib-llvm-aot_dylib", - srcs = DYLIB_AND_VULKAN_CHECK_TESTS, - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-codegen-llvm-experimental-linalg-on-tensors", - ], - driver = "dylib", - target_backend = "dylib-llvm-aot", -) - -iree_check_single_backend_test_suite( - name = "check_linalg_on_tensors_vulkan-spirv_vulkan", - srcs = DYLIB_AND_VULKAN_CHECK_TESTS, - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-codegen-spirv-experimental-linalg-on-tensors", - ], - driver = "vulkan", - target_backend = "vulkan-spirv", -) - -iree_check_single_backend_test_suite( - name = "check_linalg_on_tensors_cuda", + name = "check_cuda", srcs = [ "add.mlir", "broadcast.mlir", @@ -183,9 +161,6 @@ iree_check_single_backend_test_suite( "select.mlir", "subtract.mlir", ], - compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - ], driver = "cuda", tags = [ # CUDA cuInit fails with sanitizer on. diff --git a/iree/test/e2e/xla_ops/CMakeLists.txt b/iree/test/e2e/xla_ops/CMakeLists.txt index 44ec027a689d..294d835ebd5a 100644 --- a/iree/test/e2e/xla_ops/CMakeLists.txt +++ b/iree/test/e2e/xla_ops/CMakeLists.txt @@ -175,119 +175,7 @@ iree_check_single_backend_test_suite( iree_check_single_backend_test_suite( NAME - check_linalg_on_tensors_dylib-llvm-aot_dylib - SRCS - "abs.mlir" - "add.mlir" - "batch_norm_inference.mlir" - "broadcast.mlir" - "broadcast_add.mlir" - "broadcast_in_dim.mlir" - "clamp.mlir" - "compare.mlir" - "concatenate.mlir" - "constant.mlir" - "convert.mlir" - "convolution.mlir" - "cosine.mlir" - "divide.mlir" - "dot.mlir" - "dot_general.mlir" - "exponential.mlir" - "exponential_minus_one.mlir" - "floor.mlir" - "gather.mlir" - "iota.mlir" - "log.mlir" - "log_plus_one.mlir" - "maximum.mlir" - "minimum.mlir" - "multiply.mlir" - "negate.mlir" - "pad.mlir" - "reduce.mlir" - "reduce_window.mlir" - "remainder.mlir" - "reshape.mlir" - "reverse.mlir" - "rsqrt.mlir" - "select.mlir" - "sine.mlir" - "slice.mlir" - "sqrt.mlir" - "subtract.mlir" - "tanh.mlir" - "torch_index_select.mlir" - "transpose.mlir" - "while.mlir" - TARGET_BACKEND - "dylib-llvm-aot" - DRIVER - "dylib" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-codegen-llvm-experimental-linalg-on-tensors" -) - -iree_check_single_backend_test_suite( - NAME - check_linalg_on_tensors_vulkan-spirv_vulkan - SRCS - "abs.mlir" - "add.mlir" - "batch_norm_inference.mlir" - "broadcast.mlir" - "broadcast_add.mlir" - "broadcast_in_dim.mlir" - "clamp.mlir" - "compare.mlir" - "concatenate.mlir" - "constant.mlir" - "convert.mlir" - "convolution.mlir" - "cosine.mlir" - "divide.mlir" - "dot.mlir" - "dot_general.mlir" - "exponential.mlir" - "exponential_minus_one.mlir" - "floor.mlir" - "gather.mlir" - "iota.mlir" - "log.mlir" - "log_plus_one.mlir" - "maximum.mlir" - "minimum.mlir" - "multiply.mlir" - "negate.mlir" - "pad.mlir" - "reduce.mlir" - "reduce_window.mlir" - "remainder.mlir" - "reshape.mlir" - "reverse.mlir" - "rsqrt.mlir" - "select.mlir" - "sine.mlir" - "slice.mlir" - "sqrt.mlir" - "subtract.mlir" - "tanh.mlir" - "torch_index_select.mlir" - "transpose.mlir" - "while.mlir" - TARGET_BACKEND - "vulkan-spirv" - DRIVER - "vulkan" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-codegen-spirv-experimental-linalg-on-tensors" -) - -iree_check_single_backend_test_suite( - NAME - check_linalg_on_tensors_cuda + check_cuda SRCS "add.mlir" "broadcast.mlir" @@ -305,8 +193,6 @@ iree_check_single_backend_test_suite( "cuda" DRIVER "cuda" - COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" LABELS "noasan" "nomsan" diff --git a/iree/test/e2e/xla_ops/partial/BUILD b/iree/test/e2e/xla_ops/partial/BUILD index 08cc9d00dd64..caeb0e6e5551 100644 --- a/iree/test/e2e/xla_ops/partial/BUILD +++ b/iree/test/e2e/xla_ops/partial/BUILD @@ -38,8 +38,6 @@ iree_check_single_backend_test_suite( "dot_f16.mlir", ], compiler_flags = [ - "-iree-flow-dispatch-linalg-on-tensors", - "-iree-codegen-spirv-experimental-linalg-on-tensors", "-iree-vulkan-target-triple=valhall-g77-unknown-android10", ], driver = "vulkan", diff --git a/iree/test/e2e/xla_ops/partial/CMakeLists.txt b/iree/test/e2e/xla_ops/partial/CMakeLists.txt index efcfc75f7c25..30feee671fdd 100644 --- a/iree/test/e2e/xla_ops/partial/CMakeLists.txt +++ b/iree/test/e2e/xla_ops/partial/CMakeLists.txt @@ -21,8 +21,6 @@ iree_check_single_backend_test_suite( DRIVER "vulkan" COMPILER_FLAGS - "-iree-flow-dispatch-linalg-on-tensors" - "-iree-codegen-spirv-experimental-linalg-on-tensors" "-iree-vulkan-target-triple=valhall-g77-unknown-android10" LABELS "notap"