diff --git a/.github/workflows/build_tf_integrations.yml b/.github/workflows/build_tf_integrations.yml
deleted file mode 100644
index cba35da..0000000
--- a/.github/workflows/build_tf_integrations.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2022 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
-#
-# Workflow for building Tensorflow binaries.
-# It is designed to be called from a parent workflow.
-# The concurrency of this workflow is controlled by the caller's job.
-
-name: Build Tensorflow Integrations
-
-on:
-  workflow_call:
-    inputs:
-      runner-group:
-        required: true
-        type: string
-      runner-env:
-        required: true
-        type: string
-      write-caches:
-        required: true
-        type: string
-    outputs:
-      binaries-dir:
-        description: |
-          Local path that stores compiled Tensorflow binaries.
-        value: ${{ jobs.build_tf_integrations.outputs.binaries-dir }}
-      binaries-archive:
-        description: |
-          Local path to the zipped binary directory.
-        value: ${{ jobs.build_tf_integrations.outputs.binaries-archive }}
-      binaries-gcs-artifact:
-        description: |
-          GCS path to the uploaded binary archive.
-        value: ${{ jobs.build_tf_integrations.outputs.binaries-gcs-artifact }}
-
-env:
-  # This duplicates the variable from ci.yml. The variable needs to be in env
-  # instead of the outputs of setup because it contains the run attempt and we
-  # want that to be the current attempt, not whatever attempt the setup step
-  # last ran in. It therefore can't be passed in via inputs because the env
-  # context isn't available there.
-  GCS_DIR: gs://iree-github-actions-${{ github.event_name == 'pull_request' && 'presubmit' || 'postsubmit' }}-artifacts/${{ github.run_id }}/${{ github.run_attempt }}
-
-jobs:
-  build_tf_integrations:
-    runs-on:
-      - self-hosted # must come first
-      - runner-group=${{ inputs.runner-group }}
-      - environment=${{ inputs.runner-env }}
-      - cpu
-      - os-family=Linux
-    outputs:
-      binaries-dir: ${{ steps.build.outputs.binaries-dir }}
-      binaries-archive: ${{ steps.archive.outputs.binaries-archive }}
-      binaries-gcs-artifact: ${{ steps.upload.outputs.binaries-gcs-artifact }}
-    steps:
-      - name: "Checking out repository"
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-        with:
-          submodules: true
-      - name: "Building TF binaries"
-        id: build
-        env:
-          IREE_TF_BINARIES_OUTPUT_DIR: iree-tf-binaries
-          IREE_WRITE_REMOTE_BAZEL_CACHE: ${{ inputs.write-caches }}
-        run: |
-          ./build_tools/github_actions/docker_run.sh \
-            --env "IREE_WRITE_REMOTE_BAZEL_CACHE=${IREE_WRITE_REMOTE_BAZEL_CACHE}" \
-            --env "IREE_TF_BINARIES_OUTPUT_DIR=${IREE_TF_BINARIES_OUTPUT_DIR}" \
-            gcr.io/iree-oss/frontends-swiftshader@sha256:da14cc93637d3bfad469a670d4d7a49982df5d107b775331965e3bacb981d4cf \
-            build_tools/cmake/build_tf_binaries.sh
-          echo "binaries-dir=${IREE_TF_BINARIES_OUTPUT_DIR}" >> "${GITHUB_OUTPUT}"
-      - name: "Creating archive of binaries"
-        id: archive
-        env:
-          BINARIES_ARCHIVE: tf-binaries.tar
-          BINARIES_DIR: ${{ steps.build.outputs.binaries-dir }}
-        run: |
-          tar -cf "${BINARIES_ARCHIVE}" "${BINARIES_DIR}"
-          echo "binaries-archive=${BINARIES_ARCHIVE}" >> "${GITHUB_OUTPUT}"
-      - name: "Uploading binaries archive"
-        id: upload
-        env:
-          BINARIES_ARCHIVE: ${{ steps.archive.outputs.binaries-archive }}
-          BINARIES_GCS_ARTIFACT: ${{ env.GCS_DIR }}/${{ steps.archive.outputs.binaries-archive }}
-        run: |
-          gcloud storage cp "${BINARIES_ARCHIVE}" "${BINARIES_GCS_ARTIFACT}"
-          echo "binaries-gcs-artifact=${BINARIES_GCS_ARTIFACT}" >> "${GITHUB_OUTPUT}"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c5dd001..1f1361f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -354,19 +354,10 @@
         run: ./build_tools/cmake/ctest_all.sh "${BUILD_DIR}"
 
   ################################# Tensorflow #################################
-  # Jobs that build the IREE-Tensorflow integrations
+  # Jobs that test the IREE-Tensorflow integrations
   ##############################################################################
-  build_tf_integrations:
-    needs: setup
-    if: fromJson(needs.setup.outputs.should-run)
-    uses: ./.github/workflows/build_tf_integrations.yml
-    with:
-      runner-group: ${{ needs.setup.outputs.runner-group }}
-      runner-env: ${{ needs.setup.outputs.runner-env }}
-      write-caches: ${{ needs.setup.outputs.write-caches }}
-
   test_tf_integrations:
-    needs: [setup, build_all, build_tf_integrations]
+    needs: [setup, build_all]
     if: fromJson(needs.setup.outputs.should-run)
     runs-on:
       - self-hosted # must come first
@@ -378,21 +369,11 @@
       BUILD_DIR: ${{ needs.build_all.outputs.build-dir }}
       BUILD_DIR_ARCHIVE: ${{ needs.build_all.outputs.build-dir-archive }}
       BUILD_DIR_GCS_ARTIFACT: ${{ needs.build_all.outputs.build-dir-gcs-artifact }}
-      TF_BINARIES_DIR: ${{ needs.build_tf_integrations.outputs.binaries-dir }}
-      TF_BINARIES_ARCHIVE: ${{ needs.build_tf_integrations.outputs.binaries-archive }}
-      TF_BINARIES_GCS_ARTIFACT: ${{ needs.build_tf_integrations.outputs.binaries-gcs-artifact }}
     steps:
       - name: "Checking out repository"
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
           submodules: true
-      - name: "Downloading TF binaries archive"
-        run: gcloud storage cp "${TF_BINARIES_GCS_ARTIFACT}" "${TF_BINARIES_ARCHIVE}"
-      - name: "Extracting TF binaries archive"
-        run: tar -xvf "${TF_BINARIES_ARCHIVE}"
-      - name: "Symlinking TF binaries"
-        run: |
-          ./integrations/tensorflow/symlink_binaries.sh "${TF_BINARIES_DIR}"
       - name: "Downloading build dir archive"
         run: gcloud storage cp "${BUILD_DIR_GCS_ARTIFACT}" "${BUILD_DIR_ARCHIVE}"
       - name: "Extracting build dir archive"
@@ -405,7 +386,7 @@
             "${BUILD_DIR}"
 
   test_tf_integrations_gpu:
-    needs: [setup, build_all, build_tf_integrations]
+    needs: [setup, build_all]
     if: fromJson(needs.setup.outputs.should-run)
     runs-on:
       - self-hosted # must come first
@@ -417,21 +398,11 @@
       BUILD_DIR: ${{ needs.build_all.outputs.build-dir }}
       BUILD_DIR_ARCHIVE: ${{ needs.build_all.outputs.build-dir-archive }}
       BUILD_DIR_GCS_ARTIFACT: ${{ needs.build_all.outputs.build-dir-gcs-artifact }}
-      TF_BINARIES_DIR: ${{ needs.build_tf_integrations.outputs.binaries-dir }}
-      TF_BINARIES_ARCHIVE: ${{ needs.build_tf_integrations.outputs.binaries-archive }}
-      TF_BINARIES_GCS_ARTIFACT: ${{ needs.build_tf_integrations.outputs.binaries-gcs-artifact }}
     steps:
       - name: "Checking out repository"
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
         with:
           submodules: true
-      - name: "Downloading TF binaries archive"
-        run: gcloud storage cp "${TF_BINARIES_GCS_ARTIFACT}" "${TF_BINARIES_ARCHIVE}"
-      - name: "Extracting TF binaries archive"
-        run: tar -xvf "${TF_BINARIES_ARCHIVE}"
-      - name: "Symlinking TF binaries"
-        run: |
-          ./integrations/tensorflow/symlink_binaries.sh "${TF_BINARIES_DIR}"
       - name: "Downloading build dir archive"
         run: gcloud storage cp "${BUILD_DIR_GCS_ARTIFACT}" "${BUILD_DIR_ARCHIVE}"
       - name: "Extracting build dir archive"
@@ -1038,7 +1009,6 @@
       - build_test_runtime_windows
 
       # Tensorflow
-      - build_tf_integrations
       - test_tf_integrations
       - test_tf_integrations_gpu
 
diff --git a/build_tools/cmake/build_tf_binaries.sh b/build_tools/cmake/build_tf_binaries.sh
deleted file mode 100755
index c051bf6..0000000
--- a/build_tools/cmake/build_tf_binaries.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-# Copyright 2022 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
-
-# Build the IREE TF integration binaries. Despite the name, also runs the few
-# lit tests for these that are enabled through Bazel. These take seconds to run
-# all of them and it's easiest to just run them here rather than trying to
-# figure out how to pass prebuilt binaries to Bazel tests.
-
-set -xeuo pipefail
-
-ROOT_DIR="${ROOT_DIR:-$(git rev-parse --show-toplevel)}"
-IREE_USE_WORKSPACE_RC="${IREE_USE_WORKSPACE_RC:-0}"
-IREE_READ_REMOTE_BAZEL_CACHE="${IREE_READ_REMOTE_BAZEL_CACHE:-1}"
-IREE_WRITE_REMOTE_BAZEL_CACHE="${IREE_WRITE_REMOTE_BAZEL_CACHE:-0}"
-IREE_TF_BINARIES_OUTPUT_DIR="${IREE_TF_BINARIES_OUTPUT_DIR:-}"
-INTEGRATIONS_DIR="${ROOT_DIR}/integrations/tensorflow"
-
-if (( ${IREE_WRITE_REMOTE_BAZEL_CACHE} == 1 && ${IREE_READ_REMOTE_BAZEL_CACHE} != 1 )); then
-  echo "Can't have 'IREE_WRITE_REMOTE_BAZEL_CACHE' (${IREE_WRITE_REMOTE_BAZEL_CACHE}) set without 'IREE_READ_REMOTE_BAZEL_CACHE' (${IREE_READ_REMOTE_BAZEL_CACHE})"
-fi
-
-# We want to get back to wherever we were called from and output to the output
-# directory relative to that.
-pushd "${INTEGRATIONS_DIR}" > /dev/null
-
-BAZEL_BIN=${BAZEL_BIN:-$(which bazel)}
-
-BAZEL_STARTUP_CMD=("${BAZEL_BIN}")
-
-if [[ "${IREE_USE_WORKSPACE_RC}" == 0 ]]; then
-  BAZEL_STARTUP_CMD+=(--noworkspace_rc --bazelrc=build_tools/bazel/iree-tf.bazelrc)
-fi
-
-if [[ "${IREE_BAZEL_OUTPUT_BASE:-}" != "" ]]; then
-  BAZEL_STARTUP_CMD+=("--output_base=${IREE_BAZEL_OUTPUT_BASE}")
-  mkdir -p "${IREE_BAZEL_OUTPUT_BASE}"
-fi
-
-BAZEL_TEST_CMD=("${BAZEL_STARTUP_CMD[@]}" test)
-
-if (( IREE_READ_REMOTE_BAZEL_CACHE == 1 )); then
-  BAZEL_TEST_CMD+=(--config=remote_cache_bazel_tf_ci)
-fi
-
-if (( IREE_WRITE_REMOTE_BAZEL_CACHE != 1 )); then
-  BAZEL_TEST_CMD+=(--noremote_upload_local_results)
-fi
-
-BAZEL_TEST_CMD+=(
-  --config=generic_clang
-  --test_tag_filters="-nokokoro"
-  --build_tag_filters="-nokokoro"
-)
-
-# xargs is set to high arg limits to avoid multiple Bazel invocations and will
-# hard fail if the limits are exceeded.
-# See https://github.com/bazelbuild/bazel/issues/12479
-"${BAZEL_STARTUP_CMD[@]}" query //iree_tf_compiler/... | \
-   xargs --max-args 1000000 --max-chars 1000000 --exit \
-    "${BAZEL_TEST_CMD[@]}"
-
-popd > /dev/null
-
-if [[ "${IREE_TF_BINARIES_OUTPUT_DIR}" != "" ]]; then
-  mkdir -p "${IREE_TF_BINARIES_OUTPUT_DIR}"
-  cp \
-    "${INTEGRATIONS_DIR}/bazel-bin/iree_tf_compiler/iree-import-tflite" \
-    "${IREE_TF_BINARIES_OUTPUT_DIR}"
-fi
diff --git a/build_tools/cmake/setup_tf_python.sh b/build_tools/cmake/setup_tf_python.sh
index ee91419..ea2b3b0 100644
--- a/build_tools/cmake/setup_tf_python.sh
+++ b/build_tools/cmake/setup_tf_python.sh
@@ -14,9 +14,5 @@
 
 # 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
+"${IREE_PYTHON3_EXECUTABLE}" -m pip install integrations/tensorflow/python_projects/iree_tf integrations/tensorflow/python_projects/iree_tflite
 
-# TODO(#13061): We should install from the local source-only Python packages
-# like iree-tools-tf, once we switch to Pyhton API based tflite importer.
-# Install pinned version of iree-tools-tflite.
-"${IREE_PYTHON3_EXECUTABLE}" -m pip install iree-tools-tflite=="20230412.487" -f https://openxla.github.io/iree/pip-release-links.html
diff --git a/build_tools/python/e2e_test_framework/definitions/iree_definitions.py b/build_tools/python/e2e_test_framework/definitions/iree_definitions.py
index 539b26d..23b87e7 100644
--- a/build_tools/python/e2e_test_framework/definitions/iree_definitions.py
+++ b/build_tools/python/e2e_test_framework/definitions/iree_definitions.py
@@ -190,8 +190,7 @@
     id=unique_ids.IREE_MODEL_IMPORT_TFLITE_DEFAULT,
     name="tflite",
     tool=ImportTool.TFLITE_IMPORTER,
