Replace "llvmaot" with "llvmcpu" in Python code/tests. (#9861)
First follow-up to https://github.com/iree-org/iree/pull/9854 (the massive diff is one reason why I split this into its own PR :P)
All find-replace. I did not actually run `generate_layers_tests.py` or `generate_math_tests.py`.
diff --git a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh
index a33cc2e..4bb786c 100755
--- a/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh
+++ b/build_tools/kokoro/gcp_ubuntu/cmake-bazel/linux/x86-turing/build.sh
@@ -82,7 +82,7 @@
LIT_SCRIPT="$IREE_SRC_DIR/third_party/llvm-project/llvm/utils/lit/lit.py"
if ! python3 "$LIT_SCRIPT" -v integrations/tensorflow/test \
--max-time 1800 \
- -D DISABLE_FEATURES=llvmaot \
+ -D DISABLE_FEATURES=llvmcpu \
-D FEATURES=vulkan
then
tests_passed=false
diff --git a/compiler/src/iree/compiler/API/python/test/tools/compiler_core_test.py b/compiler/src/iree/compiler/API/python/test/tools/compiler_core_test.py
index 87b0c5d..ccc1ce1 100644
--- a/compiler/src/iree/compiler/API/python/test/tools/compiler_core_test.py
+++ b/compiler/src/iree/compiler/API/python/test/tools/compiler_core_test.py
@@ -40,11 +40,11 @@
self.assertTrue(binary)
# Compiling the string form means that the compiler does not have a valid
- # source file name, which can cause issues on the AOT side. Verify
- # specifically. See: https://github.com/iree-org/iree/issues/4439
- def testCompileStrLLVMAOT(self):
+ # source file name, which can cause issues. Verify specifically.
+ # See: https://github.com/iree-org/iree/issues/4439
+ def testCompileStrLLVMCPU(self):
binary = iree.compiler.tools.compile_str(SIMPLE_MUL_ASM,
- target_backends=["dylib-llvm-aot"])
+ target_backends=["llvm-cpu"])
logging.info("Flatbuffer size = %d", len(binary))
self.assertTrue(binary)
@@ -53,8 +53,7 @@
# See: https://github.com/iree-org/iree/issues/4436
def testCompileMultipleBackends(self):
binary = iree.compiler.tools.compile_str(
- SIMPLE_MUL_ASM,
- target_backends=["dylib-llvm-aot", "vulkan-spirv"])
+ SIMPLE_MUL_ASM, target_backends=["llvm-cpu", "vulkan-spirv"])
logging.info("Flatbuffer size = %d", len(binary))
self.assertTrue(binary)
diff --git a/docs/developers/debugging/tf_integrations_test_repro.md b/docs/developers/debugging/tf_integrations_test_repro.md
index 14871ae..512751e 100644
--- a/docs/developers/debugging/tf_integrations_test_repro.md
+++ b/docs/developers/debugging/tf_integrations_test_repro.md
@@ -22,17 +22,17 @@
python -m pip install tf-nightly Pillow
```
-4. Run the python test command line. The command can be obtained from the run file. For example, if iree_tfl_tests/llvmaot_posenet_i8.run failed,
+4. Run the python test command line. The command can be obtained from the run file. For example, if iree_tfl_tests/llvmcpu_posenet_i8.run failed,
```
cd integrations/tensorflow/test/
-cat iree_tfl_tests/llvmaot_posenet_i8.run
+cat iree_tfl_tests/llvmcpu_posenet_i8.run
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tfl_tests.posenet_i8_test --target_backend=llvmaot --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tfl_tests.posenet_i8_test --target_backend=llvmcpu --artifacts_dir=%t
cd python/
-python -m iree_tfl_tests.posenet_i8_test --target_backend=llvmaot --artifacts_dir=/tmp/posenet_i8_failure
+python -m iree_tfl_tests.posenet_i8_test --target_backend=llvmcpu --artifacts_dir=/tmp/posenet_i8_failure
```
Note that the command can only be run under `integrations/tensorflow/test/python` directory.
diff --git a/docs/developers/developing_iree/e2e_benchmarking.md b/docs/developers/developing_iree/e2e_benchmarking.md
index d808abc..173d913 100644
--- a/docs/developers/developing_iree/e2e_benchmarking.md
+++ b/docs/developers/developing_iree/e2e_benchmarking.md
@@ -84,7 +84,7 @@
# Example for MatrixOpsStaticModule:
/tmp/iree/modules/MatrixOpsStaticModule
- ├── iree_llvmaot
+ ├── iree_llvmcpu
│ └── compiled.vmfb
├── iree_vmvx
│ └──compiled.vmfb
diff --git a/integrations/tensorflow/README.md b/integrations/tensorflow/README.md
index cfbef0c..407df93 100644
--- a/integrations/tensorflow/README.md
+++ b/integrations/tensorflow/README.md
@@ -59,14 +59,14 @@
```
pip install lit
-# Just runs the LLVM AOT tests by default:
+# Just run the default tests:
lit -v test/
# Can also run vulkan tests with:
lit -v -D FEATURES=vulkan test/
-# Can disable the default LLVM AOT tests:
-lit -v -D DISABLE_FEATURES=llvmaot -D FEATURES=vulkan test/
+# Can disable the default LLVM CPU tests:
+lit -v -D DISABLE_FEATURES=llvmcpu -D FEATURES=vulkan test/
# Individual test directories, files or globs can be run individually.
lit -v $(find test -name '*softplus*')
diff --git a/integrations/tensorflow/python_projects/iree_tf/iree/tf/support/module_utils.py b/integrations/tensorflow/python_projects/iree_tf/iree/tf/support/module_utils.py
index 61f291f..ed889a3 100644
--- a/integrations/tensorflow/python_projects/iree_tf/iree/tf/support/module_utils.py
+++ b/integrations/tensorflow/python_projects/iree_tf/iree/tf/support/module_utils.py
@@ -897,10 +897,10 @@
"driver": "vulkan",
"compiler_targets": ["vulkan-spirv"]
},
- "iree_llvmaot": {
+ "iree_llvmcpu": {
"compiled_module_class": IreeCompiledModule,
"driver": "local-task",
- "compiler_targets": ["dylib-llvm-aot"]
+ "compiler_targets": ["llvm-cpu"]
},
}
@@ -909,13 +909,13 @@
Args:
backend_name: a str specifying which backend to use. Should be one of
- 'tf', 'tflite', 'iree_vmvx', 'iree_vulkan', 'iree_llvmaot'.
+ 'tf', 'tflite', 'iree_vmvx', 'iree_vulkan', 'iree_llvmcpu'.
backend_id: an optional str specifying what name to use when saving
compiled artifacts. Must satisfy `backend_id.startswith(backend_name)`.
Raises:
KeyError: if backend_name is not one of ['tf', 'tflite', 'iree_vmvx',
- 'iree_vulkan', 'iree_llvmaot'].
+ 'iree_vulkan', 'iree_llvmcpu'].
ValueError: if backend_id doesn't start with backend_name.
"""
if backend_name not in self._name_to_info:
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Activation.run
index df29a8e..d7c139a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Activation.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Activation.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Activation --artifacts_dir=%t
+# 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/llvmaot__Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Add.run
index 736a256..d9d9508 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Add.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Add.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Average.run
deleted file mode 100644
index f431cde..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Average.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv1D.run
deleted file mode 100644
index 359c10b..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv1D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv2D.run
deleted file mode 100644
index dbffc22..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv2D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv3D.run
deleted file mode 100644
index b732a08..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv3D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Dense.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dense.run
deleted file mode 100644
index 39ade61..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dense.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dot.run
deleted file mode 100644
index da0b607..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dot.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Dot --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dropout.run
deleted file mode 100644
index 7c4f767..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Dropout.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__ELU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ELU.run
deleted file mode 100644
index 000d75f..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ELU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Flatten.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Flatten.run
deleted file mode 100644
index dffd849..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Flatten.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Lambda.run
deleted file mode 100644
index 718a4cb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Lambda.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Masking.run
deleted file mode 100644
index 9e9dd54..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Masking.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Maximum.run
deleted file mode 100644
index 7288232..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Maximum.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Minimum.run
deleted file mode 100644
index b3be790..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Minimum.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Multiply.run
deleted file mode 100644
index ee81fe3..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Multiply.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__PReLU.run
deleted file mode 100644
index daf7b6d..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__PReLU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Permute.run
deleted file mode 100644
index ef3adf4..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Permute.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__ReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ReLU.run
deleted file mode 100644
index c500f18..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ReLU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Reshape.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Reshape.run
deleted file mode 100644
index de02745..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Reshape.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Softmax.run
deleted file mode 100644
index 53971cb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Softmax.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Subtract.run
deleted file mode 100644
index 04e63b8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Subtract.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Add.run
deleted file mode 100644
index bc5bb1e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Add.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Attention.run
deleted file mode 100644
index d106bcc..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Attention.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Average.run
deleted file mode 100644
index f4c69f9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Average.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_BatchNormalization.run
deleted file mode 100644
index 4f06d26..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_BatchNormalization.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv3D.run
deleted file mode 100644
index c12598e..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv3D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Dropout.run
deleted file mode 100644
index ce717e1..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Dropout.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_ELU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ELU.run
deleted file mode 100644
index 31b369a..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ELU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Embedding.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Embedding.run
deleted file mode 100644
index 4081eac..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Embedding.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Lambda.run
deleted file mode 100644
index f2b8526..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Lambda.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Lambda --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LeakyReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LeakyReLU.run
deleted file mode 100644
index 5aeeff2..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LeakyReLU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Masking.run
deleted file mode 100644
index 0d536a8..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Masking.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Masking --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool1D.run
deleted file mode 100644
index 80966cf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool1D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool2D.run
deleted file mode 100644
index 019a645..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool2D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool3D.run
deleted file mode 100644
index 39039da..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MaxPool3D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Maximum.run
deleted file mode 100644
index e9e71b0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Maximum.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Minimum.run
deleted file mode 100644
index b5f8f41..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Minimum.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MultiHeadAttention.run
deleted file mode 100644
index e7d01f6..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_MultiHeadAttention.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Multiply.run
deleted file mode 100644
index ce33fcb..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Multiply.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_PReLU.run
deleted file mode 100644
index beb4e08..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_PReLU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=PReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Permute.run
deleted file mode 100644
index cb628f5..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Permute.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_ReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ReLU.run
deleted file mode 100644
index a0e781c..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ReLU.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__dynamic_dims_Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Softmax.run
deleted file mode 100644
index 1b87ecf..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Softmax.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Subtract.run
deleted file mode 100644
index d8b7db0..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Subtract.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv1D.run
deleted file mode 100644
index f535d10..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv1D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__full_api_Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv2D.run
deleted file mode 100644
index 0af1331..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv2D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__full_api_Conv3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv3D.run
deleted file mode 100644
index 48f42f9..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv3D.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__training_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_AdditiveAttention.run
deleted file mode 100644
index 9836b56..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_AdditiveAttention.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__training_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_GRU.run
deleted file mode 100644
index ef9f3ed..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_GRU.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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/llvmaot__training_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_LSTM.run
deleted file mode 100644
index 4296941..0000000
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_LSTM.run
+++ /dev/null
@@ -1,3 +0,0 @@
-# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --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__Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation.run
new file mode 100644
index 0000000..d7c139a
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Activation.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ActivityRegularization.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ActivityRegularization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ActivityRegularization.run
index c877b5f..a88680f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ActivityRegularization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ActivityRegularization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=ActivityRegularization --artifacts_dir=%t
+# 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__Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add.run
new file mode 100644
index 0000000..d9d9508
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Add.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AdditiveAttention.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AdditiveAttention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AdditiveAttention.run
index 5d1413f..c7b06e2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AdditiveAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AdditiveAttention.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AlphaDropout.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AlphaDropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AlphaDropout.run
index 5535004..648c455 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AlphaDropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AlphaDropout.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AlphaDropout --artifacts_dir=%t
+# 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/llvmaot__Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Attention.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Attention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Attention.run
index 29e5f45..a33c1bf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Attention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Attention.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Average.run
new file mode 100644
index 0000000..a359b14
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Average.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling1D.run
index 70e400f..a0f4f02 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t
+# 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/llvmaot__AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling2D.run
index 156a273..496252c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AveragePooling2D --artifacts_dir=%t
+# 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/llvmaot__AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling3D.run
index 783d70e..5be6393 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__AveragePooling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__AveragePooling3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=AveragePooling3D --artifacts_dir=%t
+# 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/llvmaot__BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__BatchNormalization.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__BatchNormalization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__BatchNormalization.run
index ba11bce..303a8ff 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__BatchNormalization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__BatchNormalization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
+# 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/llvmaot__Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Concatenate.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Concatenate.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Concatenate.run
index bd65163..53a9abf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Concatenate.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Concatenate.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1D.run
new file mode 100644
index 0000000..6578d12
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1DTranspose.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv1DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1DTranspose.run
index 74503d5..0a9231a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv1DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv1DTranspose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Conv1DTranspose --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..43c2f86
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2DTranspose.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv2DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2DTranspose.run
index a1f7129..0586be2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv2DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv2DTranspose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Conv2DTranspose --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..ebd6aad
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3DTranspose.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv3DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3DTranspose.run
index 1b4e50e..a437f46 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Conv3DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Conv3DTranspose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Conv3DTranspose --artifacts_dir=%t
+# 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/llvmaot__Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping1D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Cropping1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping1D.run
index df2cdef..20b1dec 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Cropping1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Cropping1D --artifacts_dir=%t
+# 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/llvmaot__Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping2D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Cropping2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping2D.run
index c347754..4cbfdb2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Cropping2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Cropping2D --artifacts_dir=%t
+# 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/llvmaot__Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping3D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Cropping3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping3D.run
index 1ada65f..3a76cf7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Cropping3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Cropping3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Cropping3D --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..008c607
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dense.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__DepthwiseConv2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__DepthwiseConv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__DepthwiseConv2D.run
index 6fb4f0c..2621057 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__DepthwiseConv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__DepthwiseConv2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=DepthwiseConv2D --artifacts_dir=%t
+# 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__Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dot.run
new file mode 100644
index 0000000..760801c
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dot.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Dot --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dropout.run
new file mode 100644
index 0000000..1bbd9a7
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Dropout.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..8166dd4
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ELU.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__Embedding.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Embedding.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Embedding.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Embedding.run
index fabd538..f1edd7c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__Embedding.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Embedding.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Embedding --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..9221281
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Flatten.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GRU.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GRU.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GRU.run
index f1a90ee..93a859b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GRU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GRU.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GRU --artifacts_dir=%t
+# 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/llvmaot__GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianDropout.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GaussianDropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianDropout.run
index 3088c51..e0a211a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GaussianDropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianDropout.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GaussianDropout --artifacts_dir=%t
+# 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/llvmaot__GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianNoise.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GaussianNoise.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianNoise.run
index 5a89cb0..f5e7314 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GaussianNoise.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GaussianNoise.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GaussianNoise --artifacts_dir=%t
+# 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/llvmaot__GlobalAveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling1D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalAveragePooling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling1D.run
index f5c12ae..4db0ccb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalAveragePooling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GlobalAveragePooling1D --artifacts_dir=%t
+# 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/llvmaot__GlobalAveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalAveragePooling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling2D.run
index 889f64b..31fc08c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalAveragePooling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GlobalAveragePooling2D --artifacts_dir=%t
+# 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/llvmaot__GlobalAveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling3D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalAveragePooling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling3D.run
index 60328bb..ce99a31 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalAveragePooling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalAveragePooling3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GlobalAveragePooling3D --artifacts_dir=%t
+# 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/llvmaot__GlobalMaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalMaxPool1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool1D.run
index 3591e2c..9a4c8d1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalMaxPool1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GlobalMaxPool1D --artifacts_dir=%t
+# 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/llvmaot__GlobalMaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalMaxPool2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool2D.run
index 6f90688..3ba55ed 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalMaxPool2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GlobalMaxPool2D --artifacts_dir=%t
+# 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/llvmaot__GlobalMaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalMaxPool3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool3D.run
index bfbb0a6..5973647 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__GlobalMaxPool3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__GlobalMaxPool3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=GlobalMaxPool3D --artifacts_dir=%t
+# 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/llvmaot__InputLayer.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__InputLayer.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__InputLayer.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__InputLayer.run
index 6688e85..85a5433 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__InputLayer.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__InputLayer.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=InputLayer --artifacts_dir=%t
+# 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/llvmaot__LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LSTM.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LSTM.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LSTM.run
index 84307f8..bf8b985 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LSTM.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LSTM.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LSTM --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..4521850
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Lambda.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__LayerNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LayerNormalization.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LayerNormalization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LayerNormalization.run
index c5f8b59..429e5e8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LayerNormalization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LayerNormalization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LayerNormalization --artifacts_dir=%t
+# 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/llvmaot__LeakyReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LeakyReLU.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LeakyReLU.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LeakyReLU.run
index ffdbc6f..0acdc44 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LeakyReLU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LeakyReLU.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LeakyReLU --artifacts_dir=%t
+# 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/llvmaot__LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LocallyConnected1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected1D.run
index 981235e..b42b9d1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LocallyConnected1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LocallyConnected1D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LocallyConnected1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LocallyConnected2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected2D.run
index d482f76..3f0840e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__LocallyConnected2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__LocallyConnected2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LocallyConnected2D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=LocallyConnected2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Masking.run
new file mode 100644
index 0000000..20f1c96
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Masking.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool1D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MaxPool1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool1D.run
index fb9dbab..0557723 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MaxPool1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t
+# 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/llvmaot__MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool2D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MaxPool2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool2D.run
index 2a4c6a7..9013431 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MaxPool2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MaxPool2D --artifacts_dir=%t
+# 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/llvmaot__MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool3D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MaxPool3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool3D.run
index e49735c..1a860e9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MaxPool3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MaxPool3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MaxPool3D --artifacts_dir=%t
+# 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__Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Maximum.run
new file mode 100644
index 0000000..7f37936
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Maximum.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Minimum.run
new file mode 100644
index 0000000..5e14314
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Minimum.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MultiHeadAttention.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MultiHeadAttention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MultiHeadAttention.run
index fdba6ea..b8eac48 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__MultiHeadAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__MultiHeadAttention.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Multiply.run
new file mode 100644
index 0000000..c61b996
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Multiply.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__PReLU.run
new file mode 100644
index 0000000..efbb6b7
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__PReLU.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..3d9cefc
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Permute.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..4b8aebf
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ReLU.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__RepeatVector.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__RepeatVector.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__RepeatVector.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__RepeatVector.run
index 5b10017..fd189d3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__RepeatVector.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__RepeatVector.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=RepeatVector --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..4b8f011
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Reshape.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SeparableConv1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv1D.run
index f925359..ffbef4b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SeparableConv1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=SeparableConv1D --artifacts_dir=%t
+# 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/llvmaot__SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SeparableConv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv2D.run
index cfa5e11..1f7bf6a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SeparableConv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SeparableConv2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=SeparableConv2D --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..f42fcfc
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Softmax.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SpatialDropout1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout1D.run
index c4bf467..e30a717 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SpatialDropout1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=SpatialDropout1D --artifacts_dir=%t
+# 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/llvmaot__SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SpatialDropout2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout2D.run
index f596c63..4f01ba1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SpatialDropout2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=SpatialDropout2D --artifacts_dir=%t
+# 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/llvmaot__SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SpatialDropout3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout3D.run
index 6332146..3787a0a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__SpatialDropout3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__SpatialDropout3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=SpatialDropout3D --artifacts_dir=%t
+# 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__Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Subtract.run
new file mode 100644
index 0000000..b9b65af
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__Subtract.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ThresholdedReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ThresholdedReLU.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ThresholdedReLU.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ThresholdedReLU.run
index bf0deec..fcd4d6a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ThresholdedReLU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ThresholdedReLU.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t
+# 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/llvmaot__UpSampling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling1D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling1D.run
index 564f11b..592772f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=UpSampling1D --artifacts_dir=%t
+# 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/llvmaot__UpSampling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling2D.run
index 2326a2b..5eee1ae 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=UpSampling2D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=UpSampling2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling3D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling3D.run
index caeef88..cafcd9d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__UpSampling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__UpSampling3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=UpSampling3D --artifacts_dir=%t
+# 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/llvmaot__ZeroPadding1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding1D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ZeroPadding1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding1D.run
index 4e88ad9..bed24f0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ZeroPadding1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=ZeroPadding1D --artifacts_dir=%t
+# 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/llvmaot__ZeroPadding2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding2D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ZeroPadding2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding2D.run
index 3530f0a..8ab6fc7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ZeroPadding2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=ZeroPadding2D --artifacts_dir=%t
+# 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/llvmaot__ZeroPadding3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding3D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ZeroPadding3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding3D.run
index dd3a9a8..4357fa2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__ZeroPadding3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__ZeroPadding3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=true --layer=ZeroPadding3D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Activation.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Activation.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Activation.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Activation.run
index 9ea0f77..15c6b5e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Activation.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Activation.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Activation --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ActivityRegularization.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ActivityRegularization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ActivityRegularization.run
index ef2640c..9e96063 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ActivityRegularization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ActivityRegularization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ActivityRegularization --artifacts_dir=%t
+# 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_Add.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Add.run
new file mode 100644
index 0000000..3b54654
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Add.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AdditiveAttention.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AdditiveAttention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AdditiveAttention.run
index 05c3c3f..486b673 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AdditiveAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AdditiveAttention.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AlphaDropout.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AlphaDropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AlphaDropout.run
index 344e5db..ab815bc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AlphaDropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AlphaDropout.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AlphaDropout --artifacts_dir=%t
+# 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/llvmaot__training_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Attention.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_Attention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Attention.run
index 8860107..a6dac7c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_Attention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Attention.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t
+# 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_Average.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Average.run
new file mode 100644
index 0000000..1bfa212
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Average.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Average --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling1D.run
index 53405f3..6c5d61c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AveragePooling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling2D.run
index b65654c..55be04d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AveragePooling2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling3D.run
index 4d7046a..a20674c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AveragePooling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_AveragePooling3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AveragePooling3D --artifacts_dir=%t
+# 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/llvmaot__training_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_BatchNormalization.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_BatchNormalization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_BatchNormalization.run
index 1622600..6c7fe77 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_BatchNormalization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_BatchNormalization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Concatenate.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Concatenate.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Concatenate.run
index c195087..70ec380 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Concatenate.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Concatenate.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Concatenate --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1D.run
index 2668701..470d5ab 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv1D --artifacts_dir=%t
+# 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=Conv1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1DTranspose.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv1DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1DTranspose.run
index 3a1c8a3..f41009e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv1DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv1DTranspose.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv1DTranspose --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Conv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2D.run
index 22dcca1..dca3a75 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv2D --artifacts_dir=%t
+# 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=Conv2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2DTranspose.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv2DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2DTranspose.run
index 65ec015..5593ebf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv2DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv2DTranspose.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv2DTranspose --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..e6cb475
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__dynamic_dims_Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3DTranspose.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv3DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3DTranspose.run
index 0637c0c..7c05d30 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Conv3DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Conv3DTranspose.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Conv3DTranspose --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping1D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Cropping1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping1D.run
index 209f027..2d99d1f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Cropping1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Cropping1D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Cropping2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping2D.run
index 5228eed..db4bc9f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Cropping2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Cropping2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping3D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Cropping3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping3D.run
index 79a5850..74a2114 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Cropping3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Cropping3D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Cropping3D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Dense.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dense.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Dense.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dense.run
index 5336f62..3318fc9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Dense.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dense.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Dense --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_DepthwiseConv2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_DepthwiseConv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_DepthwiseConv2D.run
index 3721d52..cffe750 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_DepthwiseConv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_DepthwiseConv2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=DepthwiseConv2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Dot.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dot.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Dot.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dot.run
index 903f230..7a8015e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Dot.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dot.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Dot --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..265d1c5
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Dropout.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..758f097
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ELU.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..1111ded
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Embedding.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__dynamic_dims_Flatten.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Flatten.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Flatten.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Flatten.run
index 321151c..951f6c7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Flatten.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Flatten.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Flatten --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GRU.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GRU.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GRU.run
index e5f12cc..accb6f7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GRU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GRU.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GRU --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianDropout.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GaussianDropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianDropout.run
index 328598c..464bedc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GaussianDropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianDropout.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GaussianDropout --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianNoise.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GaussianNoise.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianNoise.run
index 270af2f..7b794b5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GaussianNoise.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GaussianNoise.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GaussianNoise --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GlobalAveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling1D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalAveragePooling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling1D.run
index dc1d5d9..9f1fdcc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalAveragePooling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GlobalAveragePooling1D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GlobalAveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalAveragePooling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling2D.run
index 68bc99c..f687050 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalAveragePooling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GlobalAveragePooling2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GlobalAveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling3D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalAveragePooling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling3D.run
index 1657b97..c5a61e7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalAveragePooling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalAveragePooling3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GlobalAveragePooling3D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GlobalMaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalMaxPool1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool1D.run
index e6039d4..541ac9e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalMaxPool1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GlobalMaxPool1D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GlobalMaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalMaxPool2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool2D.run
index 348d510..4343058 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalMaxPool2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GlobalMaxPool2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GlobalMaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalMaxPool3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool3D.run
index 33cfa2b..50023a6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GlobalMaxPool3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_GlobalMaxPool3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GlobalMaxPool3D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_InputLayer.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_InputLayer.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_InputLayer.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_InputLayer.run
index 82a86ba..d7571db 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_InputLayer.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_InputLayer.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=InputLayer --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LSTM.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LSTM.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LSTM.run
index 4ea078f..412acbb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LSTM.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LSTM.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=LSTM --artifacts_dir=%t
+# 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_Lambda.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Lambda.run
new file mode 100644
index 0000000..938647f
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Lambda.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Lambda --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LayerNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LayerNormalization.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LayerNormalization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LayerNormalization.run
index 78a263b..ea7b3f5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LayerNormalization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LayerNormalization.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=LayerNormalization --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..b1ec4ac
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LeakyReLU.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__dynamic_dims_LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected1D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LocallyConnected1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected1D.run
index 61bb366..2a037eb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LocallyConnected1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=LocallyConnected1D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected2D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LocallyConnected2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected2D.run
index e665b91..90c2610 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LocallyConnected2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_LocallyConnected2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=LocallyConnected2D --artifacts_dir=%t
+# 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_Masking.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Masking.run
new file mode 100644
index 0000000..48c1cfd
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Masking.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Masking --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool1D.run
new file mode 100644
index 0000000..34c10fd
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool1D.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MaxPool1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool2D.run
new file mode 100644
index 0000000..a8402df
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool2D.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..d3e1d7e
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MaxPool3D.run
@@ -0,0 +1,2 @@
+# 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_Maximum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Maximum.run
new file mode 100644
index 0000000..8f7d620
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Maximum.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Minimum.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Minimum.run
new file mode 100644
index 0000000..dcb43ee
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Minimum.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MultiHeadAttention.run
similarity index 63%
copy from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_MultiHeadAttention.run
copy to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MultiHeadAttention.run
index dc87a8e..5442bfa 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_MultiHeadAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_MultiHeadAttention.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Multiply.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Multiply.run
new file mode 100644
index 0000000..7960ca2
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Multiply.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_PReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_PReLU.run
new file mode 100644
index 0000000..5ad386e
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_PReLU.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=PReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Permute.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Permute.run
new file mode 100644
index 0000000..7acc967
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Permute.run
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..3b2d479
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ReLU.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__dynamic_dims_RepeatVector.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_RepeatVector.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_RepeatVector.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_RepeatVector.run
index 75cc1ba..e7583d9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_RepeatVector.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_RepeatVector.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=RepeatVector --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_Reshape.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Reshape.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Reshape.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Reshape.run
index a060583..1160bed 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_Reshape.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Reshape.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Reshape --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv1D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SeparableConv1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv1D.run
index 7c5d0d6..fc916b6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SeparableConv1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=SeparableConv1D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SeparableConv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv2D.run
index b8e6ffd..20ef955 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SeparableConv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SeparableConv2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=SeparableConv2D --artifacts_dir=%t
+# 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_Softmax.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Softmax.run
new file mode 100644
index 0000000..9ab7499
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Softmax.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout1D.run
index 980e44f..39876eb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=SpatialDropout1D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout2D.run
index 96610d1..d305714 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=SpatialDropout2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout3D.run
index cab96ff..38febcc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_SpatialDropout3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_SpatialDropout3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=SpatialDropout3D --artifacts_dir=%t
+# 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_Subtract.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Subtract.run
new file mode 100644
index 0000000..db96629
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_Subtract.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=Subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ThresholdedReLU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ThresholdedReLU.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ThresholdedReLU.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ThresholdedReLU.run
index 489e8dc..b408fda 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ThresholdedReLU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ThresholdedReLU.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ThresholdedReLU --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling1D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling1D.run
index 9998b80..e860df8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=UpSampling1D --artifacts_dir=%t
+# 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=UpSampling1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling2D.run
index 6745ffc..ad73b07 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=UpSampling2D --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_UpSampling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling3D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling3D.run
index 92b8507..d3df873 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_UpSampling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_UpSampling3D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=UpSampling3D --artifacts_dir=%t
+# 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=UpSampling3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding1D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding1D.run
index 3b1075a..00e0a3f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding1D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding1D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding2D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding2D.run
index cfa15af..4fde6a0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding2D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding2D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding3D.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding3D.run
index 7d77361..e1eabc3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_ZeroPadding3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__dynamic_dims_ZeroPadding3D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding3D --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=ZeroPadding3D --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_ActivityRegularization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_ActivityRegularization.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_ActivityRegularization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_ActivityRegularization.run
index d3d8aff..3314eb4 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_ActivityRegularization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_ActivityRegularization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=ActivityRegularization --artifacts_dir=%t
+# 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/llvmaot__full_api_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AdditiveAttention.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AdditiveAttention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AdditiveAttention.run
index 3ccf42a..587a910 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AdditiveAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AdditiveAttention.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AdditiveAttention --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AdditiveAttention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Attention.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Attention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Attention.run
index 323fba9..f263b41 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Attention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Attention.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Attention --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Attention --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling1D.run
index 8b9d3b4..dbe9864 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AveragePooling1D --artifacts_dir=%t
+# 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/llvmaot__full_api_AveragePooling2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling2D.run
index d720aa2..506358d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AveragePooling2D --artifacts_dir=%t
+# 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/llvmaot__full_api_AveragePooling3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling3D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling3D.run
index f6ceecb..399cb3c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_AveragePooling3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_AveragePooling3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=AveragePooling3D --artifacts_dir=%t
+# 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/llvmaot__full_api_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_BatchNormalization.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_BatchNormalization.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_BatchNormalization.run
index 6f063f6..934bb6b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_BatchNormalization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_BatchNormalization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=BatchNormalization --artifacts_dir=%t
+# 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/llvmaot__full_api_Concatenate.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Concatenate.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Concatenate.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Concatenate.run
index 5ef3bdc..1adce42 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Concatenate.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Concatenate.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Concatenate --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmcpu --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Concatenate --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1D.run
new file mode 100644
index 0000000..42fca95
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__full_api_Conv1DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1DTranspose.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv1DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1DTranspose.run
index 5349488..15ade59 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv1DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv1DTranspose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Conv1DTranspose --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..6ca3c6d
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__full_api_Conv2DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2DTranspose.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv2DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2DTranspose.run
index 180fc41..43bb871 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv2DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv2DTranspose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Conv2DTranspose --artifacts_dir=%t
+# 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
new file mode 100644
index 0000000..9599561
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3D.run
@@ -0,0 +1,2 @@
+# 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/llvmaot__full_api_Conv3DTranspose.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3DTranspose.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv3DTranspose.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3DTranspose.run
index b081230..62571f0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Conv3DTranspose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Conv3DTranspose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Conv3DTranspose --artifacts_dir=%t
+# 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/llvmaot__full_api_Cropping1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping1D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Cropping1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping1D.run
index bfc1c59..f58dd2e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Cropping1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Cropping1D --artifacts_dir=%t
+# 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/llvmaot__full_api_Cropping2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping2D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Cropping2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping2D.run
index ec94e7a..a59a76c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Cropping2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Cropping2D --artifacts_dir=%t
+# 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/llvmaot__full_api_Cropping3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping3D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Cropping3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping3D.run
index 497fcc9..5080784 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_Cropping3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_Cropping3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=Cropping3D --artifacts_dir=%t
+# 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/llvmaot__full_api_DepthwiseConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_DepthwiseConv2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_DepthwiseConv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_DepthwiseConv2D.run
index 3011d8d..5705035 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_DepthwiseConv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_DepthwiseConv2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=DepthwiseConv2D --artifacts_dir=%t
+# 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/llvmaot__full_api_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_GRU.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_GRU.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_GRU.run
index d975c5b..441170c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_GRU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_GRU.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=GRU --artifacts_dir=%t
+# 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/llvmaot__full_api_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LSTM.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_LSTM.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LSTM.run
index c814fbc..2c3e1bc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_LSTM.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LSTM.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=LSTM --artifacts_dir=%t
+# 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/llvmaot__full_api_LocallyConnected1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected1D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_LocallyConnected1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected1D.run
index 78a989e..121595f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_LocallyConnected1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=LocallyConnected1D --artifacts_dir=%t
+# 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/llvmaot__full_api_LocallyConnected2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected2D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_LocallyConnected2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected2D.run
index ab10e52..ba97743 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_LocallyConnected2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_LocallyConnected2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=LocallyConnected2D --artifacts_dir=%t
+# 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/llvmaot__full_api_MaxPool1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool1D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_MaxPool1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool1D.run
index febab28..619263e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_MaxPool1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=MaxPool1D --artifacts_dir=%t
+# 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/llvmaot__full_api_MaxPool2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool2D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_MaxPool2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool2D.run
index 2f404f3..56009dc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_MaxPool2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=MaxPool2D --artifacts_dir=%t
+# 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/llvmaot__full_api_MaxPool3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool3D.run
similarity index 60%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_MaxPool3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool3D.run
index 2fa941a..39343d3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_MaxPool3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_MaxPool3D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=MaxPool3D --artifacts_dir=%t
+# 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/llvmaot__full_api_SeparableConv1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv1D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_SeparableConv1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv1D.run
index 6af00e2..1e8a8a0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_SeparableConv1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv1D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=SeparableConv1D --artifacts_dir=%t
+# 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/llvmaot__full_api_SeparableConv2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv2D.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_SeparableConv2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv2D.run
index b07100d..084801f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_SeparableConv2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SeparableConv2D.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=SeparableConv2D --artifacts_dir=%t
+# 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/llvmaot__full_api_SimpleRNN.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SimpleRNN.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_SimpleRNN.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SimpleRNN.run
index d55414f..d93ae42 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__full_api_SimpleRNN.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__full_api_SimpleRNN.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=false --test_default_kwargs_only=false --layer=SimpleRNN --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_AdditiveAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AdditiveAttention.run
similarity index 63%
copy from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AdditiveAttention.run
copy to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AdditiveAttention.run
index 05c3c3f..663887c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_AdditiveAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AdditiveAttention.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=AdditiveAttention --artifacts_dir=%t
+# 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/llvmaot__training_AlphaDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AlphaDropout.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_AlphaDropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AlphaDropout.run
index 82e16cc..03ea27a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_AlphaDropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_AlphaDropout.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=AlphaDropout --artifacts_dir=%t
+# 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/llvmaot__training_Attention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Attention.run
similarity index 61%
copy from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_Attention.run
copy to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Attention.run
index 8860107..e655203 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_Attention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Attention.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=Attention --artifacts_dir=%t
+# 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/llvmaot__training_BatchNormalization.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_BatchNormalization.run
similarity index 61%
copy from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_BatchNormalization.run
copy to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_BatchNormalization.run
index 1622600..3de5a4e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_BatchNormalization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_BatchNormalization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=BatchNormalization --artifacts_dir=%t
+# 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/llvmaot__training_Dropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Dropout.run
similarity index 61%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_Dropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Dropout.run
index 711015a..953542a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_Dropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_Dropout.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=Dropout --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_GRU.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GRU.run
similarity index 60%
copy from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GRU.run
copy to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GRU.run
index e5f12cc..e6c9b01 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_GRU.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GRU.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=GRU --artifacts_dir=%t
+# 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/llvmaot__training_GaussianDropout.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianDropout.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_GaussianDropout.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianDropout.run
index 929f326..71527c8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_GaussianDropout.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianDropout.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=GaussianDropout --artifacts_dir=%t
+# 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/llvmaot__training_GaussianNoise.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianNoise.run
similarity index 62%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_GaussianNoise.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianNoise.run
index 39a0a30..2d17adc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_GaussianNoise.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_GaussianNoise.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=GaussianNoise --artifacts_dir=%t
+# 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/llvmaot__dynamic_dims_LSTM.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_LSTM.run
similarity index 60%
copy from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LSTM.run
copy to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_LSTM.run
index 4ea078f..a861689 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__dynamic_dims_LSTM.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_LSTM.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=true --training=false --test_default_kwargs_only=true --layer=LSTM --artifacts_dir=%t
+# 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/llvmaot__training_MultiHeadAttention.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_MultiHeadAttention.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_MultiHeadAttention.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_MultiHeadAttention.run
index dc87a8e..d306e93 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_MultiHeadAttention.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_MultiHeadAttention.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=MultiHeadAttention --artifacts_dir=%t
+# 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/llvmaot__training_SpatialDropout1D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout1D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_SpatialDropout1D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout1D.run
index 89a5e23..9b66fa8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_SpatialDropout1D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout1D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=SpatialDropout1D --artifacts_dir=%t
+# 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/llvmaot__training_SpatialDropout2D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout2D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_SpatialDropout2D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout2D.run
index 99f4b77..c7fb9eb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_SpatialDropout2D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout2D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=SpatialDropout2D --artifacts_dir=%t
+# 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/llvmaot__training_SpatialDropout3D.run b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout3D.run
similarity index 63%
rename from integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_SpatialDropout3D.run
rename to integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout3D.run
index 8cf412d..21e1616 100644
--- a/integrations/tensorflow/test/iree_tf_tests/layers/llvmaot__training_SpatialDropout3D.run
+++ b/integrations/tensorflow/test/iree_tf_tests/layers/llvmcpu__training_SpatialDropout3D.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.layers.layers_test --target_backends=iree_llvmaot --dynamic_dims=false --training=true --test_default_kwargs_only=true --layer=SpatialDropout3D --artifacts_dir=%t
+# 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/math/llvmaot__abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__abs.run
index 3bb5fe9..4a41416 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__abs.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__abs.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=abs --artifacts_dir=%t
+# 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/llvmaot__accumulate_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__accumulate_n.run
index ceac8f8..d198062 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__accumulate_n.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__accumulate_n.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=accumulate_n --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=accumulate_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acos.run
index 4917155..4456fcb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acos.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acos.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=acos --artifacts_dir=%t
+# 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/llvmaot__acosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acosh.run
index eeed3ce..fc14525 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acosh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__acosh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=acosh --artifacts_dir=%t
+# 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/llvmaot__add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__add.run
index a571f1b..d880178 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__add.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__add.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=add --artifacts_dir=%t
+# 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/llvmaot__add_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__add_n.run
index b9be5fe..a18d0c8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__add_n.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__add_n.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=add_n --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=add_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__angle.run
index cad7ecd..8ea2d02 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__angle.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__angle.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=angle --artifacts_dir=%t
+# 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/llvmaot__argmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmax.run
index 5d04268..14a395d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmax.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmax.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=argmax --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=argmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmin.run
index d410315..447308b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__argmin.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=argmin --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=argmin --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asin.run
index 2b19804..a135538 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asin.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=asin --artifacts_dir=%t
+# 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/llvmaot__asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asinh.run
index 9884782..7ce145c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__asinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=asinh --artifacts_dir=%t
+# 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/llvmaot__atan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atan.run
index 9af32ee..64461e3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atan.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=atan --artifacts_dir=%t
+# 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/llvmaot__atan2.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atan2.run
index 3277f29..dc53489 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atan2.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atan2.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=atan2 --artifacts_dir=%t
+# 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/llvmaot__atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atanh.run
index 007a73c..a86d0f0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__atanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=atanh --artifacts_dir=%t
+# 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/llvmaot__bessel_i0.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i0.run
index 1b6a48f..a10523a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i0.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i0.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=bessel_i0 --artifacts_dir=%t
+# 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/llvmaot__bessel_i0e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i0e.run
index 0bd7b17..2902a0e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i0e.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i0e.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=bessel_i0e --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=bessel_i0e --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1.run
index 0b7cacd..9f64c6d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=bessel_i1 --artifacts_dir=%t
+# 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/llvmaot__bessel_i1e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1e.run
index 3cb7656..6898354 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1e.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bessel_i1e.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=bessel_i1e --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=bessel_i1e --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__betainc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__betainc.run
index c75ab66..7b80d80 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__betainc.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__betainc.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=betainc --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=betainc --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bincount.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bincount.run
index 7a93d07..c689ada 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bincount.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__bincount.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=bincount --artifacts_dir=%t
+# 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/llvmaot__ceil.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__ceil.run
index 6285aea..9034933 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__ceil.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__ceil.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=ceil --artifacts_dir=%t
+# 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/llvmaot__complex_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_abs.run
index 3bb5fe9..4a41416 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_abs.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_abs.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=abs --artifacts_dir=%t
+# 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/llvmaot__complex_add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_add.run
index a571f1b..d880178 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_add.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_add.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=add --artifacts_dir=%t
+# 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/llvmaot__complex_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_angle.run
index cad7ecd..8ea2d02 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_angle.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_angle.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=angle --artifacts_dir=%t
+# 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/llvmaot__complex_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_asinh.run
index 9884782..7ce145c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_asinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_asinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=asinh --artifacts_dir=%t
+# 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/llvmaot__complex_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_atanh.run
index 007a73c..a86d0f0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_atanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_atanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=atanh --artifacts_dir=%t
+# 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/llvmaot__complex_conj.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_conj.run
index 4c72793..59a5fcf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_conj.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_conj.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=conj --artifacts_dir=%t
+# 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/llvmaot__complex_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cos.run
index 4542628..16b0bca 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cos.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cos.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cos --artifacts_dir=%t
+# 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/llvmaot__complex_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cosh.run
index 03e9574..5cf1429 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cosh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cosh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cosh --artifacts_dir=%t
+# 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/llvmaot__complex_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_count_nonzero.run
index 977da87..d2fca69 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_count_nonzero.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_count_nonzero.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumprod.run
index 80e2eb6..6491455 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumprod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumprod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cumprod --artifacts_dir=%t
+# 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/llvmaot__complex_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumsum.run
index 815cc6e..55dcf3b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumsum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_cumsum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cumsum --artifacts_dir=%t
+# 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/llvmaot__complex_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide.run
index 4595672..4b3beb8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=divide --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=divide --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide_no_nan.run
index e5dec15..30b1abc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_divide_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=divide_no_nan --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_abs.run
index 49d4b3e..63613a9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_abs.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_abs.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=abs --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_add.run
index 4583c72..b435ed2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_add.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_add.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=add --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_angle.run
index 2de10b7..2b07a02 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_angle.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_angle.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=angle --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=angle --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_asinh.run
index 1e83852..e1970f3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_asinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_asinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=asinh --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_atanh.run
index fd73a5e..65a5ca2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_atanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_atanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=atanh --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_conj.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_conj.run
index ac30b93..3a093f7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_conj.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_conj.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=conj --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cos.run
index 48616e9..02fbea6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cos.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cos.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cos --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cosh.run
index 181478f..514b74a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cosh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cosh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cosh --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_count_nonzero.run
index 6ff2885..9cae20a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_count_nonzero.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_count_nonzero.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumprod.run
index e5cf530..f33f22c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumprod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumprod.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cumprod --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumsum.run
index ef6beaa..9b0331e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumsum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_cumsum.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cumsum --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide.run
index cc08025..5cad607 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=divide --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide_no_nan.run
index 2ee2046..1e2f4d9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_divide_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_exp.run
index 866f03c..6d6b98d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_exp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_exp.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=exp --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_expm1.run
index 04fc794..b8a0352 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_expm1.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_expm1.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=expm1 --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_imag.run
index 6fb829d..db002ac 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_imag.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_imag.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=imag --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_l2_normalize.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_l2_normalize.run
index e34e7d1..32ea81c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_l2_normalize.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_l2_normalize.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=l2_normalize --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=l2_normalize --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log.run
index 092b59a..c56614c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=log --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log1p.run
index 1b650d1..9303ea5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log1p.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_log1p.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=log1p --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply.run
index 0e5b521..3421526 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=multiply --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply_no_nan.run
index 24decc6..9064ff2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_multiply_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_negative.run
index 5f2b283..03be2f3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_negative.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_negative.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=negative --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_pow.run
index 0a2be20..9b628ab 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_pow.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_pow.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=pow --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=pow --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_real.run
index 2006504..9a77e12 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_real.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_real.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=real --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reciprocal.run
index d29d125..5f3bc13 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reciprocal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reciprocal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reciprocal --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reciprocal_no_nan.run
index 60a8af3..f1ecafa 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reciprocal_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reciprocal_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_euclidean_norm.run
index c96667b..9d90557 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_euclidean_norm.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_euclidean_norm.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_euclidean_norm --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_std.run
index 7484a41..53bbf04 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_std.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_std.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_variance.run
index 58bc15c..04b2729 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_variance.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_reduce_variance.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_rsqrt.run
index f427f71..b6038e6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_rsqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_rsqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=rsqrt --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sigmoid.run
index b95de03..9e9125b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sigmoid.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sigmoid.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sigmoid --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sign.run
index 6c577ba..8762a03 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sign.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sign.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sign --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sin.run
index 4475880..6aa677c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sin.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sin --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sinh.run
index ece8f66..c9b9b8f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sinh --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sqrt.run
index b1cacdc..a7cc4de 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_sqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sqrt --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_square.run
index 6431928..6f1df84 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_square.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_square.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=square --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=square --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_squared_difference.run
index 7b91d96..afca872 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_squared_difference.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_squared_difference.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_subtract.run
index 98adeb9..aa8530d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_subtract.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_subtract.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=subtract --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tan.run
index ec21a60..5231e3c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=tan --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tanh.run
index 6a0ecdd..e86a456 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_tanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=tanh --artifacts_dir=%t
+# 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/llvmaot__complex_dynamic_dim_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_truediv.run
index c3f5771..61ea648 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_truediv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_truediv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=truediv --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=truediv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xdivy.run
index 17319b6..d65690d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xdivy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xdivy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=xdivy --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xdivy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlog1py.run
index 9d89bf8..1ab53a7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlog1py.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlog1py.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlogy.run
index 3b427e4..45f579e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlogy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_xlogy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=xlogy --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlogy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_zero_fraction.run
index a4694e8..7d9c149 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_zero_fraction.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_dynamic_dim_zero_fraction.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=zero_fraction --artifacts_dir=%t
+# 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/llvmaot__complex_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_exp.run
index b6dc358..0abcbad 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_exp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_exp.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=exp --artifacts_dir=%t
+# 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/llvmaot__complex_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_expm1.run
index 587db00..97b99a5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_expm1.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_expm1.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=expm1 --artifacts_dir=%t
+# 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/llvmaot__complex_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_imag.run
index 97dce68..d4dc114 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_imag.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_imag.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=imag --artifacts_dir=%t
+# 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/llvmaot__complex_l2_normalize.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_l2_normalize.run
index ecef24c..e25b53e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_l2_normalize.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_l2_normalize.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=l2_normalize --artifacts_dir=%t
+# 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/llvmaot__complex_log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_log.run
index 0884cf9..249ac50 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_log.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_log.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=log --artifacts_dir=%t
+# 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/llvmaot__complex_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_log1p.run
index 8d42425..db705ce 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_log1p.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_log1p.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=log1p --artifacts_dir=%t
+# 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/llvmaot__complex_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_multiply.run
index a63fa8f..6d34a30 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_multiply.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_multiply.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=multiply --artifacts_dir=%t
+# 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/llvmaot__complex_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_multiply_no_nan.run
index ac53d95..6815dfc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_multiply_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_multiply_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=multiply_no_nan --artifacts_dir=%t
+# 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/llvmaot__complex_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_negative.run
index 857a972..053c0d8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_negative.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_negative.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=negative --artifacts_dir=%t
+# 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/llvmaot__complex_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_pow.run
index 9df598d..e8624e1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_pow.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_pow.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=pow --artifacts_dir=%t
+# 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/llvmaot__complex_real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_real.run
index 99fe29c..241f622 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_real.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_real.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=real --artifacts_dir=%t
+# 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/llvmaot__complex_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reciprocal.run
index 4d953bc..6aab6a5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reciprocal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reciprocal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reciprocal --artifacts_dir=%t
+# 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/llvmaot__complex_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reciprocal_no_nan.run
index 9927f80..14eecbf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reciprocal_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reciprocal_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reciprocal_no_nan --artifacts_dir=%t
+# 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/llvmaot__complex_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_euclidean_norm.run
index 1d8a624..d26b40b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_euclidean_norm.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_euclidean_norm.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_euclidean_norm --artifacts_dir=%t
+# 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/llvmaot__complex_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_std.run
index 0475219..cbb8481 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_std.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_std.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_std --artifacts_dir=%t
+# 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/llvmaot__complex_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_variance.run
index 877111e..75b414b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_variance.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_reduce_variance.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_variance --artifacts_dir=%t
+# 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/llvmaot__complex_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_rsqrt.run
index f96e412..48242e3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_rsqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_rsqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=rsqrt --artifacts_dir=%t
+# 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/llvmaot__complex_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sigmoid.run
index 05ba337..1543cc9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sigmoid.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sigmoid.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sigmoid --artifacts_dir=%t
+# 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/llvmaot__complex_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sign.run
index 4ee9adb..5a064d6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sign.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sign.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sign --artifacts_dir=%t
+# 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/llvmaot__complex_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sin.run
index 94940f7..67fd6fe 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sin.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sin --artifacts_dir=%t
+# 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/llvmaot__complex_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sinh.run
index 8e9a8d5..1e3bb12 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sinh --artifacts_dir=%t
+# 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/llvmaot__complex_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sqrt.run
index 11fabc2..24d676b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_sqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sqrt --artifacts_dir=%t
+# 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/llvmaot__complex_square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_square.run
index 8feb6da..e5a5246 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_square.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_square.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=square --artifacts_dir=%t
+# 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/llvmaot__complex_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_squared_difference.run
index 4f89e0d..f41712a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_squared_difference.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_squared_difference.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=squared_difference --artifacts_dir=%t
+# 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/llvmaot__complex_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_subtract.run
index 6d3ac95..192506e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_subtract.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_subtract.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=subtract --artifacts_dir=%t
+# 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/llvmaot__complex_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_tan.run
index c0ebe67..bb04360 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_tan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_tan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=tan --artifacts_dir=%t
+# 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/llvmaot__complex_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_tanh.run
index e5e1cce..4ed8621 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_tanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_tanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=tanh --artifacts_dir=%t
+# 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/llvmaot__complex_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_truediv.run
index d794d53..c1697d9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_truediv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_truediv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=truediv --artifacts_dir=%t
+# 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/llvmaot__complex_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xdivy.run
index c7bb436..95d751b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xdivy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xdivy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=xdivy --artifacts_dir=%t
+# 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/llvmaot__complex_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xlog1py.run
index 89103b3..c0bddc2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xlog1py.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xlog1py.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=xlog1py --artifacts_dir=%t
+# 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/llvmaot__complex_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xlogy.run
index 7ce1a9e..f7025a9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xlogy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_xlogy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=xlogy --artifacts_dir=%t
+# 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/llvmaot__complex_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_zero_fraction.run
index bc39383..12bd53f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_zero_fraction.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__complex_zero_fraction.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=zero_fraction --artifacts_dir=%t
+# 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/llvmaot__confusion_matrix.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__confusion_matrix.run
index 70480b1..745801e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__confusion_matrix.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__confusion_matrix.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=confusion_matrix --artifacts_dir=%t
+# 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/llvmaot__cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cos.run
index 4542628..16b0bca 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cos.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cos.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cos --artifacts_dir=%t
+# 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/llvmaot__cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cosh.run
index 03e9574..5cf1429 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cosh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cosh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cosh --artifacts_dir=%t
+# 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/llvmaot__count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__count_nonzero.run
index 977da87..d2fca69 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__count_nonzero.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__count_nonzero.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=count_nonzero --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumprod.run
index 80e2eb6..6491455 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumprod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumprod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cumprod --artifacts_dir=%t
+# 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/llvmaot__cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumsum.run
index 815cc6e..55dcf3b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumsum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumsum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cumsum --artifacts_dir=%t
+# 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/llvmaot__cumulative_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumulative_logsumexp.run
index 0fbcd6e..f45b975 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumulative_logsumexp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__cumulative_logsumexp.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=cumulative_logsumexp --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=cumulative_logsumexp --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__digamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__digamma.run
index 79bfd03..a9b34b7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__digamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__digamma.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=digamma --artifacts_dir=%t
+# 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/llvmaot__divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide.run
index 4595672..4b3beb8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=divide --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=divide --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide_no_nan.run
index e5dec15..30b1abc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__divide_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=divide_no_nan --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_abs.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_abs.run
index 49d4b3e..63613a9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_abs.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_abs.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=abs --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_accumulate_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_accumulate_n.run
index 532ea52..3166318 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_accumulate_n.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_accumulate_n.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=accumulate_n --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=accumulate_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acos.run
index 3d7d702..bb73391 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acos.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acos.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=acos --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_acosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acosh.run
index 8aaa830..d4f67be 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acosh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_acosh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=acosh --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_add.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add.run
index 4583c72..b435ed2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=add --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=add --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add_n.run
index b159fc7..96c07ca 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add_n.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_add_n.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=add_n --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=add_n --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_angle.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_angle.run
index 2de10b7..2b07a02 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_angle.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_angle.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=angle --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=angle --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmax.run
index c116386..09bed8c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmax.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmax.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=argmax --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_argmin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmin.run
index 03ecc0e..2449b18 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_argmin.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=argmin --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_asin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_asin.run
index 481794b..a742230 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_asin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_asin.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=asin --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_asinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_asinh.run
index 1e83852..e1970f3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_asinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_asinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=asinh --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_atan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atan.run
index 1321ba3..2996fc2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atan.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=atan --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_atan2.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atan2.run
index 26cd97f..ad74778 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atan2.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atan2.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=atan2 --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_atanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atanh.run
index fd73a5e..65a5ca2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_atanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=atanh --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_bessel_i0.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i0.run
index ef36df3..580186c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i0.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i0.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=bessel_i0 --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_bessel_i0e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i0e.run
index b0f5917..328b50d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i0e.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i0e.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=bessel_i0e --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_bessel_i1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i1.run
index bba04a1..294e245 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i1.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i1.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=bessel_i1 --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_bessel_i1e.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i1e.run
index cda630e..ef24044 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i1e.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bessel_i1e.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=bessel_i1e --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_betainc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_betainc.run
index f79c778..213b6c7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_betainc.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_betainc.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=betainc --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_bincount.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bincount.run
index ce981b5..537f385 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bincount.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_bincount.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=bincount --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_ceil.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ceil.run
index 387a363..cf94168 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ceil.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ceil.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=ceil --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_confusion_matrix.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_confusion_matrix.run
index 1465156..c38b805 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_confusion_matrix.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_confusion_matrix.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=confusion_matrix --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_cos.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cos.run
index 48616e9..02fbea6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cos.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cos.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cos --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_cosh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cosh.run
index 181478f..514b74a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cosh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cosh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cosh --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_count_nonzero.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_count_nonzero.run
index 6ff2885..9cae20a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_count_nonzero.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_count_nonzero.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=count_nonzero --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumprod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumprod.run
index e5cf530..f33f22c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumprod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumprod.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cumprod --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_cumsum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumsum.run
index ef6beaa..9b0331e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumsum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumsum.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cumsum --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_cumulative_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumulative_logsumexp.run
index 2bde5fa..1f79582 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumulative_logsumexp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_cumulative_logsumexp.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=cumulative_logsumexp --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_digamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_digamma.run
index 2e70dd0..c80b18f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_digamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_digamma.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=digamma --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_divide.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide.run
index cc08025..5cad607 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=divide --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide_no_nan.run
index 2ee2046..1e2f4d9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_divide_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=divide_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_equal.run
index 2423a6b..142e089 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=equal --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erf.run
index f922e97..322f0a6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erf.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erf.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=erf --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_erfc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erfc.run
index cb58741..7a4bc0b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erfc.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erfc.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=erfc --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_erfinv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erfinv.run
index ac19618..8e6ccdf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erfinv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_erfinv.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=erfinv --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_exp.run
index 866f03c..6d6b98d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_exp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_exp.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=exp --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_expm1.run
index 04fc794..b8a0352 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_expm1.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_expm1.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=expm1 --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_floor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floor.run
index 0b44ab5..f64ae55 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floor.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floor.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=floor --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_floordiv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floordiv.run
index 1385d0f..3fd068c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floordiv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floordiv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=floordiv --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=floordiv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floormod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floormod.run
index 9ad320d..80d889e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floormod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_floormod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=floormod --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=floormod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater.run
index d9b551f..3d886ef 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=greater --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=greater --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater_equal.run
index 125865d..8a4e70d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_greater_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=greater_equal --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=greater_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igamma.run
index 2256046..9a0309a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igamma.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=igamma --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_igammac.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igammac.run
index 1683774..3e93e22 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igammac.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_igammac.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=igammac --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_imag.run
index 6fb829d..db002ac 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_imag.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_imag.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=imag --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_in_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_in_top_k.run
index 0f97331..68468dd 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_in_top_k.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_in_top_k.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=in_top_k --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_invert_permutation.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_invert_permutation.run
index 9e6e52f..b225465 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_invert_permutation.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_invert_permutation.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=invert_permutation --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_is_finite.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_finite.run
index 36167b0..8158fb9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_finite.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_finite.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=is_finite --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_is_inf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_inf.run
index b0df20a..8919511 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_inf.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_inf.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=is_inf --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_is_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_nan.run
index d304a9b..3a2a7b3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=is_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=is_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_non_decreasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_non_decreasing.run
index c60cadf..fa52b38 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_non_decreasing.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_non_decreasing.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=is_non_decreasing --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_is_strictly_increasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_strictly_increasing.run
index 5376706..2848083 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_strictly_increasing.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_is_strictly_increasing.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=is_strictly_increasing --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_lbeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lbeta.run
index c6ad548..5bc883e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lbeta.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lbeta.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=lbeta --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=lbeta --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less.run
index 33c6a4b..b813088 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=less --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=less --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less_equal.run
index 3315724..e93c9fa 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_less_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=less_equal --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=less_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lgamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lgamma.run
index 4208279..644c794 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lgamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_lgamma.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=lgamma --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log.run
index 092b59a..c56614c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=log --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log1p.run
index 1b650d1..9303ea5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log1p.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log1p.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=log1p --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_log_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log_sigmoid.run
index f66c1f2..4c3658e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log_sigmoid.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log_sigmoid.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=log_sigmoid --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_log_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log_softmax.run
index 09aeb19..c3a08f4 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log_softmax.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_log_softmax.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=log_softmax --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=log_softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_and.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_and.run
index 71d2b51..699b0f5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_and.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_and.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=logical_and --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=logical_and --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_not.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_not.run
index eee6ae1..ed7666c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_not.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_not.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=logical_not --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_logical_or.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_or.run
index 6c487f8..28ced5f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_or.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_or.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=logical_or --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=logical_or --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_xor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_xor.run
index 2b6b4bb..3dac825 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_xor.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_logical_xor.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=logical_xor --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=logical_xor --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_maximum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_maximum.run
index f9c3f01..f6625f3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_maximum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_maximum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=maximum --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=maximum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_minimum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_minimum.run
index 5974175..aa2b990 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_minimum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_minimum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=minimum --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=minimum --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_mod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_mod.run
index cbaa090..710ec6b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_mod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_mod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=mod --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=mod --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply.run
index 0e5b521..3421526 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=multiply --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply_no_nan.run
index 24decc6..9064ff2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_multiply_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=multiply_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ndtri.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ndtri.run
index 54a86a0..52cc0a3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ndtri.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_ndtri.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=ndtri --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_negative.run
index 5f2b283..03be2f3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_negative.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_negative.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=negative --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_nextafter.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_nextafter.run
index 2a36649..0eaa639 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_nextafter.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_nextafter.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=nextafter --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_not_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_not_equal.run
index 222166d..b665074 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_not_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_not_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=not_equal --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=not_equal --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polygamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polygamma.run
index f72ccd8..f603356 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polygamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polygamma.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=polygamma --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=polygamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polyval.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polyval.run
index a8e08c2..54b6316 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polyval.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_polyval.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=polyval --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=polyval --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_pow.run
index 0a2be20..9b628ab 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_pow.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_pow.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=pow --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=pow --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_real.run
index 2006504..9a77e12 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_real.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_real.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=real --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reciprocal.run
index d29d125..5f3bc13 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reciprocal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reciprocal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reciprocal --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reciprocal_no_nan.run
index 60a8af3..f1ecafa 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reciprocal_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reciprocal_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reciprocal_no_nan --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_all.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_all.run
index 516badf..d2fb0f7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_all.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_all.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_all --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_any.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_any.run
index 2cfdfeb..00a44b3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_any.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_any.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_any --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_euclidean_norm.run
index c96667b..9d90557 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_euclidean_norm.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_euclidean_norm.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_euclidean_norm --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_logsumexp.run
index 1496279..e315116 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_logsumexp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_logsumexp.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_logsumexp --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_max.run
index 75cc7bb..4009096 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_max.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_max.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_max --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_mean.run
index 1a60e0c..551c72e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_mean.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_mean.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_mean --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_min.run
index 96326fe..fc7d421 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_min.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_min.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_min --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_prod.run
index c2b43df..7f305f6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_prod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_prod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_prod --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_std.run
index 7484a41..53bbf04 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_std.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_std.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_std --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_sum.run
index 790e647..a455b28 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_sum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_sum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_sum --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_variance.run
index 58bc15c..04b2729 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_variance.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_reduce_variance.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=reduce_variance --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rint.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rint.run
index 38699e4..623a07f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rint.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rint.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=rint --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=rint --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_round.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_round.run
index ba4690b..d6956cd 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_round.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_round.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=round --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=round --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rsqrt.run
index f427f71..b6038e6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rsqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_rsqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=rsqrt --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_scalar_mul.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_scalar_mul.run
index ddbe482..4542f49 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_scalar_mul.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_scalar_mul.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=scalar_mul --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_max.run
index 6a264d5..e76f8ee 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_max.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_max.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=segment_max --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_mean.run
index 5f94119..e3eddff 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_mean.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_mean.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=segment_mean --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_min.run
index da7d651..4b84e73 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_min.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_min.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=segment_min --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_prod.run
index 3419117..41ceca4 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_prod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_prod.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=segment_prod --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_sum.run
index fe22a4a..5afa807 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_sum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_segment_sum.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=segment_sum --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sigmoid.run
index b95de03..9e9125b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sigmoid.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sigmoid.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sigmoid --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sign.run
index 6c577ba..8762a03 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sign.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sign.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sign --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sin.run
index 4475880..6aa677c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sin.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sin --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sinh.run
index ece8f66..c9b9b8f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sinh --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_sobol_sample.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sobol_sample.run
index 0a82939..2f43200 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sobol_sample.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sobol_sample.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sobol_sample --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softmax.run
index b8cc6f0..0dc5b72 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softmax.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softmax.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=softmax --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=softmax --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softplus.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softplus.run
index d4deae7..ce6fb06 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softplus.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softplus.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=softplus --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_softsign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softsign.run
index f6d759c..f073588 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softsign.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_softsign.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=softsign --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sqrt.run
index b1cacdc..a7cc4de 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_sqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=sqrt --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_square.run
index 6431928..6f1df84 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_square.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_square.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=square --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=square --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_squared_difference.run
index 7b91d96..afca872 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_squared_difference.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_squared_difference.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=squared_difference --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_subtract.run
index 98adeb9..aa8530d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_subtract.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_subtract.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=subtract --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=subtract --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tan.run
index ec21a60..5231e3c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=tan --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tanh.run
index 6a0ecdd..e86a456 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_tanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=tanh --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_top_k.run
index 619a694..b90bdad 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_top_k.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_top_k.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=top_k --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_truediv.run
index c3f5771..61ea648 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_truediv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_truediv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=truediv --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=truediv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_max.run
index 6af26d5..f70ecdb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_max.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_max.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=unsorted_segment_max --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_unsorted_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_mean.run
index 392819f..9b5a44f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_mean.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_mean.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=unsorted_segment_mean --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_unsorted_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_min.run
index 3819d36..ad1f495 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_min.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_min.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=unsorted_segment_min --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_unsorted_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_prod.run
index 38b6a38..698a07d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_prod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_prod.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=unsorted_segment_prod --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_unsorted_segment_sqrt_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_sqrt_n.run
index eb653a9..bcf1e97 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_sqrt_n.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_sqrt_n.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=unsorted_segment_sqrt_n --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_unsorted_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_sum.run
index f67499d..653430b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_sum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_unsorted_segment_sum.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=unsorted_segment_sum --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xdivy.run
index 17319b6..d65690d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xdivy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xdivy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=xdivy --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xdivy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlog1py.run
index 9d89bf8..1ab53a7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlog1py.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlog1py.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlog1py --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlogy.run
index 3b427e4..45f579e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlogy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_xlogy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=xlogy --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=xlogy --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zero_fraction.run
index a4694e8..7d9c149 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zero_fraction.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zero_fraction.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=zero_fraction --artifacts_dir=%t
+# 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/llvmaot__dynamic_dim_zeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zeta.run
index 2f7206e..3a6f200 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zeta.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__dynamic_dim_zeta.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=true --functions=zeta --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=true --functions=zeta --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__equal.run
index be612de..a5d0bdd 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=equal --artifacts_dir=%t
+# 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/llvmaot__erf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erf.run
index 8c4be8e..e20c350 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erf.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erf.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=erf --artifacts_dir=%t
+# 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/llvmaot__erfc.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erfc.run
index 6713e7f..3b61e5e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erfc.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erfc.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=erfc --artifacts_dir=%t
+# 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/llvmaot__erfinv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erfinv.run
index e1463da..7c01bae 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erfinv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__erfinv.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=erfinv --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=erfinv --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__exp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__exp.run
index b6dc358..0abcbad 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__exp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__exp.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=exp --artifacts_dir=%t
+# 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/llvmaot__expm1.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__expm1.run
index 587db00..97b99a5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__expm1.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__expm1.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=expm1 --artifacts_dir=%t
+# 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/llvmaot__floor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floor.run
index 4bcc097..324464f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floor.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floor.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=floor --artifacts_dir=%t
+# 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/llvmaot__floordiv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floordiv.run
index 09109ed..83c5e11 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floordiv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floordiv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=floordiv --artifacts_dir=%t
+# 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/llvmaot__floormod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floormod.run
index 567d4fb..336fa77 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floormod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__floormod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=floormod --artifacts_dir=%t
+# 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/llvmaot__greater.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__greater.run
index 16540b2..47fc1b6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__greater.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__greater.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=greater --artifacts_dir=%t
+# 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/llvmaot__greater_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__greater_equal.run
index 9e7d1fe..0bb1052 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__greater_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__greater_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=greater_equal --artifacts_dir=%t
+# 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/llvmaot__igamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igamma.run
index c1c6de0..753a576 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igamma.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=igamma --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=igamma --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igammac.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igammac.run
index a8cc688..405324e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igammac.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__igammac.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=igammac --artifacts_dir=%t
+# 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/llvmaot__imag.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__imag.run
index 97dce68..d4dc114 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__imag.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__imag.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=imag --artifacts_dir=%t
+# 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/llvmaot__in_top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__in_top_k.run
index 085fef4..b1d7b4b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__in_top_k.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__in_top_k.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=in_top_k --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=in_top_k --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__invert_permutation.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__invert_permutation.run
index 7d96fc4..4ab3fb5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__invert_permutation.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__invert_permutation.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=invert_permutation --artifacts_dir=%t
+# 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/llvmaot__is_finite.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_finite.run
index c736661..9dcbd99 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_finite.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_finite.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=is_finite --artifacts_dir=%t
+# 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/llvmaot__is_inf.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_inf.run
index 7d14896..4323ef6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_inf.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_inf.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=is_inf --artifacts_dir=%t
+# 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/llvmaot__is_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_nan.run
index 603746d..af32b66 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=is_nan --artifacts_dir=%t
+# 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/llvmaot__is_non_decreasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_non_decreasing.run
index 543a5ad..9436b37 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_non_decreasing.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_non_decreasing.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=is_non_decreasing --artifacts_dir=%t
+# 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/llvmaot__is_strictly_increasing.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_strictly_increasing.run
index bbdfc01..b9ff914 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_strictly_increasing.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__is_strictly_increasing.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=is_strictly_increasing --artifacts_dir=%t
+# 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/llvmaot__lbeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__lbeta.run
index a0a1c81..1c85c48 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__lbeta.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__lbeta.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=lbeta --artifacts_dir=%t
+# 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/llvmaot__less.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__less.run
index 5a714b2..cc425d1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__less.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__less.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=less --artifacts_dir=%t
+# 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/llvmaot__less_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__less_equal.run
index 7789e0b..547e361 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__less_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__less_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=less_equal --artifacts_dir=%t
+# 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/llvmaot__lgamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__lgamma.run
index d1e76ee..6cdaaa5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__lgamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__lgamma.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=lgamma --artifacts_dir=%t
+# 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/llvmaot__log.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log.run
index 0884cf9..249ac50 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=log --artifacts_dir=%t
+# 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/llvmaot__log1p.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log1p.run
index 8d42425..db705ce 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log1p.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log1p.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=log1p --artifacts_dir=%t
+# 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/llvmaot__log_sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log_sigmoid.run
index 9bc0702..ae80aa5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log_sigmoid.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log_sigmoid.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=log_sigmoid --artifacts_dir=%t
+# 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/llvmaot__log_softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log_softmax.run
index 44bf04d..1d150c5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log_softmax.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__log_softmax.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=log_softmax --artifacts_dir=%t
+# 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/llvmaot__logical_and.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_and.run
index 34a8179..eb208c1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_and.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_and.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=logical_and --artifacts_dir=%t
+# 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/llvmaot__logical_not.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_not.run
index f915994..7831946 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_not.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_not.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=logical_not --artifacts_dir=%t
+# 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/llvmaot__logical_or.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_or.run
index 696453d..8f3fd99 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_or.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_or.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=logical_or --artifacts_dir=%t
+# 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/llvmaot__logical_xor.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_xor.run
index aabeaa6..48604e8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_xor.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__logical_xor.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=logical_xor --artifacts_dir=%t
+# 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/llvmaot__maximum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__maximum.run
index b26125d..6cf4a18 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__maximum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__maximum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=maximum --artifacts_dir=%t
+# 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/llvmaot__minimum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__minimum.run
index 7ee59be..df6a953 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__minimum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__minimum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=minimum --artifacts_dir=%t
+# 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/llvmaot__mod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__mod.run
index a87dd67..e05d736 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__mod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__mod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=mod --artifacts_dir=%t
+# 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/llvmaot__multiply.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__multiply.run
index a63fa8f..6d34a30 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__multiply.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__multiply.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=multiply --artifacts_dir=%t
+# 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/llvmaot__multiply_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__multiply_no_nan.run
index ac53d95..6815dfc 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__multiply_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__multiply_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=multiply_no_nan --artifacts_dir=%t
+# 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/llvmaot__ndtri.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__ndtri.run
index 86a19e4..a9d4996 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__ndtri.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__ndtri.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=ndtri --artifacts_dir=%t
+# 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/llvmaot__negative.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__negative.run
index 857a972..053c0d8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__negative.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__negative.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=negative --artifacts_dir=%t
+# 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/llvmaot__nextafter.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__nextafter.run
index e02bcf3..8273bae 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__nextafter.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__nextafter.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=nextafter --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=nextafter --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__not_equal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__not_equal.run
index 2b778f8..d4e37e4 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__not_equal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__not_equal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=not_equal --artifacts_dir=%t
+# 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/llvmaot__polygamma.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__polygamma.run
index bcd444e..e6ec448 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__polygamma.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__polygamma.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=polygamma --artifacts_dir=%t
+# 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/llvmaot__polyval.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__polyval.run
index b65c495..d828fa1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__polyval.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__polyval.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=polyval --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmcpu --dynamic_dims=false --functions=polyval --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__pow.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__pow.run
index 9df598d..e8624e1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__pow.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__pow.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=pow --artifacts_dir=%t
+# 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/llvmaot__real.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__real.run
index 99fe29c..241f622 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__real.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__real.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=real --artifacts_dir=%t
+# 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/llvmaot__reciprocal.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reciprocal.run
index 4d953bc..6aab6a5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reciprocal.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reciprocal.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reciprocal --artifacts_dir=%t
+# 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/llvmaot__reciprocal_no_nan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reciprocal_no_nan.run
index 9927f80..14eecbf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reciprocal_no_nan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reciprocal_no_nan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reciprocal_no_nan --artifacts_dir=%t
+# 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/llvmaot__reduce_all.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_all.run
index c6565cf..2c51f3f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_all.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_all.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_all --artifacts_dir=%t
+# 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/llvmaot__reduce_any.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_any.run
index 8fd4305..c628aa0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_any.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_any.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_any --artifacts_dir=%t
+# 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/llvmaot__reduce_euclidean_norm.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_euclidean_norm.run
index 1d8a624..d26b40b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_euclidean_norm.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_euclidean_norm.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_euclidean_norm --artifacts_dir=%t
+# 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/llvmaot__reduce_logsumexp.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_logsumexp.run
index 3dc9f88..06b3ebf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_logsumexp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_logsumexp.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_logsumexp --artifacts_dir=%t
+# 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/llvmaot__reduce_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_max.run
index 6854270..e4ada85 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_max.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_max.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_max --artifacts_dir=%t
+# 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/llvmaot__reduce_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_mean.run
index da052a1..e06620f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_mean.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_mean.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_mean --artifacts_dir=%t
+# 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/llvmaot__reduce_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_min.run
index 90894bb..66da6fb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_min.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_min.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_min --artifacts_dir=%t
+# 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/llvmaot__reduce_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_prod.run
index 176ae9f..eaa5a13 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_prod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_prod.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_prod --artifacts_dir=%t
+# 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/llvmaot__reduce_std.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_std.run
index 0475219..cbb8481 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_std.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_std.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_std --artifacts_dir=%t
+# 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/llvmaot__reduce_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_sum.run
index 43b9892..8c2b1fd 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_sum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_sum.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_sum --artifacts_dir=%t
+# 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/llvmaot__reduce_variance.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_variance.run
index 877111e..75b414b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_variance.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__reduce_variance.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=reduce_variance --artifacts_dir=%t
+# 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/llvmaot__rint.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__rint.run
index ec420dd..ea12cf1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__rint.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__rint.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=rint --artifacts_dir=%t
+# 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/llvmaot__round.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__round.run
index 6bdcbff..9369168 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__round.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__round.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=round --artifacts_dir=%t
+# 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/llvmaot__rsqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__rsqrt.run
index f96e412..48242e3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__rsqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__rsqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=rsqrt --artifacts_dir=%t
+# 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/llvmaot__scalar_mul.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__scalar_mul.run
index 04d5094..85c9c93 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__scalar_mul.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__scalar_mul.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=scalar_mul --artifacts_dir=%t
+# 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/llvmaot__segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_max.run
index a0496d7..7dc3e4f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_max.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_max.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=segment_max --artifacts_dir=%t
+# 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/llvmaot__segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_mean.run
index 74681e9..5e5e2a1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_mean.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_mean.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=segment_mean --artifacts_dir=%t
+# 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/llvmaot__segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_min.run
index 318f36b..635fbd3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_min.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_min.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=segment_min --artifacts_dir=%t
+# 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/llvmaot__segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_prod.run
index bfc2a6d..0bc6df0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_prod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_prod.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=segment_prod --artifacts_dir=%t
+# 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/llvmaot__segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_sum.run
index b8bb61c..7d3fd6d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_sum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__segment_sum.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=segment_sum --artifacts_dir=%t
+# 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/llvmaot__sigmoid.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sigmoid.run
index 05ba337..1543cc9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sigmoid.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sigmoid.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sigmoid --artifacts_dir=%t
+# 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/llvmaot__sign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sign.run
index 4ee9adb..5a064d6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sign.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sign.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sign --artifacts_dir=%t
+# 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/llvmaot__sin.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sin.run
index 94940f7..67fd6fe 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sin.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sin.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sin --artifacts_dir=%t
+# 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/llvmaot__sinh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sinh.run
index 8e9a8d5..1e3bb12 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sinh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sinh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sinh --artifacts_dir=%t
+# 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/llvmaot__sobol_sample.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sobol_sample.run
index 53b7019..c3a5ee7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sobol_sample.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sobol_sample.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sobol_sample --artifacts_dir=%t
+# 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/llvmaot__softmax.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softmax.run
index 8e859eb..47f9fda 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softmax.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softmax.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=softmax --artifacts_dir=%t
+# 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/llvmaot__softplus.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softplus.run
index b0d2f85..f1256ae 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softplus.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softplus.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=softplus --artifacts_dir=%t
+# 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/llvmaot__softsign.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softsign.run
index 951c06f..9eebcdb 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softsign.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__softsign.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=softsign --artifacts_dir=%t
+# 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/llvmaot__sqrt.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sqrt.run
index 11fabc2..24d676b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sqrt.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__sqrt.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=sqrt --artifacts_dir=%t
+# 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/llvmaot__square.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__square.run
index 8feb6da..e5a5246 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__square.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__square.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=square --artifacts_dir=%t
+# 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/llvmaot__squared_difference.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__squared_difference.run
index 4f89e0d..f41712a 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__squared_difference.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__squared_difference.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=squared_difference --artifacts_dir=%t
+# 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/llvmaot__subtract.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__subtract.run
index 6d3ac95..192506e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__subtract.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__subtract.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=subtract --artifacts_dir=%t
+# 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/llvmaot__tan.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__tan.run
index c0ebe67..bb04360 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__tan.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__tan.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=tan --artifacts_dir=%t
+# 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/llvmaot__tanh.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__tanh.run
index e5e1cce..4ed8621 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__tanh.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__tanh.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=tanh --artifacts_dir=%t
+# 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/llvmaot__top_k.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__top_k.run
index d2e4973..afed13f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__top_k.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__top_k.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=top_k --artifacts_dir=%t
+# 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/llvmaot__truediv.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__truediv.run
index d794d53..c1697d9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__truediv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__truediv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=truediv --artifacts_dir=%t
+# 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/llvmaot__unsorted_segment_max.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_max.run
index d4cd57c..a72bf3e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_max.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_max.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=unsorted_segment_max --artifacts_dir=%t
+# 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/llvmaot__unsorted_segment_mean.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_mean.run
index 54a35ad..0e45018 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_mean.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_mean.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=unsorted_segment_mean --artifacts_dir=%t
+# 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/llvmaot__unsorted_segment_min.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_min.run
index d65969b..486ecc2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_min.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_min.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=unsorted_segment_min --artifacts_dir=%t
+# 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/llvmaot__unsorted_segment_prod.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_prod.run
index b3a0333..13680f5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_prod.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_prod.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=unsorted_segment_prod --artifacts_dir=%t
+# 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/llvmaot__unsorted_segment_sqrt_n.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_sqrt_n.run
index 2c4da0c..cee3bb1 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_sqrt_n.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_sqrt_n.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=unsorted_segment_sqrt_n --artifacts_dir=%t
+# 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/llvmaot__unsorted_segment_sum.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_sum.run
index 5b67a1e..e232e50 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_sum.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__unsorted_segment_sum.run
@@ -1,3 +1,3 @@
# XFAIL: *
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=unsorted_segment_sum --artifacts_dir=%t
+# 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/llvmaot__xdivy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xdivy.run
index c7bb436..95d751b 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xdivy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xdivy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=xdivy --artifacts_dir=%t
+# 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/llvmaot__xlog1py.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xlog1py.run
index 89103b3..c0bddc2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xlog1py.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xlog1py.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=xlog1py --artifacts_dir=%t
+# 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/llvmaot__xlogy.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xlogy.run
index 7ce1a9e..f7025a9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xlogy.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__xlogy.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=xlogy --artifacts_dir=%t
+# 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/llvmaot__zero_fraction.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__zero_fraction.run
index bc39383..12bd53f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__zero_fraction.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__zero_fraction.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=zero_fraction --artifacts_dir=%t
+# 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/llvmaot__zeta.run b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__zeta.run
index e78750d..c802aa5 100644
--- a/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__zeta.run
+++ b/integrations/tensorflow/test/iree_tf_tests/math/llvmaot__zeta.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.math.math_test --target_backends=iree_llvmaot --dynamic_dims=false --functions=zeta --artifacts_dir=%t
+# 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/uncategorized/llvmaot__batch_norm.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__batch_norm.run
index 2074650..e8da4fa 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__batch_norm.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__batch_norm.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.batch_norm_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__batch_to_space_nd.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__batch_to_space_nd.run
index 0c08a87..9d592fe 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__batch_to_space_nd.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__batch_to_space_nd.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.batch_to_space_nd_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__broadcast_to.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__broadcast_to.run
index 726fa34..944ef04 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__broadcast_to.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__broadcast_to.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.broadcast_to_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__broadcasting.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__broadcasting.run
index 616b749..17bf344 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__broadcasting.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__broadcasting.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.broadcasting_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__concat.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__concat.run
index a56a46d..8d2695c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__concat.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__concat.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.concat_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__control_flow.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__control_flow.run
index 4f81b53..1b31fb9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__control_flow.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__control_flow.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.control_flow_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__conv.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__conv.run
index a08b9e5..7f08cef 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__conv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__conv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.conv_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__conv_transpose.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__conv_transpose.run
index aabb0da..6598861 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__conv_transpose.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__conv_transpose.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.conv_transpose_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__depth_conv.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__depth_conv.run
index 335d26a..d003e92 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__depth_conv.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__depth_conv.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.depth_conv_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__dynamic_mlp.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp.run
index 2009cf7..aa5e429 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp_relu.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp_relu.run
index 125063b..1ca9eb9 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp_relu.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__dynamic_mlp_relu.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_relu_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.uncategorized.dynamic_mlp_relu_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_dynamic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_dynamic.run
index 158ab18..1e7300e 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_dynamic.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_dynamic.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_dynamic_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__einsum_static.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_static.run
index 3baed3d..26870d8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_static.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_static.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_static_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__einsum_vector.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_vector.run
index f03ea42..6fa458f 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_vector.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__einsum_vector.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.einsum_vector_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__fft.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__fft.run
index dc84154..1ded6f4 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__fft.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__fft.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.fft_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__fill.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__fill.run
index dde4a74..550c701 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__fill.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__fill.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.fill_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__gather.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__gather.run
index 7c3ea32..edd12fe 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__gather.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__gather.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.gather_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__image_resize.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__image_resize.run
index d001556..00c1b0d 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__image_resize.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__image_resize.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.image_resize_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__linspace.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__linspace.run
index c70175c..720bdc2 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__linspace.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__linspace.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.linspace_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__mandelbrot.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mandelbrot.run
index 84df0f5..e891693 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mandelbrot.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mandelbrot.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.mandelbrot_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__matrix_ops_dynamic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__matrix_ops_dynamic.run
index 868dc70..b3e25d8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__matrix_ops_dynamic.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__matrix_ops_dynamic.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_dynamic_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__matrix_ops_static.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__matrix_ops_static.run
index bacca2f..063f63c 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__matrix_ops_static.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__matrix_ops_static.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_static_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.uncategorized.matrix_ops_static_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mobile_bert_squad.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mobile_bert_squad.run
index 63ce68b..6c0fedf 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mobile_bert_squad.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__mobile_bert_squad.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.mobile_bert_squad_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.uncategorized.mobile_bert_squad_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__pytree.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__pytree.run
index 98e9432..22e4496 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__pytree.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__pytree.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.pytree_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tf_tests.uncategorized.pytree_test --target_backends=iree_llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization.run
index 63b89df..c901340 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.quantization_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__quantization_dyn.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization_dyn.run
index 4468e72..51367b8 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization_dyn.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__quantization_dyn.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.quantization_dyn_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__range.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__range.run
index 803dcb1..22eb8e3 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__range.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__range.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.range_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__resource_ops.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__resource_ops.run
index 35a16de..ce234b7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__resource_ops.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__resource_ops.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.resource_ops_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__ring_buffer.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__ring_buffer.run
index b212dac..51e01d6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__ring_buffer.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__ring_buffer.run
@@ -1,3 +1,3 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.ring_buffer_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__scatter_update.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__scatter_update.run
index 138a142..42ba7e6 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__scatter_update.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__scatter_update.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.scatter_update_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__simple_arithmetic.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__simple_arithmetic.run
index de6f058..ba05f48 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__simple_arithmetic.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__simple_arithmetic.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.simple_arithmetic_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__simple_stateful.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__simple_stateful.run
index 2ef2285..b7c7162 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__simple_stateful.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__simple_stateful.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.simple_stateful_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__sliding_window.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__sliding_window.run
index dd19124..cff86c7 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__sliding_window.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__sliding_window.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.sliding_window_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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/llvmaot__space_to_batch_nd.run b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__space_to_batch_nd.run
index 269b84a..d0cc0a0 100644
--- a/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__space_to_batch_nd.run
+++ b/integrations/tensorflow/test/iree_tf_tests/uncategorized/llvmaot__space_to_batch_nd.run
@@ -1,2 +1,2 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tf_tests.uncategorized.space_to_batch_nd_test --target_backends=iree_llvmaot --artifacts_dir=%t
+# 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_tfl_tests/README.md b/integrations/tensorflow/test/iree_tfl_tests/README.md
index c25dc00..9d74f6d 100644
--- a/integrations/tensorflow/test/iree_tfl_tests/README.md
+++ b/integrations/tensorflow/test/iree_tfl_tests/README.md
@@ -12,7 +12,7 @@
cartoon_gan | PASS ✓
mnasnet | PASS ✓
gpt2 | PASS ✓
-llvmaot_posenet_i8 | PASS ✓
+llvmcpu_posenet_i8 | PASS ✓
mobilenet_v3 | PASS ✓
-llvmaot_mobilenet_v1 | PASS ✓
-vulkan_mobilenet_v1 | FAIL ✗
\ No newline at end of file
+llvmcpu_mobilenet_v1 | PASS ✓
+vulkan_mobilenet_v1 | FAIL ✗
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilenet_v1.run b/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilenet_v1.run
deleted file mode 100644
index e29577a..0000000
--- a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilenet_v1.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tfl_tests.mobilenet_v1_test --target_backend=llvmaot --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilenet_v3-large_uint8.run b/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilenet_v3-large_uint8.run
deleted file mode 100644
index 868cf3c..0000000
--- a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilenet_v3-large_uint8.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tfl_tests.mobilenet_v3-large_uint8_test --target_backend=llvmaot --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_posenet_i8.run b/integrations/tensorflow/test/iree_tfl_tests/llvmaot_posenet_i8.run
deleted file mode 100644
index eea6590..0000000
--- a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_posenet_i8.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tfl_tests.posenet_i8_test --target_backend=llvmaot --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_resnet_50_int8.run b/integrations/tensorflow/test/iree_tfl_tests/llvmaot_resnet_50_int8.run
deleted file mode 100644
index 13edc56..0000000
--- a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_resnet_50_int8.run
+++ /dev/null
@@ -1,2 +0,0 @@
-# REQUIRES: llvmaot
-# RUN: %PYTHON -m iree_tfl_tests.resnet_50_int8_test --target_backend=llvmaot -artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilebert_tf2_quant.run b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilebert_tf2_quant.run
similarity index 66%
rename from integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilebert_tf2_quant.run
rename to integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilebert_tf2_quant.run
index 8986309..4e6be1f 100644
--- a/integrations/tensorflow/test/iree_tfl_tests/llvmaot_mobilebert_tf2_quant.run
+++ b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilebert_tf2_quant.run
@@ -1,4 +1,4 @@
-# REQUIRES: llvmaot
+# REQUIRES: llvmcpu
# REQUIRES: bugfix
# Numeric error (#9796)
-# RUN: %PYTHON -m iree_tfl_tests.mobilebert_tf2_quant_test --target_backend=llvmaot --artifacts_dir=%t
+# RUN: %PYTHON -m iree_tfl_tests.mobilebert_tf2_quant_test --target_backend=llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilenet_v1.run b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilenet_v1.run
new file mode 100644
index 0000000..37a05c7
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilenet_v1.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tfl_tests.mobilenet_v1_test --target_backend=llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilenet_v3-large_uint8.run b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilenet_v3-large_uint8.run
new file mode 100644
index 0000000..e12a4ad
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_mobilenet_v3-large_uint8.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tfl_tests.mobilenet_v3-large_uint8_test --target_backend=llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_posenet_i8.run b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_posenet_i8.run
new file mode 100644
index 0000000..fb78e1c
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_posenet_i8.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tfl_tests.posenet_i8_test --target_backend=llvmcpu --artifacts_dir=%t
diff --git a/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_resnet_50_int8.run b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_resnet_50_int8.run
new file mode 100644
index 0000000..064727a
--- /dev/null
+++ b/integrations/tensorflow/test/iree_tfl_tests/llvmcpu_resnet_50_int8.run
@@ -0,0 +1,2 @@
+# REQUIRES: llvmcpu
+# RUN: %PYTHON -m iree_tfl_tests.resnet_50_int8_test --target_backend=llvmcpu -artifacts_dir=%t
diff --git a/integrations/tensorflow/test/lit.cfg.py b/integrations/tensorflow/test/lit.cfg.py
index 4f8c65e..1226dec 100644
--- a/integrations/tensorflow/test/lit.cfg.py
+++ b/integrations/tensorflow/test/lit.cfg.py
@@ -72,13 +72,13 @@
# Enable features based on -D FEATURES=hugetest,vulkan
# syntax.
-# We always allow "llvmaot". It can be disabled with -D DISABLE_FEATURES=llvmaot
+# We always allow "llvmcpu". It can be disabled with -D DISABLE_FEATURES=llvmcpu
disable_features_param = lit_config.params.get("DISABLE_FEATURES")
disable_features = []
if disable_features_param:
disable_features = disable_features_param.split(",")
-if "llvmaot" not in disable_features:
- config.available_features.add("llvmaot")
+if "llvmcpu" not in disable_features:
+ config.available_features.add("llvmcpu")
features_param = lit_config.params.get("FEATURES")
if features_param:
config.available_features.update(features_param.split(","))
diff --git a/integrations/tensorflow/test/python/generate_layers_tests.py b/integrations/tensorflow/test/python/generate_layers_tests.py
index b287208..0347195 100644
--- a/integrations/tensorflow/test/python/generate_layers_tests.py
+++ b/integrations/tensorflow/test/python/generate_layers_tests.py
@@ -145,7 +145,7 @@
]
BACKENDS = [
- ("llvmaot", "--target_backends=iree_llvmaot"),
+ ("llvmcpu", "--target_backends=iree_llvmcpu"),
("vulkan", "--target_backends=iree_vulkan"),
]
diff --git a/integrations/tensorflow/test/python/generate_math_tests.py b/integrations/tensorflow/test/python/generate_math_tests.py
index 6d7f2fb..b24a71c 100644
--- a/integrations/tensorflow/test/python/generate_math_tests.py
+++ b/integrations/tensorflow/test/python/generate_math_tests.py
@@ -189,7 +189,7 @@
]
BACKENDS = [
- ("llvmaot", "--target_backends=iree_llvmaot"),
+ ("llvmcpu", "--target_backends=iree_llvmcpu"),
("vulkan", "--target_backends=iree_vulkan"),
]
diff --git a/integrations/tensorflow/test/python/generate_runner.py b/integrations/tensorflow/test/python/generate_runner.py
index b8493e5..6442c82 100644
--- a/integrations/tensorflow/test/python/generate_runner.py
+++ b/integrations/tensorflow/test/python/generate_runner.py
@@ -7,7 +7,7 @@
# Generates a ".run" file in the corresponding test tree for a file under
# this directory. This is a convenience for bootstrapping new test files.
# Usage:
-# python generate_runner.py llvmaot "--target_backends=iree_llvmaot" \
+# python generate_runner.py llvmcpu "--target_backends=iree_llvmcpu" \
# iree_tf_tests/uncategorized/batch_norm_test.py[:batch_norm_alias]
#
# The first argument is the lit feature that this test is gated on and will
diff --git a/integrations/tensorflow/test/python/iree_tfl_tests/test_util.py b/integrations/tensorflow/test/python/iree_tfl_tests/test_util.py
index d09efd5..9e4210c 100644
--- a/integrations/tensorflow/test/python/iree_tfl_tests/test_util.py
+++ b/integrations/tensorflow/test/python/iree_tfl_tests/test_util.py
@@ -18,16 +18,16 @@
import urllib.request
targets = {
- 'llvmaot': 'dylib-llvm-aot',
+ 'llvmcpu': 'llvm-cpu',
'vulkan': 'vulkan-spirv',
}
configs = {
- 'llvmaot': 'local-task',
+ 'llvmcpu': 'local-task',
'vulkan': 'vulkan',
}
-absl.flags.DEFINE_string('target_backend', 'llvmaot', 'model path to execute')
+absl.flags.DEFINE_string('target_backend', 'llvmcpu', 'model path to execute')
absl.flags.DEFINE_string(
"artifacts_dir", None,
diff --git a/samples/colab/edge_detection.ipynb b/samples/colab/edge_detection.ipynb
index c8e9bcc..944a2bc 100644
--- a/samples/colab/edge_detection.ipynb
+++ b/samples/colab/edge_detection.ipynb
@@ -246,7 +246,7 @@
"source": [
"#@markdown ### Backend Configuration\n",
"\n",
- "backend_choice = \"iree_vmvx (CPU)\" #@param [ \"iree_vmvx (CPU)\", \"iree_llvmaot (CPU)\", \"iree_vulkan (GPU/SwiftShader)\" ]\n",
+ "backend_choice = \"iree_vmvx (CPU)\" #@param [ \"iree_vmvx (CPU)\", \"iree_llvmcpu (CPU)\", \"iree_vulkan (GPU/SwiftShader)\" ]\n",
"backend_choice = backend_choice.split(\" \")[0]\n",
"backend = module_utils.BackendInfo(backend_choice)"
],
diff --git a/samples/colab/resnet.ipynb b/samples/colab/resnet.ipynb
index 0bbf9ff..5472bd4 100644
--- a/samples/colab/resnet.ipynb
+++ b/samples/colab/resnet.ipynb
@@ -170,7 +170,7 @@
"source": [
"#@markdown ### Backend Configuration\n",
"\n",
- "backend_choice = \"iree_llvmaot (CPU)\" #@param [ \"iree_vmvx (CPU)\", \"iree_llvmaot (CPU)\", \"iree_vulkan (GPU/SwiftShader)\" ]\n",
+ "backend_choice = \"iree_llvmcpu (CPU)\" #@param [ \"iree_vmvx (CPU)\", \"iree_llvmcpu (CPU)\", \"iree_vulkan (GPU/SwiftShader)\" ]\n",
"backend_choice = backend_choice.split(\" \")[0]\n",
"backend = module_utils.BackendInfo(backend_choice)"
],
