Re-apply converting TF models using TF Python API. (#13025) Revert "Revert "Convert TF models using TF Python API." (#12972)" This reverts commit 922973bc7051d948d9a4f7c9f3faa6ef2269d491. Fixes #13026

diff --git a/.github/workflows/build_e2e_test_artifacts.yml b/.github/workflows/build_e2e_test_artifacts.yml
index 6c1a66a..8943383 100644
--- a/.github/workflows/build_e2e_test_artifacts.yml
+++ b/.github/workflows/build_e2e_test_artifacts.yml

@@ -104,7 +104,7 @@
           build_tools/github_actions/docker_run.sh \
             --env "IREE_TF_BINARIES_DIR=${TF_BINARIES_DIR}" \
             --env "IREE_HOST_BIN_DIR=${HOST_BUILD_DIR}/install/bin" \
-            gcr.io/iree-oss/base@sha256:24fb5467da30c7b4c0f4c191cdf6124bda63b172d3ae98906e53b3d55ed6ddcb \
+            gcr.io/iree-oss/frontends@sha256:f7c5a863e3478a66aff8f3f527b5587666d3e84fe974e3f179a84eee11d79fd2 \
             build_tools/cmake/build_e2e_test_artifacts.sh \
             "${BUILD_E2E_TEST_ARTIFACTS_DIR}"
           echo "e2e-test-artifacts-dir=${BUILD_E2E_TEST_ARTIFACTS_DIR}/e2e_test_artifacts" >> "${GITHUB_OUTPUT}"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 258498a..691b242 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml

@@ -498,7 +498,7 @@
             --env "IREE_TF_BINARIES_DIR=${TF_BINARIES_DIR}" \
             --env "IREE_HOST_BIN_DIR=${BUILD_DIR}/install/bin" \
             --env "IREE_BUILD_BENCHMARKS_DIR=${BUILD_BENCHMARKS_DIR}" \
-            gcr.io/iree-oss/base@sha256:24fb5467da30c7b4c0f4c191cdf6124bda63b172d3ae98906e53b3d55ed6ddcb \
+            gcr.io/iree-oss/frontends@sha256:f7c5a863e3478a66aff8f3f527b5587666d3e84fe974e3f179a84eee11d79fd2 \
             build_tools/cmake/build_benchmarks.sh
 
   ############################### Configurations ###############################

diff --git a/build_tools/cmake/build_benchmarks.sh b/build_tools/cmake/build_benchmarks.sh
index 3485956..f6efbe3 100755
--- a/build_tools/cmake/build_benchmarks.sh
+++ b/build_tools/cmake/build_benchmarks.sh

@@ -25,6 +25,7 @@
 IREE_TF_BINARIES_DIR="${IREE_TF_BINARIES_DIR:-integrations/tensorflow/bazel-bin/iree_tf_compiler}"
 
 source build_tools/cmake/setup_build.sh
+source build_tools/cmake/setup_local_python.sh
 
 echo "Configuring to build benchmarks"
 "${CMAKE_BIN}" -B "${BUILD_DIR}" \
@@ -37,8 +38,7 @@
   -DIREE_BUILD_COMPILER=OFF \
   -DIREE_BUILD_SAMPLES=OFF \
   -DIREE_BUILD_TESTS=OFF \
-  -DIREE_IMPORT_TFLITE_PATH="${IREE_TF_BINARIES_DIR}/iree-import-tflite" \
-  -DIREE_IMPORT_TF_PATH="${IREE_TF_BINARIES_DIR}/iree-import-tf"
+  -DIREE_IMPORT_TFLITE_PATH="${IREE_TF_BINARIES_DIR}/iree-import-tflite"
 
 echo "Building benchmark artifacts"
 "${CMAKE_BIN}" \

diff --git a/build_tools/cmake/build_e2e_test_artifacts.sh b/build_tools/cmake/build_e2e_test_artifacts.sh
index e0e3cbb..f10a51f 100755
--- a/build_tools/cmake/build_e2e_test_artifacts.sh
+++ b/build_tools/cmake/build_e2e_test_artifacts.sh

@@ -29,6 +29,7 @@
 IREE_TF_BINARIES_DIR="${IREE_TF_BINARIES_DIR:-integrations/tensorflow/bazel-bin/iree_tf_compiler}"
 
 source build_tools/cmake/setup_build.sh
+source build_tools/cmake/setup_local_python.sh
 
 echo "Configuring to build e2e test artifacts"
 "${CMAKE_BIN}" -B "${BUILD_DIR}" \
@@ -40,8 +41,7 @@
   -DIREE_BUILD_COMPILER=OFF \
   -DIREE_BUILD_SAMPLES=OFF \
   -DIREE_BUILD_TESTS=OFF \
-  -DIREE_IMPORT_TFLITE_PATH="${IREE_TF_BINARIES_DIR}/iree-import-tflite" \
-  -DIREE_IMPORT_TF_PATH="${IREE_TF_BINARIES_DIR}/iree-import-tf"
+  -DIREE_IMPORT_TFLITE_PATH="${IREE_TF_BINARIES_DIR}/iree-import-tflite"
 
 echo "Building e2e test artifacts"
 "${CMAKE_BIN}" \

diff --git a/build_tools/cmake/build_tf_binaries.sh b/build_tools/cmake/build_tf_binaries.sh
index 9175f57..991a1de 100755
--- a/build_tools/cmake/build_tf_binaries.sh
+++ b/build_tools/cmake/build_tf_binaries.sh

@@ -69,7 +69,6 @@
 if [[ "${IREE_TF_BINARIES_OUTPUT_DIR}" != "" ]]; then
   mkdir -p "${IREE_TF_BINARIES_OUTPUT_DIR}"
   cp \
-    "${INTEGRATIONS_DIR}/bazel-bin/iree_tf_compiler/iree-import-tf" \
     "${INTEGRATIONS_DIR}/bazel-bin/iree_tf_compiler/iree-import-tflite" \
     "${INTEGRATIONS_DIR}/bazel-bin/iree_tf_compiler/iree-import-xla" \
     "${IREE_TF_BINARIES_OUTPUT_DIR}"

diff --git a/build_tools/cmake/run_tf_tests.sh b/build_tools/cmake/run_tf_tests.sh
index aaab281..1fa3c68 100755
--- a/build_tools/cmake/run_tf_tests.sh
+++ b/build_tools/cmake/run_tf_tests.sh

@@ -16,6 +16,7 @@
 IREE_LLVM_CPU_DISABLE="${IREE_LLVM_CPU_DISABLE:-0}"
 
 source "${BUILD_DIR}/.env" && export PYTHONPATH
+source build_tools/cmake/setup_local_python.sh
 
 echo "***** Running TensorFlow integration tests *****"
 # TODO: Use "--timeout 900" instead of --max-time below. Requires that

diff --git a/build_tools/cmake/setup_local_python.sh b/build_tools/cmake/setup_local_python.sh
new file mode 100644
index 0000000..ef7c6b8
--- /dev/null
+++ b/build_tools/cmake/setup_local_python.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+# Copyright 2021 The IREE Authors
+#
+# Licensed under the Apache License v2.0 with LLVM Exceptions.
+# See https://llvm.org/LICENSE.txt for license information.
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# Source this to set up the local python environment with in-tree, source
+# only packages.
+
+IREE_PYTHON3_EXECUTABLE="${IREE_PYTHON3_EXECUTABLE:-$(which python3)}"
+PYTHON_SCRIPTS_DIR="$(python -c "import sysconfig; print(sysconfig.get_path('scripts'))"):$HOME/.local/bin"
+export PATH="$PYTHON_SCRIPTS_DIR:$PATH"
+
+# Install local source-only Python packages. These do not have a build step
+# but export important binaries onto the path.
+"${IREE_PYTHON3_EXECUTABLE}" -m pip install integrations/tensorflow/python_projects/iree_tf
\ No newline at end of file

diff --git a/compiler/bindings/python/iree/compiler/tools/tf.py b/compiler/bindings/python/iree/compiler/tools/tf.py
index 69de8c7..085659e 100644
--- a/compiler/bindings/python/iree/compiler/tools/tf.py
+++ b/compiler/bindings/python/iree/compiler/tools/tf.py

@@ -31,8 +31,6 @@
     "ImportType",
 ]
 