-    dialect_type=MLIRDialectType.TOSA,
-    import_flags=["--output-format=mlir-bytecode"])
+    dialect_type=MLIRDialectType.TOSA)
 
 DEFAULT_LINALG_MLIR_IMPORT_CONFIG = ImportConfig(
     id=unique_ids.IREE_MODEL_IMPORT_LINALG_MLIR_DEFAULT,
diff --git a/compiler/bindings/python/iree/compiler/tools/tflite.py b/compiler/bindings/python/iree/compiler/tools/tflite.py
index bfbe224..72333fd 100644
--- a/compiler/bindings/python/iree/compiler/tools/tflite.py
+++ b/compiler/bindings/python/iree/compiler/tools/tflite.py
@@ -9,6 +9,7 @@
 from dataclasses import dataclass
 from enum import Enum
 import logging
+import os
 import tempfile
 from typing import List, Optional, Sequence, Set, Union
 
@@ -28,11 +29,11 @@
 
 
 def is_available():
-  """Determine if the XLA frontend is available."""
+  """Determine if the TFLite frontend is available."""
   try:
-    find_tool(_IMPORT_TOOL)
-  except ValueError:
-    logging.warning("Unable to find IREE tool %s", _IMPORT_TOOL)
+    import iree.tools.tflite.scripts.iree_import_tflite.__main__
+  except ModuleNotFoundError:
+    logging.warning("Unable to find IREE tool iree-import-tflite")
     return False
   return True
 
@@ -68,67 +69,6 @@
   input_type: Optional[str] = "tosa"
 
 
-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.
-  """
-  import_tool = find_tool(_IMPORT_TOOL)
-  cl = [
-      import_tool,
-      input_path,
-  ]
-
-  if options.import_only and options.output_file:
-    # Import stage directly outputs.
-    output_file = tfs.alloc_optional("tflite-output.mlir",
-                                     export_as=options.output_file)
-    cl.append(f"-o={options.output_file}")
-
-  # Input arrays.
-  if options.input_arrays:
-    for input_array in options.input_arrays:
-      cl.append(f"--input-array={input_array}")
-    for output_array in options.output_arrays:
-      cl.append(f"--output-array={output_array}")
-
-  # 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.
-  tfl_input = tfs.alloc_optional("tflite-input.mlir",
-                                 export_as=options.save_temp_tfl_input)
-  if tfl_input:
-    cl.append(f"--save-temp-tfl-input={tfl_input}")
-  iree_input = tfs.alloc_optional("tflite-iree-input.mlir",
-                                  export_as=options.save_temp_iree_input)
-  if iree_input:
-    cl.append(f"--save-temp-iree-input={iree_input}")
-
-  # 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-tflite")
-  crash_reproducer_path = tfs.alloc_optional(
-      "tflite-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_file(fb_path: str, **kwargs):
   """Compiles a TFLite FlatBuffer file to an IREE binary.
 
@@ -139,19 +79,36 @@
     A bytes-like object with the compiled output or None if output_file=
     was specified.
   """
+  from iree.tools.tflite.scripts.iree_import_tflite import __main__
   with TempFileSaver.implicit() as tfs:
     options = ImportOptions(**kwargs)
-    import_cl = build_import_command_line(fb_path, tfs, options)
+
+  with TempFileSaver.implicit() as tfs, tempfile.TemporaryDirectory() as tmpdir:
+    if options.import_only and options.output_file:
+      # Importing to a file and stopping, write to that file directly.
+      tfl_iree_input = options.output_file
+    elif options.save_temp_iree_input:
+      # Saving the file, use tfs.
+      tfl_iree_input = tfs.alloc_optional(
+          "tfl-iree-input.mlir", export_as=options.save_temp_iree_input)
+    else:
+      # Not saving the file, so generate a loose temp file without tfs.
+      tfl_iree_input = os.path.join(tmpdir, 'tfl-iree-input.mlir')
+
+    __main__.tflite_to_tosa(flatbuffer=fb_path,
+                            bytecode=tfl_iree_input,
+                            ordered_input_arrays=options.input_arrays,
+                            ordered_output_arrays=options.output_arrays)
+
     if options.import_only:
-      # One stage tool pipeline.
-      result = invoke_immediate(import_cl)
       if options.output_file:
         return None
-      return result
+      with open(tfl_iree_input, "r") as f:
+        return f.read()
 
-    # Full compilation pipeline.
-    compile_cl = build_compile_command_line("-", tfs, options)
-    result = invoke_pipeline([import_cl, compile_cl])
+    # Run IREE compilation pipeline
+    compile_cl = build_compile_command_line(tfl_iree_input, tfs, options)
+    result = invoke_pipeline([compile_cl])
     if options.output_file:
       return None
     return result
@@ -169,22 +126,7 @@
   """
   input_bytes = input_bytes.encode("utf-8") if isinstance(input_bytes,
                                                           str) else input_bytes
-  with TempFileSaver.implicit() as tfs:
-    options = ImportOptions(**kwargs)
-    import_cl = build_import_command_line("-", tfs, options)
-    if options.import_only:
-      # One stage tool pipeline.
-
-      result = invoke_immediate(import_cl, immediate_input=input_bytes)
-      if options.output_file:
-        return None
-      result = result.decode("utf-8")
-      return result
-
-    # Full compilation pipeline.
-    compile_cl = build_compile_command_line("-", tfs, options)
-    result = invoke_pipeline([import_cl, compile_cl],
-                             immediate_input=input_bytes)
-    if options.output_file:
-      return None
-    return result.decode("utf-8") if result is not None else result
+  with tempfile.NamedTemporaryFile(mode="w") as temp_file:
+    tempfile.write(input_bytes)
+    tempfile.close()
+    return compile_file(tempfile.name, **kwargs)
diff --git a/integrations/tensorflow/BUILD.bazel b/integrations/tensorflow/BUILD.bazel
deleted file mode 100644
index 9da145a..0000000
--- a/integrations/tensorflow/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2022 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
-
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-exports_files(["lit.cfg.py"])
diff --git a/integrations/tensorflow/README.md b/integrations/tensorflow/README.md
index 63f49a5..7d9e3da 100644
--- a/integrations/tensorflow/README.md
+++ b/integrations/tensorflow/README.md
@@ -5,24 +5,6 @@
 
 ## Quick Development Setup
 
-This assumes that you have an appropriate `bazel` installed.
-Build the importer binaries:
-
-```
-# All of them (takes a long time).
-bazel build iree_tf_compiler:importer-binaries
-
-# Or individuals:
-bazel build iree_tf_compiler:iree-import-tflite
-bazel build iree_tf_compiler:iree-import-tf
-```
-
-Symlink binaries into python packages (only needs to be done once):
-
-```
-./symlink_binaries.sh
-```
-
 Pip install editable (recommend to do this in a virtual environment):
 
 ```
@@ -31,15 +13,14 @@
 
 # Or one at a time:
 pip install -e python_projects/iree_tflite
-pip install -e python_projects/iree_xla
 pip install -e python_projects/iree_tf
 ```
 
 Test installed:
 
 ```
-iree-import-tflite -help
-iree-import-tf -help
+iree-import-tflite -h
+iree-import-tf -h
 ```
 
 ## Run test suite
diff --git a/integrations/tensorflow/WORKSPACE b/integrations/tensorflow/WORKSPACE
deleted file mode 100644
index e8aca77..0000000
--- a/integrations/tensorflow/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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
-"""Adds a local dependency on tensorflow."""
-
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-TENSORFLOW_COMMIT = "5dd766f144ee0fc20506ee6476dc21c8e1816b69"
-
-git_repository(
-    name = "org_tensorflow",
-    commit = TENSORFLOW_COMMIT,
-    remote = "https://github.com/iree-org/iree-tf-fork.git",
-)
-
-# Import all of the tensorflow dependencies.
-load("@org_tensorflow//tensorflow:workspace3.bzl", "tf_workspace3")
-
-tf_workspace3()
-
-load("@org_tensorflow//tensorflow:workspace2.bzl", "tf_workspace2")
-
-tf_workspace2()
-
-load("@org_tensorflow//tensorflow:workspace1.bzl", "tf_workspace1")
-
-tf_workspace1()
-
-load("@org_tensorflow//tensorflow:workspace0.bzl", "tf_workspace0")
-
-tf_workspace0()
diff --git a/integrations/tensorflow/build_tools/bazel/.gitignore b/integrations/tensorflow/build_tools/bazel/.gitignore
deleted file mode 100644
index 39a0668..0000000
--- a/integrations/tensorflow/build_tools/bazel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.deps
diff --git a/integrations/tensorflow/build_tools/bazel/BUILD.bazel b/integrations/tensorflow/build_tools/bazel/BUILD.bazel
deleted file mode 100644
index f27d209..0000000
--- a/integrations/tensorflow/build_tools/bazel/BUILD.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-# 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
-
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
diff --git a/integrations/tensorflow/build_tools/bazel/enforce_glob.bzl b/integrations/tensorflow/build_tools/bazel/enforce_glob.bzl
deleted file mode 100644
index 29117a3..0000000
--- a/integrations/tensorflow/build_tools/bazel/enforce_glob.bzl
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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
-
-"""A utility to enforce that a list matches a glob expression.
-
-We use this primarily to enable the error-checking capabilities of globs of test
-files in IREE while still allowing our Bazel to CMake conversion to not create
-CMake globs (which are discouraged for collecting source files, see
-https://cmake.org/cmake/help/latest/command/file.html#glob) and not be dependent
-on any information outside of the BUILD file.
-"""
-
-def enforce_glob(files, **kwargs):
-    """A utility to enforce that a list matches a glob expression.
-
-    Note that the comparison is done in an order-independent fashion.
-
-    Args:
-        files: a list that is expected to contain the same files as the
-            specified glob expression.
-        **kwargs: keyword arguments forwarded to the glob.
-
-    Returns:
-        files. The input argument unchanged
-    """
-    glob_result = native.glob(**kwargs)
-
-    # glob returns a sorted list.
-    if sorted(files) != glob_result:
-        glob_result_dict = {k: None for k in glob_result}
-        result_dict = {k: None for k in files}
-        missing = [k for k in glob_result if k not in files]
-        extra = [k for k in files if k not in glob_result]
-        expected_formatted = "\n".join(['"{}",'.format(file) for file in glob_result])
-        fail(("Error in enforce_glob." +
-              "\nExpected {}." +
-              "\nGot {}." +
-              "\nMissing {}." +
-              "\nExtra {}" +
-              "\nPaste this into the first enforce_glob argument:" +
-              "\n{}").format(
-            glob_result,
-            files,
-            missing,
-            extra,
-            expected_formatted,
-        ))
-    return files
diff --git a/integrations/tensorflow/build_tools/bazel/iree-tf.bazelrc b/integrations/tensorflow/build_tools/bazel/iree-tf.bazelrc
deleted file mode 100644
index 908b3dc..0000000
--- a/integrations/tensorflow/build_tools/bazel/iree-tf.bazelrc
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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
-
-# For now, just import the main IREE bazelrc
-try-import %workspace%/../../build_tools/bazel/iree.bazelrc
-
-# TF uses C++17.
-build:generic_clang --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
-build:generic_gcc --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
-
-# Ignore visibility issues in TensorFlow. They are inconsistently applied
-# to the OSS codebase.
-build --nocheck_visibility
-
-# Clang Flags for working around tensorflow warnings.
-build:generic_clang --copt=-Wno-deprecated-declarations --host_copt=-Wno-deprecated-declarations
-build:generic_clang --copt=-Wno-inconsistent-missing-override --host_copt=-Wno-inconsistent-missing-override
-build:generic_clang --copt=-Wno-c++11-narrowing --host_copt=-Wno-c++11-narrowing
-
-# Gcc Flags for working around tensorflow warnings.
-# We don't generally develop with this configuration, so this is mostly an
-# attempt to keep CIs somewhat clean.
-build:generic_gcc --copt=-Wno-sign-compare --host_copt=-Wno-sign-compare
-build:generic_gcc --copt=-Wno-return-type --host_copt=-Wno-return-type
-build:generic_gcc --copt=-Wno-unused-function --host_copt=-Wno-unused-function
-build:generic_gcc --copt=-Wno-deprecated-declarations --host_copt=-Wno-deprecated-declarations
-build:generic_gcc --copt=-Wno-maybe-uninitialized --host_copt=-Wno-maybe-uninitialized
-build:generic_gcc --copt=-Wno-unused-result --host_copt=-Wno-unused-result
-build:generic_gcc --copt=-Wno-comment --host_copt=-Wno-comment
-build:generic_gcc --cxxopt=-Wno-class-memaccess --host_cxxopt=-Wno-class-memaccess
-build:generic_gcc --copt=-Wno-unknown-pragmas --host_copt=-Wno-unknown-pragmas
-build:generic_gcc --copt=-Wno-strict-aliasing --host_copt=-Wno-strict-aliasing
-build:generic_gcc --copt=-Wno-ignored-attributes --host_copt=-Wno-ignored-attributes
-build:generic_gcc --copt=-Wno-unused-but-set-variable --host_copt=-Wno-unused-but-set-variable
-build:generic_gcc --copt=-Wno-unused-variable --host_copt=-Wno-unused-variable
-build:generic_gcc --copt=-Wno-parentheses --host_copt=-Wno-parentheses
-
-# TensorFlow uses cc_shared_library, which was added behind this experimental
-# flag in Bazel 5.1.0. Since we depend TensorFlow, we have to enable it too.
-build --experimental_cc_shared_library
-
-# Link protobufs by default.
-build --define tsl_link_protobuf=true
diff --git a/integrations/tensorflow/build_tools/bazel/iree_lit_test.bzl b/integrations/tensorflow/build_tools/bazel/iree_lit_test.bzl
deleted file mode 100644
index 952fc78..0000000
--- a/integrations/tensorflow/build_tools/bazel/iree_lit_test.bzl
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2019 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
-
-"""Bazel macros for running lit tests."""
-
-load(":lit_test.bzl", "lit_test", "lit_test_suite")
-
-def iree_lit_test(
-        name,
-        cfg = "//:lit.cfg.py",
-        tools = None,
-        env = None,
-        **kwargs):
-    """A thin wrapper around lit_test with some opinionated settings.
-
-    See the base lit_test for more details on argument meanings.
-
-    Args:
-      name: name for the test.
-      cfg: string. lit config file.
-      tools: label_list. tools that should be included on the PATH.
-        llvm-symbolizer is added by default.
-      env: string_dict. Environment variables available to the test at runtime.
-        FILECHECK_OPTS=--enable-var-scope is added if FILECHECK_OPTS is not
-        already set.
-      **kwargs: additional keyword args to forward to the underyling lit_test.
-    """
-
-    tools = tools or []
-    env = env or {}
-
-    # Always include llvm-symbolizer so we get useful stack traces. Maybe it
-    # would be better to force everyone to do this explicitly, but since
-    # forgetting wouldn't cause the test to fail, only make debugging harder
-    # when it does, I think better to hardcode it here.
-    llvm_symbolizer = "@llvm-project//llvm:llvm-symbolizer"
-    if llvm_symbolizer not in tools:
-        tools.append(llvm_symbolizer)
-
-    filecheck_env_var = "FILECHECK_OPTS"
-    if filecheck_env_var not in env:
-        env[filecheck_env_var] = "--enable-var-scope"
-
-    lit_test(
-        name = name,
-        cfg = cfg,
-        tools = tools,
-        env = env,
-        **kwargs
-    )
-
-def iree_lit_test_suite(
-        name,
-        cfg = "//:lit.cfg.py",
-        tools = None,
-        env = None,
-        **kwargs):
-    """A thin wrapper around lit_test_suite with some opinionated settings.
-
-    See the base lit_test for more details on argument meanings.
-
-    Args:
-      name: name for the test suite.
-      cfg: string. lit config file.
-      tools: label_list. tools that should be included on the PATH.
-        llvm-symbolizer is added by default.
-      env: string_dict. Environment variables available to the test at runtime.
-        FILECHECK_OPTS=--enable-var-scope is added if FILECHECK_OPTS is not
-        already set.
-      **kwargs: additional keyword args to forward to the underyling
-        lit_test_suite.
-    """
-    tools = tools or []
-    env = env or {}
-
-    # Always include llvm-symbolizer so we get useful stack traces. Maybe it
-    # would be better to force everyone to do this explicitly, but since
-    # forgetting wouldn't cause the test to fail, only make debugging harder
-    # when it does, I think better to hardcode it here.
-    llvm_symbolizer = "@llvm-project//llvm:llvm-symbolizer"
-    if llvm_symbolizer not in tools:
-        tools.append(llvm_symbolizer)
-
-    filecheck_env_var = "FILECHECK_OPTS"
-    if filecheck_env_var not in env:
-        env[filecheck_env_var] = "--enable-var-scope"
-
-    lit_test_suite(
-        name = name,
-        cfg = cfg,
-        tools = tools,
-        env = env,
-        **kwargs
-    )
diff --git a/integrations/tensorflow/build_tools/bazel/lit_test.bzl b/integrations/tensorflow/build_tools/bazel/lit_test.bzl
deleted file mode 100644
index e77d7a0..0000000
--- a/integrations/tensorflow/build_tools/bazel/lit_test.bzl
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 2022 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
-
-"""Rules for running lit tests with the upstream lit binary."""
-
-# This exists as a separate file from iree_lit_test.bzl because we anticipate
-# upstreaming it soon.
-
-load("@bazel_skylib//lib:paths.bzl", "paths")
-load(":native_binary.bzl", "native_test")
-
-def _tools_on_path_impl(ctx):
-    runfiles = ctx.runfiles()
-
-    # For Bazel 4.x support. Drop when Bazel 4.x is no longer supported
-    to_merge = [d[DefaultInfo].default_runfiles for d in ctx.attr.srcs]
-    if hasattr(runfiles, "merge_all"):
-        runfiles = runfiles.merge_all(to_merge)
-    else:
-        for m in to_merge:
-            runfiles = runfiles.merge(m)
-
-    runfiles_symlinks = {}
-
-    for src in ctx.attr.srcs:
-        exe = src[DefaultInfo].files_to_run.executable
-        if not exe:
-            fail("All targets used as tools by lit tests must have exactly one" +
-                 " executable, but {} has none".format(src))
-        bin_path = paths.join(ctx.attr.bin_dir, exe.basename)
-        if bin_path in runfiles_symlinks:
-            fail("All tools used by lit tests must have unique basenames, as" +
-                 " they are added to the path." +
-                 " {} and {} conflict".format(runfiles_symlinks[bin_path], exe))
-        runfiles_symlinks[bin_path] = exe
-
-    return [
-        DefaultInfo(runfiles = ctx.runfiles(
-            symlinks = runfiles_symlinks,
-        ).merge(runfiles)),
-    ]
-
-_tools_on_path = rule(
-    _tools_on_path_impl,
-    attrs = {
-        "srcs": attr.label_list(allow_files = True, mandatory = True),
-        "bin_dir": attr.string(mandatory = True),
-    },
-    doc = "Symlinks srcs into a single lit_bin directory. All basenames must be unique.",
-)
-
-def lit_test(
-        name,
-        test_file,
-        cfg,
-        tools = None,
-        args = None,
-        data = None,
-        visibility = None,
-        env = None,
-        **kwargs):
-    """Runs a single test file with LLVM's lit tool.
-
-    Args:
-      name: string. the name of the generated test target.
-      test_file: label. The file on which to run lit.
-      cfg: label. The lit config file. It must list the file extension of
-        `test_file` in config.suffixes and must be in a parent directory of
-        `test_file`.
-      tools: label list. Tools invoked in the lit RUN lines. These binaries will
-        be symlinked into a directory which is on the path. They must therefore
-        have unique basenames.
-      args: string list. Additional arguments to pass to lit. Note that the test
-        file, `-v`, and a `--path` argument for the directory to which `tools`
-        are symlinked are added automatically.
-      data: label list. Additional data dependencies of the test. Note that
-        targets in `cfg` and `tools`, as well as their data dependencies, are
-        added automatically.
-      visibility: visibility of the generated test target.
-      env: string_dict. Environment variables available during test execution.
-        See the common Bazel test attribute.
-      **kwargs: additional keyword arguments to pass to all generated rules.
-
-    See https://llvm.org/docs/CommandGuide/lit.html for details on lit
-    """
-    args = args or []
-    data = data or []
-    tools = tools or []
-
-    tools_on_path_target_name = "_{}_tools_on_path".format(name)
-
-    bin_dir = paths.join(
-        native.package_name(),
-        tools_on_path_target_name,
-        "lit_bin",
-    )
-
-    _tools_on_path(
-        name = tools_on_path_target_name,
-        testonly = True,
-        srcs = tools,
-        bin_dir = bin_dir,
-        visibility = ["//visibility:private"],
-        **kwargs
-    )
-
-    native_test(
-        name = name,
-        src = "@llvm-project//llvm:lit",
-        # out = name,
-        args = [
-            "-v",
-            "--path",
-            bin_dir,
-            "$(location {})".format(test_file),
-        ] + args,
-        data = [test_file, cfg, tools_on_path_target_name] + data,
-        visibility = visibility,
-        env = env,
-        **kwargs
-    )
-
-def lit_test_suite(
-        name,
-        srcs,
-        cfg,
-        tools = None,
-        args = None,
-        data = None,
-        visibility = None,
-        size = "small",
-        env = None,
-        **kwargs):
-    """Creates one lit test per source file and a test suite that bundles them.
-
-    Args:
-      name: string. the name of the generated test suite.
-      srcs: label_list. The files which contain the lit tests.
-      cfg: label. The lit config file. It must list the file extension of
-        the files in `srcs` in config.suffixes and must be in a parent directory
-        of `srcs`.
-      tools: label list. Tools invoked in the lit RUN lines. These binaries will
-        be symlinked into a directory which is on the path. They must therefore
-        have unique basenames.
-      args: string list. Additional arguments to pass to lit. Note that the test
-        file, `-v`, and a `--path` argument for the directory to which `tools`
-        are symlinked are added automatically.
-      data: label list. Additional data dependencies of the test. Note that
-        targets in `cfg` and `tools`, as well as their data dependencies, are
-        added automatically.
-      visibility: visibility of the generated test targets and test suite.
-      size: string. size of the generated tests.
-      env: string_dict. Environment variables available during test execution.
-        See the common Bazel test attribute.
-      **kwargs: additional keyword arguments to pass to all generated rules.
-
-    See https://llvm.org/docs/CommandGuide/lit.html for details on lit
-    """
-    # If there are kwargs that need to be passed to only some of the generated
-    # rules, they should be extracted into separate named arguments.
-
-    args = args or []
-    data = data or []
-    tools = tools or []
-
-    tests = []
-    for test_file in srcs:
-        # It's generally good practice to prefix any generated names with the
-        # macro name, but it's also nice to have the test name just match the
-        # file name.
-        test_name = "%s.test" % (test_file)
-        tests.append(test_name)
-        lit_test(
-            name = test_name,
-            test_file = test_file,
-            cfg = cfg,
-            tools = tools,
-            args = args,
-            data = data,
-            visibility = visibility,
-            env = env,
-            **kwargs
-        )
-
-    native.test_suite(
-        name = name,
-        tests = tests,
-        **kwargs
-    )
diff --git a/integrations/tensorflow/build_tools/bazel/native_binary.bzl b/integrations/tensorflow/build_tools/bazel/native_binary.bzl
deleted file mode 100644
index 5b047e6..0000000
--- a/integrations/tensorflow/build_tools/bazel/native_binary.bzl
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 2022 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
-
-"""native_binary() and native_test() rule implementations.
-
-Rewritten from the Bazel Skylib version pending several fixes and improvements
-to that rule:
-
-- https://github.com/bazelbuild/bazel-skylib/pull/338
-- https://github.com/bazelbuild/bazel-skylib/pull/339
-- https://github.com/bazelbuild/bazel-skylib/pull/340
-- https://github.com/bazelbuild/bazel-skylib/pull/341
-
-These rules let you wrap a pre-built binary or script in a conventional binary
-and test rule respectively. They fulfill the same goal as sh_binary and sh_test
-do, but they run the wrapped binary directly, instead of through Bash, so they
-don't depend on Bash and work with --shell_exectuable="".
-"""
-
-def _shared_impl(ctx):
-    out = ctx.attr.out
-    if not out:
-        out = ctx.attr.name
-    output = ctx.actions.declare_file(out)
-    ctx.actions.symlink(
-        target_file = ctx.executable.src,
-        output = output,
-        is_executable = True,
-    )
-
-    runfiles = ctx.runfiles(files = ctx.files.data)
-
-    # For Bazel 4.x support. Drop when Bazel 4.x is no longer supported
-    to_merge = ([d[DefaultInfo].default_runfiles for d in ctx.attr.data] +
-                [ctx.attr.src[DefaultInfo].default_runfiles])
-    if hasattr(runfiles, "merge_all"):
-        runfiles = runfiles.merge_all(to_merge)
-    else:
-        for m in to_merge:
-            runfiles = runfiles.merge(m)
-    return DefaultInfo(
-        executable = output,
-        files = depset([output]),
-        runfiles = runfiles,
-    )
-
-def _native_binary_impl(ctx):
-    default_info = _shared_impl(ctx)
-    return [default_info]
-
-def _native_test_impl(ctx):
-    default_info = _shared_impl(ctx)
-    return [default_info, testing.TestEnvironment(ctx.attr.env)]
-
-# We have to manually set "env" on the test rule because the builtin one is only
-# available in native rules. See
-# https://docs.bazel.build/versions/main/be/common-definitions.html#test.env
-# We don't have "env" on native_binary because there is no BinaryEnvironment
-# mirroring TestEnvironment. See https://github.com/bazelbuild/bazel/issues/7364
-_SHARED_ATTRS = {
-    "src": attr.label(
-        executable = True,
-        allow_files = True,
-        mandatory = True,
-        cfg = "target",
-    ),
-    "data": attr.label_list(allow_files = True),
-    # "out" is attr.string instead of attr.output, so that it is select()'able.
-    "out": attr.string(),
-}
-
-native_binary = rule(
-    implementation = _native_binary_impl,
-    attrs = _SHARED_ATTRS,
-    executable = True,
-)
-
-_TEST_ATTRS = {
-    k: v
-    for k, v in _SHARED_ATTRS.items() + [
-        (
-            "env",
-            attr.string_dict(
-                doc = "Mirrors the common env attribute that otherwise is" +
-                      " only available on native rules. See" +
-                      " https://docs.bazel.build/versions/main/be/common-definitions.html#test.env",
-            ),
-        ),
-    ]
-}
-
-native_test = rule(
-    implementation = _native_test_impl,
-    attrs = _TEST_ATTRS,
-    test = True,
-)
diff --git a/integrations/tensorflow/build_tools/bazel/setup_local_llvm.py b/integrations/tensorflow/build_tools/bazel/setup_local_llvm.py
deleted file mode 100644
index fa75e60..0000000
--- a/integrations/tensorflow/build_tools/bazel/setup_local_llvm.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-"""
-Sets up a locally symlinked llvm-project directory and configures bazel to
-use it.
-
-In its default mode of operation, TensorFlow provides the llvm instance by
-downloading a blob from GitHub and expanding it. Run this script to switch
-it instead to use the llvm-project from IREE's third_party directory. Aside
-from saving download time, this lets you make local edits.
-"""
-
-import os
-import shutil
-
-
-def symlink_dir_children(source_dir, dest_dir):
-  print(f"Symlink children from {source_dir} -> {dest_dir}")
-  os.makedirs(dest_dir, exist_ok=True)
-  for child in os.listdir(source_dir):
-    dest_path = os.path.join(dest_dir, child)
-    if os.path.exists(dest_path):
-      os.unlink(dest_path)
-    os.symlink(os.path.join(source_dir, child), dest_path)
-
-
-this_dir = os.path.dirname(os.path.abspath(__file__))
-workspace_root = this_dir
-for i in range(2):
-  workspace_root = os.path.dirname(workspace_root)
-repo_root = workspace_root
-for i in range(2):
-  repo_root = os.path.dirname(repo_root)
-print(f"IREE repository root: {repo_root}")
-
-llvm_dir = os.path.join(repo_root, "third_party", "llvm-project")
-bazel_llvm_dir = os.path.join(this_dir, ".deps", "llvm-project")
-tensorflow_dir = os.path.join(repo_root, "third_party", "tensorflow")
-
-print(f"Symlinking shadow LLVM directory into: {bazel_llvm_dir}")
-os.makedirs(bazel_llvm_dir, exist_ok=True)
-for name in ["llvm", "mlir"]:
-  symlink_dir_children(os.path.join(llvm_dir, name),
-                       os.path.join(bazel_llvm_dir, name))
-
-# Now copy some bits and bobs from tensorflow.
-with open(os.path.join(bazel_llvm_dir, "WORKSPACE"), "wt") as f:
-  f.write("""workspace(name = "llvm-project")""")
-
-shutil.copyfile(
-    os.path.join(tensorflow_dir, "third_party", "llvm",
-                 "llvm.autogenerated.BUILD"),
-    os.path.join(bazel_llvm_dir, "llvm", "BUILD"))
-shutil.copyfile(os.path.join(tensorflow_dir, "third_party", "mlir", "BUILD"),
-                os.path.join(bazel_llvm_dir, "mlir", "BUILD"))
-
-rcfile = os.path.join(workspace_root, "tf-user.bazelrc")
-print(f"Writing rc file: {rcfile}")
-with open(rcfile, "wt") as f:
-  f.write(f"build --override_repository=llvm-project={bazel_llvm_dir}\n")
diff --git a/integrations/tensorflow/iree_tf_compiler/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/BUILD.bazel
deleted file mode 100644
index e1820a2..0000000
--- a/integrations/tensorflow/iree_tf_compiler/BUILD.bazel
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2019 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
-
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-filegroup(
-    name = "importer-binaries",
-    srcs = [
-        ":iree-import-tflite",
-    ],
-)
-
-filegroup(
-    name = "opt-binaries",
-    srcs = [
-        ":iree-opt-tflite",
-    ],
-)
-
-cc_binary(
-    name = "iree-opt-tflite",
-    srcs = ["iree-opt-tflite-main.cpp"],
-    deps = [
-        "//iree_tf_compiler/TFL",
-        "@llvm-project//llvm:Support",
-        "@llvm-project//mlir:FuncDialect",
-        "@llvm-project//mlir:IR",
-        "@llvm-project//mlir:MlirOptLib",
-        "@llvm-project//mlir:QuantOps",
-        "@llvm-project//mlir:Support",
-        "@llvm-project//mlir:TosaDialect",
-        "@org_tensorflow//tensorflow/compiler/mlir/lite:tensorflow_lite",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tf_dialect_passes",
-        "@org_tensorflow//tensorflow/compiler/mlir/tosa:tf_passes",
-        "@org_tensorflow//tensorflow/compiler/mlir/tosa:tf_tfl_passes",
-        "@org_tensorflow//tensorflow/compiler/mlir/tosa:tfl_passes",
-    ],
-)
-
-cc_binary(
-    name = "iree-import-tflite",
-    srcs = ["iree-import-tflite-main.cpp"],
-    deps = [
-        "//iree_tf_compiler/TFL",
-        "@llvm-project//llvm:Support",
-        "@llvm-project//mlir:BytecodeWriter",
-        "@llvm-project//mlir:IR",
-        "@llvm-project//mlir:Parser",
-        "@llvm-project//mlir:Pass",
-        "@llvm-project//mlir:QuantOps",
-        "@llvm-project//mlir:Support",
-        "@llvm-project//mlir:TosaDialect",
-        "@org_tensorflow//tensorflow/compiler/mlir/lite:flatbuffer_import",
-        "@org_tensorflow//tensorflow/compiler/mlir/lite:tensorflow_lite",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow",
-        "@org_tensorflow//tensorflow/compiler/mlir/tensorflow:tf_dialect_passes",
-    ],
-)
diff --git a/integrations/tensorflow/iree_tf_compiler/MHLO/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/MHLO/BUILD.bazel
deleted file mode 100644
index 9622ee3..0000000
--- a/integrations/tensorflow/iree_tf_compiler/MHLO/BUILD.bazel
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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
-
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-cc_library(
-    name = "MHLO",
-    srcs = [
-        "EmitDefaultIREEABI.cpp",
-        "Passes.cpp",
-    ],
-    hdrs = [
-        "Passes.h",
-    ],
-    defines = [
-        "IREE_COMPILER_TENSORFLOW_ENABLED",
-    ],
-    deps = [
-        "@llvm-project//llvm:Support",
-        "@llvm-project//mlir:FuncDialect",
-        "@llvm-project//mlir:IR",
-        "@llvm-project//mlir:Pass",
-        "@llvm-project//mlir:SCFToControlFlow",
-        "@llvm-project//mlir:SCFTransforms",
-        "@llvm-project//mlir:ShapeDialect",
-        "@llvm-project//mlir:ShapeTransforms",
-        "@llvm-project//mlir:Support",
-        "@llvm-project//mlir:TensorDialect",
-        "@llvm-project//mlir:TransformUtils",
-        "@llvm-project//mlir:Transforms",
-        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo",
-        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:all_passes",
-        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:chlo_legalize_to_hlo",
-        "@org_tensorflow//tensorflow/compiler/xla/mlir_hlo:mhlo_passes",
-    ],
-)
diff --git a/integrations/tensorflow/iree_tf_compiler/MHLO/EmitDefaultIREEABI.cpp b/integrations/tensorflow/iree_tf_compiler/MHLO/EmitDefaultIREEABI.cpp
deleted file mode 100644
index 97edaef..0000000
--- a/integrations/tensorflow/iree_tf_compiler/MHLO/EmitDefaultIREEABI.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/MHLO/Passes.h"
-#include "llvm/Support/JSON.h"
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/IR/Attributes.h"
-#include "mlir/IR/Builders.h"
-#include "mlir/IR/BuiltinTypes.h"
-#include "mlir/IR/SymbolTable.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Pass/PassRegistry.h"
-
-namespace json = llvm::json;
-
-namespace mlir {
-namespace iree_integrations {
-namespace MHLO {
-
-class EmitDefaultIREEABIPass
-    : public PassWrapper<EmitDefaultIREEABIPass, OperationPass<func::FuncOp>> {
- public:
-  StringRef getArgument() const override {
-    return "iree-mhlo-emit-default-iree-abi";
-  }
-
-  StringRef getDescription() const override {
-    return "Emits simple default ABI metadata";
-  }
-
-  void runOnOperation() override {
-    auto funcOp = getOperation();
-    if (SymbolTable::getSymbolVisibility(funcOp) !=
-        SymbolTable::Visibility::Public) {
-      return;
-    }
-    if (funcOp->hasAttr("iree.abi")) {
-      return;
-    }
-
-    json::Array refArgs;
-    SmallVector<Type> argTypes = flattenTypes(funcOp.getArgumentTypes());
-    for (Type t : argTypes) {
-      auto descriptor = mapTypeToJsonTypeRecord(t);
-      if (!descriptor) {
-        funcOp.emitWarning()
-            << "unable to generate reflection descriptor for argument type "
-            << t;
-        return;
-      }
-      refArgs.push_back(*descriptor);
-    }
-
-    json::Array refReturns;
-    SmallVector<Type> resultTypes = flattenTypes(funcOp.getCallableResults());
-    for (Type t : resultTypes) {
-      auto descriptor = mapTypeToJsonTypeRecord(t);
-      if (!descriptor) {
-        funcOp.emitWarning()
-            << "unable to generate reflection descriptor for result type " << t;
-        return;
-      }
-      refReturns.push_back(*descriptor);
-    }
-
-    Builder builder(&getContext());
-    json::Object refDict;
-    refDict["v"] = json::Value(1);
-    refDict["a"] = json::Value(std::move(refArgs));
-    refDict["r"] = json::Value(std::move(refReturns));
-    json::Value refDictValue(std::move(refDict));
-    std::string refStr;
-    llvm::raw_string_ostream refOut(refStr);
-    refOut << refDictValue;
-    refOut.flush();
-    funcOp->setAttr("iree.abi", builder.getStringAttr(refStr));
-  }
-
-  SmallVector<Type> flattenTypes(ArrayRef<Type> types) {
-    SmallVector<Type> flattened;
-    std::function<void(ArrayRef<Type>)> helper =
-        [&](ArrayRef<Type> types) -> void {
-      for (Type t : types) {
-        if (auto tt = t.dyn_cast<TupleType>()) {
-          helper(tt.getTypes());
-        } else {
-          flattened.push_back(t);
-        }
-      }
-    };
-    helper(types);
-    return flattened;
-  }
-
-  std::optional<json::Value> mapTypeToJsonTypeRecord(Type type) {
-    if (auto shapedType = type.dyn_cast<ShapedType>()) {
-      auto typeValue = mapTypeToJsonTypeRecord(shapedType.getElementType());
-      json::Array record({
-          json::Value("ndarray"),
-          typeValue ? *typeValue : json::Value(nullptr),
-          shapedType.hasRank() ? json::Value(shapedType.getRank())
-                               : json::Value(nullptr),
-      });
-      if (shapedType.hasRank()) {
-        for (auto dim : shapedType.getShape()) {
-          record.push_back(dim == ShapedType::kDynamic ? json::Value(nullptr)
-                                                       : json::Value(dim));
-        }
-      }
-      return json::Value(std::move(record));
-    }
-
-    // Primitives.
-    if (auto integerType = type.dyn_cast<IntegerType>()) {
-      std::string name = (Twine("i") + Twine(integerType.getWidth())).str();
-      return json::Value(std::move(name));
-    }
-    if (auto floatType = type.dyn_cast<FloatType>()) {
-      if (floatType == FloatType::getBF16(floatType.getContext())) {
-        // Why Google?
-        return json::Value("bf16");
-      }
-      std::string name = (Twine("f") + Twine(floatType.getWidth())).str();
-      return json::Value(std::move(name));
-    }
-
-    return std::nullopt;
-  }
-};
-
-std::unique_ptr<OperationPass<func::FuncOp>> createEmitDefaultIREEABIPass() {
-  return std::make_unique<EmitDefaultIREEABIPass>();
-}
-
-static PassRegistration<EmitDefaultIREEABIPass> funcPass;
-
-}  // namespace MHLO
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/MHLO/Passes.cpp b/integrations/tensorflow/iree_tf_compiler/MHLO/Passes.cpp
deleted file mode 100644
index 9566aca..0000000
--- a/integrations/tensorflow/iree_tf_compiler/MHLO/Passes.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2019 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
-
-#include "iree_tf_compiler/MHLO/Passes.h"
-
-#include "mhlo/transforms/passes.h"
-#include "mlir/Dialect/SCF/Transforms/Passes.h"
-#include "mlir/Dialect/Shape/Transforms/Passes.h"
-#include "mlir/Pass/PassManager.h"
-#include "mlir/Pass/PassRegistry.h"
-#include "mlir/Transforms/Passes.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace MHLO {
-
-void buildMHLOImportPassPipeline(OpPassManager &pm) {
-  // We run the inliner for legacy reasons. It shouldn't be necessary anymore,
-  // but this entire pipeline will soon be deleted and it isn't worth
-  // removing now.
-  pm.addPass(mlir::createInlinerPass());
-
-  // Import pipelines should end with canonicalization because they may have
-  // access to dialects and patterns that the core compiler does not.
-  pm.addNestedPass<func::FuncOp>(mlir::createCanonicalizerPass());
-}
-
-void registerMHLOImportPassPipeline() {
-  mlir::PassPipelineRegistration<> pipeline(
-      "iree-mhlo-import-pipeline",
-      "Run IREE-specific passes for importing MHLO code into IREE",
-      [](OpPassManager &passManager) {
-        buildMHLOImportPassPipeline(passManager);
-      });
-}
-
-}  // namespace MHLO
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/MHLO/Passes.h b/integrations/tensorflow/iree_tf_compiler/MHLO/Passes.h
deleted file mode 100644
index 8930e85..0000000
--- a/integrations/tensorflow/iree_tf_compiler/MHLO/Passes.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2019 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
-
-#ifndef IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_MHLO_PASSES_H_
-#define IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_MHLO_PASSES_H_
-
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Pass/Pass.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace MHLO {
-
-//===----------------------------------------------------------------------===//
-// Helpers
-//===----------------------------------------------------------------------===//
-
-void buildMHLOImportPassPipeline(OpPassManager &pm);
-void registerMHLOImportPassPipeline();
-
-//===----------------------------------------------------------------------===//
-// IREE-specific Passes For MHLO Import
-//===----------------------------------------------------------------------===//
-
-// Annotates an appropriate iree.abi attribute on public functions that
-// operate exclusively on tensor types. This corresponds to the expectations
-// of MHLO and is suitable for such programs.
-std::unique_ptr<OperationPass<func::FuncOp>> createEmitDefaultIREEABIPass();
-
-//===----------------------------------------------------------------------===//
-// Registration
-//===----------------------------------------------------------------------===//
-
-inline void registerAllPasses() {
-  registerMHLOImportPassPipeline();
-
-  createEmitDefaultIREEABIPass();
-}
-
-}  // namespace MHLO
-}  // namespace iree_integrations
-}  // namespace mlir
-
-#endif  // IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_MHLO_PASSES_H_
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/TFL/BUILD.bazel
deleted file mode 100644
index 1ea56af..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/BUILD.bazel
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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
-
-load("@llvm-project//mlir:tblgen.bzl", "gentbl_cc_library")
-
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-gentbl_cc_library(
-    name = "PassesIncGen",
-    tbl_outs = [
-        (
-            ["--gen-pass-decls"],
-            "Passes.h.inc",
-        ),
-    ],
-    tblgen = "@llvm-project//mlir:mlir-tblgen",
-    td_file = "Passes.td",
-    deps = [
-        "@llvm-project//mlir:PassBaseTdFiles",
-    ],
-)
-
-cc_library(
-    name = "TFL",
-    srcs = [
-        "ConvertMetadata.cpp",
-        "LowerGlobalTensors.cpp",
-        "Passes.cpp",
-        "RetainCallOnceFuncs.cpp",
-        "StripMetadata.cpp",
-        "VerifyFullyConverted.cpp",
-    ],
-    hdrs = [
-        "PassDetail.h",
-        "Passes.h",
-        "Passes.h.inc",
-    ],
-    defines = [
-        "IREE_COMPILER_TENSORFLOW_ENABLED",
-    ],
-    deps = [
-        ":PassesIncGen",
-        "//iree_tf_compiler/Utils",
-        "@llvm-project//llvm:Support",
-        "@llvm-project//mlir:FuncDialect",
-        "@llvm-project//mlir:IR",
-        "@llvm-project//mlir:MLProgramDialect",
-        "@llvm-project//mlir:Pass",
-        "@llvm-project//mlir:QuantOps",
-        "@llvm-project//mlir:ReconcileUnrealizedCasts",
-        "@llvm-project//mlir:ShapeDialect",
-        "@llvm-project//mlir:ShapeTransforms",
-        "@llvm-project//mlir:Support",
-        "@llvm-project//mlir:TensorDialect",
-        "@llvm-project//mlir:TransformUtils",
-        "@llvm-project//mlir:Transforms",
-        "@org_tensorflow//tensorflow/compiler/mlir/lite:tensorflow_lite",
-        "@org_tensorflow//tensorflow/compiler/mlir/tosa:tf_tfl_passes",
-    ],
-)
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/ConvertMetadata.cpp b/integrations/tensorflow/iree_tf_compiler/TFL/ConvertMetadata.cpp
deleted file mode 100644
index 2379c2d..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/ConvertMetadata.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/TFL/PassDetail.h"
-#include "iree_tf_compiler/TFL/Passes.h"
-#include "llvm/ADT/StringExtras.h"
-#include "mlir/IR/BuiltinAttributes.h"
-#include "mlir/IR/BuiltinOps.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Support/LLVM.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-namespace {
-
-// Extract the input and output names
-static void splitFunctionIONames(StringAttr namesAttr,
-                                 llvm::SmallVectorImpl<std::string> &names) {
-  SmallVector<StringRef, 4> namesRef;
-  llvm::SplitString(namesAttr.getValue(), namesRef, ",");
-  for (auto nameRef : namesRef) {
-    names.push_back(nameRef.str());
-  }
-}
-
-class ConvertModuleMetadataPass
-    : public ConvertModuleMetadataBase<ConvertModuleMetadataPass> {
- public:
-  void runOnOperation() override {
-    // None currently handled.
-  }
-};
-
-class ConvertFunctionMetadataPass
-    : public ConvertFunctionMetadataBase<ConvertFunctionMetadataPass> {
- public:
-  void runOnOperation() override {
-    auto funcOp = getOperation();
-
-    // Setup TF entry functions as an IREE entry point and preserve the
-    // associated metadata. Note that TFLite uses `tf.entry_function`.
-    auto entryFunctionAttr =
-        funcOp->getAttrOfType<DictionaryAttr>("tf.entry_function");
-    if (entryFunctionAttr) {
-      setupEntryPointAttrs(funcOp, entryFunctionAttr);
-    }
-  }
-
- private:
-  // TF/TFL pack their I/O names on an annoying dictionary. We want our shape
-  // names to match up with those for readability so we extract them here.
-  // Is this ugly? Yeah - but such is what we have to deal with here.
-  void setupEntryPointAttrs(func::FuncOp funcOp,
-                            DictionaryAttr entryFunctionAttr) {
-    funcOp.setPublic();
-
-    if (funcOp.getNumArguments() > 0) {
-      auto inputsAttr = entryFunctionAttr.get("inputs")
-                            .template dyn_cast_or_null<StringAttr>();
-      if (!inputsAttr) {
-        funcOp.emitError() << "functions with tf.entry_function must have "
-                              "input names to be handled by IREE";
-        return signalPassFailure();
-      }
-      SmallVector<std::string, 4> inputNames;
-      splitFunctionIONames(inputsAttr, inputNames);
-      if (inputNames.size() != funcOp.getNumArguments()) {
-        funcOp.emitError()
-            << "tf.entry_function attribute malformed: inputs don't "
-               "match the function signature";
-        return signalPassFailure();
-      }
-      for (unsigned i = 0, s = inputNames.size(); i < s; ++i) {
-        funcOp.setArgAttr(i, "iree.identifier",
-                          StringAttr::get(&getContext(), inputNames[i]));
-      }
-    }
-    if (funcOp.getNumResults() > 0) {
-      auto outputsAttr = entryFunctionAttr.get("outputs")
-                             .template dyn_cast_or_null<StringAttr>();
-      if (!outputsAttr) {
-        funcOp.emitError() << "functions with tf.entry_function must have "
-                              "output names to be handled by IREE";
-        return signalPassFailure();
-      }
-      SmallVector<std::string, 4> outputNames;
-      splitFunctionIONames(outputsAttr, outputNames);
-      if (outputNames.size() != funcOp.getNumResults()) {
-        funcOp.emitError()
-            << "tf.entry_function attribute malformed: outputs don't "
-               "match the function signature";
-        return signalPassFailure();
-      }
-      for (unsigned i = 0, s = outputNames.size(); i < s; ++i) {
-        funcOp.setResultAttr(i, "iree.identifier",
-                             StringAttr::get(&getContext(), outputNames[i]));
-      }
-    }
-  }
-};
-}  // anonymous namespace
-
-std::unique_ptr<OperationPass<ModuleOp>> createConvertModuleMetadataPass() {
-  return std::make_unique<ConvertModuleMetadataPass>();
-}
-
-std::unique_ptr<OperationPass<func::FuncOp>>
-createConvertFunctionMetadataPass() {
-  return std::make_unique<ConvertFunctionMetadataPass>();
-}
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/LowerGlobalTensors.cpp b/integrations/tensorflow/iree_tf_compiler/TFL/LowerGlobalTensors.cpp
deleted file mode 100644
index 47bb166..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/LowerGlobalTensors.cpp
+++ /dev/null
@@ -1,193 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/TFL/PassDetail.h"
-#include "iree_tf_compiler/TFL/Passes.h"
-#include "mlir/Dialect/MLProgram/IR/MLProgram.h"
-#include "mlir/IR/BuiltinAttributes.h"
-#include "mlir/IR/BuiltinOps.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Support/LLVM.h"
-#include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/lite/ir/tfl_ops.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-namespace {
-
-class LowerGlobalTensorsPass
-    : public LowerGlobalTensorsBase<LowerGlobalTensorsPass> {
- public:
-  void getDependentDialects(DialectRegistry& registry) const override {
-    registry.insert<mlir::TFL::TensorFlowLiteDialect,
-                    mlir::ml_program::MLProgramDialect>();
-  }
-
-  // Converts TFLite state operations to the IREE equivalent.
-  void runOnOperation() override {
-    auto* context = &getContext();
-    auto moduleOp = getOperation();
-    mlir::OpBuilder builder(moduleOp.getBodyRegion());
-
-    DenseMap<StringRef, func::FuncOp> symNameToFunction;
-    for (auto func : moduleOp.getOps<func::FuncOp>()) {
-      symNameToFunction[func.getSymName()] = func;
-    }
-
-    DenseMap<StringRef, DenseElementsAttr> sharedNameToConstant;
-    DenseMap<StringRef, LocationAttr> sharedNameToLoc;
-
-    llvm::SmallVector<mlir::TFL::VarHandleOp, 6> handleOps;
-    llvm::SmallVector<mlir::TFL::AssignVariableOp, 6> assignOps;
-    llvm::SmallVector<mlir::TFL::ReadVariableOp, 6> readOps;
-    for (auto it : symNameToFunction) {
-      auto func = std::get<1>(it);
-      // Look through the initialization functions and find the assigned values
-      // for each handle, save out the constant value.
-      for (auto init : func.getOps<mlir::TFL::CallOnceOp>()) {
-        auto findInitFunc =
-            symNameToFunction.find(init.getSessionInitFunction());
-        if (findInitFunc == symNameToFunction.end()) {
-          init.emitError("Unable to find initialization function: " +
-                         init.getSessionInitFunction());
-          continue;
-        }
-        func::FuncOp initFunc = std::get<1>(*findInitFunc);
-        for (auto assign : initFunc.getOps<mlir::TFL::AssignVariableOp>()) {
-          auto handle = dyn_cast<mlir::TFL::VarHandleOp>(
-              assign.getResourceId().getDefiningOp());
-          if (!handle) continue;
-
-          DenseElementsAttr constant;
-          if (!matchPattern(assign.getValue(), m_Constant(&constant))) {
-            // Quantized types we can not use the m_Constant matcher.
-            if (auto constOp = dyn_cast<mlir::TFL::QConstOp>(
-                    assign.getValue().getDefiningOp())) {
-              constant = constOp.getValue().cast<DenseElementsAttr>();
-            }
-          }
-          if (!constant) continue;
-
-          auto name = handle.getSharedName();
-          sharedNameToConstant[name] = constant;
-          sharedNameToLoc[name] = handle.getLoc();
-        }
-      }
-
-      // We also want to grab the list of operations to replace.
-      for (auto& op : func.getOps()) {
-        if (auto handle = dyn_cast<mlir::TFL::VarHandleOp>(op))
-          handleOps.push_back(handle);
-        if (auto assign = dyn_cast<mlir::TFL::AssignVariableOp>(op))
-          assignOps.push_back(assign);
-        if (auto read = dyn_cast<mlir::TFL::ReadVariableOp>(op))
-          readOps.push_back(read);
-      }
-    }
-
-    // TF::CallOnceOps are no longer needed as we have already extracted their
-    // state.
-    SmallVector<mlir::TFL::CallOnceOp> callOnceOps;
-    for (auto func : moduleOp.getOps<func::FuncOp>()) {
-      for (auto init : func.getOps<mlir::TFL::CallOnceOp>()) {
-        callOnceOps.push_back(init);
-      }
-    }
-    for (auto op : callOnceOps) op.erase();
-
-    // Create the Util::GlobalOps to store our new global variables.
-    DenseMap<StringRef, mlir::ml_program::GlobalOp> symbolRefMap;
-    for (auto it : sharedNameToConstant) {
-      auto name = std::get<0>(it);
-      auto attribute = std::get<1>(it);
-      auto locIt = sharedNameToLoc.find(name);
-      LocationAttr loc = mlir::UnknownLoc();
-      if (locIt != sharedNameToLoc.end()) {
-        loc = std::get<1>(*locIt);
-      }
-
-      // TODO(suderman): Determine the global type based on all store
-      // operations.
-      auto global = builder.create<mlir::ml_program::GlobalOp>(
-          loc, name, attribute.getType(), /*is_mutable=*/true, attribute,
-          nullptr);
-      global.setPrivate();
-
-      symbolRefMap[name] = global;
-    }
-
-    // Replace the assign ops with a global store operation.
-    for (auto assign : assignOps) {
-      auto handle = dyn_cast<mlir::TFL::VarHandleOp>(
-          assign.getResourceId().getDefiningOp());
-      if (!handle) continue;
-
-      Value value = assign.getValue();
-      auto globalOpIt = symbolRefMap.find(handle.getSharedName());
-      if (globalOpIt == symbolRefMap.end()) {
-        assign->emitError(
-            "Unable to find corresponding GlobalOp for op's VarHandle");
-        continue;
-      }
-      auto globalOp = std::get<1>(*globalOpIt);
-
-      builder.setInsertionPoint(assign);
-      if (globalOp.getType() != value.getType()) {
-        value = builder
-                    .create<UnrealizedConversionCastOp>(
-                        assign.getLoc(), globalOp.getType(), value)
-                    .getResult(0);
-      }
-
-      auto globalSymbolRef = SymbolRefAttr::get(context, globalOp.getSymName());
-      builder.create<mlir::ml_program::GlobalStoreOp>(assign.getLoc(),
-                                                      globalSymbolRef, value);
-      assign.erase();
-    }
-
-    for (auto read : readOps) {
-      auto handle = dyn_cast<mlir::TFL::VarHandleOp>(
-          read.getResourceId().getDefiningOp());
-      if (!handle) continue;
-
-      auto globalOpIt = symbolRefMap.find(handle.getSharedName());
-      if (globalOpIt == symbolRefMap.end()) continue;
-      auto globalOp = std::get<1>(*globalOpIt);
-
-      builder.setInsertionPoint(read);
-
-      auto globalSymbolRef = SymbolRefAttr::get(context, globalOp.getSymName());
-      Value load = builder.create<mlir::ml_program::GlobalLoadOp>(
-          read.getLoc(), globalOp.getType(), globalSymbolRef);
-
-      if (read.getType() != load.getType()) {
-        load = builder
-                   .create<UnrealizedConversionCastOp>(read.getLoc(),
-                                                       read.getType(), load)
-                   .getResult(0);
-      }
-      read.getResult().replaceAllUsesWith(load);
-      read.erase();
-    }
-
-    for (auto handle : handleOps) {
-      if (handle.getResult().use_empty()) {
-        handle.erase();
-      }
-    }
-  }
-};
-
-}  // namespace
-
-std::unique_ptr<OperationPass<ModuleOp>> createLowerGlobalTensorsPass() {
-  return std::make_unique<LowerGlobalTensorsPass>();
-}
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/PassDetail.h b/integrations/tensorflow/iree_tf_compiler/TFL/PassDetail.h
deleted file mode 100644
index 61848c9..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/PassDetail.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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
-
-#ifndef IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_TFL_PASS_DETAIL_H_
-#define IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_TFL_PASS_DETAIL_H_
-
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/IR/BuiltinOps.h"
-#include "mlir/Pass/Pass.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-
-#define GEN_PASS_CLASSES
-#include "iree_tf_compiler/TFL/Passes.h.inc"  // IWYU pragma: keep
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
-
-#endif  // IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_TFL_PASS_DETAIL_H_
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/Passes.cpp b/integrations/tensorflow/iree_tf_compiler/TFL/Passes.cpp
deleted file mode 100644
index bcbb29a..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/Passes.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/TFL/Passes.h"
-
-#include "mlir/Conversion/ReconcileUnrealizedCasts/ReconcileUnrealizedCasts.h"
-#include "mlir/Dialect/Shape/Transforms/Passes.h"
-#include "mlir/IR/BuiltinOps.h"
-#include "mlir/Pass/PassManager.h"
-#include "mlir/Pass/PassRegistry.h"
-#include "mlir/Transforms/Passes.h"
-#include "tensorflow/compiler/mlir/tosa/tf_tfl_passes.h"
-#include "tensorflow/compiler/mlir/tosa/transforms/passes.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-
-namespace {
-#define GEN_PASS_REGISTRATION
-#include "iree_tf_compiler/TFL/Passes.h.inc"  // IWYU pragma: export
-}  // namespace
-
-// All IREE-specific passes that lower TFL representations before reaching the
-// IREE core should go here.
-void buildTFLImportPassPipeline(OpPassManager &pm) {
-  //----------------------------------------------------------------------------
-  // Guarantee the call once functions are preserved.
-  //----------------------------------------------------------------------------
-
-  pm.addPass(createRetainCallOnceFuncsPass());
-
-  //----------------------------------------------------------------------------
-  // Input IR cleanup
-  //----------------------------------------------------------------------------
-
-  pm.addPass(createInlinerPass());
-  pm.addPass(createCanonicalizerPass());
-  pm.addPass(createSymbolDCEPass());
-
-  //----------------------------------------------------------------------------
-  // Convert useful metadata into forms IREE's main compiler understands
-  //----------------------------------------------------------------------------
-
-  pm.addPass(createConvertModuleMetadataPass());
-  pm.nest<func::FuncOp>().addPass(createConvertFunctionMetadataPass());
-
-  //----------------------------------------------------------------------------
-  // Convert all TFL ops to TOSA ops
-  //----------------------------------------------------------------------------
-
-  pm.addPass(createLowerGlobalTensorsPass());
-
-  mlir::tosa::TOSATFTFLLegalizationPipelineOptions tosaOptions;
-  // Temporary work-around for https://github.com/openxla/iree/issues/8974
-  tosaOptions.dequantize_tfl_softmax = true;
-  mlir::tosa::createTFTFLtoTOSALegalizationPipeline(pm, tosaOptions);
-
-  pm.nest<func::FuncOp>().addPass(mlir::tosa::createStripQuantTypesPass());
-  pm.addPass(createCanonicalizerPass());
-  pm.addPass(createReconcileUnrealizedCastsPass());
-
-  //----------------------------------------------------------------------------
-  // Lowering shape-related constructs
-  //----------------------------------------------------------------------------
-
-  // TODO(#3975): support dynamic shapes in tflite inputs.
-  // pm.addPass(iree_compiler::Shape::createConvertHLOToShapePass());
-  // pm.addPass(createCanonicalizerPass());
-  // pm.addPass(iree_compiler::Shape::createConvertShapeToShapexPass());
-  // pm.addPass(createCanonicalizerPass());
-
-  //----------------------------------------------------------------------------
-  // Remove the rest of the TFL goo and verify that all ops converted
-  //----------------------------------------------------------------------------
-
-  pm.nest<func::FuncOp>().addPass(createStripFunctionMetadataPass());
-  pm.addPass(createStripModuleMetadataPass());
-  pm.addPass(createVerifyFullyConvertedPass());
-}
-
-void registerTFLImportPassPipeline() {
-  mlir::PassPipelineRegistration<> pipeline(
-      "iree-tflite-import-pipeline",
-      "Run IREE-specific passes for importing TFLite code into IREE",
-      [](OpPassManager &passManager) {
-        buildTFLImportPassPipeline(passManager);
-      });
-}
-
-void registerAllPasses() {
-  registerTFLImportPassPipeline();
-
-  // Generated.
-  registerPasses();
-
-  createVerifyFullyConvertedPass();
-}
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/Passes.h b/integrations/tensorflow/iree_tf_compiler/TFL/Passes.h
deleted file mode 100644
index dd09195..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/Passes.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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
-
-#ifndef IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_TFL_PASSES_H_
-#define IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_TFL_PASSES_H_
-
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/IR/BuiltinOps.h"
-#include "mlir/Pass/Pass.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-
-//===----------------------------------------------------------------------===//
-// Pipelines
-//===----------------------------------------------------------------------===//
-
-// Create a single pipeline that will run all the needed IREE-specific TFL
-// import passes in the right order.
-void buildTFLImportPassPipeline(OpPassManager &pm);
-
-//===----------------------------------------------------------------------===//
-// IREE-specific passes for TFLite import
-//===----------------------------------------------------------------------===//
-
-// Retain functions used by tfl.call_once to avoid removal.
-std::unique_ptr<OperationPass<ModuleOp>> createRetainCallOnceFuncsPass();
-
-// Converts TFLite attributes that are useful to corresponding IREE attributes.
-std::unique_ptr<OperationPass<ModuleOp>> createConvertModuleMetadataPass();
-std::unique_ptr<OperationPass<func::FuncOp>>
-createConvertFunctionMetadataPass();
-
-// Lowers TFLite's global tensor operations to the Util dialect.
-std::unique_ptr<OperationPass<ModuleOp>> createLowerGlobalTensorsPass();
-
-// Strips all leftover TFLite-related attributes; none are needed by IREE.
-std::unique_ptr<OperationPass<ModuleOp>> createStripModuleMetadataPass();
-std::unique_ptr<OperationPass<func::FuncOp>> createStripFunctionMetadataPass();
-
-// Validates whether any TFLite operations remain.
-std::unique_ptr<OperationPass<func::FuncOp>> createVerifyFullyConvertedPass();
-
-//===----------------------------------------------------------------------===//
-// Registration
-//===----------------------------------------------------------------------===//
-
-void registerTFLImportPassPipeline();
-
-void registerAllPasses();
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
-
-#endif  // IREE_INTEGRATIONS_TENSORFLOW_IREE_TF_COMPILER_TFL_PASSES_H_
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/Passes.td b/integrations/tensorflow/iree_tf_compiler/TFL/Passes.td
deleted file mode 100644
index 70eaab7..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/Passes.td
+++ /dev/null
@@ -1,54 +0,0 @@
-// 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
-
-#ifndef IREE_INTEGRATIONS_TFL_PASSES
-#define IREE_INTEGRATIONS_TFL_PASSES
-
-include "mlir/Pass/PassBase.td"
-
-def ConvertFunctionMetadata :
-    Pass<"iree-tflite-convert-function-metadata", "mlir::func::FuncOp"> {
-  let summary = "Converts TFLite attributes to IREE attributes on functions.";
-  let constructor = "mlir::iree_integrations::TFL::createConvertFunctionMetadataPass()";
-}
-
-def ConvertModuleMetadata :
-    Pass<"iree-tflite-convert-module-metadata", "mlir::ModuleOp"> {
-  let summary = "Converts TFLite attributes to IREE attributes on modules.";
-  let constructor = "mlir::iree_integrations::TFL::createConvertModuleMetadataPass()";
-}
-
-def LowerGlobalTensors :
-    Pass<"iree-tflite-lower-global-tensors", "mlir::ModuleOp"> {
-  let summary = "Lowers tflite global tensors to IREE flow dialect variables.";
-  let constructor = "mlir::iree_integrations::TFL::createLowerGlobalTensorsPass()";
-}
-
-def RetainCallOnceFuncs :
-    Pass<"iree-tflite-retain-call-once-funcs", "mlir::ModuleOp"> {
-  let summary = "Guarantees that functions used by tfl.call_once are retained.";
-  let constructor = "mlir::iree_integrations::TFL::createRetainCallOnceFuncsPass()";
-}
-
-def StripFunctionMetadata :
-    Pass<"iree-tflite-strip-function-metadata", "mlir::func::FuncOp"> {
-  let summary = "Guarantees that functions used by tfl.call_once are retained.";
-  let constructor = "mlir::iree_integrations::TFL::createStripFunctionMetadataPass()";
-}
-
-def StripModuleMetadata :
-    Pass<"iree-tflite-strip-module-metadata", "mlir::ModuleOp"> {
-  let summary = "Guarantees that functions used by tfl.call_once are retained.";
-  let constructor = "mlir::iree_integrations::TFL::createStripModuleMetadataPass()";
-}
-
-def VerifyFullyConverted :
-    Pass<"iree-tflite-verify-fully-converted", "mlir::func::FuncOp"> {
-  let summary = "Verifies that all TFLite frontend ops were converted and none remain.";
-  let constructor = "mlir::iree_integrations::TFL::createVerifyFullyConvertedPass()";
-}
-
-#endif  // IREE_INTEGRATIONS_TFL_PASSES
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/RetainCallOnceFuncs.cpp b/integrations/tensorflow/iree_tf_compiler/TFL/RetainCallOnceFuncs.cpp
deleted file mode 100644
index 53cf17b..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/RetainCallOnceFuncs.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/TFL/PassDetail.h"
-#include "iree_tf_compiler/TFL/Passes.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Support/LLVM.h"
-#include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/lite/ir/tfl_ops.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-namespace {
-
-class RetainCallOnceFuncsPass
-    : public RetainCallOnceFuncsBase<RetainCallOnceFuncsPass> {
- public:
-  void getDependentDialects(DialectRegistry& registry) const override {
-    registry.insert<mlir::TFL::TensorFlowLiteDialect>();
-  }
-
-  void runOnOperation() override {
-    auto moduleOp = getOperation();
-
-    llvm::DenseMap<StringRef, func::FuncOp> funcMap;
-    for (auto func : moduleOp.getOps<mlir::func::FuncOp>()) {
-      funcMap[func.getSymName()] = func;
-    }
-
-    for (auto func : moduleOp.getOps<mlir::func::FuncOp>()) {
-      for (auto callOnce : func.getOps<mlir::TFL::CallOnceOp>()) {
-        auto callFunc = funcMap[callOnce.getSessionInitFunction()];
-        callOnce->setAttr("session_init_function_symbol",
-                          SymbolRefAttr::get(callFunc));
-      }
-    }
-  }
-};
-
-}  // anonymous namespace
-
-std::unique_ptr<OperationPass<ModuleOp>> createRetainCallOnceFuncsPass() {
-  return std::make_unique<RetainCallOnceFuncsPass>();
-}
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/StripMetadata.cpp b/integrations/tensorflow/iree_tf_compiler/TFL/StripMetadata.cpp
deleted file mode 100644
index 241165d..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/StripMetadata.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/TFL/PassDetail.h"
-#include "iree_tf_compiler/TFL/Passes.h"
-#include "mlir/IR/FunctionInterfaces.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Support/LLVM.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-namespace {
-
-static bool isTFLAttr(NamedAttribute &namedAttr) {
-  // NOTE: tflite mixes tf and tfl, for some reason.
-  auto name = namedAttr.getName().strref();
-  // Don't trim attributes from tf_saved_model---they carry ABI information.
-  if (name.startswith("tf_saved_model.")) return false;
-
-  if (name.startswith("tf.") || name.startswith("tf_") ||
-      name.startswith("tfl.") || name.startswith("tfl_")) {
-    return true;
-  }
-  StringRef attrNamespace = namedAttr.getValue().getDialect().getNamespace();
-  return attrNamespace == "tf" || attrNamespace == "tfl";
-}
-
-class StripModuleMetadataPass
-    : public StripModuleMetadataBase<StripModuleMetadataPass> {
- public:
-  void runOnOperation() override {
-    auto moduleOp = getOperation();
-    auto stripAttrs = llvm::to_vector<4>(llvm::make_filter_range(
-        moduleOp->getAttrs(),
-        [](NamedAttribute namedAttr) { return isTFLAttr(namedAttr); }));
-    for (auto namedAttr : stripAttrs) {
-      moduleOp->removeAttr(namedAttr.getName());
-    }
-  }
-};
-
-class StripFunctionMetadataPass
-    : public StripFunctionMetadataBase<StripFunctionMetadataPass> {
- public:
-  void runOnOperation() override {
-    auto funcOp = getOperation();
-    auto stripAttrs = llvm::to_vector<4>(llvm::make_filter_range(
-        funcOp->getAttrs(),
-        [](NamedAttribute namedAttr) { return isTFLAttr(namedAttr); }));
-    for (auto namedAttr : stripAttrs) {
-      funcOp->removeAttr(namedAttr.getName());
-    }
-
-    for (int i = 0; i < funcOp.getNumArguments(); ++i) {
-      auto stripAttrs = llvm::to_vector<4>(llvm::make_filter_range(
-          mlir::function_interface_impl::getArgAttrs(funcOp, i),
-          [](NamedAttribute namedAttr) { return isTFLAttr(namedAttr); }));
-      for (auto namedAttr : stripAttrs) {
-        funcOp.removeArgAttr(i, namedAttr.getName());
-      }
-    }
-
-    for (int i = 0; i < funcOp.getNumResults(); ++i) {
-      auto stripAttrs = llvm::to_vector<4>(llvm::make_filter_range(
-          mlir::function_interface_impl::getResultAttrs(funcOp, i),
-          [](NamedAttribute namedAttr) { return isTFLAttr(namedAttr); }));
-      for (auto namedAttr : stripAttrs) {
-        funcOp.removeResultAttr(i, namedAttr.getName());
-      }
-    }
-  }
-};
-
-}  // anonymous namespace
-
-std::unique_ptr<OperationPass<ModuleOp>> createStripModuleMetadataPass() {
-  return std::make_unique<StripModuleMetadataPass>();
-}
-
-std::unique_ptr<OperationPass<func::FuncOp>> createStripFunctionMetadataPass() {
-  return std::make_unique<StripFunctionMetadataPass>();
-}
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/VerifyFullyConverted.cpp b/integrations/tensorflow/iree_tf_compiler/TFL/VerifyFullyConverted.cpp
deleted file mode 100644
index fd8172b..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/VerifyFullyConverted.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/TFL/PassDetail.h"
-#include "iree_tf_compiler/TFL/Passes.h"
-#include "iree_tf_compiler/Utils/ConversionUtils.h"
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "mlir/Pass/Pass.h"
-#include "mlir/Support/LLVM.h"
-#include "mlir/Transforms/DialectConversion.h"
-#include "tensorflow/compiler/mlir/lite/ir/tfl_ops.h"
-
-namespace mlir {
-namespace iree_integrations {
-namespace TFL {
-namespace {
-
-class VerifyFullyConvertedPass
-    : public VerifyFullyConvertedBase<VerifyFullyConvertedPass> {
- public:
-
-  // Validates that no TFLite frontends ops are in the function.
-  void runOnOperation() override {
-    ConversionTarget target(getContext());
-    target.markUnknownOpDynamicallyLegal([](Operation *) { return true; });
-    target.addIllegalDialect<mlir::TFL::TensorFlowLiteDialect>();
-    target.addIllegalOp<mlir::UnrealizedConversionCastOp>();
-    if (failed(
-            iree_compiler::verifyAllOperationsAreLegal(getOperation(), target)))
-      return signalPassFailure();
-  }
-};
-
-}  // anonymous namespace
-
-std::unique_ptr<OperationPass<func::FuncOp>> createVerifyFullyConvertedPass() {
-  return std::make_unique<VerifyFullyConvertedPass>();
-}
-
-}  // namespace TFL
-}  // namespace iree_integrations
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/TFL/test/BUILD.bazel
deleted file mode 100644
index 7de9274..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/BUILD.bazel
+++ /dev/null
@@ -1,32 +0,0 @@
-# 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
-
-load("//build_tools/bazel:iree_lit_test.bzl", "iree_lit_test_suite")
-load("//build_tools/bazel:enforce_glob.bzl", "enforce_glob")
-
-package(
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-iree_lit_test_suite(
-    name = "lit",
-    srcs = enforce_glob(
-        [
-            "convert_metadata.mlir",
-            "flex_ops.mlir",
-            "lower_global_tensors.mlir",
-            "retain_call_once_funcs.mlir",
-            "strip_metadata.mlir",
-            "verify_fully_converted.mlir",
-        ],
-        include = ["*.mlir"],
-    ),
-    tools = [
-        "//iree_tf_compiler:iree-opt-tflite",
-        "@llvm-project//llvm:FileCheck",
-    ],
-)
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/convert_metadata.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/convert_metadata.mlir
deleted file mode 100644
index 16b2ce6..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/convert_metadata.mlir
+++ /dev/null
@@ -1,25 +0,0 @@
-// RUN: iree-opt-tflite --split-input-file --pass-pipeline='builtin.module(iree-tflite-convert-module-metadata,func.func(iree-tflite-convert-function-metadata))' %s | FileCheck %s
-
-module attributes {tfl.schema_version = 3 : i32} {
-  // CHECK: func.func @main(
-  // CHECK-SAME: %arg0: tensor<?xf32> {iree.identifier = "input0"},
-  // CHECK-SAME: %arg1: tensor<?xf32> {iree.identifier = "input1"}
-  // CHECK-SAME: ) -> (
-  // CHECK-SAME: tensor<?xf32> {iree.identifier = "output0"},
-  // CHECK-SAME: tensor<?xf32> {iree.identifier = "output1"})
-  func.func @main(%arg0: tensor<?xf32>, %arg1: tensor<?xf32>) -> (tensor<?xf32>, tensor<?xf32>) attributes {
-    tf.entry_function = {inputs = "input0,input1", outputs = "output0,output1"}
-  } {
-    return %arg0, %arg1 : tensor<?xf32>, tensor<?xf32>
-  }
-
-  // CHECK: func.func @no_input(
-  // CHECK-SAME: ) -> (
-  // CHECK-SAME: tensor<1xf32> {iree.identifier = "output0"})
-  func.func @no_input() -> (tensor<1xf32>) attributes {
-    tf.entry_function = {outputs = "output0"}
-  } {
-    %0 = "tfl.pseudo_const"() {value = dense<0.000000e+00> : tensor<1xf32>} : () -> tensor<1xf32>
-    return %0 : tensor<1xf32>
-  }
-}
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/flex_ops.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/flex_ops.mlir
deleted file mode 100644
index 5d403d7..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/flex_ops.mlir
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: iree-opt-tflite --split-input-file --iree-tflite-import-pipeline %s | FileCheck %s
-// Disabled as part of 2022-08-12 integrate: https://github.com/openxla/iree/issues/10091
-
-// This test was generated by importing a TFLite model that contained flex ops.
-// The opaque data is a serialized tf-node proto and is not easily handwritten.
-// This excerpt was extracted from:
-// https://tfhub.dev/tulasiram58827/lite-model/parallel-wavegan/float16/1
-// CHECK-LABEL: @test_flex_ops
-func.func @test_flex_ops(%arg0: tensor<?x2x64xf32>, %arg1: tensor<1x1x64xf32>) -> tensor<*xf32> {
-  // CHECK: %[[ADD:.+]] = "tosa.add"(%arg0, %arg1) : (tensor<?x2x64xf32>, tensor<1x1x64xf32>)
-  // CHECK: return %[[ADD]] : tensor<?x2x64xf32>
-  %0 = "tfl.custom"(%arg0, %arg1) {custom_code = "FlexAddV2", custom_option = #tfl<const_bytes :"0x054164645632002E120541646456321A001A002A070A01541202300132180A16726573696475616C5F626C6F636B5F2E5F302F616464000237311414042801"> : tensor<63xi8>} : (tensor<?x2x64xf32>, tensor<1x1x64xf32>) -> tensor<*xf32>
-  return %0: tensor<*xf32>
-}
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/TFL/test/import/BUILD.bazel
deleted file mode 100644
index b120c58..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/BUILD.bazel
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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
-
-load("//build_tools/bazel:iree_lit_test.bzl", "iree_lit_test_suite")
-load("//build_tools/bazel:enforce_glob.bzl", "enforce_glob")
-
-package(
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-iree_lit_test_suite(
-    name = "lit",
-    srcs = enforce_glob(
-        [
-            "add.mlir",
-            "multi_add.mlir",
-        ],
-        include = ["*.mlir"],
-    ),
-    data = glob(["*.tflite"]),
-    tools = [
-        "//iree_tf_compiler:iree-import-tflite",
-        "@llvm-project//llvm:FileCheck",
-    ],
-)
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/add.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/import/add.mlir
deleted file mode 100644
index 76bf350..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/add.mlir
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: iree-import-tflite --output-format=mlir-ir %S/add.tflite | FileCheck %s
-
-//      CHECK: module {
-// CHECK-NEXT:   func.func @main(%arg0: tensor<1x8x8x3xf32> {iree.identifier = "input"}) -> (tensor<1x8x8x3xf32> {iree.identifier = "output"}) {
-// CHECK-NEXT:     %0 = "tosa.add"(%arg0, %arg0) : (tensor<1x8x8x3xf32>, tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32>
-// CHECK-NEXT:     %1 = "tosa.add"(%0, %arg0) : (tensor<1x8x8x3xf32>, tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32>
-// CHECK-NEXT:     return %1 : tensor<1x8x8x3xf32>
-// CHECK-NEXT:   }
-// CHECK-NEXT: }
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/add.tflite b/integrations/tensorflow/iree_tf_compiler/TFL/test/import/add.tflite
deleted file mode 100644
index b4c0235..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/add.tflite
+++ /dev/null
Binary files differ
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/multi_add.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/import/multi_add.mlir
deleted file mode 100644
index e9444e6..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/multi_add.mlir
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: iree-import-tflite --output-format=mlir-ir %S/multi_add.tflite | FileCheck %s
-
-//      CHECK: module {
-// CHECK-NEXT:   func.func @main(%arg0: tensor<1x8x8x3xf32> {iree.identifier = "a"}, %arg1: tensor<1x8x8x3xf32> {iree.identifier = "b"}, %arg2: tensor<1x8x8x3xf32> {iree.identifier = "c"}, %arg3: tensor<1x8x8x3xf32> {iree.identifier = "d"}) -> (tensor<1x8x8x3xf32> {iree.identifier = "x"}, tensor<1x8x8x3xf32> {iree.identifier = "y"}) {
-// CHECK-NEXT:     %0 = "tosa.add"(%arg1, %arg2) : (tensor<1x8x8x3xf32>, tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32>
-// CHECK-NEXT:     %1 = "tosa.add"(%arg0, %0) : (tensor<1x8x8x3xf32>, tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32>
-// CHECK-NEXT:     %2 = "tosa.add"(%arg3, %0) : (tensor<1x8x8x3xf32>, tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32>
-// CHECK-NEXT:     return %1, %2 : tensor<1x8x8x3xf32>, tensor<1x8x8x3xf32>
-// CHECK-NEXT:   }
-// CHECK-NEXT: }
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/multi_add.tflite b/integrations/tensorflow/iree_tf_compiler/TFL/test/import/multi_add.tflite
deleted file mode 100644
index e5048a3..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/import/multi_add.tflite
+++ /dev/null
Binary files differ
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/lower_global_tensors.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/lower_global_tensors.mlir
deleted file mode 100644
index 7e70757..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/lower_global_tensors.mlir
+++ /dev/null
@@ -1,144 +0,0 @@
-// RUN: iree-opt-tflite --split-input-file --pass-pipeline='builtin.module(iree-tflite-lower-global-tensors)' %s | FileCheck %s
-
-module {
-  // CHECK: ml_program.global private mutable @Variable(dense<1.000000e+00> : tensor<16x16xf32>)
-  // CHECK-LABEL: func.func @state
-  func.func @state(%arg0: tensor<16x16xf32>) -> () {
-    "tfl.call_once"() {session_init_function = "StateInit"} : () -> ()
-    return
-  }
-
-  func.func private @StateInit() {
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.pseudo_const"() {value = dense<1.000000e+00> : tensor<16x16xf32>} : () -> tensor<16x16xf32>
-    "tfl.assign_variable"(%0, %1) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return
-  }
-}
-
-// -----
-
-module {
-  // CHECK: ml_program.global private mutable @Variable(dense<1.000000e+00> : tensor<16x16xf32>)
-
-  // CHECK-LABEL: func.func @assign
-  func.func @assign(%arg0: tensor<16x16xf32>) -> () {
-    "tfl.call_once"() {session_init_function = "AssignInit"} : () -> ()
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-
-    // CHECK: ml_program.global_store @Variable = %arg0
-    "tfl.assign_variable"(%0, %arg0) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return
-  }
-
-  func.func private @AssignInit() {
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.pseudo_const"() {value = dense<1.000000e+00> : tensor<16x16xf32>} : () -> tensor<16x16xf32>
-    "tfl.assign_variable"(%0, %1) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return
-  }
-}
-
-// -----
-
-module {
-  // CHECK: ml_program.global private mutable @Variable(dense<1.000000e+00> : tensor<16x16xf32>)
-
-  // CHECK-LABEL: func.func @read
-  func.func @read(%arg0: tensor<16x16xf32>) -> (tensor<16x16xf32>) {
-    "tfl.call_once"() {session_init_function = "ReadInit"} : () -> ()
-
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-
-    // CHECK: %[[LOAD:.+]] = ml_program.global_load @Variable : tensor<16x16xf32>
-    %1 = "tfl.read_variable"(%0) : (tensor<*x!tf_type.resource>) -> tensor<16x16xf32>
-    return %1 : tensor<16x16xf32>
-  }
-
-  func.func private @ReadInit() {
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.pseudo_const"() {value = dense<1.000000e+00> : tensor<16x16xf32>} : () -> tensor<16x16xf32>
-    "tfl.assign_variable"(%0, %1) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return
-  }
-}
-
-// -----
-
-module {
-  // CHECK: ml_program.global private mutable @Variable(dense<2.000000e+00> : tensor<16x16xf32>)
-
-  // CHECK-LABEL: func.func @readAssign
-  func.func @readAssign(%arg0: tensor<16x16xf32>) -> (tensor<16x16xf32>) {
-    "tfl.call_once"() {session_init_function = "ReadAssignInit"} : () -> ()
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-
-    // CHECK: %[[LOAD:.+]] = ml_program.global_load @Variable : tensor<16x16xf32>
-    %1 = "tfl.read_variable"(%0) : (tensor<*x!tf_type.resource>) -> tensor<16x16xf32>
-
-    // CHECK: %[[ADD:.+]] = tfl.add %[[LOAD]], %arg0
-    %2 = tfl.add %1, %arg0 {fused_activation_function = "NONE"} : tensor<16x16xf32>
-
-    // CHECK: ml_program.global_store  @Variable = %[[ADD]]
-    "tfl.assign_variable"(%0, %2) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return %2 : tensor<16x16xf32>
-  }
-  func.func private @ReadAssignInit() {
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.pseudo_const"() {value = dense<2.000000e+00> : tensor<16x16xf32>} : () -> tensor<16x16xf32>
-    "tfl.assign_variable"(%0, %1) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return
-  }
-}
-
-// -----
-
-module {
-  // CHECK: ml_program.global private mutable @Variable(dense<42> : tensor<2x3xi8>)
-  // CHECK-LABEL: func.func @readAssignQuant
-  func.func @readAssignQuant(%arg0: tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>) -> (tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>) {
-    "tfl.call_once"() {session_init_function = "ReadAssignInit"} : () -> ()
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-
-    // CHECK: %[[ADDR:.+]] = ml_program.global_load @Variable : tensor<2x3xi8>
-    // CHECK: %[[CAST:.+]] = builtin.unrealized_conversion_cast %[[ADDR]] : tensor<2x3xi8> to tensor<2x3x!quant.uniform<i8:f32, 1.000000e-01:2>>
-    %1 = "tfl.read_variable"(%0) : (tensor<*x!tf_type.resource>) -> tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>
-
-    // CHECK: %[[ADD:.+]] = tfl.add %[[CAST]], %arg0 {fused_activation_function = "NONE"}
-    %2 = tfl.add %1, %arg0 {fused_activation_function = "NONE"} : tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>
-
-    // CHECK: %[[CAST2:.+]] = builtin.unrealized_conversion_cast %[[ADD]] : tensor<2x3x!quant.uniform<i8:f32, 1.000000e-01:2>> to tensor<2x3xi8>
-    // CHECK: ml_program.global_store @Variable = %[[CAST2]]
-    "tfl.assign_variable"(%0, %2) : (tensor<*x!tf_type.resource>, tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>) -> ()
-    return %2 : tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>
-  }
-  func.func private @ReadAssignInit() {
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.pseudo_const"() {qtype = tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>, value = dense<42> : tensor<2x3xi8>} : () -> tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>
-    "tfl.assign_variable"(%0, %1) : (tensor<*x!tf_type.resource>, tensor<2x3x!quant.uniform<i8:f32, 0.1:2>>) -> ()
-    return
-  }
-}
-
-// -----
-
-module {
-  // CHECK-label: @nostate
-  func.func @nostate(%arg0: tensor<16x16xf32>) -> (tensor<16x16xf32>) {
-    "tfl.call_once"() {session_init_function = "NoStateInit"} : () -> ()
-    // CHECK: tfl.var_handle
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-
-    // CHECK: tfl.read_variable
-    %1 = "tfl.read_variable"(%0) : (tensor<*x!tf_type.resource>) -> tensor<16x16xf32>
-
-    %2 = tfl.add %1, %arg0 {fused_activation_function = "NONE"} : tensor<16x16xf32>
-
-    // CHECK: tfl.assign_variable
-    "tfl.assign_variable"(%0, %2) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return %2 : tensor<16x16xf32>
-  }
-  func.func private @NoStateInit() {
-    return
-  }
-}
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/retain_call_once_funcs.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/retain_call_once_funcs.mlir
deleted file mode 100644
index f2f1e60..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/retain_call_once_funcs.mlir
+++ /dev/null
@@ -1,21 +0,0 @@
-// RUN: iree-opt-tflite --split-input-file --pass-pipeline='builtin.module(iree-tflite-retain-call-once-funcs)' %s | FileCheck %s
-
-// CHECK-LABEL: module {
-module {
-  // CHECK-LABEL: @main
-  func.func @main(%arg0: tensor<16x16xf32>) -> (tensor<16x16xf32>) {
-    // CHECK: "tfl.call_once"() {session_init_function = "NoOp", session_init_function_symbol = @NoOp} : () -> ()
-    "tfl.call_once"() {session_init_function = "NoOp"} : () -> ()
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.read_variable"(%0) : (tensor<*x!tf_type.resource>) -> tensor<16x16xf32>
-    %2 = tfl.add %1, %arg0 {fused_activation_function = "NONE"} : tensor<16x16xf32>
-    "tfl.assign_variable"(%0, %2) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return %2 : tensor<16x16xf32>
-  }
-  func.func private @NoOp() {
-    %0 = "tfl.var_handle"() {container = "", shared_name = "Variable"} : () -> tensor<*x!tf_type.resource>
-    %1 = "tfl.pseudo_const"() {value = dense<0.000000e+00> : tensor<16x16xf32>} : () -> tensor<16x16xf32>
-    "tfl.assign_variable"(%0, %1) : (tensor<*x!tf_type.resource>, tensor<16x16xf32>) -> ()
-    return
-  }
-}
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/strip_metadata.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/strip_metadata.mlir
deleted file mode 100644
index bc3ff55..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/strip_metadata.mlir
+++ /dev/null
@@ -1,14 +0,0 @@
-// RUN: iree-opt-tflite --split-input-file --verify-diagnostics --pass-pipeline='builtin.module(iree-tflite-strip-module-metadata,func.func(iree-tflite-strip-function-metadata))' %s | FileCheck %s
-
-// CHECK-LABEL: module {
-// CHECK-NOT: tf.schema_version
-module attributes {tfl.schema_version = 3 : i32} {
-  // CHECK: func.func @main
-  // CHECK-NOT: tf.entry_function
-  func.func @main(%arg0: tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32> attributes {tf.entry_function = {inputs = "input", outputs = "output"}} {
-    // CHECK-NEXT: tfl.add
-    %0 = tfl.add %arg0, %arg0 {fused_activation_function = "NONE"} : tensor<1x8x8x3xf32>
-    %1 = tfl.add %0, %arg0 {fused_activation_function = "NONE"} : tensor<1x8x8x3xf32>
-    return %1 : tensor<1x8x8x3xf32>
-  }
-}
diff --git a/integrations/tensorflow/iree_tf_compiler/TFL/test/verify_fully_converted.mlir b/integrations/tensorflow/iree_tf_compiler/TFL/test/verify_fully_converted.mlir
deleted file mode 100644
index 335513f..0000000
--- a/integrations/tensorflow/iree_tf_compiler/TFL/test/verify_fully_converted.mlir
+++ /dev/null
@@ -1,19 +0,0 @@
-// RUN: iree-opt-tflite %s --iree-tflite-verify-fully-converted --split-input-file -verify-diagnostics
-
-// CHECK-LABEL: func.func @main
-func.func @main(%arg0: tensor<2xf32>) -> (tensor<2xf32>) {
-  // CHECK: "tosa.add"
-  %0 = "tosa.add"(%arg0, %arg0) : (tensor<2xf32>, tensor<2xf32>) -> tensor<2xf32>
-  return %0 : tensor<2xf32>
-}
-
-// -----
-
-// expected-error@below {{The following illegal operations still remain}}
-func.func @main(%arg0: tensor<1x8x8x3xf32>) -> tensor<1x8x8x3xf32> attributes {tf.entry_function = {inputs = "input", outputs = "output"}} {
-  // expected-error@+1 {{'tfl.add' op : illegal op still exists}}
-  %0 = tfl.add %arg0, %arg0 {fused_activation_function = "NONE"} : tensor<1x8x8x3xf32>
-  // expected-error@+1 {{'tfl.sub' op : illegal op still exists}}
-  %1 = tfl.sub %0, %arg0 {fused_activation_function = "NONE"} : tensor<1x8x8x3xf32>
-  return %1 : tensor<1x8x8x3xf32>
-}
diff --git a/integrations/tensorflow/iree_tf_compiler/Utils/BUILD.bazel b/integrations/tensorflow/iree_tf_compiler/Utils/BUILD.bazel
deleted file mode 100644
index 36a9a06..0000000
--- a/integrations/tensorflow/iree_tf_compiler/Utils/BUILD.bazel
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2019 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
-
-# Utilities for working with IREE MLIR types.
-
-package(
-    default_visibility = ["//visibility:public"],
-    features = ["layering_check"],
-    licenses = ["notice"],  # Apache 2.0
-)
-
-cc_library(
-    name = "Utils",
-    srcs = [
-        "ConversionUtils.cpp",
-    ],
-    hdrs = [
-        "ConversionUtils.h",
-    ],
-    deps = [
-        "@llvm-project//llvm:Support",
-        "@llvm-project//mlir:IR",
-        "@llvm-project//mlir:Support",
-        "@llvm-project//mlir:TransformUtils",
-    ],
-)
diff --git a/integrations/tensorflow/iree_tf_compiler/Utils/ConversionUtils.cpp b/integrations/tensorflow/iree_tf_compiler/Utils/ConversionUtils.cpp
deleted file mode 100644
index b254f77..0000000
--- a/integrations/tensorflow/iree_tf_compiler/Utils/ConversionUtils.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// 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
-
-#include "iree_tf_compiler/Utils/ConversionUtils.h"
-
-#include "llvm/ADT/StringExtras.h"
-#include "llvm/Support/FormatVariadic.h"
-#include "mlir/IR/Operation.h"
-#include "mlir/Support/LLVM.h"
-#include "mlir/Transforms/DialectConversion.h"
-
-namespace mlir {
-namespace iree_compiler {
-
-static void emitLegalizationErrors(Location loc,
-                                   const DenseSet<Operation *> &illegalOps) {
-  // Print op errors for each of the illegal ops that still remain.
-  llvm::MapVector<StringRef, int> opNameCounts;
-  for (Operation *illegalOp : illegalOps) {
-    StringRef opName = illegalOp->getName().getStringRef();
-    opNameCounts[opName]++;
-    illegalOp->emitOpError() << ": illegal op still exists";
-  }
-
-  std::vector<std::string> errorMessages;
-  errorMessages.reserve(opNameCounts.size());
-  for (const auto &opInfo : opNameCounts) {
-    errorMessages.push_back(
-        llvm::formatv("\t{0} (count: {1})", opInfo.first, opInfo.second));
-  }
-  emitError(loc) << "The following illegal operations still remain: \n"
-                 << llvm::join(errorMessages, "\n") << "\n";
-}
-
-LogicalResult verifyAllOperationsAreLegal(Operation *op,
-                                          const ConversionTarget &target) {
-  // We don't just use applyPartialConversion with no patterns because this pass
-  // shouldn't alter the IR at all (including via folding or canonicalizations
-  // that dialect conversion does automatically).
-  DenseSet<Operation *> illegalOps;
-  op->walk([&](Operation *op) {
-    if (!target.isLegal(op)) {
-      illegalOps.insert(op);
-    }
-  });
-  if (illegalOps.empty()) return success();
-  emitLegalizationErrors(op->getLoc(), illegalOps);
-  return failure();
-}
-
-}  // namespace iree_compiler
-}  // namespace mlir
diff --git a/integrations/tensorflow/iree_tf_compiler/Utils/ConversionUtils.h b/integrations/tensorflow/iree_tf_compiler/Utils/ConversionUtils.h
deleted file mode 100644
index dd696fb..0000000
--- a/integrations/tensorflow/iree_tf_compiler/Utils/ConversionUtils.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// 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
-
-#ifndef IREE_TF_COMPILER_UTILS_CONVERSIONUTILS_H_
-#define IREE_TF_COMPILER_UTILS_CONVERSIONUTILS_H_
-
-#include "mlir/IR/Operation.h"
-#include "mlir/Support/LLVM.h"
-#include "mlir/Transforms/DialectConversion.h"
-
-namespace mlir {
-namespace iree_compiler {
-
-/// Report whether the given operation, and all nested operations, are legal as
-/// specified by the give ConversionTarget. Returns failure and emits error
-/// diagnostics if any operations are not legal as well as a summary of the
-/// illegal operations. Does not alter the IR.
-LogicalResult verifyAllOperationsAreLegal(Operation *op,
-                                          const ConversionTarget &target);
-
-}  // namespace iree_compiler
-}  // namespace mlir
-
-#endif  // IREE_TF_COMPILER_UTILS_CONVERSIONUTILS_H_
diff --git a/integrations/tensorflow/python_projects/iree_tflite/iree/tools/tflite/scripts/iree_import_tflite/__main__.py b/integrations/tensorflow/python_projects/iree_tflite/iree/tools/tflite/scripts/iree_import_tflite/__main__.py
index 04e6496..7bf64b6 100644
--- a/integrations/tensorflow/python_projects/iree_tflite/iree/tools/tflite/scripts/iree_import_tflite/__main__.py
+++ b/integrations/tensorflow/python_projects/iree_tflite/iree/tools/tflite/scripts/iree_import_tflite/__main__.py
@@ -4,18 +4,77 @@
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-import subprocess
+import argparse
+import inspect
+import logging
+from pathlib import Path
+import re
 import sys
-
 import iree.tools.tflite
+from tensorflow.python.pywrap_mlir import experimental_tflite_to_tosa_bytecode
 
 
-def main(args=None):
-  if args is None:
-    args = sys.argv[1:]
-  exe = iree.tools.tflite.get_tool("iree-import-tflite")
-  return subprocess.call(args=[exe] + args)
+def main():
+  parser = argparse.ArgumentParser()
+  parser.add_argument('flatbuffer', help='<TFLite FlatBuffer>')
+  parser.add_argument(
+      '-o',
+      '--output-path',
+      dest='output_path',
+      required=True,
+      help='Path to the mlirbc file name to output.',
+  )
+  parser.add_argument(
+      '--input-array',
+      dest='input_arrays',
+      action='append',
+      help='Input tensor, if different from the default inputs',
+  )
+  parser.add_argument(
+      '--output-array',
+      dest='output_arrays',
+      action='append',
+      help='Output tensor, if different from the default inputs',
+  )
+
+  # 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='output_format',
+      required=False,
+      default='mlir-bytecode',
+      help=argparse.SUPPRESS,
+  )
+  args = parser.parse_args()
+
+  if args.output_format != 'mlir-bytecode':
+    logging.warning(
+        'output-format option is deprecated, emitting MLIR bytecode')
+
+  tflite_to_tosa(
+      flatbuffer=args.flatbuffer,
+      bytecode=args.output_path,
+      ordered_input_arrays=args.input_arrays,
+      ordered_output_arrays=args.output_arrays,
+  )
 
 
-if __name__ == "__main__":
-  sys.exit(main())
+def tflite_to_tosa(
+    flatbuffer,
+    bytecode,
+    use_external_constant=False,
+    ordered_input_arrays=None,
+    ordered_output_arrays=None,
+):
+  experimental_tflite_to_tosa_bytecode(
+      flatbuffer,
+      bytecode,
+      use_external_constant,
+      ordered_input_arrays,
+      ordered_output_arrays,
+  )
+
+
+if __name__ == '__main__':
+  main()
diff --git a/integrations/tensorflow/python_projects/iree_tflite/setup.py b/integrations/tensorflow/python_projects/iree_tflite/setup.py
index f5c6d2b..b8df4cb 100644
--- a/integrations/tensorflow/python_projects/iree_tflite/setup.py
+++ b/integrations/tensorflow/python_projects/iree_tflite/setup.py
@@ -20,12 +20,6 @@
 '''
 
 exe_suffix = ".exe" if platform.system() == "Windows" else ""
-import_tflite_path = os.path.join(os.path.dirname(__file__), "iree", "tools",
-                                  "tflite", f"iree-import-tflite{exe_suffix}")
-if not os.access(import_tflite_path, os.X_OK):
-  raise RuntimeError(
-      f"Tool not found ({import_tflite_path}). Be sure to build "
-      f"//iree_tf_compiler:iree-import-tflite 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
deleted file mode 100755
index d3df051..0000000
--- a/integrations/tensorflow/symlink_binaries.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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
-
-# Symlinks built TF import binaries from the specified directory (defaults to
-# the appropriate bazel-bin/ subdirectory) into the corresponding Python
-# packages. If the binary directory is contained within the root directory, it
-# uses a relative symlink, which makes this work when the repository is copied
-# or mounted in a Docker container under some other path.
-
-set -euo pipefail
-
-ROOT_DIR="${ROOT_DIR:-$(git rev-parse --show-toplevel)}"
-SCRIPT_DIR="$(dirname -- "$( readlink -f -- "$0"; )")";
-
-BINARIES_DIR="${1:-${SCRIPT_DIR}/bazel-bin/iree_tf_compiler}"
-
-function symlink_import_binary() {
-  local type="$1"
-  local import_binary="${BINARIES_DIR}/iree-import-${type}"
-  if [ -f "${import_binary}" ]; then
-    local to="${SCRIPT_DIR}/python_projects/iree_${type}/iree/tools/${type}"
-    local from="$(realpath --no-symlinks --relative-to=${to} --relative-base="${ROOT_DIR}" "${import_binary}")"
-    ln --symbolic --verbose --force "${from}" "${to}"
-  fi
-}
-
-symlink_import_binary tflite
-symlink_import_binary xla
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation.run
deleted file mode 100644
index d7c139a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation.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=Activation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation_1.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation_1.run
deleted file mode 100644
index d7c139a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation_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=Activation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ActivityRegularization.run
deleted file mode 100644
index a88680f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ActivityRegularization.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=ActivityRegularization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AlphaDropout.run
deleted file mode 100644
index 648c455..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AlphaDropout.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=AlphaDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling1D.run
deleted file mode 100644
index a0f4f02..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling2D.run
deleted file mode 100644
index 496252c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling2D.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=AveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling3D.run
deleted file mode 100644
index 5be6393..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling3D.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=AveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__BatchNormalization.run
deleted file mode 100644
index 303a8ff..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1D.run
deleted file mode 100644
index 6578d12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1D.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=Conv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1DTranspose.run
deleted file mode 100644
index 0a9231a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1DTranspose.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=Conv1DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2D.run
deleted file mode 100644
index 43c2f86..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2D.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=Conv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2DTranspose.run
deleted file mode 100644
index 0586be2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2DTranspose.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=Conv2DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3D.run
deleted file mode 100644
index ebd6aad..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3D.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=Conv3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3DTranspose.run
deleted file mode 100644
index a437f46..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3DTranspose.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=Conv3DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping1D.run
deleted file mode 100644
index 20b1dec..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping1D.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=Cropping1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping2D.run
deleted file mode 100644
index 4cbfdb2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping2D.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=Cropping2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping3D.run
deleted file mode 100644
index 3a76cf7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping3D.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=Cropping3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dense.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dense.run
deleted file mode 100644
index 008c607..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dense.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=Dense --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__DepthwiseConv2D.run
deleted file mode 100644
index 2621057..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__DepthwiseConv2D.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=DepthwiseConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dropout.run
deleted file mode 100644
index 1bbd9a7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dropout.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=Dropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ELU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ELU.run
deleted file mode 100644
index 8166dd4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ELU.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=ELU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Embedding.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Embedding.run
deleted file mode 100644
index f1edd7c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Embedding.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=Embedding --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Flatten.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Flatten.run
deleted file mode 100644
index 9221281..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Flatten.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=Flatten --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GRU.run
deleted file mode 100644
index 93a859b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GRU.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=GRU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianDropout.run
deleted file mode 100644
index e0a211a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianDropout.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=GaussianDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianNoise.run
deleted file mode 100644
index f5e7314..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianNoise.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=GaussianNoise --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling1D.run
deleted file mode 100644
index 4db0ccb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling1D.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=GlobalAveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling2D.run
deleted file mode 100644
index 31fc08c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling2D.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=GlobalAveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling3D.run
deleted file mode 100644
index ce99a31..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling3D.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=GlobalAveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool1D.run
deleted file mode 100644
index 9a4c8d1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool1D.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=GlobalMaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool2D.run
deleted file mode 100644
index 3ba55ed..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool2D.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=GlobalMaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool3D.run
deleted file mode 100644
index 5973647..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool3D.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=GlobalMaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__InputLayer.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__InputLayer.run
deleted file mode 100644
index 85a5433..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__InputLayer.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=InputLayer --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LSTM.run
deleted file mode 100644
index bf8b985..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LSTM.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=LSTM --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Lambda.run
deleted file mode 100644
index 4521850..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=Lambda --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LayerNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LayerNormalization.run
deleted file mode 100644
index 429e5e8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LayerNormalization.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=LayerNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LeakyReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LeakyReLU.run
deleted file mode 100644
index 0acdc44..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LeakyReLU.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=LeakyReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Masking.run
deleted file mode 100644
index 20f1c96..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=Masking --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool1D.run
deleted file mode 100644
index 0557723..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool2D.run
deleted file mode 100644
index 9013431..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool2D.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=MaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool3D.run
deleted file mode 100644
index 1a860e9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool3D.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=MaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__PReLU.run
deleted file mode 100644
index efbb6b7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=PReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Permute.run
deleted file mode 100644
index 3d9cefc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Permute.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=Permute --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ReLU.run
deleted file mode 100644
index 4b8aebf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ReLU.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=ReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__RepeatVector.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__RepeatVector.run
deleted file mode 100644
index fd189d3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__RepeatVector.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=RepeatVector --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Reshape.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Reshape.run
deleted file mode 100644
index 4b8f011..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Reshape.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=Reshape --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv1D.run
deleted file mode 100644
index ffbef4b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv1D.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=SeparableConv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv2D.run
deleted file mode 100644
index 1f7bf6a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv2D.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=SeparableConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Softmax.run
deleted file mode 100644
index f42fcfc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=Softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout1D.run
deleted file mode 100644
index e30a717..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout1D.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=SpatialDropout1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout2D.run
deleted file mode 100644
index 4f01ba1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout2D.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=SpatialDropout2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout3D.run
deleted file mode 100644
index 3787a0a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout3D.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=SpatialDropout3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ThresholdedReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ThresholdedReLU.run
deleted file mode 100644
index fcd4d6a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__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=false --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling1D.run
deleted file mode 100644
index 592772f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling1D.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=UpSampling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling3D.run
deleted file mode 100644
index cafcd9d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling3D.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=UpSampling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding1D.run
deleted file mode 100644
index bed24f0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding1D.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=ZeroPadding1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding2D.run
deleted file mode 100644
index 8ab6fc7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding2D.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=ZeroPadding2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding3D.run
deleted file mode 100644
index 4357fa2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding3D.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=ZeroPadding3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Activation.run
deleted file mode 100644
index 15c6b5e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Activation.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=Activation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ActivityRegularization.run
deleted file mode 100644
index 9e96063..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ActivityRegularization.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=ActivityRegularization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AdditiveAttention.run
deleted file mode 100644
index 486b673..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AdditiveAttention.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=AdditiveAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AlphaDropout.run
deleted file mode 100644
index ab815bc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AlphaDropout.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=AlphaDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Attention.run
deleted file mode 100644
index a6dac7c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Attention.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=Attention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling2D.run
deleted file mode 100644
index 55be04d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling2D.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=AveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling3D.run
deleted file mode 100644
index a20674c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling3D.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=AveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1DTranspose.run
deleted file mode 100644
index f41009e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1DTranspose.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=Conv1DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2DTranspose.run
deleted file mode 100644
index 5593ebf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2DTranspose.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=Conv2DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3D.run
deleted file mode 100644
index e6cb475..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3D.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=Conv3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3DTranspose.run
deleted file mode 100644
index 7c05d30..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3DTranspose.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=Conv3DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping1D.run
deleted file mode 100644
index 2d99d1f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping1D.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=Cropping1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping2D.run
deleted file mode 100644
index db4bc9f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping2D.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=Cropping2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping3D.run
deleted file mode 100644
index 74a2114..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping3D.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=Cropping3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dense.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dense.run
deleted file mode 100644
index 3318fc9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dense.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=Dense --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_DepthwiseConv2D.run
deleted file mode 100644
index cffe750..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_DepthwiseConv2D.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=DepthwiseConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dot.run
deleted file mode 100644
index 7a8015e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dot.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=Dot --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dropout.run
deleted file mode 100644
index 265d1c5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dropout.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=Dropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ELU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ELU.run
deleted file mode 100644
index 758f097..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ELU.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=ELU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Embedding.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Embedding.run
deleted file mode 100644
index 1111ded..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Embedding.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=Embedding --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Flatten.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Flatten.run
deleted file mode 100644
index 951f6c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Flatten.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=Flatten --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GRU.run
deleted file mode 100644
index accb6f7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GRU.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=GRU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianDropout.run
deleted file mode 100644
index 464bedc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianDropout.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=GaussianDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianNoise.run
deleted file mode 100644
index 7b794b5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianNoise.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=GaussianNoise --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling1D.run
deleted file mode 100644
index 9f1fdcc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling1D.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=GlobalAveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling2D.run
deleted file mode 100644
index f687050..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling2D.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=GlobalAveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling3D.run
deleted file mode 100644
index c5a61e7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling3D.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=GlobalAveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool1D.run
deleted file mode 100644
index 541ac9e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool1D.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=GlobalMaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool2D.run
deleted file mode 100644
index 4343058..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool2D.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=GlobalMaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool3D.run
deleted file mode 100644
index 50023a6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool3D.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=GlobalMaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_InputLayer.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_InputLayer.run
deleted file mode 100644
index d7571db..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_InputLayer.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=InputLayer --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LSTM.run
deleted file mode 100644
index 412acbb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LSTM.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=LSTM --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LayerNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LayerNormalization.run
deleted file mode 100644
index ea7b3f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LayerNormalization.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=LayerNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LeakyReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LeakyReLU.run
deleted file mode 100644
index b1ec4ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LeakyReLU.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=LeakyReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected1D.run
deleted file mode 100644
index 2a037eb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected1D.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=LocallyConnected1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected2D.run
deleted file mode 100644
index 90c2610..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected2D.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=LocallyConnected2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool2D.run
deleted file mode 100644
index a8402df..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool2D.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=MaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool3D.run
deleted file mode 100644
index d3e1d7e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool3D.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=MaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Permute.run
deleted file mode 100644
index 7acc967..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Permute.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=Permute --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ReLU.run
deleted file mode 100644
index 3b2d479..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ReLU.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=ReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_RepeatVector.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_RepeatVector.run
deleted file mode 100644
index e7583d9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_RepeatVector.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=RepeatVector --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Reshape.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Reshape.run
deleted file mode 100644
index 1160bed..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Reshape.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=Reshape --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv1D.run
deleted file mode 100644
index fc916b6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv1D.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=SeparableConv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv2D.run
deleted file mode 100644
index 20ef955..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv2D.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=SeparableConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout1D.run
deleted file mode 100644
index 39876eb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout1D.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=SpatialDropout1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout2D.run
deleted file mode 100644
index d305714..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout2D.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=SpatialDropout2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout3D.run
deleted file mode 100644
index 38febcc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout3D.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=SpatialDropout3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling2D.run
deleted file mode 100644
index ad73b07..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_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=true --training=false --test_default_kwargs_only=true --layer=UpSampling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_ActivityRegularization.run
deleted file mode 100644
index 3314eb4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_ActivityRegularization.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=ActivityRegularization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling1D.run
deleted file mode 100644
index dbe9864..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_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=false --training=false --test_default_kwargs_only=false --layer=AveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling2D.run
deleted file mode 100644
index 506358d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling2D.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=AveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling3D.run
deleted file mode 100644
index 399cb3c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling3D.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=AveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_BatchNormalization.run
deleted file mode 100644
index 934bb6b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_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=false --training=false --test_default_kwargs_only=false --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1D.run
deleted file mode 100644
index 42fca95..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1D.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=Conv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1DTranspose.run
deleted file mode 100644
index 15ade59..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1DTranspose.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=Conv1DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2D.run
deleted file mode 100644
index 6ca3c6d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2D.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=Conv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2DTranspose.run
deleted file mode 100644
index 43bb871..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2DTranspose.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=Conv2DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3D.run
deleted file mode 100644
index 9599561..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3D.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=Conv3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3DTranspose.run
deleted file mode 100644
index 62571f0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3DTranspose.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=Conv3DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping1D.run
deleted file mode 100644
index f58dd2e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping1D.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=Cropping1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping2D.run
deleted file mode 100644
index a59a76c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping2D.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=Cropping2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping3D.run
deleted file mode 100644
index 5080784..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping3D.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=Cropping3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_DepthwiseConv2D.run
deleted file mode 100644
index 5705035..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_DepthwiseConv2D.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=DepthwiseConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_GRU.run
deleted file mode 100644
index 441170c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_GRU.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=false --layer=GRU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LSTM.run
deleted file mode 100644
index 2c3e1bc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LSTM.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=false --layer=LSTM --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected1D.run
deleted file mode 100644
index 121595f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected1D.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=false --layer=LocallyConnected1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected2D.run
deleted file mode 100644
index ba97743..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected2D.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=false --layer=LocallyConnected2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool1D.run
deleted file mode 100644
index 619263e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_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=false --training=false --test_default_kwargs_only=false --layer=MaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool2D.run
deleted file mode 100644
index 56009dc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool2D.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=MaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool3D.run
deleted file mode 100644
index 39343d3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool3D.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=MaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv1D.run
deleted file mode 100644
index 1e8a8a0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv1D.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=SeparableConv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv2D.run
deleted file mode 100644
index 084801f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv2D.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=SeparableConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SimpleRNN.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SimpleRNN.run
deleted file mode 100644
index d93ae42..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SimpleRNN.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=false --layer=SimpleRNN --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AdditiveAttention.run
deleted file mode 100644
index 663887c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AdditiveAttention.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=true --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AlphaDropout.run
deleted file mode 100644
index 03ea27a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AlphaDropout.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=true --test_default_kwargs_only=true --layer=AlphaDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Attention.run
deleted file mode 100644
index e655203..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Attention.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=true --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_BatchNormalization.run
deleted file mode 100644
index 3de5a4e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_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=false --training=true --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Dropout.run
deleted file mode 100644
index 953542a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Dropout.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=true --test_default_kwargs_only=true --layer=Dropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GRU.run
deleted file mode 100644
index e6c9b01..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GRU.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=true --test_default_kwargs_only=true --layer=GRU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianDropout.run
deleted file mode 100644
index 71527c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianDropout.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=true --test_default_kwargs_only=true --layer=GaussianDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianNoise.run
deleted file mode 100644
index 2d17adc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianNoise.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=true --test_default_kwargs_only=true --layer=GaussianNoise --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_LSTM.run
deleted file mode 100644
index a861689..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_LSTM.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=true --test_default_kwargs_only=true --layer=LSTM --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_MultiHeadAttention.run
deleted file mode 100644
index d306e93..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_MultiHeadAttention.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=true --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout1D.run
deleted file mode 100644
index 9b66fa8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout1D.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=true --test_default_kwargs_only=true --layer=SpatialDropout1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout2D.run
deleted file mode 100644
index c7fb9eb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout2D.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=true --test_default_kwargs_only=true --layer=SpatialDropout2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout3D.run
deleted file mode 100644
index 21e1616..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout3D.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=true --test_default_kwargs_only=true --layer=SpatialDropout3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Activation.run
deleted file mode 100644
index c62fc15..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Activation.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=Activation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ActivityRegularization.run
deleted file mode 100644
index 6a93fc0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ActivityRegularization.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=ActivityRegularization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AlphaDropout.run
deleted file mode 100644
index 3ce42f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AlphaDropout.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=AlphaDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling1D.run
deleted file mode 100644
index e903b92..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling2D.run
deleted file mode 100644
index e8b9974..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling2D.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=AveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling3D.run
deleted file mode 100644
index 7754233..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__AveragePooling3D.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=AveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__BatchNormalization.run
deleted file mode 100644
index 2a8f692..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv1D.run
deleted file mode 100644
index 8d42d5f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv1D.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=Conv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv1DTranspose.run
deleted file mode 100644
index a9486e4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv1DTranspose.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=Conv1DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv2D.run
deleted file mode 100644
index cff354a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv2D.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=Conv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv2DTranspose.run
deleted file mode 100644
index 43f0bb5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv2DTranspose.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=Conv2DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv3D.run
deleted file mode 100644
index 1e2920a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv3D.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=Conv3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv3DTranspose.run
deleted file mode 100644
index dde8a89..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Conv3DTranspose.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=Conv3DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping1D.run
deleted file mode 100644
index fb2d62c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping1D.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=Cropping1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping2D.run
deleted file mode 100644
index 80e0ed4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping2D.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=Cropping2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping3D.run
deleted file mode 100644
index 69a5b39..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Cropping3D.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=Cropping3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dense.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dense.run
deleted file mode 100644
index 8eeb42c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dense.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=Dense --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__DepthwiseConv2D.run
deleted file mode 100644
index b6f8d98..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__DepthwiseConv2D.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=DepthwiseConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dropout.run
deleted file mode 100644
index 9dd5293..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Dropout.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=Dropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ELU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ELU.run
deleted file mode 100644
index 8de9ace..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ELU.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=ELU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Embedding.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Embedding.run
deleted file mode 100644
index 6b43e38..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Embedding.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=Embedding --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Flatten.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Flatten.run
deleted file mode 100644
index b75f6ea..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Flatten.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=Flatten --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GRU.run
deleted file mode 100644
index cf5e145..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GRU.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=GRU --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GaussianDropout.run
deleted file mode 100644
index 30dd1e7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GaussianDropout.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=GaussianDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GaussianNoise.run
deleted file mode 100644
index 3ecc232..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GaussianNoise.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=GaussianNoise --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling1D.run
deleted file mode 100644
index 8c014c6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling1D.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=GlobalAveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling2D.run
deleted file mode 100644
index 8a2a8b7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling2D.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=GlobalAveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling3D.run
deleted file mode 100644
index f6b4ca2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalAveragePooling3D.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=GlobalAveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool1D.run
deleted file mode 100644
index 6f9af61..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool1D.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=GlobalMaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool2D.run
deleted file mode 100644
index f95b467..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool2D.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=GlobalMaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool3D.run
deleted file mode 100644
index 792a4c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__GlobalMaxPool3D.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=GlobalMaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__InputLayer.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__InputLayer.run
deleted file mode 100644
index eb16415..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__InputLayer.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=InputLayer --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LSTM.run
deleted file mode 100644
index 8257487..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LSTM.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=LSTM --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Lambda.run
deleted file mode 100644
index 9e2bfe6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=Lambda --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LayerNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LayerNormalization.run
deleted file mode 100644
index 32613a2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LayerNormalization.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=LayerNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LeakyReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LeakyReLU.run
deleted file mode 100644
index 199ba90..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LeakyReLU.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=LeakyReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LocallyConnected1D.run
deleted file mode 100644
index 94536b7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LocallyConnected1D.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=LocallyConnected1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LocallyConnected2D.run
deleted file mode 100644
index 541db7d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__LocallyConnected2D.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=LocallyConnected2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Masking.run
deleted file mode 100644
index 7a24169..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=Masking --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool1D.run
deleted file mode 100644
index 859191e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool2D.run
deleted file mode 100644
index f352b53..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool2D.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=MaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool3D.run
deleted file mode 100644
index 3b7ef46..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__MaxPool3D.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=MaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__PReLU.run
deleted file mode 100644
index bc72945..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=PReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Permute.run
deleted file mode 100644
index 9b25a7e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Permute.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=Permute --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ReLU.run
deleted file mode 100644
index 33f1af7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ReLU.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=ReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__RepeatVector.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__RepeatVector.run
deleted file mode 100644
index a79d062..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__RepeatVector.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=RepeatVector --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Reshape.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Reshape.run
deleted file mode 100644
index 7a003d4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Reshape.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=Reshape --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SeparableConv1D.run
deleted file mode 100644
index 6221504..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SeparableConv1D.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=SeparableConv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SeparableConv2D.run
deleted file mode 100644
index d13d8bd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SeparableConv2D.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=SeparableConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__Softmax.run
deleted file mode 100644
index 1754309..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=Softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout1D.run
deleted file mode 100644
index bd54b23..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout1D.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=SpatialDropout1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout2D.run
deleted file mode 100644
index 2da0bdf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout2D.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=SpatialDropout2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout3D.run
deleted file mode 100644
index 0cbd577..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__SpatialDropout3D.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=SpatialDropout3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ThresholdedReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ThresholdedReLU.run
deleted file mode 100644
index bf6086e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__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=false --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling1D.run
deleted file mode 100644
index 0ef41b2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling1D.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=UpSampling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling3D.run
deleted file mode 100644
index 8541acf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__UpSampling3D.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=UpSampling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding1D.run
deleted file mode 100644
index cf041bf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding1D.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=ZeroPadding1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding2D.run
deleted file mode 100644
index 20569d4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding2D.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=ZeroPadding2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding3D.run
deleted file mode 100644
index 531bc04..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__ZeroPadding3D.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=ZeroPadding3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Activation.run
deleted file mode 100644
index f49256c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Activation.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=Activation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ActivityRegularization.run
deleted file mode 100644
index 57dde25..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ActivityRegularization.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=ActivityRegularization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AdditiveAttention.run
deleted file mode 100644
index efd3f18..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AdditiveAttention.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=AdditiveAttention --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AlphaDropout.run
deleted file mode 100644
index 99e617b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AlphaDropout.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=AlphaDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Attention.run
deleted file mode 100644
index 9ce70cb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Attention.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=Attention --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling2D.run
deleted file mode 100644
index 3e8b3fe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling2D.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=AveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling3D.run
deleted file mode 100644
index 26a71e5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_AveragePooling3D.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=AveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv1DTranspose.run
deleted file mode 100644
index 49dad84..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv1DTranspose.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=Conv1DTranspose --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv2DTranspose.run
deleted file mode 100644
index f527679..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv2DTranspose.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=Conv2DTranspose --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv3D.run
deleted file mode 100644
index 59d0105..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv3D.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=Conv3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv3DTranspose.run
deleted file mode 100644
index 64f4332..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Conv3DTranspose.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=Conv3DTranspose --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping1D.run
deleted file mode 100644
index ee3dbca..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping1D.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=Cropping1D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping2D.run
deleted file mode 100644
index d996da0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping2D.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=Cropping2D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping3D.run
deleted file mode 100644
index fdacd10..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Cropping3D.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=Cropping3D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dense.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dense.run
deleted file mode 100644
index 09b42cf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dense.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=Dense --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_DepthwiseConv2D.run
deleted file mode 100644
index a131b6f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_DepthwiseConv2D.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=DepthwiseConv2D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dot.run
deleted file mode 100644
index aef4b4d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dot.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=Dot --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dropout.run
deleted file mode 100644
index c1ba798c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Dropout.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=Dropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ELU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ELU.run
deleted file mode 100644
index 61d9a50..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ELU.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=ELU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Embedding.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Embedding.run
deleted file mode 100644
index 85829d2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Embedding.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=Embedding --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Flatten.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Flatten.run
deleted file mode 100644
index 3ecf76d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Flatten.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=Flatten --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GRU.run
deleted file mode 100644
index 2d8fe82..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GRU.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=GRU --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GaussianDropout.run
deleted file mode 100644
index 93002ec..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GaussianDropout.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=GaussianDropout --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GaussianNoise.run
deleted file mode 100644
index 5f9e23d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GaussianNoise.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=GaussianNoise --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling1D.run
deleted file mode 100644
index 36a3352..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling1D.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=GlobalAveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling2D.run
deleted file mode 100644
index 251b19b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling2D.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=GlobalAveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling3D.run
deleted file mode 100644
index 8e8ae3a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalAveragePooling3D.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=GlobalAveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool1D.run
deleted file mode 100644
index 5470d37..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool1D.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=GlobalMaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool2D.run
deleted file mode 100644
index 8a27574..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool2D.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=GlobalMaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool3D.run
deleted file mode 100644
index cd708a5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_GlobalMaxPool3D.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=GlobalMaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_InputLayer.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_InputLayer.run
deleted file mode 100644
index 438d1d8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_InputLayer.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=InputLayer --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LSTM.run
deleted file mode 100644
index d0aeae8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LSTM.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=LSTM --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LayerNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LayerNormalization.run
deleted file mode 100644
index 46f94b4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LayerNormalization.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=LayerNormalization --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LeakyReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LeakyReLU.run
deleted file mode 100644
index 207fcae..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LeakyReLU.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=LeakyReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LocallyConnected1D.run
deleted file mode 100644
index d165f1a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LocallyConnected1D.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=LocallyConnected1D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LocallyConnected2D.run
deleted file mode 100644
index 41e35f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_LocallyConnected2D.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=LocallyConnected2D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool2D.run
deleted file mode 100644
index 8d10700..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool2D.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=MaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool3D.run
deleted file mode 100644
index 1179e11..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_MaxPool3D.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=MaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Permute.run
deleted file mode 100644
index 3e676ed..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Permute.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=Permute --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ReLU.run
deleted file mode 100644
index c1eac4f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_ReLU.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=ReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_RepeatVector.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_RepeatVector.run
deleted file mode 100644
index ab7b610..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_RepeatVector.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=RepeatVector --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Reshape.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Reshape.run
deleted file mode 100644
index 20ed4df..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_Reshape.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=Reshape --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SeparableConv1D.run
deleted file mode 100644
index b94511d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SeparableConv1D.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=SeparableConv1D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SeparableConv2D.run
deleted file mode 100644
index 16a9bda..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SeparableConv2D.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=SeparableConv2D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout1D.run
deleted file mode 100644
index f04f766..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout1D.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=SpatialDropout1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout2D.run
deleted file mode 100644
index 39caef2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout2D.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=SpatialDropout2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout3D.run
deleted file mode 100644
index 33b728c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_SpatialDropout3D.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=SpatialDropout3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling1D.run
deleted file mode 100644
index 4561f85..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling1D.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=UpSampling1D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling2D.run
deleted file mode 100644
index 7c8954c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_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=true --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_UpSampling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling3D.run
deleted file mode 100644
index 60dad89..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__dynamic_dims_UpSampling3D.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=UpSampling3D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_ActivityRegularization.run
deleted file mode 100644
index a377a06..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_ActivityRegularization.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=ActivityRegularization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling1D.run
deleted file mode 100644
index b0c4606..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_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=false --training=false --test_default_kwargs_only=false --layer=AveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling2D.run
deleted file mode 100644
index 495669a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling2D.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=AveragePooling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling3D.run
deleted file mode 100644
index 026282a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_AveragePooling3D.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=AveragePooling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_BatchNormalization.run
deleted file mode 100644
index b2bdfa8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_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=false --training=false --test_default_kwargs_only=false --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv1D.run
deleted file mode 100644
index fb06748..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv1D.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=Conv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv1DTranspose.run
deleted file mode 100644
index f6d847b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv1DTranspose.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=Conv1DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv2D.run
deleted file mode 100644
index 6b103f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv2D.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=Conv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv2DTranspose.run
deleted file mode 100644
index 02973ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv2DTranspose.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=Conv2DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv3D.run
deleted file mode 100644
index cb05138..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv3D.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=Conv3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv3DTranspose.run
deleted file mode 100644
index bdd5cbe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Conv3DTranspose.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=Conv3DTranspose --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping1D.run
deleted file mode 100644
index dca4ed9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping1D.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=Cropping1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping2D.run
deleted file mode 100644
index 1ab7583..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping2D.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=Cropping2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping3D.run
deleted file mode 100644
index 526de12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_Cropping3D.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=Cropping3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_DepthwiseConv2D.run
deleted file mode 100644
index 4930152..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_DepthwiseConv2D.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=DepthwiseConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_GRU.run
deleted file mode 100644
index f598464..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_GRU.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=false --layer=GRU --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LSTM.run
deleted file mode 100644
index 3bd450d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LSTM.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=false --layer=LSTM --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LocallyConnected1D.run
deleted file mode 100644
index 8b6c878..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LocallyConnected1D.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=false --layer=LocallyConnected1D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LocallyConnected2D.run
deleted file mode 100644
index 39808cc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_LocallyConnected2D.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=false --layer=LocallyConnected2D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool1D.run
deleted file mode 100644
index 7f8300b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_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=false --training=false --test_default_kwargs_only=false --layer=MaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool2D.run
deleted file mode 100644
index 14835c4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool2D.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=MaxPool2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool3D.run
deleted file mode 100644
index 4a7055c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_MaxPool3D.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=MaxPool3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SeparableConv1D.run
deleted file mode 100644
index 19c8411..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SeparableConv1D.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=SeparableConv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SeparableConv2D.run
deleted file mode 100644
index 44abd5e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SeparableConv2D.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=SeparableConv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SimpleRNN.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SimpleRNN.run
deleted file mode 100644
index 8f7f018..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__full_api_SimpleRNN.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=false --layer=SimpleRNN --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_AdditiveAttention.run
deleted file mode 100644
index db21325..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_AdditiveAttention.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=true --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_AlphaDropout.run
deleted file mode 100644
index ddfe46b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_AlphaDropout.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=true --test_default_kwargs_only=true --layer=AlphaDropout --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_Attention.run
deleted file mode 100644
index 9719b3b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_Attention.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=true --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_BatchNormalization.run
deleted file mode 100644
index 5781dd9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_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=false --training=true --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_Dropout.run
deleted file mode 100644
index 0b8cb15..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_Dropout.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=true --test_default_kwargs_only=true --layer=Dropout --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GRU.run
deleted file mode 100644
index fc7e237..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GRU.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=true --test_default_kwargs_only=true --layer=GRU --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GaussianDropout.run
deleted file mode 100644
index 05f24e4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GaussianDropout.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=true --test_default_kwargs_only=true --layer=GaussianDropout --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GaussianNoise.run
deleted file mode 100644
index 2e84ce7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_GaussianNoise.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=true --test_default_kwargs_only=true --layer=GaussianNoise --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_LSTM.run
deleted file mode 100644
index 918743d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_LSTM.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=true --test_default_kwargs_only=true --layer=LSTM --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_MultiHeadAttention.run
deleted file mode 100644
index cb632b9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_MultiHeadAttention.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=true --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout1D.run
deleted file mode 100644
index e5243d1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout1D.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=true --test_default_kwargs_only=true --layer=SpatialDropout1D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout2D.run
deleted file mode 100644
index 8a2a34f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout2D.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=true --test_default_kwargs_only=true --layer=SpatialDropout2D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout3D.run
deleted file mode 100644
index 4d8ffe0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/vulkan__training_SpatialDropout3D.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=true --test_default_kwargs_only=true --layer=SpatialDropout3D --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__abs.run
deleted file mode 100644
index 4a41416..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__acos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__acos.run
deleted file mode 100644
index 4456fcb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__acos.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=acos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__acosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__acosh.run
deleted file mode 100644
index fc14525..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__acosh.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=acosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__add.run
deleted file mode 100644
index d880178..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__angle.run
deleted file mode 100644
index 8ea2d02..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=angle --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__asin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__asin.run
deleted file mode 100644
index a135538..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__asin.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=asin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__asinh.run
deleted file mode 100644
index 7ce145c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atan.run
deleted file mode 100644
index 64461e3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atan.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=atan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atan2.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atan2.run
deleted file mode 100644
index dc53489..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atan2.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=atan2 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atanh.run
deleted file mode 100644
index a86d0f0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i0.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i0.run
deleted file mode 100644
index a10523a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i0.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_i0 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i1.run
deleted file mode 100644
index 9f64c6d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bessel_i1.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_i1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bincount.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bincount.run
deleted file mode 100644
index c689ada..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__bincount.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=bincount --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__ceil.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__ceil.run
deleted file mode 100644
index 9034933..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__ceil.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=ceil --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_abs.run
deleted file mode 100644
index 4a41416..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_add.run
deleted file mode 100644
index d880178..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_angle.run
deleted file mode 100644
index 8ea2d02..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=angle --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_asinh.run
deleted file mode 100644
index 7ce145c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_atanh.run
deleted file mode 100644
index a86d0f0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_conj.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_conj.run
deleted file mode 100644
index 59a5fcf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_conj.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=conj --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cos.run
deleted file mode 100644
index 16b0bca..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cosh.run
deleted file mode 100644
index 5cf1429..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cumprod.run
deleted file mode 100644
index 6491455..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cumprod.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=cumprod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cumsum.run
deleted file mode 100644
index 55dcf3b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_cumsum.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=cumsum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_divide_no_nan.run
deleted file mode 100644
index 30b1abc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=divide_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_abs.run
deleted file mode 100644
index 63613a9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_asinh.run
deleted file mode 100644
index e1970f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_atanh.run
deleted file mode 100644
index 65a5ca2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_conj.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_conj.run
deleted file mode 100644
index 3a093f7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_conj.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=conj --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cos.run
deleted file mode 100644
index 02fbea6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cosh.run
deleted file mode 100644
index 514b74a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cumprod.run
deleted file mode 100644
index f33f22c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cumprod.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=true --functions=cumprod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cumsum.run
deleted file mode 100644
index 9b0331e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_cumsum.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=true --functions=cumsum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_exp.run
deleted file mode 100644
index 6d6b98d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_expm1.run
deleted file mode 100644
index b8a0352..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_imag.run
deleted file mode 100644
index db002ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_log.run
deleted file mode 100644
index c56614c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_log.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=log --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_log1p.run
deleted file mode 100644
index 9303ea5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_negative.run
deleted file mode 100644
index 03be2f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_real.run
deleted file mode 100644
index 9a77e12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reciprocal.run
deleted file mode 100644
index 5f3bc13..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reciprocal.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 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_euclidean_norm.run
deleted file mode 100644
index 9d90557..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_reduce_euclidean_norm.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=true --functions=reduce_euclidean_norm --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_rsqrt.run
deleted file mode 100644
index b6038e6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sigmoid.run
deleted file mode 100644
index 9e9125b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sign.run
deleted file mode 100644
index 8762a03..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sin.run
deleted file mode 100644
index 6aa677c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sinh.run
deleted file mode 100644
index c9b9b8f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sqrt.run
deleted file mode 100644
index a7cc4de..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_tan.run
deleted file mode 100644
index 5231e3c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_tanh.run
deleted file mode 100644
index e86a456..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_zero_fraction.run
deleted file mode 100644
index 7d9c149..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_dynamic_dim_zero_fraction.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=true --functions=zero_fraction --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_exp.run
deleted file mode 100644
index 0abcbad..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_expm1.run
deleted file mode 100644
index 97b99a5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_imag.run
deleted file mode 100644
index d4dc114..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_l2_normalize.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_l2_normalize.run
deleted file mode 100644
index e25b53e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=l2_normalize --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_log.run
deleted file mode 100644
index 249ac50..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_log.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=log --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_log1p.run
deleted file mode 100644
index db705ce..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_multiply.run
deleted file mode 100644
index 6d34a30..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_multiply_no_nan.run
deleted file mode 100644
index 6815dfc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=multiply_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_negative.run
deleted file mode 100644
index 053c0d8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_pow.run
deleted file mode 100644
index e8624e1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=pow --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_real.run
deleted file mode 100644
index 241f622..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reciprocal.run
deleted file mode 100644
index 6aab6a5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reciprocal.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=reciprocal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reciprocal_no_nan.run
deleted file mode 100644
index 14eecbf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=reciprocal_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_euclidean_norm.run
deleted file mode 100644
index d26b40b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_euclidean_norm.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=reduce_euclidean_norm --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_std.run
deleted file mode 100644
index cbb8481..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=reduce_std --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_reduce_variance.run
deleted file mode 100644
index 75b414b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=reduce_variance --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_rsqrt.run
deleted file mode 100644
index 48242e3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sigmoid.run
deleted file mode 100644
index 1543cc9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sign.run
deleted file mode 100644
index 5a064d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sin.run
deleted file mode 100644
index 67fd6fe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sinh.run
deleted file mode 100644
index 1e3bb12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sqrt.run
deleted file mode 100644
index 24d676b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_square.run
deleted file mode 100644
index e5a5246..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=square --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_squared_difference.run
deleted file mode 100644
index f41712a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=squared_difference --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_subtract.run
deleted file mode 100644
index 192506e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_tan.run
deleted file mode 100644
index bb04360..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_tanh.run
deleted file mode 100644
index 4ed8621..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_truediv.run
deleted file mode 100644
index c1697d9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=truediv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_xdivy.run
deleted file mode 100644
index 95d751b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=xdivy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_xlog1py.run
deleted file mode 100644
index c0bddc2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=xlog1py --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_xlogy.run
deleted file mode 100644
index f7025a9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_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=false --functions=xlogy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_zero_fraction.run
deleted file mode 100644
index 12bd53f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__complex_zero_fraction.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=zero_fraction --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__confusion_matrix.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__confusion_matrix.run
deleted file mode 100644
index 745801e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__confusion_matrix.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=confusion_matrix --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cos.run
deleted file mode 100644
index 16b0bca..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cosh.run
deleted file mode 100644
index 5cf1429..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumprod.run
deleted file mode 100644
index 6491455..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumprod.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=cumprod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumsum.run
deleted file mode 100644
index 55dcf3b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__cumsum.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=cumsum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__digamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__digamma.run
deleted file mode 100644
index a9b34b7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__digamma.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=digamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__divide_no_nan.run
deleted file mode 100644
index 30b1abc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=divide_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_abs.run
deleted file mode 100644
index 63613a9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_acos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_acos.run
deleted file mode 100644
index bb73391..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_acos.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=true --functions=acos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_acosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_acosh.run
deleted file mode 100644
index d4f67be..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_acosh.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=acosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_argmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_argmax.run
deleted file mode 100644
index 09bed8c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_argmax.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=true --functions=argmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_argmin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_argmin.run
deleted file mode 100644
index 2449b18..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_argmin.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=true --functions=argmin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_asin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_asin.run
deleted file mode 100644
index a742230..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_asin.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=true --functions=asin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_asinh.run
deleted file mode 100644
index e1970f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atan.run
deleted file mode 100644
index 2996fc2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atan.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=true --functions=atan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atan2.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atan2.run
deleted file mode 100644
index ad74778..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atan2.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=true --functions=atan2 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atanh.run
deleted file mode 100644
index 65a5ca2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i0.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i0.run
deleted file mode 100644
index 580186c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i0.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=true --functions=bessel_i0 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i0e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i0e.run
deleted file mode 100644
index 328b50d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=bessel_i0e --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i1.run
deleted file mode 100644
index 294e245..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i1.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=true --functions=bessel_i1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i1e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bessel_i1e.run
deleted file mode 100644
index ef24044..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=bessel_i1e --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_betainc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_betainc.run
deleted file mode 100644
index 213b6c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=betainc --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bincount.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bincount.run
deleted file mode 100644
index 537f385..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_bincount.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=true --functions=bincount --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_ceil.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_ceil.run
deleted file mode 100644
index cf94168..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_ceil.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=ceil --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_confusion_matrix.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_confusion_matrix.run
deleted file mode 100644
index c38b805..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_confusion_matrix.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=true --functions=confusion_matrix --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cos.run
deleted file mode 100644
index 02fbea6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cosh.run
deleted file mode 100644
index 514b74a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumprod.run
deleted file mode 100644
index f33f22c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumprod.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=true --functions=cumprod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumsum.run
deleted file mode 100644
index 9b0331e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumsum.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=true --functions=cumsum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumulative_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_cumulative_logsumexp.run
deleted file mode 100644
index 1f79582..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=cumulative_logsumexp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_digamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_digamma.run
deleted file mode 100644
index c80b18f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_digamma.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=digamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erf.run
deleted file mode 100644
index 322f0a6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erf.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=erf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erfc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erfc.run
deleted file mode 100644
index 7a4bc0b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erfc.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=erfc --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erfinv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_erfinv.run
deleted file mode 100644
index 8e6ccdf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=erfinv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_exp.run
deleted file mode 100644
index 6d6b98d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_expm1.run
deleted file mode 100644
index b8a0352..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floor.run
deleted file mode 100644
index f64ae55..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_floor.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=floor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_igamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_igamma.run
deleted file mode 100644
index 9a0309a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=igamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_igammac.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_igammac.run
deleted file mode 100644
index 3e93e22..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_igammac.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=true --functions=igammac --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_imag.run
deleted file mode 100644
index db002ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_in_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_in_top_k.run
deleted file mode 100644
index 68468dd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=in_top_k --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_invert_permutation.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_invert_permutation.run
deleted file mode 100644
index b225465..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_invert_permutation.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=true --functions=invert_permutation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_finite.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_finite.run
deleted file mode 100644
index 8158fb9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_finite.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_finite --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_inf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_inf.run
deleted file mode 100644
index 8919511..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_inf.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_inf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_non_decreasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_non_decreasing.run
deleted file mode 100644
index fa52b38..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_non_decreasing.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=true --functions=is_non_decreasing --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_strictly_increasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_strictly_increasing.run
deleted file mode 100644
index 2848083..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_is_strictly_increasing.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=true --functions=is_strictly_increasing --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_lgamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_lgamma.run
deleted file mode 100644
index 644c794..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_lgamma.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=lgamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log.run
deleted file mode 100644
index c56614c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log.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=log --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log1p.run
deleted file mode 100644
index 9303ea5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log_sigmoid.run
deleted file mode 100644
index 4c3658e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_log_sigmoid.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=log_sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_not.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_not.run
deleted file mode 100644
index ed7666c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_logical_not.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_not --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_ndtri.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_ndtri.run
deleted file mode 100644
index 52cc0a3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_ndtri.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=true --functions=ndtri --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_negative.run
deleted file mode 100644
index 03be2f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_nextafter.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_nextafter.run
deleted file mode 100644
index 0eaa639..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=nextafter --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_real.run
deleted file mode 100644
index 9a77e12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reciprocal.run
deleted file mode 100644
index 5f3bc13..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reciprocal.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 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_all.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_all.run
deleted file mode 100644
index d2fb0f7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_all.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_all --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_any.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_any.run
deleted file mode 100644
index 00a44b3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_any.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_any --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_euclidean_norm.run
deleted file mode 100644
index 9d90557..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_euclidean_norm.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=true --functions=reduce_euclidean_norm --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_logsumexp.run
deleted file mode 100644
index e315116..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_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=true --functions=reduce_logsumexp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_max.run
deleted file mode 100644
index 4009096..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_max.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_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_mean.run
deleted file mode 100644
index 551c72e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_mean.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_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_min.run
deleted file mode 100644
index fc7d421..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_min.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_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_prod.run
deleted file mode 100644
index 7f305f6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_prod.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_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_sum.run
deleted file mode 100644
index a455b28..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_reduce_sum.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_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_rsqrt.run
deleted file mode 100644
index b6038e6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_scalar_mul.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_scalar_mul.run
deleted file mode 100644
index 4542f49..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_scalar_mul.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=scalar_mul --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_max.run
deleted file mode 100644
index e76f8ee..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_max.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=true --functions=segment_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_mean.run
deleted file mode 100644
index e3eddff..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_mean.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=true --functions=segment_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_min.run
deleted file mode 100644
index 4b84e73..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_min.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=true --functions=segment_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_prod.run
deleted file mode 100644
index 41ceca4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_prod.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=true --functions=segment_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_sum.run
deleted file mode 100644
index 5afa807..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_segment_sum.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=true --functions=segment_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sigmoid.run
deleted file mode 100644
index 9e9125b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sign.run
deleted file mode 100644
index 8762a03..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sin.run
deleted file mode 100644
index 6aa677c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sinh.run
deleted file mode 100644
index c9b9b8f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sobol_sample.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sobol_sample.run
deleted file mode 100644
index 2f43200..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sobol_sample.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=true --functions=sobol_sample --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softplus.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softplus.run
deleted file mode 100644
index ce6fb06..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softplus.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=softplus --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softsign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softsign.run
deleted file mode 100644
index f073588..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_softsign.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=softsign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sqrt.run
deleted file mode 100644
index a7cc4de..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_tan.run
deleted file mode 100644
index 5231e3c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_tanh.run
deleted file mode 100644
index e86a456..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_top_k.run
deleted file mode 100644
index b90bdad..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_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=true --functions=top_k --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_max.run
deleted file mode 100644
index f70ecdb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_max.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=true --functions=unsorted_segment_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_mean.run
deleted file mode 100644
index 9b5a44f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_mean.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=true --functions=unsorted_segment_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_min.run
deleted file mode 100644
index ad1f495..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_min.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=true --functions=unsorted_segment_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_prod.run
deleted file mode 100644
index 698a07d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_prod.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=true --functions=unsorted_segment_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_sqrt_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_sqrt_n.run
deleted file mode 100644
index bcf1e97..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_sqrt_n.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=true --functions=unsorted_segment_sqrt_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_sum.run
deleted file mode 100644
index 653430b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_unsorted_segment_sum.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=true --functions=unsorted_segment_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_zero_fraction.run
deleted file mode 100644
index 7d9c149..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__dynamic_dim_zero_fraction.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=true --functions=zero_fraction --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__equal.run
deleted file mode 100644
index a5d0bdd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erf.run
deleted file mode 100644
index e20c350..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erf.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=erf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erfc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erfc.run
deleted file mode 100644
index 3b61e5e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__erfc.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=erfc --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__exp.run
deleted file mode 100644
index 0abcbad..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__expm1.run
deleted file mode 100644
index 97b99a5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floor.run
deleted file mode 100644
index 324464f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floor.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=floor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floordiv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floordiv.run
deleted file mode 100644
index 83c5e11..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=floordiv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floormod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__floormod.run
deleted file mode 100644
index 336fa77..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=floormod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__greater.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__greater.run
deleted file mode 100644
index 47fc1b6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=greater --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__greater_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__greater_equal.run
deleted file mode 100644
index 0bb1052..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=greater_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__igammac.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__igammac.run
deleted file mode 100644
index 405324e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__igammac.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=igammac --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__imag.run
deleted file mode 100644
index d4dc114..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__invert_permutation.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__invert_permutation.run
deleted file mode 100644
index 4ab3fb5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__invert_permutation.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=invert_permutation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_finite.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_finite.run
deleted file mode 100644
index 9dcbd99..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_finite.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=is_finite --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_inf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_inf.run
deleted file mode 100644
index 4323ef6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_inf.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=is_inf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_nan.run
deleted file mode 100644
index af32b66..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=is_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_non_decreasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_non_decreasing.run
deleted file mode 100644
index 9436b37..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_non_decreasing.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=is_non_decreasing --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_strictly_increasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_strictly_increasing.run
deleted file mode 100644
index b9ff914..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__is_strictly_increasing.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=is_strictly_increasing --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__lbeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__lbeta.run
deleted file mode 100644
index 1c85c48..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__lbeta.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=lbeta --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__less.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__less.run
deleted file mode 100644
index cc425d1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=less --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__less_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__less_equal.run
deleted file mode 100644
index 547e361..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=less_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__lgamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__lgamma.run
deleted file mode 100644
index 6cdaaa5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__lgamma.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=lgamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log.run
deleted file mode 100644
index 249ac50..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log.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=log --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log1p.run
deleted file mode 100644
index db705ce..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log_sigmoid.run
deleted file mode 100644
index ae80aa5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log_sigmoid.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=log_sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log_softmax.run
deleted file mode 100644
index 1d150c5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__log_softmax.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=log_softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_and.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_and.run
deleted file mode 100644
index eb208c1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=logical_and --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_not.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_not.run
deleted file mode 100644
index 7831946..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_not.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=logical_not --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_or.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_or.run
deleted file mode 100644
index 8f3fd99..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=logical_or --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_xor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__logical_xor.run
deleted file mode 100644
index 48604e8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=logical_xor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__maximum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__maximum.run
deleted file mode 100644
index 6cf4a18..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__minimum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__minimum.run
deleted file mode 100644
index df6a953..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__mod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__mod.run
deleted file mode 100644
index e05d736..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=mod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__multiply.run
deleted file mode 100644
index 6d34a30..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__multiply_no_nan.run
deleted file mode 100644
index 6815dfc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=multiply_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__ndtri.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__ndtri.run
deleted file mode 100644
index a9d4996..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__ndtri.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=ndtri --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__negative.run
deleted file mode 100644
index 053c0d8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__not_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__not_equal.run
deleted file mode 100644
index d4e37e4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=not_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__polygamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__polygamma.run
deleted file mode 100644
index e6ec448..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=polygamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__pow.run
deleted file mode 100644
index e8624e1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=pow --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__real.run
deleted file mode 100644
index 241f622..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reciprocal.run
deleted file mode 100644
index 6aab6a5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reciprocal.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=reciprocal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reciprocal_no_nan.run
deleted file mode 100644
index 14eecbf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=reciprocal_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_all.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_all.run
deleted file mode 100644
index 2c51f3f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_all.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=reduce_all --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_any.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_any.run
deleted file mode 100644
index c628aa0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_any.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=reduce_any --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_euclidean_norm.run
deleted file mode 100644
index d26b40b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_euclidean_norm.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=reduce_euclidean_norm --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_logsumexp.run
deleted file mode 100644
index 06b3ebf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_logsumexp.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=reduce_logsumexp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_max.run
deleted file mode 100644
index e4ada85..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_max.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=reduce_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_mean.run
deleted file mode 100644
index e06620f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_mean.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=reduce_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_min.run
deleted file mode 100644
index 66da6fb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_min.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=reduce_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_prod.run
deleted file mode 100644
index eaa5a13..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_prod.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=reduce_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_std.run
deleted file mode 100644
index cbb8481..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=reduce_std --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_sum.run
deleted file mode 100644
index 8c2b1fd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_sum.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=reduce_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__reduce_variance.run
deleted file mode 100644
index 75b414b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=reduce_variance --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__rint.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__rint.run
deleted file mode 100644
index ea12cf1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=rint --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__round.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__round.run
deleted file mode 100644
index 9369168..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=round --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__rsqrt.run
deleted file mode 100644
index 48242e3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__scalar_mul.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__scalar_mul.run
deleted file mode 100644
index 85c9c93..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__scalar_mul.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=scalar_mul --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_max.run
deleted file mode 100644
index 7dc3e4f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_max.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=segment_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_mean.run
deleted file mode 100644
index 5e5e2a1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_mean.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=segment_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_min.run
deleted file mode 100644
index 635fbd3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_min.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=segment_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_prod.run
deleted file mode 100644
index 0bc6df0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_prod.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=segment_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_sum.run
deleted file mode 100644
index 7d3fd6d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__segment_sum.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=segment_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sigmoid.run
deleted file mode 100644
index 1543cc9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sign.run
deleted file mode 100644
index 5a064d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sin.run
deleted file mode 100644
index 67fd6fe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sinh.run
deleted file mode 100644
index 1e3bb12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sobol_sample.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sobol_sample.run
deleted file mode 100644
index c3a5ee7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sobol_sample.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=sobol_sample --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softmax.run
deleted file mode 100644
index 47f9fda..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softmax.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=softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softplus.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softplus.run
deleted file mode 100644
index f1256ae..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softplus.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=softplus --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softsign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softsign.run
deleted file mode 100644
index 9eebcdb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__softsign.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=softsign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sqrt.run
deleted file mode 100644
index 24d676b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__square.run
deleted file mode 100644
index e5a5246..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=square --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__squared_difference.run
deleted file mode 100644
index f41712a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=squared_difference --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__subtract.run
deleted file mode 100644
index 192506e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__tan.run
deleted file mode 100644
index bb04360..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__tanh.run
deleted file mode 100644
index 4ed8621..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__top_k.run
deleted file mode 100644
index afed13f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__top_k.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=top_k --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__truediv.run
deleted file mode 100644
index c1697d9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=truediv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_max.run
deleted file mode 100644
index a72bf3e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_max.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=unsorted_segment_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_mean.run
deleted file mode 100644
index 0e45018..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_mean.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=unsorted_segment_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_min.run
deleted file mode 100644
index 486ecc2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_min.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=unsorted_segment_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_prod.run
deleted file mode 100644
index 13680f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_prod.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=unsorted_segment_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_sqrt_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_sqrt_n.run
deleted file mode 100644
index cee3bb1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_sqrt_n.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=unsorted_segment_sqrt_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_sum.run
deleted file mode 100644
index e232e50..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__unsorted_segment_sum.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=unsorted_segment_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__xdivy.run
deleted file mode 100644
index 95d751b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=xdivy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__xlog1py.run
deleted file mode 100644
index c0bddc2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=xlog1py --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__xlogy.run
deleted file mode 100644
index f7025a9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=xlogy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__zero_fraction.run
deleted file mode 100644
index 12bd53f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__zero_fraction.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=zero_fraction --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__zeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__zeta.run
deleted file mode 100644
index c802aa5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmcpu__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=false --functions=zeta --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__abs.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__abs.run
deleted file mode 100644
index 2cf5476..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__acos.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__acos.run
deleted file mode 100644
index d593e5d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__acos.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=acos --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__acosh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__acosh.run
deleted file mode 100644
index a79858d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__acosh.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=acosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__add.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__add.run
deleted file mode 100644
index 6d08fdd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__angle.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__angle.run
deleted file mode 100644
index 3716827..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=angle --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__asin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__asin.run
deleted file mode 100644
index 5410ea1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__asin.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=asin --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__asinh.run
deleted file mode 100644
index 3f481bd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atan.run
deleted file mode 100644
index 660b46e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atan.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=atan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atan2.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atan2.run
deleted file mode 100644
index f29e06a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atan2.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=atan2 --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atanh.run
deleted file mode 100644
index 14914c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i0.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i0.run
deleted file mode 100644
index 3d394d7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i0.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_i0 --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i1.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i1.run
deleted file mode 100644
index 70b60cd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bessel_i1.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_i1 --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bincount.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bincount.run
deleted file mode 100644
index b921bb8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__bincount.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=bincount --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__ceil.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__ceil.run
deleted file mode 100644
index fb1886c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__ceil.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=ceil --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_abs.run
deleted file mode 100644
index 2cf5476..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_add.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_add.run
deleted file mode 100644
index 6d08fdd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_angle.run
deleted file mode 100644
index 3716827..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=angle --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_asinh.run
deleted file mode 100644
index 3f481bd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_atanh.run
deleted file mode 100644
index 14914c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_conj.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_conj.run
deleted file mode 100644
index c9866c2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_conj.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=conj --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cos.run
deleted file mode 100644
index da66182..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cosh.run
deleted file mode 100644
index a00d622..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cumprod.run
deleted file mode 100644
index 36934ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cumprod.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=cumprod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cumsum.run
deleted file mode 100644
index 813d66c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_cumsum.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=cumsum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_divide_no_nan.run
deleted file mode 100644
index ac96c26..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=divide_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_abs.run
deleted file mode 100644
index e003a62..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_asinh.run
deleted file mode 100644
index 0fba697..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_atanh.run
deleted file mode 100644
index 291b096..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_conj.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_conj.run
deleted file mode 100644
index daa01de..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_conj.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=conj --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cos.run
deleted file mode 100644
index e9d67ea..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cosh.run
deleted file mode 100644
index 2286215..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cumprod.run
deleted file mode 100644
index f8533d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cumprod.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=cumprod --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cumsum.run
deleted file mode 100644
index 41f9943..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_cumsum.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=cumsum --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_exp.run
deleted file mode 100644
index f16d8c1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_expm1.run
deleted file mode 100644
index 9b14c16..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_imag.run
deleted file mode 100644
index f971ae2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_log.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_log.run
deleted file mode 100644
index 3eeb115..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_log.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 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_log1p.run
deleted file mode 100644
index aaeebd4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_negative.run
deleted file mode 100644
index d04207f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_real.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_real.run
deleted file mode 100644
index f9c4301..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reciprocal.run
deleted file mode 100644
index 48181b9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reciprocal.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 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_euclidean_norm.run
deleted file mode 100644
index 695e79e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_reduce_euclidean_norm.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reduce_euclidean_norm --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_rsqrt.run
deleted file mode 100644
index 91088f9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sigmoid.run
deleted file mode 100644
index 4f90bf4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sign.run
deleted file mode 100644
index 79d8efb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sin.run
deleted file mode 100644
index 199da60..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sinh.run
deleted file mode 100644
index 580a34d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sqrt.run
deleted file mode 100644
index b90271f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_tan.run
deleted file mode 100644
index f41eb44..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_tanh.run
deleted file mode 100644
index 190cad5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_zero_fraction.run
deleted file mode 100644
index e1d0642..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_dynamic_dim_zero_fraction.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=zero_fraction --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_exp.run
deleted file mode 100644
index e90326c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_expm1.run
deleted file mode 100644
index d783ad7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_imag.run
deleted file mode 100644
index 8e35ceb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_l2_normalize.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_l2_normalize.run
deleted file mode 100644
index 2dd1bee..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=l2_normalize --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_log.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_log.run
deleted file mode 100644
index 4b8b89c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_log.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=log --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_log1p.run
deleted file mode 100644
index a7690a6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_multiply.run
deleted file mode 100644
index 7a8b088..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_multiply_no_nan.run
deleted file mode 100644
index 40e3d12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=multiply_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_negative.run
deleted file mode 100644
index 6fe102a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_pow.run
deleted file mode 100644
index 8df735e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=pow --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_real.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_real.run
deleted file mode 100644
index aaab01b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reciprocal.run
deleted file mode 100644
index 28097ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reciprocal.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=reciprocal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reciprocal_no_nan.run
deleted file mode 100644
index e2fced3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=reciprocal_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_euclidean_norm.run
deleted file mode 100644
index cfe5216..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_euclidean_norm.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=reduce_euclidean_norm --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_std.run
deleted file mode 100644
index 4fd658f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=reduce_std --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_reduce_variance.run
deleted file mode 100644
index 39aafd6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=reduce_variance --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_rsqrt.run
deleted file mode 100644
index 2718c65..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sigmoid.run
deleted file mode 100644
index aadda8f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sign.run
deleted file mode 100644
index f890861..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sin.run
deleted file mode 100644
index fe8527c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sinh.run
deleted file mode 100644
index ecccec6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sqrt.run
deleted file mode 100644
index 5f6794f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_square.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_square.run
deleted file mode 100644
index 1d7b0c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=square --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_squared_difference.run
deleted file mode 100644
index 02a87ef..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=squared_difference --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_subtract.run
deleted file mode 100644
index df9fcf6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_tan.run
deleted file mode 100644
index 07ded35..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_tanh.run
deleted file mode 100644
index 372e04d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_truediv.run
deleted file mode 100644
index 0f07aa3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=truediv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_xdivy.run
deleted file mode 100644
index b6810bd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=xdivy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_xlog1py.run
deleted file mode 100644
index 07d22f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=xlog1py --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_xlogy.run
deleted file mode 100644
index c6c9f9a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_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=false --functions=xlogy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_zero_fraction.run
deleted file mode 100644
index 6151c1d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__complex_zero_fraction.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=zero_fraction --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__confusion_matrix.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__confusion_matrix.run
deleted file mode 100644
index 4ab2f55..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__confusion_matrix.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=confusion_matrix --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cos.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cos.run
deleted file mode 100644
index da66182..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cosh.run
deleted file mode 100644
index a00d622..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumprod.run
deleted file mode 100644
index 36934ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumprod.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=cumprod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumsum.run
deleted file mode 100644
index 813d66c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__cumsum.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=cumsum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__digamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__digamma.run
deleted file mode 100644
index ba1f4c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__digamma.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=digamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__divide_no_nan.run
deleted file mode 100644
index ac96c26..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=divide_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_abs.run
deleted file mode 100644
index e003a62..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_abs.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=abs --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_accumulate_n.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_accumulate_n.run
deleted file mode 100644
index 39b905d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_accumulate_n.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# REQUIRES: vulkan
-# REQUIRES: bugfix
-#           Fails on SwiftShader
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=accumulate_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_acos.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_acos.run
deleted file mode 100644
index 0c4c632..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_acos.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=acos --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_acosh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_acosh.run
deleted file mode 100644
index 54fa3a2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_acosh.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=acosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_add_n.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_add_n.run
deleted file mode 100644
index 50c6f1a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_add_n.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# REQUIRES: vulkan
-# REQUIRES: bugfix
-#           Fails on SwiftShader
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=add_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_argmax.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_argmax.run
deleted file mode 100644
index 7f85b9a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_argmax.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=argmax --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_argmin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_argmin.run
deleted file mode 100644
index 1b5d968..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_argmin.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=argmin --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_asin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_asin.run
deleted file mode 100644
index 0ce31bb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_asin.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=asin --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_asinh.run
deleted file mode 100644
index 0fba697..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_asinh.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=asinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atan.run
deleted file mode 100644
index a09943a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atan.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=atan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atan2.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atan2.run
deleted file mode 100644
index 5fbe509..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atan2.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=atan2 --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atanh.run
deleted file mode 100644
index 291b096..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_atanh.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=atanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i0.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i0.run
deleted file mode 100644
index 4dc02d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i0.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=bessel_i0 --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i0e.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i0e.run
deleted file mode 100644
index 1129e2a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=bessel_i0e --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i1.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i1.run
deleted file mode 100644
index 21fe945..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i1.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=bessel_i1 --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i1e.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bessel_i1e.run
deleted file mode 100644
index 5317153..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=bessel_i1e --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_betainc.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_betainc.run
deleted file mode 100644
index 8166851..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=betainc --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bincount.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bincount.run
deleted file mode 100644
index 383a73b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_bincount.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=bincount --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_ceil.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_ceil.run
deleted file mode 100644
index b283866..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_ceil.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=ceil --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_confusion_matrix.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_confusion_matrix.run
deleted file mode 100644
index 0fa2833..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_confusion_matrix.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=confusion_matrix --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cos.run
deleted file mode 100644
index e9d67ea..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cos.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=cos --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cosh.run
deleted file mode 100644
index 2286215..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cosh.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=cosh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumprod.run
deleted file mode 100644
index f8533d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumprod.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=cumprod --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumsum.run
deleted file mode 100644
index 41f9943..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumsum.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=cumsum --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumulative_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_cumulative_logsumexp.run
deleted file mode 100644
index 30be0d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=cumulative_logsumexp --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_digamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_digamma.run
deleted file mode 100644
index 62fec3d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_digamma.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=digamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erf.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erf.run
deleted file mode 100644
index 93748ce..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erf.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=erf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erfc.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erfc.run
deleted file mode 100644
index 3a30942..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erfc.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=erfc --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erfinv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_erfinv.run
deleted file mode 100644
index 417faa3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=erfinv --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_exp.run
deleted file mode 100644
index f16d8c1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_expm1.run
deleted file mode 100644
index 9b14c16..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floor.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floor.run
deleted file mode 100644
index 635e9c9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_floor.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=floor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_igamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_igamma.run
deleted file mode 100644
index aba5fa9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=igamma --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_igammac.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_igammac.run
deleted file mode 100644
index 46f13eb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_igammac.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=igammac --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_imag.run
deleted file mode 100644
index f971ae2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_in_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_in_top_k.run
deleted file mode 100644
index 0b1c80c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=in_top_k --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_invert_permutation.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_invert_permutation.run
deleted file mode 100644
index d8f912e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_invert_permutation.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=invert_permutation --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_finite.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_finite.run
deleted file mode 100644
index 9c5a49d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_finite.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_finite --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_inf.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_inf.run
deleted file mode 100644
index 123142c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_inf.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_inf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_non_decreasing.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_non_decreasing.run
deleted file mode 100644
index ea79033..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_non_decreasing.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=is_non_decreasing --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_strictly_increasing.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_strictly_increasing.run
deleted file mode 100644
index b91ef18..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_is_strictly_increasing.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=is_strictly_increasing --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_lgamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_lgamma.run
deleted file mode 100644
index f0ddcc5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_lgamma.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=lgamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log.run
deleted file mode 100644
index 3eeb115..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log.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 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log1p.run
deleted file mode 100644
index aaeebd4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log_sigmoid.run
deleted file mode 100644
index 66f3a75..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_log_sigmoid.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_sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_not.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_not.run
deleted file mode 100644
index 87b060e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_logical_not.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_not --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_mod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_mod.run
deleted file mode 100644
index ccf123d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_mod.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# REQUIRES: vulkan
-# REQUIRES: bugfix
-#           Fails on NVIDIA Turing
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=mod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_ndtri.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_ndtri.run
deleted file mode 100644
index 7984843..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_ndtri.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=ndtri --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_negative.run
deleted file mode 100644
index d04207f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_nextafter.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_nextafter.run
deleted file mode 100644
index 32a7ce7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=nextafter --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_real.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_real.run
deleted file mode 100644
index f9c4301..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reciprocal.run
deleted file mode 100644
index 48181b9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reciprocal.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 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_all.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_all.run
deleted file mode 100644
index cd6e521..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_all.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_all --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_any.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_any.run
deleted file mode 100644
index 4c2deed..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_any.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_any --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_euclidean_norm.run
deleted file mode 100644
index 695e79e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_euclidean_norm.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=reduce_euclidean_norm --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_logsumexp.run
deleted file mode 100644
index ffb15c5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_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=true --functions=reduce_logsumexp --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_max.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_max.run
deleted file mode 100644
index d92d4b5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_max.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_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_mean.run
deleted file mode 100644
index 63190a4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_mean.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_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_min.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_min.run
deleted file mode 100644
index 1eda898..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_min.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_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_prod.run
deleted file mode 100644
index 83e6139..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_prod.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_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_sum.run
deleted file mode 100644
index b2b2516..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_reduce_sum.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_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_rsqrt.run
deleted file mode 100644
index 91088f9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_scalar_mul.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_scalar_mul.run
deleted file mode 100644
index ed0e425..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_scalar_mul.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=scalar_mul --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_max.run
deleted file mode 100644
index 97d96d2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_max.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=segment_max --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_mean.run
deleted file mode 100644
index 6500665..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_mean.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=segment_mean --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_min.run
deleted file mode 100644
index af12aa5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_min.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=segment_min --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_prod.run
deleted file mode 100644
index e62ff00..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_prod.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=segment_prod --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_sum.run
deleted file mode 100644
index 4870a00..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_segment_sum.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=segment_sum --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sigmoid.run
deleted file mode 100644
index 4f90bf4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sign.run
deleted file mode 100644
index 79d8efb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sin.run
deleted file mode 100644
index 199da60..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sinh.run
deleted file mode 100644
index 580a34d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sobol_sample.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sobol_sample.run
deleted file mode 100644
index e8c87d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sobol_sample.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=sobol_sample --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_softplus.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_softplus.run
deleted file mode 100644
index d3f08e6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_softplus.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=softplus --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_softsign.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_softsign.run
deleted file mode 100644
index 070d92b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_softsign.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=softsign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sqrt.run
deleted file mode 100644
index b90271f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_tan.run
deleted file mode 100644
index f41eb44..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_tanh.run
deleted file mode 100644
index 190cad5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_top_k.run
deleted file mode 100644
index 7d056c8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_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=true --functions=top_k --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_max.run
deleted file mode 100644
index 191d0c0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_max.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=unsorted_segment_max --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_mean.run
deleted file mode 100644
index 22ea817..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_mean.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=unsorted_segment_mean --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_min.run
deleted file mode 100644
index 25d2a1b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_min.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=unsorted_segment_min --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_prod.run
deleted file mode 100644
index a16d6d1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_prod.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=unsorted_segment_prod --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_sqrt_n.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_sqrt_n.run
deleted file mode 100644
index 3817a01..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_sqrt_n.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=unsorted_segment_sqrt_n --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_sum.run
deleted file mode 100644
index f57eaf3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_unsorted_segment_sum.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=unsorted_segment_sum --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_zero_fraction.run
deleted file mode 100644
index e1d0642..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__dynamic_dim_zero_fraction.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=true --functions=zero_fraction --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__equal.run
deleted file mode 100644
index 3237302..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erf.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erf.run
deleted file mode 100644
index f5fc8bc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erf.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=erf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erfc.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erfc.run
deleted file mode 100644
index 8c8fcf4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__erfc.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=erfc --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__exp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__exp.run
deleted file mode 100644
index e90326c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__exp.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=exp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__expm1.run
deleted file mode 100644
index d783ad7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__expm1.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=expm1 --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floor.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floor.run
deleted file mode 100644
index a615382..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floor.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=floor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floordiv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floordiv.run
deleted file mode 100644
index 3984a09..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=floordiv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floormod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__floormod.run
deleted file mode 100644
index 13fc166..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=floormod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__greater.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__greater.run
deleted file mode 100644
index 3e559b3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=greater --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__greater_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__greater_equal.run
deleted file mode 100644
index 4a1dddb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=greater_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__igammac.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__igammac.run
deleted file mode 100644
index f0bb977..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__igammac.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=igammac --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__imag.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__imag.run
deleted file mode 100644
index 8e35ceb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__imag.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=imag --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__invert_permutation.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__invert_permutation.run
deleted file mode 100644
index 15f16f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__invert_permutation.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=invert_permutation --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_finite.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_finite.run
deleted file mode 100644
index 5fa2e94..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_finite.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=is_finite --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_inf.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_inf.run
deleted file mode 100644
index dfb2393..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_inf.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=is_inf --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_nan.run
deleted file mode 100644
index a7a8661..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=is_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_non_decreasing.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_non_decreasing.run
deleted file mode 100644
index 061cc66..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_non_decreasing.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=is_non_decreasing --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_strictly_increasing.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_strictly_increasing.run
deleted file mode 100644
index d5316a1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__is_strictly_increasing.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=is_strictly_increasing --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__lbeta.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__lbeta.run
deleted file mode 100644
index ff9dfbb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=lbeta --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__less.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__less.run
deleted file mode 100644
index a3e7721..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=less --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__less_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__less_equal.run
deleted file mode 100644
index a451ef3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=less_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__lgamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__lgamma.run
deleted file mode 100644
index 5cfbb26..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__lgamma.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=lgamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log.run
deleted file mode 100644
index 4b8b89c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log.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=log --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log1p.run
deleted file mode 100644
index a7690a6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log1p.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=log1p --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log_sigmoid.run
deleted file mode 100644
index c280e41..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log_sigmoid.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=log_sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__log_softmax.run
deleted file mode 100644
index 1c4499d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=log_softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_and.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_and.run
deleted file mode 100644
index 0ce6d04..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=logical_and --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_not.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_not.run
deleted file mode 100644
index c6ae5e7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_not.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=logical_not --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_or.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_or.run
deleted file mode 100644
index 3ea9510..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=logical_or --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_xor.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__logical_xor.run
deleted file mode 100644
index ffa0201..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=logical_xor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__maximum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__maximum.run
deleted file mode 100644
index 1a14bce..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__minimum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__minimum.run
deleted file mode 100644
index b4cbcbc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__mod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__mod.run
deleted file mode 100644
index d771480..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__mod.run
+++ /dev/null
@@ -1,4 +0,0 @@
-# REQUIRES: vulkan
-# REQUIRES: bugfix
-#           Fails on NVIDIA Turing
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_vulkan --dynamic_dims=false --functions=mod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__multiply.run
deleted file mode 100644
index 7a8b088..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__multiply_no_nan.run
deleted file mode 100644
index 40e3d12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=multiply_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__ndtri.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__ndtri.run
deleted file mode 100644
index cc3a7f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__ndtri.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=ndtri --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__negative.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__negative.run
deleted file mode 100644
index 6fe102a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__negative.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=negative --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__not_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__not_equal.run
deleted file mode 100644
index 753884e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=not_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__polygamma.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__polygamma.run
deleted file mode 100644
index 6e24915..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=polygamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__pow.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__pow.run
deleted file mode 100644
index 8df735e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=pow --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__real.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__real.run
deleted file mode 100644
index aaab01b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__real.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=real --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reciprocal.run
deleted file mode 100644
index 28097ac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reciprocal.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=reciprocal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reciprocal_no_nan.run
deleted file mode 100644
index e2fced3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=reciprocal_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_all.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_all.run
deleted file mode 100644
index b00ce08..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_all.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=reduce_all --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_any.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_any.run
deleted file mode 100644
index dc654c4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_any.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=reduce_any --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_euclidean_norm.run
deleted file mode 100644
index cfe5216..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_euclidean_norm.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=reduce_euclidean_norm --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_logsumexp.run
deleted file mode 100644
index e1a0cc0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_logsumexp.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=reduce_logsumexp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_max.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_max.run
deleted file mode 100644
index 91ee231..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_max.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=reduce_max --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_mean.run
deleted file mode 100644
index 7315b55..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_mean.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=reduce_mean --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_min.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_min.run
deleted file mode 100644
index 0681eca..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_min.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=reduce_min --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_prod.run
deleted file mode 100644
index 903674a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_prod.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=reduce_prod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_std.run
deleted file mode 100644
index 4fd658f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=reduce_std --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_sum.run
deleted file mode 100644
index 14f4127..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_sum.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=reduce_sum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__reduce_variance.run
deleted file mode 100644
index 39aafd6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=reduce_variance --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__rint.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__rint.run
deleted file mode 100644
index ffecabd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=rint --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__round.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__round.run
deleted file mode 100644
index 5dc4ce9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=round --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__rsqrt.run
deleted file mode 100644
index 2718c65..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__rsqrt.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=rsqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__scalar_mul.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__scalar_mul.run
deleted file mode 100644
index 945bedb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__scalar_mul.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=scalar_mul --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_max.run
deleted file mode 100644
index da3a956..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_max.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=segment_max --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_mean.run
deleted file mode 100644
index ace4bb0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_mean.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=segment_mean --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_min.run
deleted file mode 100644
index a441f12..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_min.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=segment_min --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_prod.run
deleted file mode 100644
index 66851f9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_prod.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=segment_prod --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_sum.run
deleted file mode 100644
index 264d7da..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__segment_sum.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=segment_sum --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sigmoid.run
deleted file mode 100644
index aadda8f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sigmoid.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=sigmoid --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sign.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sign.run
deleted file mode 100644
index f890861..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sign.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=sign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sin.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sin.run
deleted file mode 100644
index fe8527c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sin.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=sin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sinh.run
deleted file mode 100644
index ecccec6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sinh.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=sinh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sobol_sample.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sobol_sample.run
deleted file mode 100644
index 0ed488b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sobol_sample.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=sobol_sample --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__softplus.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__softplus.run
deleted file mode 100644
index 2bf36e2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__softplus.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=softplus --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__softsign.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__softsign.run
deleted file mode 100644
index 7dc024b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__softsign.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=softsign --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sqrt.run
deleted file mode 100644
index 5f6794f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__sqrt.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=sqrt --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__square.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__square.run
deleted file mode 100644
index 1d7b0c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=square --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__squared_difference.run
deleted file mode 100644
index 02a87ef..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=squared_difference --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__subtract.run
deleted file mode 100644
index df9fcf6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__tan.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__tan.run
deleted file mode 100644
index 07ded35..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__tan.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=tan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__tanh.run
deleted file mode 100644
index 372e04d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__tanh.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=tanh --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__top_k.run
deleted file mode 100644
index 8e5f145..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__top_k.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=top_k --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__truediv.run
deleted file mode 100644
index 0f07aa3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=truediv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_max.run
deleted file mode 100644
index aed6ad4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_max.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=unsorted_segment_max --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_mean.run
deleted file mode 100644
index 6f3b241..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_mean.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=unsorted_segment_mean --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_min.run
deleted file mode 100644
index 7cdb2ec..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_min.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=unsorted_segment_min --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_prod.run
deleted file mode 100644
index 401d778..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_prod.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=unsorted_segment_prod --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_sqrt_n.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_sqrt_n.run
deleted file mode 100644
index 445332a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_sqrt_n.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=unsorted_segment_sqrt_n --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_sum.run
deleted file mode 100644
index 430cf3e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__unsorted_segment_sum.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=unsorted_segment_sum --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__xdivy.run
deleted file mode 100644
index b6810bd..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=xdivy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__xlog1py.run
deleted file mode 100644
index 07d22f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=xlog1py --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__xlogy.run
deleted file mode 100644
index c6c9f9a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=xlogy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__zero_fraction.run
deleted file mode 100644
index 6151c1d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__zero_fraction.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=zero_fraction --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__zeta.run b/integrations/tensorflow/test/iree_tf_tests/math/vulkan__zeta.run
deleted file mode 100644
index 79ac32f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/math/vulkan__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=false --functions=zeta --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__batch_norm.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__batch_norm.run
deleted file mode 100644
index e8da4fa..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__batch_norm.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.batch_norm_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__batch_to_space_nd.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__batch_to_space_nd.run
deleted file mode 100644
index 9d592fe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__batch_to_space_nd.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.batch_to_space_nd_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__broadcast_to.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__broadcast_to.run
deleted file mode 100644
index 944ef04..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__broadcast_to.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.broadcast_to_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__broadcasting.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__broadcasting.run
deleted file mode 100644
index 17bf344..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__broadcasting.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.broadcasting_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__concat.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__concat.run
deleted file mode 100644
index 8d2695c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__concat.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.concat_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__control_flow.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__control_flow.run
deleted file mode 100644
index 1b31fb9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__control_flow.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.control_flow_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__conv.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__conv.run
deleted file mode 100644
index 7f08cef..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__conv.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.conv_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__conv_transpose.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__conv_transpose.run
deleted file mode 100644
index 6598861..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__conv_transpose.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.conv_transpose_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__depth_conv.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__depth_conv.run
deleted file mode 100644
index d003e92..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__depth_conv.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.depth_conv_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_dynamic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_dynamic.run
deleted file mode 100644
index 1e7300e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_dynamic.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_dynamic_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_static.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_static.run
deleted file mode 100644
index 26870d8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_static.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_static_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_vector.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_vector.run
deleted file mode 100644
index 6fa458f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__einsum_vector.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_vector_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__fft.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__fft.run
deleted file mode 100644
index 1ded6f4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__fft.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.fft_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__fill.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__fill.run
deleted file mode 100644
index 550c701..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__fill.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.fill_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__gather.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__gather.run
deleted file mode 100644
index edd12fe..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__gather.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.gather_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__image_resize.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__image_resize.run
deleted file mode 100644
index 00c1b0d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__image_resize.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.image_resize_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__linspace.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__linspace.run
deleted file mode 100644
index 720bdc2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__linspace.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.linspace_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__mandelbrot.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__mandelbrot.run
deleted file mode 100644
index e891693..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__mandelbrot.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.mandelbrot_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__matrix_ops_dynamic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__matrix_ops_dynamic.run
deleted file mode 100644
index b3e25d8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__matrix_ops_dynamic.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_dynamic_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__quantization.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__quantization.run
deleted file mode 100644
index c901340..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__quantization.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.quantization_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__quantization_dyn.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__quantization_dyn.run
deleted file mode 100644
index 51367b8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__quantization_dyn.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.quantization_dyn_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__range.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__range.run
deleted file mode 100644
index 22eb8e3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__range.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.range_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__resource_ops.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__resource_ops.run
deleted file mode 100644
index ce234b7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__resource_ops.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.resource_ops_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__ring_buffer.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__ring_buffer.run
deleted file mode 100644
index 51e01d6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__ring_buffer.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.ring_buffer_test --target_backends=iree_llvmcpu --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__scatter_update.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__scatter_update.run
deleted file mode 100644
index 42ba7e6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__scatter_update.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.scatter_update_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__simple_arithmetic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__simple_arithmetic.run
deleted file mode 100644
index ba05f48..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__simple_arithmetic.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.simple_arithmetic_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__simple_stateful.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__simple_stateful.run
deleted file mode 100644
index b7c7162..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__simple_stateful.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.simple_stateful_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__sliding_window.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__sliding_window.run
deleted file mode 100644
index cff86c7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__sliding_window.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.sliding_window_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__space_to_batch_nd.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__space_to_batch_nd.run
deleted file mode 100644
index d0cc0a0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmcpu__space_to_batch_nd.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmcpu
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.space_to_batch_nd_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__batch_norm.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__batch_norm.run
deleted file mode 100644
index 136e0d5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__batch_norm.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.batch_norm_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__batch_to_space_nd.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__batch_to_space_nd.run
deleted file mode 100644
index 7642c8a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__batch_to_space_nd.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.batch_to_space_nd_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__broadcast_to.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__broadcast_to.run
deleted file mode 100644
index 62e4a43..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__broadcast_to.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: bugfix
-#           TODO(#11277): re-enable after passing
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.broadcast_to_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__broadcasting.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__broadcasting.run
deleted file mode 100644
index ea448c3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__broadcasting.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.broadcasting_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__concat.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__concat.run
deleted file mode 100644
index ce4ab71..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__concat.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.concat_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__control_flow.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__control_flow.run
deleted file mode 100644
index 8d47b19..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__control_flow.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.control_flow_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__conv.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__conv.run
deleted file mode 100644
index 4f6f357..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__conv.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.conv_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__conv_transpose.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__conv_transpose.run
deleted file mode 100644
index 705fdd7..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__conv_transpose.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.conv_transpose_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__depth_conv.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__depth_conv.run
deleted file mode 100644
index d983a94..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__depth_conv.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.depth_conv_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_dynamic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_dynamic.run
deleted file mode 100644
index fabf36c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_dynamic.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_dynamic_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_static.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_static.run
deleted file mode 100644
index 616460f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_static.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_static_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_vector.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_vector.run
deleted file mode 100644
index 1c4654d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__einsum_vector.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_vector_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__fft.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__fft.run
deleted file mode 100644
index 2feb0e9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__fft.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.fft_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__fill.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__fill.run
deleted file mode 100644
index f0592a3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__fill.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: bugfix
-# FIXME(https://github.com/openxla/iree/issues/11277): Re-enable this test after resolving the issue.
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.fill_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__gather.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__gather.run
deleted file mode 100644
index d07b030..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__gather.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.gather_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__image_resize.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__image_resize.run
deleted file mode 100644
index 8d75d50..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__image_resize.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.image_resize_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__linspace.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__linspace.run
deleted file mode 100644
index 1de48f3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__linspace.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.linspace_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__mandelbrot.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__mandelbrot.run
deleted file mode 100644
index fc7fb92..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__mandelbrot.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.mandelbrot_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__matrix_ops_dynamic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__matrix_ops_dynamic.run
deleted file mode 100644
index 45469ec..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__matrix_ops_dynamic.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_dynamic_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__matrix_ops_static.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__matrix_ops_static.run
deleted file mode 100644
index 287a686..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__matrix_ops_static.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_static_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__quantization.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__quantization.run
deleted file mode 100644
index eb66e64..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__quantization.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.quantization_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__quantization_dyn.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__quantization_dyn.run
deleted file mode 100644
index 3559cd3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__quantization_dyn.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.quantization_dyn_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__range.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__range.run
deleted file mode 100644
index 726bc39..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__range.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.range_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__resource_ops.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__resource_ops.run
deleted file mode 100644
index 390a2e5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__resource_ops.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.resource_ops_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__ring_buffer.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__ring_buffer.run
deleted file mode 100644
index d6d95d5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__ring_buffer.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.ring_buffer_test --target_backends=iree_vulkan --artifacts_dir=%t
-# XFAIL: *
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__scatter_update.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__scatter_update.run
deleted file mode 100644
index 468bdc5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__scatter_update.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.scatter_update_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__simple_arithmetic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__simple_arithmetic.run
deleted file mode 100644
index 3da0288..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__simple_arithmetic.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.simple_arithmetic_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__simple_stateful.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__simple_stateful.run
deleted file mode 100644
index d5aa084..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__simple_stateful.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.simple_stateful_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__sliding_window.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__sliding_window.run
deleted file mode 100644
index 8634c23..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__sliding_window.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.sliding_window_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__space_to_batch_nd.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__space_to_batch_nd.run
deleted file mode 100644
index 1d16618..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/vulkan__space_to_batch_nd.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: vulkan
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.space_to_batch_nd_test --target_backends=iree_vulkan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/python/generate_layers_tests.py b/integrations/tensorflow/test/python/generate_layers_tests.py
deleted file mode 100644
index 0347195..0000000
--- a/integrations/tensorflow/test/python/generate_layers_tests.py
+++ /dev/null
@@ -1,186 +0,0 @@
-# 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
-
-# Generates runner variants for the tf math tests.
-
-import generate_runner
-
-# These layers were selected by:
-#   1. Getting all subclasses of `tf.keras.layers.Layer`
-#   2. Removing deperacated layers based on the tf.keras docs
-#   3. Removing irrelevant layers
-#   4. Removing layers that don't fit in the testing framework (Wrappers, DenseFeatures, ...)
-LAYERS = [
-    "Activation",
-    "ActivityRegularization",
-    "Add",
-    "AdditiveAttention",
-    "AlphaDropout",
-    "Attention",
-    "Average",
-    "AveragePooling1D",
-    "AveragePooling2D",
-    "AveragePooling3D",
-    "BatchNormalization",
-    "Concatenate",
-    "Conv1D",
-    "Conv1DTranspose",
-    "Conv2D",
-    "Conv2DTranspose",
-    "Conv3D",
-    "Conv3DTranspose",
-    # "ConvLSTM2D",  # TODO(meadowlark): Debug flakiness.
-    "Cropping1D",
-    "Cropping2D",
-    "Cropping3D",
-    "Dense",
-    "DepthwiseConv2D",
-    "Dot",
-    "Dropout",
-    "ELU",
-    "Embedding",
-    "Flatten",
-    "GRU",
-    "GaussianDropout",
-    "GaussianNoise",
-    "GlobalAveragePooling1D",
-    "GlobalAveragePooling2D",
-    "GlobalAveragePooling3D",
-    "GlobalMaxPool1D",
-    "GlobalMaxPool2D",
-    "GlobalMaxPool3D",
-    "InputLayer",
-    "LSTM",
-    "Lambda",
-    "LayerNormalization",
-    "LeakyReLU",
-    "LocallyConnected1D",
-    "LocallyConnected2D",
-    "Masking",
-    "MaxPool1D",
-    "MaxPool2D",
-    "MaxPool3D",
-    "Maximum",
-    "Minimum",
-    "MultiHeadAttention",
-    "Multiply",
-    "PReLU",
-    "Permute",
-    "ReLU",
-    "RepeatVector",
-    "Reshape",
-    "SeparableConv1D",
-    "SeparableConv2D",
-    # "SimpleRNN",  # TODO(meadowlark): Debug flakiness.
-    "Softmax",
-    "SpatialDropout1D",
-    "SpatialDropout2D",
-    "SpatialDropout3D",
-    "Subtract",
-    "ThresholdedReLU",
-    "UpSampling1D",
-    "UpSampling2D",
-    "UpSampling3D",
-    "ZeroPadding1D",
-    "ZeroPadding2D",
-    "ZeroPadding3D",
-]
-
-# A list of all layers with non-default api tests can be generated by running:
-#   bazel run integrations/tensorflow/e2e/keras/layers:layers_test_manual -- \
-#     --list_layers_with_full_api_tests
-LAYERS_WITH_FULL_API_TESTS = [
-    "ActivityRegularization",
-    "AdditiveAttention",
-    "Attention",
-    "AveragePooling1D",
-    "AveragePooling2D",
-    "AveragePooling3D",
-    "BatchNormalization",
-    "Concatenate",
-    "Conv1D",
-    "Conv1DTranspose",
-    "Conv2D",
-    "Conv2DTranspose",
-    "Conv3D",
-    "Conv3DTranspose",
-    # "ConvLSTM2D",  # TODO(meadowlark): Debug flakiness.
-    "Cropping1D",
-    "Cropping2D",
-    "Cropping3D",
-    "DepthwiseConv2D",
-    "GRU",
-    "LSTM",
-    "LocallyConnected1D",
-    "LocallyConnected2D",
-    "MaxPool1D",
-    "MaxPool2D",
-    "MaxPool3D",
-    "SeparableConv1D",
-    "SeparableConv2D",
-    "SimpleRNN",
-    # "SimpleRNN",  # TODO(meadowlark): Debug flakiness.
-]
-
-# Layers that mention a training kwarg in their doc.
-LAYERS_WITH_TRAINING_BEHAVIOR = [
-    "AdditiveAttention",
-    "AlphaDropout",
-    "Attention",
-    "BatchNormalization",
-    # "ConvLSTM2D",  # TODO(meadowlark): Debug flakiness.
-    "Dropout",
-    "GRU",
-    "GaussianDropout",
-    "GaussianNoise",
-    "LSTM",
-    "MultiHeadAttention",
-    # "SimpleRNN",  # TODO(meadowlark): Debug flakiness.
-    "SpatialDropout1D",
-    "SpatialDropout2D",
-    "SpatialDropout3D",
-]
-
-BACKENDS = [
-    ("llvmcpu", "--target_backends=iree_llvmcpu"),
-    ("vulkan", "--target_backends=iree_vulkan"),
-]
-
-# Non dynamic dim tests.
-for variant, flags in BACKENDS:
-  for layer in LAYERS:
-    # Static.
-    generate_runner.main([
-        variant,
-        (f"{flags} --dynamic_dims=false --training=false "
-         f"--test_default_kwargs_only=true --layer={layer} --artifacts_dir=%t"),
-        f"iree_tf_tests/layers/layers_test.py:{layer}"
-    ])
-    # Dynamic.
-    generate_runner.main([
-        variant,
-        (f"{flags} --dynamic_dims=true --training=false "
-         f"--test_default_kwargs_only=true --layer={layer} --artifacts_dir=%t"),
-        f"iree_tf_tests/layers/layers_test.py:dynamic_dims_{layer}"
-    ])
-
-  # Test with test_default_kwargs_only=false
-  for layer in LAYERS_WITH_FULL_API_TESTS:
-    generate_runner.main([
-        variant,
-        (f"{flags} --dynamic_dims=false --training=false "
-         f"--test_default_kwargs_only=false --layer={layer} --artifacts_dir=%t"
-        ), f"iree_tf_tests/layers/layers_test.py:full_api_{layer}"
-    ])
-
-  # Test with training flags.
-  for layer in LAYERS_WITH_TRAINING_BEHAVIOR:
-    generate_runner.main([
-        variant,
-        (f"{flags} --dynamic_dims=false --training=true "
-         f"--test_default_kwargs_only=true --layer={layer} --artifacts_dir=%t"),
-        f"iree_tf_tests/layers/layers_test.py:training_{layer}"
-    ])
diff --git a/integrations/tensorflow/test/python/generate_math_tests.py b/integrations/tensorflow/test/python/generate_math_tests.py
deleted file mode 100644
index b24a71c..0000000
--- a/integrations/tensorflow/test/python/generate_math_tests.py
+++ /dev/null
@@ -1,224 +0,0 @@
-# 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
-
-# Generates runner variants for the tf math tests.
-
-import generate_runner
-
-TF_MATH_FUNCTIONS = [
-    "abs",
-    "accumulate_n",
-    "acos",
-    "acosh",
-    "add",
-    "add_n",
-    "angle",
-    "argmax",
-    "argmin",
-    "asin",
-    "asinh",
-    "atan",
-    "atan2",
-    "atanh",
-    "bessel_i0",
-    "bessel_i0e",
-    "bessel_i1",
-    "bessel_i1e",
-    "betainc",
-    "bincount",
-    "ceil",
-    "confusion_matrix",
-    "cos",
-    "cosh",
-    "count_nonzero",
-    "cumprod",
-    "cumsum",
-    "cumulative_logsumexp",
-    "digamma",
-    "divide",
-    "divide_no_nan",
-    "equal",
-    "erf",
-    "erfc",
-    "erfinv",
-    "exp",
-    "expm1",
-    "floor",
-    "floordiv",
-    "floormod",
-    "greater",
-    "greater_equal",
-    "igamma",
-    "igammac",
-    "imag",
-    "in_top_k",
-    "invert_permutation",
-    "is_finite",
-    "is_inf",
-    "is_nan",
-    "is_non_decreasing",
-    "is_strictly_increasing",
-    "lbeta",
-    "less",
-    "less_equal",
-    "lgamma",
-    "log",
-    "log1p",
-    "log_sigmoid",
-    "log_softmax",
-    "logical_and",
-    "logical_not",
-    "logical_or",
-    "logical_xor",
-    "maximum",
-    "minimum",
-    "mod",
-    "multiply",
-    "multiply_no_nan",
-    "ndtri",
-    "negative",
-    "nextafter",
-    "not_equal",
-    "polygamma",
-    "polyval",
-    "pow",
-    "real",
-    "reciprocal",
-    "reciprocal_no_nan",
-    "reduce_all",
-    "reduce_any",
-    "reduce_euclidean_norm",
-    "reduce_logsumexp",
-    "reduce_max",
-    "reduce_mean",
-    "reduce_min",
-    "reduce_prod",
-    "reduce_std",
-    "reduce_sum",
-    "reduce_variance",
-    "rint",
-    "round",
-    "rsqrt",
-    "scalar_mul",
-    "segment_max",
-    "segment_mean",
-    "segment_min",
-    "segment_prod",
-    "segment_sum",
-    "sigmoid",
-    "sign",
-    "sin",
-    "sinh",
-    "sobol_sample",
-    "softmax",
-    "softplus",
-    "softsign",
-    "sqrt",
-    "square",
-    "squared_difference",
-    "subtract",
-    "tan",
-    "tanh",
-    "top_k",
-    "truediv",
-    "unsorted_segment_max",
-    "unsorted_segment_mean",
-    "unsorted_segment_min",
-    "unsorted_segment_prod",
-    "unsorted_segment_sqrt_n",
-    "unsorted_segment_sum",
-    "xdivy",
-    "xlog1py",
-    "xlogy",
-    "zero_fraction",
-    "zeta",
-]
-
-# This list was generated by running:
-#   bazel run integrations/tensorflow/e2e/math:math_test_manual -- --list_functions_with_complex_tests
-# keep sorted
-COMPLEX_FUNCTIONS = [
-    "abs",
-    "add",
-    "angle",
-    "asinh",
-    "atanh",
-    "conj",
-    "cos",
-    "cosh",
-    "count_nonzero",
-    "cumprod",
-    "cumsum",
-    "divide",
-    "divide_no_nan",
-    "exp",
-    "expm1",
-    "imag",
-    "l2_normalize",
-    "log",
-    "log1p",
-    "multiply",
-    "multiply_no_nan",
-    "negative",
-    "pow",
-    "real",
-    "reciprocal",
-    "reciprocal_no_nan",
-    "reduce_euclidean_norm",
-    "reduce_std",
-    "reduce_variance",
-    "rsqrt",
-    "sigmoid",
-    "sign",
-    "sin",
-    "sinh",
-    "sqrt",
-    "square",
-    "squared_difference",
-    "subtract",
-    "tan",
-    "tanh",
-    "truediv",
-    "xdivy",
-    "xlog1py",
-    "xlogy",
-    "zero_fraction",
-]
-
-BACKENDS = [
-    ("llvmcpu", "--target_backends=iree_llvmcpu"),
-    ("vulkan", "--target_backends=iree_vulkan"),
-]
-
-# Non dynamic dim tests.
-for variant, flags in BACKENDS:
-  for math_fn in TF_MATH_FUNCTIONS:
-    generate_runner.main([
-        variant,
-        f"{flags} --dynamic_dims=false --functions={math_fn} --artifacts_dir=%t",
-        f"iree_tf_tests/math/math_test.py:{math_fn}"
-    ])
-  for math_fn in COMPLEX_FUNCTIONS:
-    generate_runner.main([
-        variant,
-        f"{flags} --dynamic_dims=false --functions={math_fn} --artifacts_dir=%t",
-        f"iree_tf_tests/math/math_test.py:complex_{math_fn}"
-    ])
-
-# Dynamic dim tests.
-for variant, flags in BACKENDS:
-  for math_fn in TF_MATH_FUNCTIONS:
-    generate_runner.main([
-        variant,
-        f"{flags} --dynamic_dims=true --functions={math_fn} --artifacts_dir=%t",
-        f"iree_tf_tests/math/math_test.py:dynamic_dim_{math_fn}"
-    ])
-  for math_fn in COMPLEX_FUNCTIONS:
-    generate_runner.main([
-        variant,
-        f"{flags} --dynamic_dims=true --functions={math_fn} --artifacts_dir=%t",
-        f"iree_tf_tests/math/math_test.py:complex_dynamic_dim_{math_fn}"
-    ])
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/batch_norm_test.py b/integrations/tensorflow/test/python/iree_tf_tests/batch_norm_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/batch_norm_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/batch_norm_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/batch_to_space_nd_test.py b/integrations/tensorflow/test/python/iree_tf_tests/batch_to_space_nd_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/batch_to_space_nd_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/batch_to_space_nd_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/broadcast_to_test.py b/integrations/tensorflow/test/python/iree_tf_tests/broadcast_to_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/broadcast_to_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/broadcast_to_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/broadcasting_test.py b/integrations/tensorflow/test/python/iree_tf_tests/broadcasting_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/broadcasting_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/broadcasting_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/concat_test.py b/integrations/tensorflow/test/python/iree_tf_tests/concat_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/concat_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/concat_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/control_flow_test.py b/integrations/tensorflow/test/python/iree_tf_tests/control_flow_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/control_flow_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/control_flow_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/conv_test.py b/integrations/tensorflow/test/python/iree_tf_tests/conv_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/conv_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/conv_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/conv_transpose_test.py b/integrations/tensorflow/test/python/iree_tf_tests/conv_transpose_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/conv_transpose_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/conv_transpose_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/depth_conv_test.py b/integrations/tensorflow/test/python/iree_tf_tests/depth_conv_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/depth_conv_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/depth_conv_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/dynamic_mlp_relu_test.py b/integrations/tensorflow/test/python/iree_tf_tests/dynamic_mlp_relu_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/dynamic_mlp_relu_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/dynamic_mlp_relu_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/dynamic_mlp_test.py b/integrations/tensorflow/test/python/iree_tf_tests/dynamic_mlp_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/dynamic_mlp_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/dynamic_mlp_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/einsum_dynamic_test.py b/integrations/tensorflow/test/python/iree_tf_tests/einsum_dynamic_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/einsum_dynamic_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/einsum_dynamic_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/einsum_static_test.py b/integrations/tensorflow/test/python/iree_tf_tests/einsum_static_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/einsum_static_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/einsum_static_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/einsum_vector_test.py b/integrations/tensorflow/test/python/iree_tf_tests/einsum_vector_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/einsum_vector_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/einsum_vector_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/fft_test.py b/integrations/tensorflow/test/python/iree_tf_tests/fft_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/fft_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/fft_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/fill_test.py b/integrations/tensorflow/test/python/iree_tf_tests/fill_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/fill_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/fill_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/gather_test.py b/integrations/tensorflow/test/python/iree_tf_tests/gather_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/gather_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/gather_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/image_resize_test.py b/integrations/tensorflow/test/python/iree_tf_tests/image_resize_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/image_resize_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/image_resize_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/layers/layers_test.py b/integrations/tensorflow/test/python/iree_tf_tests/layers/layers_test.py
deleted file mode 100644
index 52aca34..0000000
--- a/integrations/tensorflow/test/python/iree_tf_tests/layers/layers_test.py
+++ /dev/null
@@ -1,603 +0,0 @@
-# Copyright 2020 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
-"""Tests of tf.keras.layer.Layer subclasses."""
-
-import collections
-import copy
-import inspect
-import os
-from typing import Any, Dict, List, Sequence, Tuple, Union
-
-from absl import app
-from absl import flags
-from absl import logging
-from iree.tf.support import tf_test_utils
-from iree.tf.support import tf_utils
-import tensorflow.compat.v2 as tf
-
-FLAGS = flags.FLAGS
-
-DROPOUT = 0.5
-CONV_FILTERS = 2
-CONV_KERNEL_SIZE = 2
-DIM = 3
-
-# Used for attention layers and recurrent layers.
-RANK_3_SHAPE = [DIM] * 3
-# Highest rank that tf.keras will allow for all layers.
-RANK_5_SHAPE = [DIM] * 5
-
-UNARY_SIGNATURE_SHAPES = [[RANK_5_SHAPE]]
-BINARY_SIGNATURE_SHAPES = [[RANK_5_SHAPE] * 2]
-TERNARY_SIGNATURE_SHAPES = [[RANK_5_SHAPE] * 3]
-
-CONV_1D_SIGNATURE_SHAPES = [[[2, 8, 3]]]
-CONV_2D_SIGNATURE_SHAPES = [[[2, 8, 8, 3]]]
-CONV_3D_SIGNATURE_SHAPES = [[[2, 8, 8, 8, 3]]]
-
-RNN_SIGNATURE_SHAPES = [[RANK_3_SHAPE]]
-RNN_KWARGS_TO_VALUES = dict(units=[4],
-                            return_sequences=[False, True],
-                            stateful=[False, True])
-
-POOLING_KWARGS_TO_VALUES = dict(strides=[None, 2],
-                                padding=["valid", "same"],
-                                data_format=[None, "channels_first"])
-CONV_KWARGS_TO_VALUES = dict(filters=[CONV_FILTERS],
-                             kernel_size=[CONV_KERNEL_SIZE],
-                             strides=[1, 2],
-                             padding=["valid", "same"],
-                             data_format=[None, "channels_first"],
-                             dilation_rate=[1, 1])
-# Address pooling and conv layers having different default values for
-# 'data_format' for 1D layers.
-POOLING_1D_KWARGS_TO_VALUES = copy.deepcopy(POOLING_KWARGS_TO_VALUES)
-POOLING_1D_KWARGS_TO_VALUES.update(
-    {"data_format": ["channels_last", "channels_first"]})
-CONV_1D_KWARGS_TO_VALUES = copy.deepcopy(CONV_KWARGS_TO_VALUES)
-CONV_1D_KWARGS_TO_VALUES.update(
-    {"data_format": ["channels_last", "channels_first"]})
-
-# Unsupported by TensorFlow (at least on CPU).
-LAYERS_TO_TF_UNSUPPORTED_NON_DEFAULT_KWARGS = {
-    "AveragePooling2D": ["data_format"],
-    "Conv1D": ["data_format"],
-    "Conv1DTranspose": ["data_format", "dilation_rate"],
-    "Conv2D": ["data_format"],
-    "Conv3D": ["data_format"],
-    "Conv3DTranspose": ["data_format"],
-    "LocallyConnected1D": ["padding"],
-    "LocallyConnected2D": ["padding"],
-    "MaxPool2D": ["data_format"],
-}
-
-# Some layers have kwargs which cannot both have non-default values.
-LAYERS_TO_MUTUALLY_EXCLUSIVE_KWARGS = {
-    "Conv1D": ["strides", "dilation_rate"],
-    "Conv2D": ["strides", "dilation_rate"],
-    "Conv2DTranspose": ["strides", "dilation_rate"],
-    "Conv3D": ["strides", "dilation_rate"],
-    "ConvLSTM2D": ["strides", "dilation_rate"],
-}
-
-# Some layers cannot operate on a fully dynamic shape, only dynamic batch size.
-LAYERS_WITH_BATCH_ONLY_DYNAMIC_SHAPE = [
-    "AveragePooling1D",  # uses tf.nn.avg_pool2d with reshape, which is illegal
-    "BatchNormalization",  # failed to materialize conversion
-    "Conv3D",  # tf.Conv3D op illegal
-    "MaxPool1D",  # uses tf.nn.max_pool2d with reshape, which is illegal
-]
-
-
-def get_default_kwargs_values(layer: str) -> Dict[str, Any]:
-  """Gets the default kwargs for a tf.keras.layers layer."""
-  layer_class = getattr(tf.keras.layers, layer)
-  layer_parameters = inspect.signature(layer_class.__init__).parameters
-  kwargs_to_default_values = {
-      kwarg: value.default
-      for kwarg, value in layer_parameters.items()
-      if value.default is not inspect.Parameter.empty
-  }
-  return kwargs_to_default_values
-
-
-def _equal_or_splat_equal(value: Any, sequence: Any) -> bool:
-  """Returns True if value==sequence or value==(every element in sequence)."""
-  if value == sequence:
-    return True
-  elif isinstance(sequence, (list, tuple)):
-    for element in sequence:
-      if not _equal_or_splat_equal(value, element):
-        return False
-    return True
-  return False
-
-
-def get_non_default_kwargs(
-    layer: str, unit_test_spec: tf_test_utils.UnitTestSpec) -> List[str]:
-  """Returns all non-default optional kwargs in unit_test_spec."""
-  kwargs_to_defaults = get_default_kwargs_values(layer)
-  non_default_kwargs = []
-  for kwarg, value in unit_test_spec.kwargs.items():
-    if (kwarg in kwargs_to_defaults and
-        not _equal_or_splat_equal(value, kwargs_to_defaults[kwarg])):
-      non_default_kwargs.append(kwarg)
-  return non_default_kwargs
-
-
-def unsupported_by_tf(layer: str,
-                      unit_test_spec: tf_test_utils.UnitTestSpec) -> bool:
-  """True if unit_test_spec specifies tf-unsupported non-default kwargs."""
-  if layer in LAYERS_TO_TF_UNSUPPORTED_NON_DEFAULT_KWARGS:
-    unsupported_kwargs = LAYERS_TO_TF_UNSUPPORTED_NON_DEFAULT_KWARGS[layer]
-    non_default_kwargs = get_non_default_kwargs(layer, unit_test_spec)
-    return any(kwarg in unsupported_kwargs for kwarg in non_default_kwargs)
-  return False
-
-
-def has_mutually_exclusive_kwargs(
-    layer: str, unit_test_spec: tf_test_utils.UnitTestSpec) -> bool:
-  """True if unit_test_spec specifies mutually exclusive non-default kwargs."""
-  if layer in LAYERS_TO_MUTUALLY_EXCLUSIVE_KWARGS:
-    mutually_exclusive_kwargs = LAYERS_TO_MUTUALLY_EXCLUSIVE_KWARGS[layer]
-    non_default_kwargs = get_non_default_kwargs(layer, unit_test_spec)
-    return set(mutually_exclusive_kwargs).issubset(set(non_default_kwargs))
-  return False
-
-
-# A dictionary mapping tf.keras.layers names to lists of UnitTestSpecs.
-# Each unit_test_name will have the tf.keras.layer name prepended to it.
-#
-# Each layer is required to have a UnitTestSpec with all-default values for
-# unrequired kwargs. This allows us to seperately test the basic api and the
-# full api.
-LAYERS_TO_UNIT_TEST_SPECS = {
-    "Activation":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(activation=["relu"])),
-    "ActivityRegularization":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(l1=[0.0, 0.1], l2=[0.0, 0.1])),
-    "Add":
-        tf_test_utils.unit_test_specs_from_signatures(BINARY_SIGNATURE_SHAPES),
-    "AdditiveAttention":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[(RANK_3_SHAPE, RANK_3_SHAPE, RANK_3_SHAPE)],
-            kwargs_to_values=dict(causal=[False, True])),
-    "AlphaDropout":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(rate=[DROPOUT])),
-    "Attention":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[(RANK_3_SHAPE, RANK_3_SHAPE, RANK_3_SHAPE)],
-            kwargs_to_values=dict(causal=[False, True])),
-    "Average":
-        tf_test_utils.unit_test_specs_from_signatures(BINARY_SIGNATURE_SHAPES),
-    "AveragePooling1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=POOLING_1D_KWARGS_TO_VALUES),
-    "AveragePooling2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=POOLING_KWARGS_TO_VALUES),
-    "AveragePooling3D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=POOLING_KWARGS_TO_VALUES),
-    "BatchNormalization":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(renorm=[False, True])),
-    "Concatenate":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(axis=[-1, 0])),
-    "Conv1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=CONV_1D_KWARGS_TO_VALUES),
-    "Conv1DTranspose":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=CONV_KWARGS_TO_VALUES),
-    "Conv2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=CONV_KWARGS_TO_VALUES),
-    "Conv2DTranspose":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=CONV_KWARGS_TO_VALUES),
-    "Conv3D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=CONV_KWARGS_TO_VALUES),
-    "Conv3DTranspose":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=CONV_KWARGS_TO_VALUES),
-    "ConvLSTM2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(filters=[CONV_FILTERS],
-                                  kernel_size=[CONV_KERNEL_SIZE],
-                                  return_state=[False, True],
-                                  strides=[1, 2],
-                                  dilation_rate=[1, 1],
-                                  stateful=[False, True])),
-    "Cropping1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(cropping=[1, (1, 2)])),
-    "Cropping2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(cropping=[0, ((1, 2), (2, 1))])),
-    "Cropping3D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(cropping=[1, ((1, 2), (2, 1), (1, 0))])),
-    "Dense":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(units=[8])),
-    "DepthwiseConv2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(kernel_size=[CONV_KERNEL_SIZE],
-                                  strides=[1, 2],
-                                  padding=["valid", "same"],
-                                  dilation_rate=[1, 1],
-                                  depth_multiplier=[1, 2])),
-    "Dot":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(axes=[(1, 2)])),
-    "Dropout":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(rate=[DROPOUT])),
-    "ELU":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "Embedding":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(input_dim=[4], output_dim=[2])),
-    "Flatten":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "GRU":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=RNN_SIGNATURE_SHAPES,
-            kwargs_to_values=RNN_KWARGS_TO_VALUES),
-    "GaussianDropout":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=RNN_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(rate=[DROPOUT])),
-    "GaussianNoise":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=RNN_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(stddev=[1.0])),
-    "GlobalAveragePooling1D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_1D_SIGNATURE_SHAPES),
-    "GlobalAveragePooling2D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_2D_SIGNATURE_SHAPES),
-    "GlobalAveragePooling3D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_3D_SIGNATURE_SHAPES),
-    "GlobalMaxPool1D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_1D_SIGNATURE_SHAPES),
-    "GlobalMaxPool2D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_2D_SIGNATURE_SHAPES),
-    "GlobalMaxPool3D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_3D_SIGNATURE_SHAPES),
-    "InputLayer":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "LSTM":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=RNN_SIGNATURE_SHAPES,
-            kwargs_to_values=RNN_KWARGS_TO_VALUES),
-    "Lambda":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(function=[lambda x: x * x])),
-    "LayerNormalization":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "LeakyReLU":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "LocallyConnected1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(filters=[CONV_FILTERS],
-                                  kernel_size=[CONV_KERNEL_SIZE],
-                                  strides=[1, 3],
-                                  padding=["valid", "same"],
-                                  implementation=[1, 3])),
-    "LocallyConnected2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(filters=[CONV_FILTERS],
-                                  kernel_size=[CONV_KERNEL_SIZE],
-                                  strides=[1, 3],
-                                  padding=["valid", "same"],
-                                  implementation=[1, 3])),
-    "Masking":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "MaxPool1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=POOLING_1D_KWARGS_TO_VALUES),
-    "MaxPool2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=POOLING_KWARGS_TO_VALUES),
-    "MaxPool3D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=POOLING_KWARGS_TO_VALUES),
-    "Maximum":
-        tf_test_utils.unit_test_specs_from_signatures(BINARY_SIGNATURE_SHAPES),
-    "Minimum":
-        tf_test_utils.unit_test_specs_from_signatures(BINARY_SIGNATURE_SHAPES),
-    "MultiHeadAttention":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[(RANK_3_SHAPE, RANK_3_SHAPE)],
-            kwargs_to_values=dict(num_heads=[2], key_dim=[3])),
-    "Multiply":
-        tf_test_utils.unit_test_specs_from_signatures(BINARY_SIGNATURE_SHAPES),
-    "PReLU":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "Permute":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(dims=[(3, 1, 4, 2)])),
-    "ReLU":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "RepeatVector":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[((2, 2),)], kwargs_to_values=dict(n=[3])),
-    "Reshape":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[((3, 2, 2, 2),)],
-            kwargs_to_values=dict(target_shape=[(2, 1, 4, 1)])),
-    "SeparableConv1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(filters=[CONV_FILTERS],
-                                  kernel_size=[CONV_KERNEL_SIZE],
-                                  strides=[1, 2],
-                                  padding=["valid", "same"],
-                                  dilation_rate=[1, 1],
-                                  depth_multiplier=[1, 2])),
-    "SeparableConv2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(filters=[CONV_FILTERS],
-                                  kernel_size=[CONV_KERNEL_SIZE],
-                                  strides=[1, 2],
-                                  padding=["valid", "same"],
-                                  dilation_rate=[1, 1],
-                                  depth_multiplier=[1, 2])),
-    "SimpleRNN":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=RNN_SIGNATURE_SHAPES,
-            kwargs_to_values=RNN_KWARGS_TO_VALUES),
-    "Softmax":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "SpatialDropout1D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_1D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(rate=[DROPOUT])),
-    "SpatialDropout2D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_2D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(rate=[DROPOUT])),
-    "SpatialDropout3D":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=CONV_3D_SIGNATURE_SHAPES,
-            kwargs_to_values=dict(rate=[DROPOUT])),
-    "Subtract":
-        tf_test_utils.unit_test_specs_from_signatures(BINARY_SIGNATURE_SHAPES),
-    "ThresholdedReLU":
-        tf_test_utils.unit_test_specs_from_signatures(UNARY_SIGNATURE_SHAPES),
-    "UpSampling1D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_1D_SIGNATURE_SHAPES),
-    "UpSampling2D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_2D_SIGNATURE_SHAPES),
-    "UpSampling3D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_3D_SIGNATURE_SHAPES),
-    "ZeroPadding1D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_1D_SIGNATURE_SHAPES),
-    "ZeroPadding2D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_2D_SIGNATURE_SHAPES),
-    "ZeroPadding3D":
-        tf_test_utils.unit_test_specs_from_signatures(CONV_3D_SIGNATURE_SHAPES),
-}
-
-for layer, specs in LAYERS_TO_UNIT_TEST_SPECS.items():
-  # Update using 'with_name' to avoid updating shared UnitTestSpecs.
-  specs = [spec.with_name(f"{layer}__{spec.unit_test_name}") for spec in specs]
-  LAYERS_TO_UNIT_TEST_SPECS[layer] = specs
-
-  # Validate that there are not multiple UnitTestSpecs with the same name.
-  seen_unit_test_names = set()
-  for spec in specs:
-    if spec.unit_test_name in seen_unit_test_names:
-      raise ValueError(
-          f"Found multiple UnitTestSpecs with the name '{spec.unit_test_name}'")
-    seen_unit_test_names.add(spec.unit_test_name)
-
-  # Validate that there is one spec that has default values for all unrequired
-  # kwargs.
-  has_default_unrequired_kwargs = False
-  for spec in specs:
-    if not get_non_default_kwargs(layer, spec):
-      has_default_unrequired_kwargs = True
-
-  if not has_default_unrequired_kwargs:
-    raise ValueError(
-        f"The configuration for '{layer}' did not have a UnitTestSpec with all "
-        "default kwargs.")
-
-# Layers that allow specifying the 'dropout' kwarg.
-DROPOUT_LAYERS = [
-    "AdditiveAttention", "Attention", "ConvLSTM2D", "GRU", "LSTM",
-    "MultiHeadAttention", "SimpleRNN"
-]
-
-flags.DEFINE_string("layer", None,
-                    f"One of {list(LAYERS_TO_UNIT_TEST_SPECS.keys())}.")
-flags.DEFINE_bool(
-    "dynamic_dims", False,
-    "Whether or not to compile the layer with a dynamic dimension sizes.")
-flags.DEFINE_bool("training", False,
-                  "Whether or not to compile the layer in training mode.")
-flags.DEFINE_bool(
-    "test_default_kwargs_only", True,
-    "Whether or not to test multiple layer configurations using non-required "
-    "kwargs.")
-flags.DEFINE_bool(
-    "list_layers_with_full_api_tests", False,
-    "Whether or not to print out all layers with non-default configurations "
-    "(and skip running the tests).")
-
-
-def get_input(shape: Sequence[int]) -> tf.keras.layers.Input:
-  """Converts a shape into a tf.keras.Input."""
-  # Most keras layers are only compatible with dynamic batch sizes.
-  batch_size = None if FLAGS.dynamic_dims else shape[0]
-  return tf.keras.layers.Input(batch_size=batch_size, shape=shape[1:])
-
-
-def keras_input_normalizer(inputs: Sequence[Any]) -> Union[Any, Sequence[Any]]:
-  """Unpacks inputs if it has length one."""
-  return inputs[0] if len(inputs) == 1 else inputs
-
-
-def create_wrapped_keras_layer(
-    layer: str, unit_test_spec: tf_test_utils.UnitTestSpec) -> tf.keras.Model:
-  """Wraps a keras layer in a model for compilation."""
-  layer_class = getattr(tf.keras.layers, layer)
-
-  kwargs = copy.deepcopy(unit_test_spec.kwargs)
-  if FLAGS.training and layer in DROPOUT_LAYERS:
-    kwargs["dropout"] = DROPOUT
-
-  if "dtype" not in unit_test_spec.kwargs:
-    kwargs["dtype"] = unit_test_spec.input_signature[0].dtype
-
-  inputs = keras_input_normalizer(
-      [get_input(spec.shape) for spec in unit_test_spec.input_signature])
-  if layer == "MultiHeadAttention":
-    # TODO(meadowlark): Remove specialization if API changes.
-    outputs = layer_class(**kwargs)(*inputs)
-  else:
-    outputs = layer_class(**kwargs)(inputs)
-  return tf.keras.Model(inputs, outputs)
-
-
-def create_layer_unit_test(
-    model: tf.keras.Model,
-    unit_test_spec: tf_test_utils.UnitTestSpec) -> tf.function:
-  """Wrap the model's __call__ function in a tf.function for testing."""
-  static_signature = unit_test_spec.input_signature
-
-  dynamic_signature = static_signature
-  if FLAGS.dynamic_dims:
-
-    def make_batch_size_dynamic(tensor_spec: tf.TensorSpec) -> tf.TensorSpec:
-      return tf.TensorSpec([None] + tensor_spec.shape[1:], tensor_spec.dtype)
-
-    if FLAGS.layer in LAYERS_WITH_BATCH_ONLY_DYNAMIC_SHAPE:
-      dynamic_signature = tf_utils.apply_function(dynamic_signature,
-                                                  make_batch_size_dynamic)
-    else:
-      dynamic_signature = tf_utils.apply_function(dynamic_signature,
-                                                  tf_utils.make_dims_dynamic)
-
-  if len(static_signature) > 1:
-    static_signature = [static_signature]
-    dynamic_signature = [dynamic_signature]
-
-  call = lambda *args: model(*args, training=FLAGS.training)
-  return tf_test_utils.tf_function_unit_test(
-      input_signature=dynamic_signature,
-      static_signature=static_signature,
-      input_generator=unit_test_spec.input_generator,
-      input_args=unit_test_spec.input_args,
-      name=unit_test_spec.unit_test_name)(call)
-
-
-class KerasLayersModule(tf_test_utils.TestModule):
-
-  def __init__(self):
-    super().__init__()
-    self.models = []
-    for unit_test_spec in LAYERS_TO_UNIT_TEST_SPECS[FLAGS.layer]:
-      if (FLAGS.test_default_kwargs_only and
-          get_non_default_kwargs(FLAGS.layer, unit_test_spec)):
-        # Skip all UnitTestSpecs with non-default unrequired kwargs.
-        continue
-
-      if (unsupported_by_tf(FLAGS.layer, unit_test_spec) or
-          has_mutually_exclusive_kwargs(FLAGS.layer, unit_test_spec)):
-        # Filter out UnitTestSpecs with kwargs that TensorFlow can't run on
-        # CPU or that are mutually exclusive. This allows us to take a product
-        # like that in CONV_KWARGS_TO_VALUE and filter out the configurations
-        # lacking support for particular layers.
-        continue
-
-      model = create_wrapped_keras_layer(FLAGS.layer, unit_test_spec)
-      # IREE requires that the models are stored on the module instance.
-      self.models.append(model)
-      layer_unit_test = create_layer_unit_test(model, unit_test_spec)
-      setattr(self, unit_test_spec.unit_test_name, layer_unit_test)
-
-
-def get_relative_artifacts_dir() -> str:
-  dynamic_str = "dynamic" if FLAGS.dynamic_dims else "static"
-  training_str = "training" if FLAGS.training else "non_training"
-  full_api_str = "default_api" if FLAGS.test_default_kwargs_only else "full_api"
-  settings_str = f"{full_api_str}_{dynamic_str}_{training_str}"
-  return os.path.join("tf", "keras", "layers", FLAGS.layer, settings_str)
-
-
-class KerasLayersTest(tf_test_utils.TracedModuleTestCase):
-
-  def __init__(self, *args, **kwargs):
-    super().__init__(*args, **kwargs)
-    self._modules = tf_test_utils.compile_tf_module(
-        KerasLayersModule,
-        exported_names=KerasLayersModule.get_tf_function_unit_tests(),
-        relative_artifacts_dir=get_relative_artifacts_dir())
-
-
-def main(argv):
-  del argv  # Unused.
-  if hasattr(tf, "enable_v2_behavior"):
-    tf.enable_v2_behavior()
-
-  if FLAGS.list_layers_with_full_api_tests:
-    for layer, unit_test_specs in sorted(LAYERS_TO_UNIT_TEST_SPECS.items()):
-      if len(unit_test_specs) > 1:
-        print(f'    "{layer}",')
-    return
-
-  if FLAGS.layer not in LAYERS_TO_UNIT_TEST_SPECS:
-    raise ValueError(f"Unrecognized layer: '{FLAGS.layer}'")
-
-  unit_tests = KerasLayersModule.get_tf_function_unit_tests()
-  logging.info("Testing the following %s functions: %s", len(unit_tests),
-               unit_tests)
-
-  KerasLayersTest.generate_unit_tests(KerasLayersModule)
-  tf.test.main()
-
-
-if __name__ == "__main__":
-  app.run(main)
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/linspace_test.py b/integrations/tensorflow/test/python/iree_tf_tests/linspace_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/linspace_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/linspace_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/mandelbrot_test.py b/integrations/tensorflow/test/python/iree_tf_tests/mandelbrot_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/mandelbrot_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/mandelbrot_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/math/math_test.py b/integrations/tensorflow/test/python/iree_tf_tests/math/math_test.py
deleted file mode 100644
index fc6d5ed..0000000
--- a/integrations/tensorflow/test/python/iree_tf_tests/math/math_test.py
+++ /dev/null
@@ -1,753 +0,0 @@
-# Copyright 2020 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
-
-import collections
-import os
-from typing import Any, Dict, Sequence, Type, Union
-
-from absl import app
-from absl import flags
-from iree.tf.support import tf_test_utils
-from iree.tf.support import tf_utils
-import numpy as np
-import tensorflow.compat.v2 as tf
-
-FLAGS = flags.FLAGS
-
-# As high as tf goes without breaking.
-RANK_7_SHAPE = [2] * 7
-UNARY_SIGNATURE_SHAPES = [[RANK_7_SHAPE]]
-BINARY_SIGNATURE_SHAPES = [[RANK_7_SHAPE] * 2]
-TERNARY_SIGNATURE_SHAPES = [[RANK_7_SHAPE] * 3]
-
-# Reused UnitTestSpecs.
-SEGMENT_UNIT_TEST_SPECS = tf_test_utils.unit_test_specs_from_args(
-    names_to_input_args={
-        "tf_doc_example": [
-            tf.constant([
-                [1, 2, 3, 4],
-                [4, 3, 2, 1],
-                [5, 6, 7, 8],
-            ], np.float32),
-            np.array([0, 0, 1], np.int32),
-        ]
-    })
-UNSORTED_SEGMENT_UNIT_TEST_SPECS = tf_test_utils.unit_test_specs_from_args(
-    names_to_input_args={
-        "tf_doc_example": [
-            tf.constant([
-                [1, 2, 3, 4],
-                [4, 3, 2, 1],
-                [5, 6, 7, 8],
-            ], np.float32),
-            np.array([0, 0, 1], np.int32),
-            2,
-        ]
-    })
-
-REDUCE_KWARGS_TO_VALUES = {
-    "axis": [None, 1],
-    "keepdims": [False, True],
-}
-
-# A dictionary mapping tf.math function names to lists of UnitTestSpecs.
-# Each unit_test_name will have the tf.math function name prepended to it.
-FUNCTIONS_TO_UNIT_TEST_SPECS = {
-    "abs":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "accumulate_n": [
-        tf_test_utils.UnitTestSpec(
-            unit_test_name='f32',
-            input_signature=[[tf.TensorSpec(RANK_7_SHAPE, tf.float32)] * 5]),
-        tf_test_utils.UnitTestSpec(
-            unit_test_name='i32',
-            input_signature=[[tf.TensorSpec(RANK_7_SHAPE, tf.int32)] * 5]),
-    ],
-    "acos":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "acosh":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32],
-            input_generators=[tf_utils.ndarange]),
-    "add":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "add_n": [
-        tf_test_utils.UnitTestSpec(
-            unit_test_name='f32',
-            input_signature=[[tf.TensorSpec(RANK_7_SHAPE, tf.float32)] * 5]),
-        tf_test_utils.UnitTestSpec(
-            unit_test_name='i32',
-            input_signature=[[tf.TensorSpec(RANK_7_SHAPE, tf.int32)] * 5]),
-    ],
-    "angle":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "argmax":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "argmin":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "asin":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "asinh":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "atan":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "atan2":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "atanh":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "bessel_i0":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "bessel_i0e":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "bessel_i1":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "bessel_i1e":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "betainc":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=TERNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "bincount":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.int32],
-            input_generators=[tf_utils.ndarange]),
-    "ceil":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "confusion_matrix":
-        tf_test_utils.unit_test_specs_from_args(names_to_input_args={
-            "five_classes": [tf.constant([1, 2, 4]),
-                             tf.constant([2, 2, 4])]
-        }),
-    "conj":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "cos":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "cosh":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "count_nonzero":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64],
-            input_generators=[tf_utils.ndarange]),
-    "cumprod":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "cumsum":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "cumulative_logsumexp":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "digamma":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "divide":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "divide_no_nan":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "equal":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "erf":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "erfc":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "erfinv":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "exp":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "expm1":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "floor":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "floordiv":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            # Avoid integer division by 0.
-            input_generators={
-                "uniform_1_3":
-                    lambda *args: tf_utils.uniform(*args, low=1.0, high=3.0)
-            }),
-    "floormod":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            # Avoid integer division by 0.
-            input_generators={
-                "uniform_1_3":
-                    lambda *args: tf_utils.uniform(*args, low=1.0, high=3.0)
-            }),
-    "greater":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "greater_equal":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "igamma":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "igammac":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "imag":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "in_top_k": [
-        tf_test_utils.UnitTestSpec(
-            unit_test_name="k_3",
-            input_signature=[
-                tf.TensorSpec([8], tf.int32),
-                tf.TensorSpec([8, 3])
-            ],
-            input_generator=tf_utils.ndarange,
-            kwargs=dict(k=3),
-        )
-    ],
-    "invert_permutation": [
-        tf_test_utils.UnitTestSpec(
-            unit_test_name="random",
-            input_signature=[tf.TensorSpec([8], tf.int32)],
-            input_generator=tf_utils.random_permutation,
-        )
-    ],
-    "is_finite":
-        tf_test_utils.unit_test_specs_from_args(names_to_input_args={
-            "nan_and_inf": [tf.constant([[1., np.nan], [np.inf, 2.]])]
-        }),
-    "is_inf":
-        tf_test_utils.unit_test_specs_from_args(names_to_input_args={
-            "nan_and_inf": [tf.constant([[1., np.nan], [np.inf, 2.]])]
-        }),
-    "is_nan":
-        tf_test_utils.unit_test_specs_from_args(names_to_input_args={
-            "nan_and_inf": [tf.constant([[1., np.nan], [np.inf, 2.]])]
-        }),
-    "is_non_decreasing":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "is_strictly_increasing":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "l2_normalize":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "lbeta":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "less":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "less_equal":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "lgamma":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "log":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "log1p":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "log_sigmoid":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "log_softmax":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "logical_and":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.bool]),
-    "logical_not":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.bool]),
-    "logical_or":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.bool]),
-    "logical_xor":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.bool]),
-    "maximum":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "minimum":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "mod":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            input_generators={
-                "positive_ndarange": lambda *args: tf_utils.ndarange(*args) + 1
-            }),
-    "multiply":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "multiply_no_nan":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "ndtri":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "negative":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "nextafter":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES),
-    "not_equal":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32]),
-    "polygamma":
-        tf_test_utils.unit_test_specs_from_args(names_to_input_args={
-            "nan_and_inf": [tf.ones(16), tf.linspace(0.5, 4, 16)]
-        }),
-    "polyval": [
-        tf_test_utils.UnitTestSpec(
-            unit_test_name="three_coeffs",
-            input_signature=[[tf.TensorSpec(RANK_7_SHAPE)] * 3,
-                             tf.TensorSpec([])],
-        )
-    ],
-    "pow":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[[[1, 2, 2, 2], [1, 2, 2, 2]]],
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64],
-            # Avoid numbers <1 or large ones that will overflow
-            input_generators={
-                "positive_moderate_ndarange":
-                    lambda *args: tf_utils.uniform(*args, low=1.0, high=3.0)
-            }),
-    "real":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "reciprocal":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "reciprocal_no_nan":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "reduce_all": [
-        # Explicitly test all True inputs to be absolutely sure that some
-        # reduction axes return True.
-        *tf_test_utils.unit_test_specs_from_args(
-            names_to_input_args={
-                "all_true": [np.ones(RANK_7_SHAPE, bool)],
-            },
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-        *tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.bool],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    ],
-    "reduce_any": [
-        # Explicitly test all False inputs to be absolutely sure that some
-        # reduction axes return False.
-        *tf_test_utils.unit_test_specs_from_args(
-            names_to_input_args={
-                "all_false": [np.zeros(RANK_7_SHAPE, bool)],
-            },
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-        *tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.bool],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    ],
-    "reduce_euclidean_norm":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_logsumexp":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_max":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_mean":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_min":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_prod":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_std":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_sum":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "reduce_variance":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64],
-            kwargs_to_values=REDUCE_KWARGS_TO_VALUES),
-    "rint":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "round":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "rsqrt":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "scalar_mul":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[[[], [8]]]),
-    "segment_max":
-        SEGMENT_UNIT_TEST_SPECS,
-    "segment_mean":
-        SEGMENT_UNIT_TEST_SPECS,
-    "segment_min":
-        SEGMENT_UNIT_TEST_SPECS,
-    "segment_prod":
-        SEGMENT_UNIT_TEST_SPECS,
-    "segment_sum":
-        SEGMENT_UNIT_TEST_SPECS,
-    "sigmoid":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "sign":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "sin":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "sinh":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "sobol_sample":
-        tf_test_utils.unit_test_specs_from_args(
-            names_to_input_args={"simple": [4, 3]}),
-    "softmax":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "softplus":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "softsign":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32]),
-    "sqrt":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "square":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "squared_difference":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "subtract":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "tan":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "tanh":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "top_k":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=[[[2, 2]]],
-            signature_dtypes=[tf.float32],
-            kwargs_to_values={"k": [1, 2]}),
-    "truediv":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "unsorted_segment_max":
-        UNSORTED_SEGMENT_UNIT_TEST_SPECS,
-    "unsorted_segment_mean":
-        UNSORTED_SEGMENT_UNIT_TEST_SPECS,
-    "unsorted_segment_min":
-        UNSORTED_SEGMENT_UNIT_TEST_SPECS,
-    "unsorted_segment_prod":
-        UNSORTED_SEGMENT_UNIT_TEST_SPECS,
-    "unsorted_segment_sqrt_n":
-        UNSORTED_SEGMENT_UNIT_TEST_SPECS,
-    "unsorted_segment_sum":
-        UNSORTED_SEGMENT_UNIT_TEST_SPECS,
-    "xdivy":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "xlog1py":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "xlogy":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.complex64]),
-    "zero_fraction":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=UNARY_SIGNATURE_SHAPES,
-            signature_dtypes=[tf.float32, tf.int32, tf.complex64]),
-    "zeta":
-        tf_test_utils.unit_test_specs_from_signatures(
-            signature_shapes=BINARY_SIGNATURE_SHAPES,
-            # The function is poorly behaved near zero, so we test this range
-            # to avoid outputing all nans.
-            input_generators={
-                "uniform_3_4":
-                    lambda *args: tf_utils.uniform(*args, low=3.0, high=4.0)
-            },
-        )
-}
-
-for function, specs in FUNCTIONS_TO_UNIT_TEST_SPECS.items():
-  # Update using 'with_name' to avoid updating shared UnitTestSpecs.
-  specs = [
-      spec.with_name(f"{function}__{spec.unit_test_name}") for spec in specs
-  ]
-  FUNCTIONS_TO_UNIT_TEST_SPECS[function] = specs
-
-  # Validate that there are not multiple UnitTestSpecs with the same name.
-  seen_unit_test_names = set()
-  for spec in specs:
-    if spec.unit_test_name in seen_unit_test_names:
-      raise ValueError(
-          f"Found multiple UnitTestSpecs with the name '{spec.unit_test_name}'")
-    seen_unit_test_names.add(spec.unit_test_name)
-
-flags.DEFINE_list(
-    "functions", None,
-    f"Any of {list(FUNCTIONS_TO_UNIT_TEST_SPECS.keys())}. If more than one "
-    "function is provided then len(--target_backends) must be one.")
-flags.DEFINE_bool(
-    "dynamic_dims", False,
-    "Whether or not to compile the layer with dynamic dimensions.")
-flags.DEFINE_bool(
-    "test_complex", False,
-    "Whether or not to test or ignore function signatures with complex types.")
-flags.DEFINE_bool(
-    'list_functions_with_complex_tests', False,
-    'Whether or not to print out all functions with complex inputs '
-    '(and skip running the tests).')
-
-
-def _wrap_top_k(top_k):
-  # top_k returns a tensorflow.python.ops.gen_nn_ops.TopKV2. Wrap it in a tuple
-  # so we don't have to. (The lambda is wrapped to avoid a recursive capture).
-  return lambda *args, **kwargs: tuple(top_k(*args, **kwargs))
-
-
-def create_function_unit_test(
-    function_name: str,
-    unit_test_spec: tf_test_utils.UnitTestSpec) -> tf.function:
-  """Creates a tf_function_unit_test from the provided UnitTestSpec."""
-  function = getattr(tf.math, function_name)
-  signature = unit_test_spec.input_signature
-
-  if tf_utils.is_complex(signature):
-    function, signature = tf_utils.rewrite_complex_signature(
-        function, signature)
-  if function_name == "top_k":
-    function = _wrap_top_k(function)
-  wrapped_function = lambda *args: function(*args, **unit_test_spec.kwargs)
-
-  if FLAGS.dynamic_dims:
-    signature = tf_utils.apply_function(signature, tf_utils.make_dims_dynamic)
-
-  return tf_test_utils.tf_function_unit_test(
-      input_signature=signature,
-      input_generator=unit_test_spec.input_generator,
-      input_args=unit_test_spec.input_args,
-      name=unit_test_spec.unit_test_name,
-      rtol=1e-5,
-      atol=1e-5)(wrapped_function)
-
-
-class TfMathModule(tf_test_utils.TestModule):
-
-  def __init__(self):
-    super().__init__()
-    for function in FLAGS.functions:
-      for unit_test_spec in FUNCTIONS_TO_UNIT_TEST_SPECS[function]:
-        if not FLAGS.test_complex and tf_utils.is_complex(
-            unit_test_spec.input_signature):
-          continue
-        function_unit_test = create_function_unit_test(function, unit_test_spec)
-        setattr(self, unit_test_spec.unit_test_name, function_unit_test)
-
-
-def get_relative_artifacts_dir() -> str:
-  if len(FLAGS.functions) > 1:
-    # We only allow testing multiple functions with a single target backend
-    # so that we can store the artifacts under:
-    #   'artifacts_dir/multiple_functions__backend/...'
-    # We specialize the 'multiple_functions' dir by backend to avoid overwriting
-    # tf_input.mlir and iree_input.mlir. These are typically identical across
-    # backends, but are not when the functions to compile change per-backend.
-    if len(FLAGS.target_backends) != 1:
-      raise flags.IllegalFlagValueError(
-          "Expected len(target_backends) == 1 when len(functions) > 1, but got "
-          f"the following values for target_backends: {FLAGS.target_backends}.")
-    function_str = f"multiple_functions__{FLAGS.target_backends[0]}"
-  else:
-    function_str = FLAGS.functions[0]
-  dim_str = "dynamic_dims" if FLAGS.dynamic_dims else "static_dims"
-  complex_str = "complex" if FLAGS.test_complex else "non_complex"
-  return os.path.join("tf", "math", function_str, f"{dim_str}_{complex_str}")
-
-
-class TfMathTest(tf_test_utils.TracedModuleTestCase):
-
-  def __init__(self, *args, **kwargs):
-    super().__init__(*args, **kwargs)
-    self._modules = tf_test_utils.compile_tf_module(
-        TfMathModule,
-        exported_names=TfMathModule.get_tf_function_unit_tests(),
-        relative_artifacts_dir=get_relative_artifacts_dir())
-
-
-def main(argv):
-  del argv  # Unused.
-  if hasattr(tf, "enable_v2_behavior"):
-    tf.enable_v2_behavior()
-
-  if FLAGS.list_functions_with_complex_tests:
-    for function_name, unit_test_specs in FUNCTIONS_TO_UNIT_TEST_SPECS.items():
-      for spec in unit_test_specs:
-        if tf_utils.is_complex(spec.input_signature):
-          print(f'    "{function_name}",')
-    return
-
-  if FLAGS.functions is None:
-    raise flags.IllegalFlagValueError(
-        "'--functions' must be specified if "
-        "'--list_functions_with_complex_tests' isn't")
-
-  TfMathTest.generate_unit_tests(TfMathModule)
-  tf.test.main()
-
-
-if __name__ == "__main__":
-  app.run(main)
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/matrix_ops_dynamic_test.py b/integrations/tensorflow/test/python/iree_tf_tests/matrix_ops_dynamic_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/matrix_ops_dynamic_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/matrix_ops_dynamic_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/matrix_ops_static_test.py b/integrations/tensorflow/test/python/iree_tf_tests/matrix_ops_static_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/matrix_ops_static_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/matrix_ops_static_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/mobile_bert_squad_test.py b/integrations/tensorflow/test/python/iree_tf_tests/mobile_bert_squad_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/mobile_bert_squad_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/mobile_bert_squad_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/pytree_test.py b/integrations/tensorflow/test/python/iree_tf_tests/pytree_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/pytree_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/pytree_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/quantization_dyn_test.py b/integrations/tensorflow/test/python/iree_tf_tests/quantization_dyn_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/quantization_dyn_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/quantization_dyn_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/quantization_test.py b/integrations/tensorflow/test/python/iree_tf_tests/quantization_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/quantization_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/quantization_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/range_test.py b/integrations/tensorflow/test/python/iree_tf_tests/range_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/range_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/range_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/resource_ops_test.py b/integrations/tensorflow/test/python/iree_tf_tests/resource_ops_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/resource_ops_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/resource_ops_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/ring_buffer_test.py b/integrations/tensorflow/test/python/iree_tf_tests/ring_buffer_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/ring_buffer_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/ring_buffer_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/scatter_update_test.py b/integrations/tensorflow/test/python/iree_tf_tests/scatter_update_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/scatter_update_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/scatter_update_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/simple_arithmetic_test.py b/integrations/tensorflow/test/python/iree_tf_tests/simple_arithmetic_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/simple_arithmetic_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/simple_arithmetic_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/simple_stateful_test.py b/integrations/tensorflow/test/python/iree_tf_tests/simple_stateful_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/simple_stateful_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/simple_stateful_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/sliding_window_test.py b/integrations/tensorflow/test/python/iree_tf_tests/sliding_window_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/sliding_window_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/sliding_window_test.py
diff --git a/integrations/tensorflow/test/python/iree_tf_tests/uncategorized/space_to_batch_nd_test.py b/integrations/tensorflow/test/python/iree_tf_tests/space_to_batch_nd_test.py
similarity index 100%
rename from integrations/tensorflow/test/python/iree_tf_tests/uncategorized/space_to_batch_nd_test.py
rename to integrations/tensorflow/test/python/iree_tf_tests/space_to_batch_nd_test.py
diff --git a/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake b/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake
index e8615ab..4867189 100644
--- a/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake
+++ b/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake
@@ -3,8 +3,6 @@
     "${PACKAGE_NAME}_iree-imported-model-93c0f75188363af77647cb2f1deb41446575c9cd084d86119287156eb181d850"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_bc1338be-e3df-44fd-82e4-40ba9560a073_PersonDetect_int8.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_PersonDetect_int8_93c0f75188363af77647cb2f1deb41446575c9cd084d86119287156eb181d850.mlir"
 )
@@ -14,8 +12,6 @@
     "${PACKAGE_NAME}_iree-imported-model-394878992fb35f2ed531b7f0442c05bde693346932f049cbb3614e06b3c82337"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_58855e40-eba9-4a71-b878-6b35e3460244_MobileNetV3Small_fp32.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileNetV3Small_fp32_394878992fb35f2ed531b7f0442c05bde693346932f049cbb3614e06b3c82337.mlir"
 )
@@ -25,8 +21,6 @@
     "${PACKAGE_NAME}_iree-imported-model-05c50f54ffea1fce722d07588e7de026ce10324eccc5d83d1eac2c5a9f5d639d"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_c36c63b0-220a-4d78-8ade-c45ce47d89d3_DeepLabV3_fp32.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_DeepLabV3_fp32_05c50f54ffea1fce722d07588e7de026ce10324eccc5d83d1eac2c5a9f5d639d.mlir"
 )
@@ -36,8 +30,6 @@
     "${PACKAGE_NAME}_iree-imported-model-3f492fde47abecd3640f1e04c14f2bfc24940f1cf11f66e72128c590bc711025"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_4a6f545e-1b4e-41a5-9236-792aa578184b_EfficientNet_int8.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_EfficientNet_int8_3f492fde47abecd3640f1e04c14f2bfc24940f1cf11f66e72128c590bc711025.mlir"
 )
@@ -47,8 +39,6 @@
     "${PACKAGE_NAME}_iree-imported-model-a359c8f1e19b6f476e843bdc5566f9554e329cbfb3b4437995ad9cccfb381aee"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_78eab9e5-9ff1-4769-9b55-933c81cc9a0f_MobileNetV1_fp32.0_float.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileNetV1_fp32_a359c8f1e19b6f476e843bdc5566f9554e329cbfb3b4437995ad9cccfb381aee.mlir"
 )
@@ -58,8 +48,6 @@
     "${PACKAGE_NAME}_iree-imported-model-a56388db344366834963ce4295c7695bd3f75b6840962c0b4aec857f34575ded"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_7d45f8e5-bb5e-48d0-928d-8f125104578f_MobileNetV2_fp32.0_224.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileNetV2_fp32_a56388db344366834963ce4295c7695bd3f75b6840962c0b4aec857f34575ded.mlir"
 )
@@ -69,8 +57,6 @@
     "${PACKAGE_NAME}_iree-imported-model-7f3f1c653a612b1a7c13af9e9e6a3b0d0d12ae159e5e4e619d00717b0686bc9a"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_3dd5a95e-92a9-4486-9062-9a33224f28db_MobileNetV2_int8.0_224_quantized.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileNetV2_int8_7f3f1c653a612b1a7c13af9e9e6a3b0d0d12ae159e5e4e619d00717b0686bc9a.mlir"
 )
@@ -80,8 +66,6 @@
     "${PACKAGE_NAME}_iree-imported-model-2b9d79769b2b1ece7dd4a4bccd146a99fc3c38c4427a179d37308146adfc5c0e"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_0e466f69-91d6-4e50-b62b-a82b6213a231_MobileSSD_fp32.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileSSD_fp32_2b9d79769b2b1ece7dd4a4bccd146a99fc3c38c4427a179d37308146adfc5c0e.mlir"
 )
@@ -91,8 +75,6 @@
     "${PACKAGE_NAME}_iree-imported-model-3ea5b376aec708e6c6827b0a9da7135fc50f20400dc0d55f16a3378a08fa5cf4"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_5afc3014-d29d-4e88-a840-fbaf678acf2b_PoseNet_fp32.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_PoseNet_fp32_3ea5b376aec708e6c6827b0a9da7135fc50f20400dc0d55f16a3378a08fa5cf4.mlir"
 )
@@ -102,8 +84,6 @@
     "${PACKAGE_NAME}_iree-imported-model-4afb465f351db6dbf3d06a03d98f0e77c9cc1e284d89f6db6367969793e44a59"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_73a0402e-271b-4aa8-a6a5-ac05839ca569_MobileBertSquad_fp16.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileBertSquad_fp16_4afb465f351db6dbf3d06a03d98f0e77c9cc1e284d89f6db6367969793e44a59.mlir"
 )
@@ -113,8 +93,6 @@
     "${PACKAGE_NAME}_iree-imported-model-af95be67ed750381753ca4fe4341853e7e2884d4c4bd1dd9a17d8ceab3ee8882"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_cc69d69f-6d1f-4a1a-a31e-e021888d0d28_MobileBertSquad_fp32.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileBertSquad_fp32_af95be67ed750381753ca4fe4341853e7e2884d4c4bd1dd9a17d8ceab3ee8882.mlir"
 )
@@ -124,8 +102,6 @@
     "${PACKAGE_NAME}_iree-imported-model-3bda9f3a5eb6a0fd3adc80187495d7ab840e409f379c70e3fd687934fafdd3b6"
   SOURCE
     "${ROOT_ARTIFACTS_DIR}/model_e3997104-a3d2-46b4-9fbf-39069906d123_MobileBertSquad_int8.tflite"
-  IMPORT_FLAGS
-    "--output-format=mlir-bytecode"
   OUTPUT_MLIR_FILE
     "${ROOT_ARTIFACTS_DIR}/iree_MobileBertSquad_int8_3bda9f3a5eb6a0fd3adc80187495d7ab840e409f379c70e3fd687934fafdd3b6.mlir"
 )