Revert "Actually make MobileBERT run in the test. (#5264)"

This reverts commit 1bdc3a4.
iree-org · Mar 31, 2021 · dbe1d92 · dbe1d92
1 parent 10f5eaf
commit dbe1d92
Show file tree

Hide file tree

Showing 4 changed files with 751 additions and 763 deletions.
diff --git a/iree/compiler/Dialect/Flow/IR/FlowOps.cpp b/iree/compiler/Dialect/Flow/IR/FlowOps.cpp
@@ -19,7 +19,6 @@
 #include "iree/compiler/Dialect/Shape/IR/Builders.h"
 #include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/CommandLine.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BlockAndValueMapping.h"
@@ -34,12 +33,6 @@
 #include "mlir/Support/LogicalResult.h"
 #include "mlir/Transforms/RegionUtils.h"
 
-static llvm::cl::opt<int> clInlineConstantByteLength(
-    "iree-flow-inline-constants-max-byte-length",
-    llvm::cl::desc("Maximum byte-length of constant that can be inlined into a "
-                   "dispatch region"),
-    llvm::cl::init(256));
-
 namespace mlir {
 namespace iree_compiler {
 namespace IREE {
@@ -838,8 +831,7 @@ static bool canDispatchRegionContainOp(Operation *op) {
       uint64_t estimatedByteLength =
           (shapedType.getNumElements() * shapedType.getElementTypeBitWidth()) /
           8;
-      return denseAttr.isSplat() ||
-             estimatedByteLength <= clInlineConstantByteLength;
+      return denseAttr.isSplat() || estimatedByteLength <= 256;  // or whatever
     } else if (constantType.isIntOrIndexOrFloat()) {
       return true;
     }

diff --git a/iree/test/e2e/models/BUILD b/iree/test/e2e/models/BUILD
@@ -68,7 +68,6 @@ iree_check_single_backend_test_suite(
     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",
     ],
@@ -81,7 +80,6 @@ iree_check_single_backend_test_suite(
     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",

diff --git a/iree/test/e2e/models/CMakeLists.txt b/iree/test/e2e/models/CMakeLists.txt
@@ -53,7 +53,6 @@ iree_check_single_backend_test_suite(
     "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"
 )
@@ -70,7 +69,6 @@ iree_check_single_backend_test_suite(
     "dylib"
   COMPILER_FLAGS
     "-iree-flow-dispatch-linalg-on-tensors"
-    "-iree-flow-inline-constants-max-byte-length=2048"
     "-iree-codegen-llvm-experimental-linalg-on-tensors"
 )