-_TF_IMPORT_TOOL = "iree-import-tf"
-
 
 def is_available():
   """Determine if TensorFlow and the compiler are available."""
@@ -42,9 +40,9 @@
     logging.warn("Unable to import tensorflow")
     return False
   try:
-    find_tool(_TF_IMPORT_TOOL)
-  except ValueError:
-    logging.warning("Unable to find IREE tool %s", _TF_IMPORT_TOOL)
+    import iree.tools.tf.scripts.iree_import_tf.__main__
+  except ModuleNotFoundError:
+    logging.warning("Unable to find iree-import-tf")
     return False
   return True
 
@@ -102,7 +100,7 @@
 
   exported_names: Sequence[str] = ()
   import_only: bool = False
-  import_type: Union[ImportType, str] = ImportType.OBJECT_GRAPH
+  import_type: ImportType = ImportType.OBJECT_GRAPH
   input_type: Union[InputType, str] = InputType.XLA
   saved_model_tags: Set[str] = field(default_factory=set)
   import_extra_args: Sequence[str] = ()
@@ -115,71 +113,6 @@
     self.import_type = ImportType.parse(self.import_type)
 
 
-def build_import_command_line(input_path: str, tfs: TempFileSaver,
-                              options: ImportOptions) -> List[str]:
-  """Builds a command line for invoking the import stage.
-
-  Args:
-    input_path: The input path.
-    tfs: TempFileSaver.
-    options: Import options.
-  Returns:
-    List of strings of command line.
-  """
-  tf_import = find_tool(_TF_IMPORT_TOOL)
-  cl = [
-      tf_import,
-      input_path,
-      f"--tf-import-type={options.import_type.value}",
-      f"--tf-savedmodel-exported-names={','.join(options.exported_names)}",
-      f"--tf-savedmodel-tags={','.join(options.saved_model_tags)}",
-  ]
-
-  if options.import_only and options.output_file:
-    # Import stage directly outputs.
-    output_file = tfs.alloc_optional("tf-output.mlir",
-                                     export_as=options.output_file)
-    cl.append(f"-o={output_file}")
-    cl.append(f"--output-format=mlir-ir")
-
-  # MLIR flags.
-  if options.output_mlir_debuginfo:
-    cl.append("--mlir-print-debuginfo")
-  if options.output_generic_mlir:
-    cl.append("--mlir-print-op-generic")
-
-  # Save temps flags.
-  save_tf_input = tfs.alloc_optional("tf-input.mlir",
-                                     export_as=options.save_temp_tf_input)
-  if save_tf_input:
-    cl.append(f"--save-temp-tf-input={save_tf_input}")
-  save_mid_level_input = tfs.alloc_optional(
-      "tf-mid-level-input.mlir", export_as=options.save_temp_mid_level_input)
-  if save_mid_level_input:
-    cl.append(f"--save-temp-mid-level-input={save_mid_level_input}")
-  save_iree_input = tfs.alloc_optional("tf-iree-input.mlir",
-                                       export_as=options.save_temp_iree_input)
-  if save_iree_input:
-    cl.append(f"--save-temp-iree-input={save_iree_input}")
-
-  if options.use_tosa:
-    cl.append(f"--use-tosa")
-
-  # Crash reproducer (locally qualified).
-  requested_crash_reproducer_path = options.crash_reproducer_path
-  if requested_crash_reproducer_path:
-    requested_crash_reproducer_path = (requested_crash_reproducer_path +
-                                       ".import-tf")
-  crash_reproducer_path = tfs.alloc_optional(
-      "tf-reproducer.mlir", export_as=requested_crash_reproducer_path)
-  if crash_reproducer_path:
-    cl.append(f"--mlir-pass-pipeline-crash-reproducer={crash_reproducer_path}")
-
-  # Extra args.
-  cl.extend(options.import_extra_args)
-  return cl
-
-
 def compile_saved_model(saved_model_dir: str, **kwargs):
   """Compiles an on-disk saved model to an IREE binary.
 
@@ -190,19 +123,21 @@
     A bytes-like object with the compiled output or None if output_file=
     was specified.
   """
+  from iree.tools.tf.scripts.iree_import_tf import __main__
   with TempFileSaver.implicit() as tfs:
     options = ImportOptions(**kwargs)
-    import_cl = build_import_command_line(saved_model_dir, tfs, options)
-    if options.import_only:
-      # One stage tool pipeline.
-      result = invoke_immediate(import_cl)
-      if options.output_file:
-        return None
-      return result
+
+  with tempfile.NamedTemporaryFile(mode="w") as temp_file:
+    # Generate MLIR
+    __main__.import_saved_model(output_path=temp_file.name,
+                                saved_model_dir=saved_model_dir,
+                                exported_names=",".join(options.exported_names),
+                                import_type=options.import_type.value,
+                                tags=",".join(options.saved_model_tags))
 
     # Full compilation pipeline.
-    compile_cl = build_compile_command_line("-", tfs, options)
-    result = invoke_pipeline([import_cl, compile_cl])
+    compile_cl = build_compile_command_line(temp_file.name, tfs, options)
+    result = invoke_pipeline([compile_cl])
     if options.output_file:
       return None
     return result

diff --git a/integrations/tensorflow/iree_tf_compiler/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/BUILD.bazel
index 8f5605d..13e8db1 100644
--- a/integrations/tensorflow/iree_tf_compiler/BUILD.bazel
+++ b/integrations/tensorflow/iree_tf_compiler/BUILD.bazel

@@ -13,7 +13,6 @@
 filegroup(
     name = "importer-binaries",
     srcs = [
-        ":iree-import-tf",
         ":iree-import-tflite",
         ":iree-import-xla",
     ],
@@ -72,26 +71,6 @@
 )
 
 cc_binary(
-    name = "iree-import-tf",
-    srcs = ["iree-import-tf-main.cpp"],
-    deps = [
-        "//iree_tf_compiler/MHLO",
-        "//iree_tf_compiler/TF",
-        "@llvm-project//llvm:Support",
-        "@llvm-project//mlir:BytecodeWriter",
-        "@llvm-project//mlir:IR",
-        "@llvm-project//mlir:Pass",
-        "@llvm-project//mlir:Support",
-        "@org_tensorflow//tensorflow/cc/saved_model:loader",
-        "@org_tensorflow//tensorflow/compiler/mlir:init_mlir",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:import_model",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tf_dialect_passes",
-        "@org_tensorflow//tensorflow/core/platform:errors",
-    ],
-)
-
-cc_binary(
     name = "iree-import-tflite",
     srcs = ["iree-import-tflite-main.cpp"],
     deps = [

diff --git a/integrations/tensorflow/python_projects/iree_tf/iree/tools/tf/scripts/iree_import_tf/__main__.py b/integrations/tensorflow/python_projects/iree_tf/iree/tools/tf/scripts/iree_import_tf/__main__.py
index 0be95c7..9efebda 100644
--- a/integrations/tensorflow/python_projects/iree_tf/iree/tools/tf/scripts/iree_import_tf/__main__.py
+++ b/integrations/tensorflow/python_projects/iree_tf/iree/tools/tf/scripts/iree_import_tf/__main__.py

@@ -4,18 +4,106 @@
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-import subprocess
+import argparse
+import inspect
+from pathlib import Path
+import re
 import sys
 
-import iree.tools.tf
+
+def main():
+  parser = argparse.ArgumentParser()
+  parser.add_argument('saved_model_path',
+                      help='Path to the saved model directory to import.')
+  parser.add_argument('-o',
+                      '--output_path',
+                      dest='output_path',
+                      required=True,
+                      help='Path to the mlir file name to output.')
+  parser.add_argument(
+      '--tf-savedmodel-exported-names',
+      required=False,
+      help=
+      "List of exported names for cases that the model has ambiguous exports")
+  parser.add_argument(
+      "--tf-import-type",
+      default="savedmodel_v2",
+      help=
+      "Import type for legacy saved models ('savedmodel_v2' or 'savedmodel_v1')"
+  )
+  parser.add_argument(
+      "--tf-savedmodel-tags",
+      default="serve",
+      help="Tags used to indicate which MetaGraphDef to import, separated by "
+      "','")
+
+  # Deprecated and unused.  Kept in place so callers of the old tool don't break
+  # when using the new tool.
+  parser.add_argument('--output-format',
+                      dest='_',
+                      required=False,
+                      help=argparse.SUPPRESS)
+  args = parser.parse_args()
+
+  saved_model_dir = args.saved_model_path
+  exported_names = args.tf_savedmodel_exported_names
+  output_path = args.output_path
+  import_type = args.tf_import_type
+  tags = args.tf_savedmodel_tags
+  import_saved_model(output_path=output_path,
+                     saved_model_dir=saved_model_dir,
+                     exported_names=exported_names,
+                     import_type=import_type,
+                     tags=tags)
 
 
-def main(args=None):
-  if args is None:
-    args = sys.argv[1:]
-  exe = iree.tools.tf.get_tool("iree-import-tf")
-  return subprocess.call(args=[exe] + args)
+def import_saved_model(*, output_path, saved_model_dir, exported_names,
+                       import_type, tags):
+  # From here there be dragons.
+  from tensorflow.python import pywrap_mlir
+  if import_type == "savedmodel_v2":
+    result = pywrap_mlir.experimental_convert_saved_model_to_mlir(
+        saved_model_dir, exported_names=exported_names, show_debug_info=False)
+  elif import_type == "savedmodel_v1":
+    # You saw it here, folks: The TF team just adds random positional params
+    # without explanation or default. So we detect and default them on our
+    # own. Because this is normal and fine.
+    sig = inspect.signature(
+        pywrap_mlir.experimental_convert_saved_model_v1_to_mlir)
+    dumb_extra_kwargs = {}
+    if "include_variables_in_initializers" in sig.parameters:
+      dumb_extra_kwargs["include_variables_in_initializers"] = False
+    if "upgrade_legacy" in sig.parameters:
+      dumb_extra_kwargs["upgrade_legacy"] = False
+    if "lift_variables" in sig.parameters:
+      dumb_extra_kwargs["lift_variables"] = True
+    result = pywrap_mlir.experimental_convert_saved_model_v1_to_mlir(
+        saved_model_dir,
+        exported_names=exported_names,
+        tags=tags,
+        show_debug_info=False,
+        **dumb_extra_kwargs)
+  else:
+    raise ValueError(f"Unsupported import type: '{import_type}'")
+  # The import to MLIR produces public functions like __inference__{name}_2222
+  # but the conversion pipeline requires a single public @main function.
+  # Not sure how this was allowed to happen, but regex to the rescue.
+  # This is fine and normal, and totally to be expected. :(
+  result = re.sub(r"func @__inference_(.+)_[0-9]+\(", r"func @\1(", result)
+  pipeline = ["tf-lower-to-mlprogram-and-hlo"]
+  result = pywrap_mlir.experimental_run_pass_pipeline(result,
+                                                      ",".join(pipeline),
+                                                      show_debug_info=False)
+
+  # TODO: The experimental_write_bytecode function does not register the
+  # stablehlo dialect. Once fixed, remove this bypass.
+  WRITE_BYTECODE = False
+  if WRITE_BYTECODE:
+    result = pywrap_mlir.experimental_write_bytecode(output_path, result)
+  else:
+    with open(output_path, "wt") as f:
+      f.write(result)
 
 
 if __name__ == "__main__":
-  sys.exit(main())
+  main()

diff --git a/integrations/tensorflow/python_projects/iree_tf/setup.py b/integrations/tensorflow/python_projects/iree_tf/setup.py
index 7cc5844..e86771c 100644
--- a/integrations/tensorflow/python_projects/iree_tf/setup.py
+++ b/integrations/tensorflow/python_projects/iree_tf/setup.py

@@ -20,12 +20,6 @@
 '''
 
 exe_suffix = ".exe" if platform.system() == "Windows" else ""
-import_tf_path = os.path.join(os.path.dirname(__file__), "iree", "tools", "tf",
-                              f"iree-import-tf{exe_suffix}")
-if not os.access(import_tf_path, os.X_OK):
-  raise RuntimeError(
-      f"Tool not found ({import_tf_path}). Be sure to build "
-      f"//iree_tf_compiler:iree-import-tf and run ./symlink_binaries.sh")
 
 # Setup and get version information.
 THIS_DIR = os.path.realpath(os.path.dirname(__file__))

diff --git a/integrations/tensorflow/symlink_binaries.sh b/integrations/tensorflow/symlink_binaries.sh
index 67e2b1c..d3df051 100755
--- a/integrations/tensorflow/symlink_binaries.sh
+++ b/integrations/tensorflow/symlink_binaries.sh

@@ -27,6 +27,5 @@
   fi
 }
 
-symlink_import_binary tf
 symlink_import_binary tflite
 symlink_import_binary xla

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add.run
deleted file mode 100644
index d9d9508..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add_1.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add_1.run
deleted file mode 100644
index d9d9508..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add_1.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AdditiveAttention.run
deleted file mode 100644
index c7b06e2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AdditiveAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Attention.run
deleted file mode 100644
index a33c1bf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Attention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Average.run
deleted file mode 100644
index a359b14..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Average.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Concatenate.run
deleted file mode 100644
index 53a9abf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Concatenate.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dot.run
deleted file mode 100644
index 760801c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dot.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Dot --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected1D.run
deleted file mode 100644
index b42b9d1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected1D.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LocallyConnected1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected2D.run
deleted file mode 100644
index 3f0840e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected2D.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LocallyConnected2D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Maximum.run
deleted file mode 100644
index 7f37936..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Maximum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Minimum.run
deleted file mode 100644
index 5e14314..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Minimum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MultiHeadAttention.run
deleted file mode 100644
index b8eac48..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MultiHeadAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Multiply.run
deleted file mode 100644
index c61b996..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Subtract.run
deleted file mode 100644
index b9b65af..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling2D.run
deleted file mode 100644
index 5eee1ae..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling2D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=UpSampling2D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Add.run
deleted file mode 100644
index 3b54654..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Average.run
deleted file mode 100644
index 1bfa212..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Average.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling1D.run
deleted file mode 100644
index 6c5d61c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling1D.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_BatchNormalization.run
deleted file mode 100644
index 6c7fe77..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_BatchNormalization.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Concatenate.run
deleted file mode 100644
index 70ec380..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Concatenate.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1D.run
deleted file mode 100644
index 1ada4ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# XFAIL: *
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2D.run
deleted file mode 100644
index 0547aa7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# XFAIL: *
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv2D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Lambda.run
deleted file mode 100644
index 938647f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Lambda.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Lambda --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Masking.run
deleted file mode 100644
index 48c1cfd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Masking.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Masking --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool1D.run
deleted file mode 100644
index 34c10fd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool1D.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Maximum.run
deleted file mode 100644
index 8f7d620..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Maximum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Minimum.run
deleted file mode 100644
index dcb43ee..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Minimum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MultiHeadAttention.run
deleted file mode 100644
index 6bb7bfd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MultiHeadAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Multiply.run
deleted file mode 100644
index 7960ca2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_PReLU.run
deleted file mode 100644
index 5ad386e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_PReLU.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=PReLU --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Softmax.run
deleted file mode 100644
index 9ab7499..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Softmax.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Softmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Subtract.run
deleted file mode 100644
index db96629..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ThresholdedReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ThresholdedReLU.run
deleted file mode 100644
index b408fda..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ThresholdedReLU.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling1D.run
deleted file mode 100644
index 0a247c3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling1D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# XFAIL: *
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=UpSampling1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling3D.run
deleted file mode 100644
index 1c2555b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling3D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# XFAIL: *
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=UpSampling3D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding1D.run
deleted file mode 100644
index 00e0a3f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding1D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding2D.run
deleted file mode 100644
index 4fde6a0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding2D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding2D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding3D.run
deleted file mode 100644
index e1eabc3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding3D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding3D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AdditiveAttention.run
deleted file mode 100644
index 587a910..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AdditiveAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AdditiveAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Attention.run
deleted file mode 100644
index f263b41..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Attention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Attention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Concatenate.run
deleted file mode 100644
index 1adce42..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Concatenate.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Concatenate --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Add.run
deleted file mode 100644
index 397b448..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AdditiveAttention.run
deleted file mode 100644
index 0150abd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AdditiveAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Attention.run
deleted file mode 100644
index 6118db7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Attention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Average.run
deleted file mode 100644
index 270e71e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Average.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Concatenate.run
deleted file mode 100644
index 32fc09f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Concatenate.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dot.run
deleted file mode 100644
index 6dd75bd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dot.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Dot --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Maximum.run
deleted file mode 100644
index 5e91e05..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Maximum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Minimum.run
deleted file mode 100644
index b2d053c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Minimum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MultiHeadAttention.run
deleted file mode 100644
index a1d2829..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MultiHeadAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Multiply.run
deleted file mode 100644
index 0dbc2dd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Subtract.run
deleted file mode 100644
index aea2bc8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling2D.run
deleted file mode 100644
index 22e969f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling2D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=UpSampling2D --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Add.run
deleted file mode 100644
index 6e195e0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Average.run
deleted file mode 100644
index 034a9ab..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Average.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling1D.run
deleted file mode 100644
index 2f840f7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling1D.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_BatchNormalization.run
deleted file mode 100644
index 97ebe34..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_BatchNormalization.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Concatenate.run
deleted file mode 100644
index 594b7a6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Concatenate.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv1D.run
deleted file mode 100644
index aabf8c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv1D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# XFAIL: *
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv2D.run
deleted file mode 100644
index 4f0c5a9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv2D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# XFAIL: *
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv2D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Lambda.run
deleted file mode 100644
index 68c67fd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Lambda.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Lambda --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Masking.run
deleted file mode 100644
index f047730..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Masking.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Masking --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool1D.run
deleted file mode 100644
index 1cf42ea..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool1D.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Maximum.run
deleted file mode 100644
index 2774717..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Maximum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Minimum.run
deleted file mode 100644
index df6c4b0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Minimum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MultiHeadAttention.run
deleted file mode 100644
index 1191b26..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MultiHeadAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Multiply.run
deleted file mode 100644
index e1cb278..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_PReLU.run
deleted file mode 100644
index 30b3c4a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_PReLU.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=PReLU --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Softmax.run
deleted file mode 100644
index 44f45f7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Softmax.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Softmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Subtract.run
deleted file mode 100644
index 1cb7600..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ThresholdedReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ThresholdedReLU.run
deleted file mode 100644
index 76c86b0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ThresholdedReLU.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding1D.run
deleted file mode 100644
index 66a255b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding1D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding1D --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding2D.run
deleted file mode 100644
index fb19d76..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding2D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding2D --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding3D.run
deleted file mode 100644
index fe9f008..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ZeroPadding3D.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding3D --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AdditiveAttention.run
deleted file mode 100644
index 2f49d89..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AdditiveAttention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AdditiveAttention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Attention.run
deleted file mode 100644
index b7ea1d9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Attention.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Attention --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Concatenate.run
deleted file mode 100644
index dfbda14..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Concatenate.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_vulkan --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Concatenate --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__accumulate_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__accumulate_n.run
deleted file mode 100644
index d198062..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__accumulate_n.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=accumulate_n --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__add_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__add_n.run
deleted file mode 100644
index a18d0c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__add_n.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=add_n --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__argmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__argmax.run
deleted file mode 100644
index 14a395d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__argmax.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=argmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__argmin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__argmin.run
deleted file mode 100644
index 447308b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__argmin.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=argmin --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i0e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i0e.run
deleted file mode 100644
index 2902a0e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i0e.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=bessel_i0e --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i1e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i1e.run
deleted file mode 100644
index 6898354..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i1e.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=bessel_i1e --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__betainc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__betainc.run
deleted file mode 100644
index 7b80d80..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__betainc.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=betainc --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_count_nonzero.run
deleted file mode 100644
index d2fca69..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_divide.run
deleted file mode 100644
index 4b3beb8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_add.run
deleted file mode 100644
index b435ed2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_angle.run
deleted file mode 100644
index 2b07a02..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_angle.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=angle --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_count_nonzero.run
deleted file mode 100644
index 9cae20a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_divide.run
deleted file mode 100644
index 5cad607..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_divide_no_nan.run
deleted file mode 100644
index 1e2f4d9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_divide_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_l2_normalize.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_l2_normalize.run
deleted file mode 100644
index 32ea81c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_l2_normalize.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=l2_normalize --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_multiply.run
deleted file mode 100644
index 3421526..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_multiply_no_nan.run
deleted file mode 100644
index 9064ff2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_multiply_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_pow.run
deleted file mode 100644
index 9b628ab..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_pow.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=pow --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reciprocal_no_nan.run
deleted file mode 100644
index f1ecafa..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reciprocal_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_std.run
deleted file mode 100644
index 53bbf04..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_std.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_variance.run
deleted file mode 100644
index 04b2729..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_variance.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_square.run
deleted file mode 100644
index 6f1df84..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_square.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=square --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_squared_difference.run
deleted file mode 100644
index afca872..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_squared_difference.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_subtract.run
deleted file mode 100644
index aa8530d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_truediv.run
deleted file mode 100644
index 61ea648..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_truediv.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=truediv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xdivy.run
deleted file mode 100644
index d65690d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xdivy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xdivy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xlog1py.run
deleted file mode 100644
index 1ab53a7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xlog1py.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xlogy.run
deleted file mode 100644
index 45f579e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_xlogy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlogy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__count_nonzero.run
deleted file mode 100644
index d2fca69..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumulative_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumulative_logsumexp.run
deleted file mode 100644
index f45b975..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumulative_logsumexp.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=cumulative_logsumexp --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__divide.run
deleted file mode 100644
index 4b3beb8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_accumulate_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_accumulate_n.run
deleted file mode 100644
index 3166318..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_accumulate_n.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=accumulate_n --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_add.run
deleted file mode 100644
index b435ed2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_add_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_add_n.run
deleted file mode 100644
index 96c07ca..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_add_n.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=add_n --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_angle.run
deleted file mode 100644
index 2b07a02..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_angle.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=angle --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_count_nonzero.run
deleted file mode 100644
index 9cae20a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_divide.run
deleted file mode 100644
index 5cad607..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_divide_no_nan.run
deleted file mode 100644
index 1e2f4d9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_divide_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_equal.run
deleted file mode 100644
index 142e089..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floordiv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floordiv.run
deleted file mode 100644
index 3fd068c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floordiv.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=floordiv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floormod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floormod.run
deleted file mode 100644
index 80d889e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floormod.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=floormod --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_greater.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_greater.run
deleted file mode 100644
index 3d886ef..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_greater.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=greater --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_greater_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_greater_equal.run
deleted file mode 100644
index 8a4e70d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_greater_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=greater_equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_nan.run
deleted file mode 100644
index 3a2a7b3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=is_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_lbeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_lbeta.run
deleted file mode 100644
index e96141f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_lbeta.run
+++ /dev/null

@@ -1,4 +0,0 @@
-# TODO(#11923): If this test fails again, check #11923.
-
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=lbeta --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_less.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_less.run
deleted file mode 100644
index b813088..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_less.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=less --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_less_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_less_equal.run
deleted file mode 100644
index e93c9fa..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_less_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=less_equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log_softmax.run
deleted file mode 100644
index 0753eb1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log_softmax.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# TODO(#11196): If this test fails again, check #11196.
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=log_softmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_and.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_and.run
deleted file mode 100644
index 699b0f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_and.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=logical_and --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_or.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_or.run
deleted file mode 100644
index 28ced5f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_or.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=logical_or --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_xor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_xor.run
deleted file mode 100644
index 3dac825..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_xor.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=logical_xor --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_maximum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_maximum.run
deleted file mode 100644
index f6625f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_maximum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=maximum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_minimum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_minimum.run
deleted file mode 100644
index aa2b990..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_minimum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=minimum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_mod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_mod.run
deleted file mode 100644
index 710ec6b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_mod.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=mod --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_multiply.run
deleted file mode 100644
index 3421526..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_multiply_no_nan.run
deleted file mode 100644
index 9064ff2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_multiply_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_not_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_not_equal.run
deleted file mode 100644
index b665074..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_not_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=not_equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_polygamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_polygamma.run
deleted file mode 100644
index f603356..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_polygamma.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=polygamma --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_polyval.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_polyval.run
deleted file mode 100644
index 54b6316..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_polyval.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=polyval --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_pow.run
deleted file mode 100644
index 9b628ab..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_pow.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=pow --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reciprocal_no_nan.run
deleted file mode 100644
index f1ecafa..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reciprocal_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_std.run
deleted file mode 100644
index 53bbf04..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_std.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_variance.run
deleted file mode 100644
index 04b2729..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_variance.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_rint.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_rint.run
deleted file mode 100644
index 623a07f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_rint.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=rint --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_round.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_round.run
deleted file mode 100644
index d6956cd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_round.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=round --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softmax.run
deleted file mode 100644
index 092b784..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softmax.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# TODO(#11196): If this test fails again, check #11196.
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=softmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_square.run
deleted file mode 100644
index 6f1df84..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_square.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=square --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_squared_difference.run
deleted file mode 100644
index afca872..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_squared_difference.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_subtract.run
deleted file mode 100644
index aa8530d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_truediv.run
deleted file mode 100644
index 61ea648..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_truediv.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=truediv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xdivy.run
deleted file mode 100644
index d65690d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xdivy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xdivy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xlog1py.run
deleted file mode 100644
index 1ab53a7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xlog1py.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xlogy.run
deleted file mode 100644
index 45f579e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_xlogy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlogy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_zeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_zeta.run
deleted file mode 100644
index 3a6f200..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_zeta.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=zeta --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erfinv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erfinv.run
deleted file mode 100644
index 7c01bae..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erfinv.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=erfinv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__igamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__igamma.run
deleted file mode 100644
index 753a576..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__igamma.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=igamma --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__in_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__in_top_k.run
deleted file mode 100644
index b1d7b4b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__in_top_k.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=in_top_k --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__nextafter.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__nextafter.run
deleted file mode 100644
index 8273bae..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__nextafter.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=nextafter --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__polyval.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__polyval.run
deleted file mode 100644
index d828fa1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__polyval.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=polyval --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__accumulate_n.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__accumulate_n.run
deleted file mode 100644
index 5ba4f66..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__accumulate_n.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=accumulate_n --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__add_n.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__add_n.run
deleted file mode 100644
index 5e62c0e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__add_n.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=add_n --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__argmax.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__argmax.run
deleted file mode 100644
index 5aadf91..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__argmax.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=argmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__argmin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__argmin.run
deleted file mode 100644
index f25a9eb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__argmin.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=argmin --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i0e.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i0e.run
deleted file mode 100644
index 3ca5fc2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i0e.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=bessel_i0e --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i1e.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i1e.run
deleted file mode 100644
index 19716cb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i1e.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=bessel_i1e --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__betainc.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__betainc.run
deleted file mode 100644
index 8e67fda..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__betainc.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=betainc --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_count_nonzero.run
deleted file mode 100644
index 0cb6001..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_divide.run
deleted file mode 100644
index 468954e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_add.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_add.run
deleted file mode 100644
index 9e2d986..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_angle.run
deleted file mode 100644
index 192b3f4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_angle.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=angle --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_count_nonzero.run
deleted file mode 100644
index f3a7518..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_divide.run
deleted file mode 100644
index 2cfd159..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_divide_no_nan.run
deleted file mode 100644
index 009cb6e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_divide_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_l2_normalize.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_l2_normalize.run
deleted file mode 100644
index d976d1f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_l2_normalize.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=l2_normalize --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_multiply.run
deleted file mode 100644
index f9dce5e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_multiply_no_nan.run
deleted file mode 100644
index 45cd75b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_multiply_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_pow.run
deleted file mode 100644
index 5d5ee49..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_pow.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=pow --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reciprocal_no_nan.run
deleted file mode 100644
index f161a63..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reciprocal_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_std.run
deleted file mode 100644
index 6019c68..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_std.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_variance.run
deleted file mode 100644
index 7507e73..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_variance.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_square.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_square.run
deleted file mode 100644
index 8b77a1f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_square.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=square --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_squared_difference.run
deleted file mode 100644
index 8b786e7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_squared_difference.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_subtract.run
deleted file mode 100644
index 07c9cd4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_truediv.run
deleted file mode 100644
index 721658c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_truediv.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=truediv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xdivy.run
deleted file mode 100644
index 2659444..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xdivy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=xdivy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xlog1py.run
deleted file mode 100644
index 089833f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xlog1py.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xlogy.run
deleted file mode 100644
index d25a4e2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_xlogy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=xlogy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__count_nonzero.run
deleted file mode 100644
index 0cb6001..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumulative_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumulative_logsumexp.run
deleted file mode 100644
index 9187655..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumulative_logsumexp.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=cumulative_logsumexp --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__divide.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__divide.run
deleted file mode 100644
index 468954e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_add.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_add.run
deleted file mode 100644
index 9e2d986..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_add.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=add --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_angle.run
deleted file mode 100644
index 192b3f4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_angle.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=angle --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_count_nonzero.run
deleted file mode 100644
index f3a7518..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_count_nonzero.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_divide.run
deleted file mode 100644
index 2cfd159..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_divide.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=divide --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_divide_no_nan.run
deleted file mode 100644
index 009cb6e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_divide_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_equal.run
deleted file mode 100644
index f3b55c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floordiv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floordiv.run
deleted file mode 100644
index fcfd956..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floordiv.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=floordiv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floormod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floormod.run
deleted file mode 100644
index e857a1d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floormod.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=floormod --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_greater.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_greater.run
deleted file mode 100644
index d015f91..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_greater.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=greater --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_greater_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_greater_equal.run
deleted file mode 100644
index e07a28f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_greater_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=greater_equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_nan.run
deleted file mode 100644
index b27d425..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=is_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_lbeta.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_lbeta.run
deleted file mode 100644
index 72afd9f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_lbeta.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=lbeta --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_less.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_less.run
deleted file mode 100644
index e0fd355..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_less.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=less --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_less_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_less_equal.run
deleted file mode 100644
index ef40f04..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_less_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=less_equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log_softmax.run
deleted file mode 100644
index 1ff754c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log_softmax.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=log_softmax --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_and.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_and.run
deleted file mode 100644
index 9791b13..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_and.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=logical_and --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_or.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_or.run
deleted file mode 100644
index aacc55f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_or.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=logical_or --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_xor.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_xor.run
deleted file mode 100644
index a1ab5f2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_xor.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=logical_xor --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_maximum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_maximum.run
deleted file mode 100644
index 1cf2efe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_maximum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=maximum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_minimum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_minimum.run
deleted file mode 100644
index 92ff3a9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_minimum.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=minimum --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_multiply.run
deleted file mode 100644
index f9dce5e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_multiply.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=multiply --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_multiply_no_nan.run
deleted file mode 100644
index 45cd75b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_multiply_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_not_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_not_equal.run
deleted file mode 100644
index 2e520e7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_not_equal.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=not_equal --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_polygamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_polygamma.run
deleted file mode 100644
index 23e353b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_polygamma.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=polygamma --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_polyval.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_polyval.run
deleted file mode 100644
index c3fefac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_polyval.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=polyval --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_pow.run
deleted file mode 100644
index 5d5ee49..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_pow.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=pow --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reciprocal_no_nan.run
deleted file mode 100644
index f161a63..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reciprocal_no_nan.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_std.run
deleted file mode 100644
index 6019c68..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_std.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_variance.run
deleted file mode 100644
index 7507e73..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_variance.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_rint.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_rint.run
deleted file mode 100644
index 0d2aeef..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_rint.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=rint --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_round.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_round.run
deleted file mode 100644
index a9a0521..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_round.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=round --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_square.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_square.run
deleted file mode 100644
index 8b77a1f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_square.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=square --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_squared_difference.run
deleted file mode 100644
index 8b786e7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_squared_difference.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_subtract.run
deleted file mode 100644
index 07c9cd4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_subtract.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=subtract --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_truediv.run
deleted file mode 100644
index 721658c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_truediv.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=truediv --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xdivy.run
deleted file mode 100644
index 2659444..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xdivy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=xdivy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xlog1py.run
deleted file mode 100644
index 089833f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xlog1py.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xlogy.run
deleted file mode 100644
index d25a4e2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_xlogy.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=xlogy --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_zeta.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_zeta.run
deleted file mode 100644
index 5bc238e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_zeta.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=zeta --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erfinv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erfinv.run
deleted file mode 100644
index 7bdd07b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erfinv.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=erfinv --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__igamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__igamma.run
deleted file mode 100644
index 76622e1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__igamma.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=igamma --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__in_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__in_top_k.run
deleted file mode 100644
index e7f45f0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__in_top_k.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=in_top_k --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__nextafter.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__nextafter.run
deleted file mode 100644
index 82b0c18..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__nextafter.run
+++ /dev/null

@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=nextafter --artifacts_dir=%t
-# XFAIL: *

diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__polyval.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__polyval.run
deleted file mode 100644
index 7559ae9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__polyval.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=polyval --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__dynamic_mlp.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__dynamic_mlp.run
deleted file mode 100644
index aa5e429..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__dynamic_mlp.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_test --target_backends=iree_llvmcpu --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__dynamic_mlp_relu.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__dynamic_mlp_relu.run
deleted file mode 100644
index 1ca9eb9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__dynamic_mlp_relu.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_relu_test --target_backends=iree_llvmcpu --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__matrix_ops_static.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__matrix_ops_static.run
deleted file mode 100644
index 063f63c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__matrix_ops_static.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_static_test --target_backends=iree_llvmcpu --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__mobile_bert_squad.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__mobile_bert_squad.run
deleted file mode 100644
index 6c0fedf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__mobile_bert_squad.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.mobile_bert_squad_test --target_backends=iree_llvmcpu --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__pytree.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__pytree.run
deleted file mode 100644
index 22e4496..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__pytree.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.pytree_test --target_backends=iree_llvmcpu --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__dynamic_mlp.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__dynamic_mlp.run
deleted file mode 100644
index 8c11a28..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__dynamic_mlp.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_test --target_backends=iree_vulkan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__dynamic_mlp_relu.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__dynamic_mlp_relu.run
deleted file mode 100644
index 5cd8fc1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__dynamic_mlp_relu.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_relu_test --target_backends=iree_vulkan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__mobile_bert_squad.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__mobile_bert_squad.run
deleted file mode 100644
index 66cbdad..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__mobile_bert_squad.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.mobile_bert_squad_test --target_backends=iree_vulkan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__pytree.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__pytree.run
deleted file mode 100644
index 58bd031..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__pytree.run
+++ /dev/null

@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.pytree_test --target_backends=iree_vulkan --artifacts_dir=%t

diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/pytree_test.py b/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/pytree_test.py
index 2fa8bd9..ba77687 100644
--- a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/pytree_test.py
+++ b/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/pytree_test.py

@@ -29,15 +29,6 @@
   def output_nested_pytree(self):
     return {"key_a": (0, 1, 2), "key_b": (0, 1, {"key_c": (0, 1)})}
 
-  @tf_test_utils.tf_function_unit_test(input_signature=[{
-      "key_a": (tf.TensorSpec([]), tf.TensorSpec([]), tf.TensorSpec([])),
-      "key_b": (tf.TensorSpec([]), tf.TensorSpec([]), {
-          "key_c": (tf.TensorSpec([]), tf.TensorSpec([]))
-      })
-  }])
-  def input_nested_pytree(self, input_pytree):
-    return input_pytree
-
 
 class PyTreeTest(tf_test_utils.TracedModuleTestCase):