Renaming `--iree-llvm-` CPU flags to `--iree-llvmcpu-`.
This matches the existing `--iree-llvmgpu-` flag prefix.
diff --git a/benchmarks/TF/linux-x86_64.cmake b/benchmarks/TF/linux-x86_64.cmake
index cdce2a9..409cc13 100644
--- a/benchmarks/TF/linux-x86_64.cmake
+++ b/benchmarks/TF/linux-x86_64.cmake
@@ -18,8 +18,8 @@
 
 set(LINUX_X86_64_CASCADELAKE_CPU_COMPILATION_FLAGS
   "--iree-input-type=mhlo"
-  "--iree-llvm-target-cpu=cascadelake"
-  "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
+  "--iree-llvmcpu-target-cpu=cascadelake"
+  "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
 )
 
 # CPU, LLVM, local-sync, x86_64, full-inference
diff --git a/benchmarks/TFLite/android-arm64-v8a.cmake b/benchmarks/TFLite/android-arm64-v8a.cmake
index 0950bc7..a4cc545 100644
--- a/benchmarks/TFLite/android-arm64-v8a.cmake
+++ b/benchmarks/TFLite/android-arm64-v8a.cmake
@@ -18,7 +18,7 @@
 
 set(ANDROID_CPU_COMPILATION_FLAGS
   "--iree-input-type=tosa"
-  "--iree-llvm-target-triple=aarch64-none-linux-android29")
+  "--iree-llvmcpu-target-triple=aarch64-none-linux-android29")
 
 # CPU, LLVM, local-sync, big/little-core, full-inference
 iree_benchmark_suite(
@@ -253,7 +253,7 @@
   COMPILATION_FLAGS
     ${ANDROID_CPU_COMPILATION_FLAGS}
     "--iree-flow-enable-data-tiling"
-    "--iree-llvm-target-cpu-features=+dotprod"
+    "--iree-llvmcpu-target-cpu-features=+dotprod"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   BENCHMARK_TOOL
@@ -326,7 +326,7 @@
   COMPILATION_FLAGS
     ${ANDROID_CPU_COMPILATION_FLAGS}
     "--iree-flow-enable-data-tiling"
-    "--iree-llvm-target-cpu-features=+dotprod"
+    "--iree-llvmcpu-target-cpu-features=+dotprod"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   BENCHMARK_TOOL
@@ -465,7 +465,7 @@
   COMPILATION_FLAGS
     ${ANDROID_CPU_COMPILATION_FLAGS}
     "--iree-flow-enable-data-tiling"
-    "--iree-llvm-target-cpu-features=+dotprod"
+    "--iree-llvmcpu-target-cpu-features=+dotprod"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
 
diff --git a/benchmarks/TFLite/linux-riscv.cmake b/benchmarks/TFLite/linux-riscv.cmake
index f93a067..18c4151 100644
--- a/benchmarks/TFLite/linux-riscv.cmake
+++ b/benchmarks/TFLite/linux-riscv.cmake
@@ -18,20 +18,20 @@
 
 set(LINUX_RV64_GENERIC_CPU_COMPILATION_FLAGS
   "--iree-input-type=tosa"
-  "--iree-llvm-target-triple=riscv64"
-  "--iree-llvm-target-cpu=generic-rv64"
-  "--iree-llvm-target-abi=lp64d"
-  "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+  "--iree-llvmcpu-target-triple=riscv64"
+  "--iree-llvmcpu-target-cpu=generic-rv64"
+  "--iree-llvmcpu-target-abi=lp64d"
+  "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
   "--riscv-v-fixed-length-vector-lmul-max=8"
 )
 
 # TODO(llvm-project/60463): Replace 'zve32f' with 'zve32x'.
 set(LINUX_RV32_GENERIC_CPU_COMPILATION_FLAGS
   "--iree-input-type=tosa"
-  "--iree-llvm-target-triple=riscv32-pc-linux-elf"
-  "--iree-llvm-target-cpu=generic-rv32"
-  "--iree-llvm-target-abi=ilp32"
-  "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+  "--iree-llvmcpu-target-triple=riscv32-pc-linux-elf"
+  "--iree-llvmcpu-target-cpu=generic-rv32"
+  "--iree-llvmcpu-target-abi=ilp32"
+  "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
   "--riscv-v-fixed-length-vector-lmul-max=8"
 )
 
diff --git a/benchmarks/TFLite/linux-x86_64.cmake b/benchmarks/TFLite/linux-x86_64.cmake
index a4c2370..25fed22 100644
--- a/benchmarks/TFLite/linux-x86_64.cmake
+++ b/benchmarks/TFLite/linux-x86_64.cmake
@@ -18,8 +18,8 @@
 
 set(LINUX_X86_64_CASCADELAKE_CPU_COMPILATION_FLAGS
   "--iree-input-type=tosa"
-  "--iree-llvm-target-cpu=cascadelake"
-  "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
+  "--iree-llvmcpu-target-cpu=cascadelake"
+  "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
 )
 
 # CPU, LLVM, local-sync, x86_64, full-inference
diff --git a/build_tools/bazel/iree_bytecode_module.bzl b/build_tools/bazel/iree_bytecode_module.bzl
index 5946d02..f1db8af 100644
--- a/build_tools/bazel/iree_bytecode_module.bzl
+++ b/build_tools/bazel/iree_bytecode_module.bzl
@@ -50,9 +50,9 @@
         static_header_path = static_lib_path.replace(".o", ".h")
         out_files.extend([static_lib_path, static_header_path])
         flags += [
-            "--iree-llvm-link-embedded=false",
-            "--iree-llvm-link-static",
-            "--iree-llvm-static-library-output-path=$(location %s)" % (static_lib_path),
+            "--iree-llvmcpu-link-embedded=false",
+            "--iree-llvmcpu-link-static",
+            "--iree-llvmcpu-static-library-output-path=$(location %s)" % (static_lib_path),
         ]
 
     native.genrule(
@@ -63,9 +63,9 @@
             " ".join([
                 "$(location %s)" % (compile_tool),
                 " ".join(flags),
-                "--iree-llvm-embedded-linker-path=$(location %s)" % (linker_tool),
-                "--iree-llvm-wasm-linker-path=$(location %s)" % (linker_tool),
-                # Note: --iree-llvm-system-linker-path is left unspecified.
+                "--iree-llvmcpu-embedded-linker-path=$(location %s)" % (linker_tool),
+                "--iree-llvmcpu-wasm-linker-path=$(location %s)" % (linker_tool),
+                # Note: --iree-llvmcpu-system-linker-path is left unspecified.
                 "-o $(location %s)" % (module_name),
                 "$(location %s)" % (src),
             ]),
diff --git a/build_tools/bazel/iree_c_module.bzl b/build_tools/bazel/iree_c_module.bzl
index 115d201..8ffb335 100644
--- a/build_tools/bazel/iree_c_module.bzl
+++ b/build_tools/bazel/iree_c_module.bzl
@@ -47,9 +47,9 @@
         static_header_path = static_lib_path.replace(".o", ".h")
         out_files.extend([static_lib_path, static_header_path])
         flags += [
-            "--iree-llvm-link-embedded=false",
-            "--iree-llvm-link-static",
-            "--iree-llvm-static-library-output-path=$(location %s)" % (static_lib_path),
+            "--iree-llvmcpu-link-embedded=false",
+            "--iree-llvmcpu-link-static",
+            "--iree-llvmcpu-static-library-output-path=$(location %s)" % (static_lib_path),
         ]
 
     native.genrule(
diff --git a/build_tools/bazel/iree_check_test.bzl b/build_tools/bazel/iree_check_test.bzl
index 9400151..2fbe67d 100644
--- a/build_tools/bazel/iree_check_test.bzl
+++ b/build_tools/bazel/iree_check_test.bzl
@@ -118,7 +118,7 @@
     # We haven't implemented this so far because we have been using target_cpu_features so far only
     # for aarch64 targets, for which we use the CMake build. To future people implementing this:
     # target_cpu_features should be a list, and here it should be joined into a comma-separated
-    # string to be passed to --iree-llvm-target-cpu-features
+    # string to be passed to --iree-llvmcpu-target-cpu-features
     if target_cpu_features:
         fail("target_cpu_features must currently be empty")
 
diff --git a/build_tools/benchmarks/comparisons/setup_desktop.sh b/build_tools/benchmarks/comparisons/setup_desktop.sh
index 723daa3..279b38e 100644
--- a/build_tools/benchmarks/comparisons/setup_desktop.sh
+++ b/build_tools/benchmarks/comparisons/setup_desktop.sh
@@ -84,7 +84,7 @@
     --iree-input-type=tosa \
     --iree-hal-target-backends=cuda \
     --iree-hal-cuda-llvm-target-arch=sm_80 \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -96,7 +96,7 @@
     --iree-hal-target-backends=cuda \
     --iree-hal-cuda-llvm-target-arch=sm_80 \
     --iree-flow-demote-f32-to-f16 \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -107,9 +107,9 @@
   "${IREE_COMPILE_PATH}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-cpu=cascadelake \
-    --iree-llvm-target-triple=x86_64-unknown-linux-gnu \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-target-cpu=cascadelake \
+    --iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -119,10 +119,10 @@
   "${IREE_COMPILE_PATH}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-cpu=cascadelake \
-    --iree-llvm-target-triple=x86_64-unknown-linux-gnu \
+    --iree-llvmcpu-target-cpu=cascadelake \
+    --iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu \
     --iree-flow-enable-fuse-padding-into-linalg-consumer-ops \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
diff --git a/build_tools/benchmarks/comparisons/setup_mobile.sh b/build_tools/benchmarks/comparisons/setup_mobile.sh
index c557a23..de19d66 100644
--- a/build_tools/benchmarks/comparisons/setup_mobile.sh
+++ b/build_tools/benchmarks/comparisons/setup_mobile.sh
@@ -95,8 +95,8 @@
   "${IREE_COMPILE_PATH}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=aarch64-none-linux-android29 \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-target-triple=aarch64-none-linux-android29 \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -106,8 +106,8 @@
   "${IREE_COMPILE_PATH}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=aarch64-none-linux-android29 \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-target-triple=aarch64-none-linux-android29 \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops" \
@@ -119,12 +119,12 @@
   "${IREE_COMPILE_PATH}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=aarch64-none-linux-android29 \
+    --iree-llvmcpu-target-triple=aarch64-none-linux-android29 \
     --iree-flow-enable-data-tiling \
-    --iree-llvm-target-cpu-features=+dotprod \
+    --iree-llvmcpu-target-cpu-features=+dotprod \
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops" \
     "--iree-llvmcpu-enable-pad-consumer-fusion" \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -134,13 +134,13 @@
   "${IREE_COMPILE_PATH}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=aarch64-none-linux-android29 \
+    --iree-llvmcpu-target-triple=aarch64-none-linux-android29 \
     --iree-flow-enable-data-tiling \
-    --iree-llvm-target-cpu-features=+dotprod \
+    --iree-llvmcpu-target-cpu-features=+dotprod \
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops" \
     "--iree-llvmcpu-enable-pad-consumer-fusion" \
     --iree-flow-enable-conv-img2col-transform \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-debug-symbols=false \
     --iree-vm-bytecode-module-strip-source-map=true \
     --iree-vm-emit-polyglot-zip=false \
     "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -152,7 +152,7 @@
       --iree-input-type=tosa \
       --iree-hal-target-backends=vulkan-spirv \
       --iree-vulkan-target-triple=valhall-unknown-android31 \
-      --iree-llvm-debug-symbols=false \
+      --iree-llvmcpu-debug-symbols=false \
       --iree-vm-bytecode-module-strip-source-map=true \
       --iree-vm-emit-polyglot-zip=false \
       "${IREE_MODEL_DIR}/${MODEL_NAME}.mlir" \
@@ -163,7 +163,7 @@
       --iree-input-type=tosa \
       --iree-hal-target-backends=vulkan-spirv \
       --iree-vulkan-target-triple=valhall-unknown-android31 \
-      --iree-llvm-debug-symbols=false \
+      --iree-llvmcpu-debug-symbols=false \
       --iree-vm-bytecode-module-strip-source-map=true \
       --iree-vm-emit-polyglot-zip=false \
       --iree-flow-enable-fuse-padding-into-linalg-consumer-ops \
@@ -176,7 +176,7 @@
       --iree-hal-target-backends=vulkan-spirv \
       --iree-vulkan-target-triple=valhall-unknown-android31 \
       --iree-flow-demote-f32-to-f16 \
-      --iree-llvm-debug-symbols=false \
+      --iree-llvmcpu-debug-symbols=false \
       --iree-vm-bytecode-module-strip-source-map=true \
       --iree-vm-emit-polyglot-zip=false \
       --iree-flow-enable-fuse-padding-into-linalg-consumer-ops \
@@ -188,7 +188,7 @@
       --iree-input-type=tosa \
       --iree-hal-target-backends=vulkan-spirv \
       --iree-vulkan-target-triple=adreno-unknown-android31 \
-      --iree-llvm-debug-symbols=false \
+      --iree-llvmcpu-debug-symbols=false \
       --iree-vm-bytecode-module-strip-source-map=true \
       --iree-vm-emit-polyglot-zip=false \
       --iree-flow-enable-fuse-padding-into-linalg-consumer-ops \
diff --git a/build_tools/cmake/iree_benchmark_suite.cmake b/build_tools/cmake/iree_benchmark_suite.cmake
index b9296f6..f3daa35 100644
--- a/build_tools/cmake/iree_benchmark_suite.cmake
+++ b/build_tools/cmake/iree_benchmark_suite.cmake
@@ -377,7 +377,7 @@
             # Enable zip polyglot to provide component sizes.
             "--iree-vm-emit-polyglot-zip=true"
             # Disable debug symbols to provide correct component sizes.
-            "--iree-llvm-debug-symbols=false"
+            "--iree-llvmcpu-debug-symbols=false"
             ${_COMPILATION_ARGS}
           DEPENDS
             "${_MODULE_SOURCE_TARGET}"
diff --git a/build_tools/cmake/iree_bytecode_module.cmake b/build_tools/cmake/iree_bytecode_module.cmake
index ac983b4..549c509 100644
--- a/build_tools/cmake/iree_bytecode_module.cmake
+++ b/build_tools/cmake/iree_bytecode_module.cmake
@@ -83,29 +83,29 @@
   # If an LLVM CPU backend is enabled, supply the linker tool.
   if(IREE_LLD_TARGET)
     set(_LINKER_TOOL_EXECUTABLE "$<TARGET_FILE:${IREE_LLD_TARGET}>")
-    list(APPEND _ARGS "--iree-llvm-embedded-linker-path=\"${_LINKER_TOOL_EXECUTABLE}\"")
-    list(APPEND _ARGS "--iree-llvm-wasm-linker-path=\"${_LINKER_TOOL_EXECUTABLE}\"")
-    # Note: --iree-llvm-system-linker-path is left unspecified.
+    list(APPEND _ARGS "--iree-llvmcpu-embedded-linker-path=\"${_LINKER_TOOL_EXECUTABLE}\"")
+    list(APPEND _ARGS "--iree-llvmcpu-wasm-linker-path=\"${_LINKER_TOOL_EXECUTABLE}\"")
+    # Note: --iree-llvmcpu-system-linker-path is left unspecified.
   endif()
 
   if(IREE_BYTECODE_MODULE_FORCE_LLVM_SYSTEM_LINKER)
-    list(APPEND _ARGS "--iree-llvm-link-embedded=false")
+    list(APPEND _ARGS "--iree-llvmcpu-link-embedded=false")
   endif()
 
   # Support testing in TSan build dirs. Unlike other sanitizers, TSan is an
   # ABI break: when the host code is built with TSan, the module must be too,
   # otherwise we get crashes calling module code.
   if(IREE_BYTECODE_MODULE_ENABLE_TSAN)
-    list(APPEND _ARGS "--iree-llvm-sanitize=thread")
+    list(APPEND _ARGS "--iree-llvmcpu-sanitize=thread")
   endif()
 
   set(_OUTPUT_FILES "${_MODULE_FILE_NAME}")
   # Check LLVM static library setting. If the static libary output path is set,
   # retrieve the object path and the corresponding header file path.
   if(_RULE_STATIC_LIB_PATH)
-    list(APPEND _ARGS "--iree-llvm-link-embedded=false")
-    list(APPEND _ARGS "--iree-llvm-link-static")
-    list(APPEND _ARGS "--iree-llvm-static-library-output-path=${_RULE_STATIC_LIB_PATH}")
+    list(APPEND _ARGS "--iree-llvmcpu-link-embedded=false")
+    list(APPEND _ARGS "--iree-llvmcpu-link-static")
+    list(APPEND _ARGS "--iree-llvmcpu-static-library-output-path=${_RULE_STATIC_LIB_PATH}")
 
     string(REPLACE ".o" ".h" _STATIC_HDR_PATH "${_RULE_STATIC_LIB_PATH}")
     list(APPEND _OUTPUT_FILES "${_RULE_STATIC_LIB_PATH}" "${_STATIC_HDR_PATH}")
diff --git a/build_tools/cmake/iree_c_module.cmake b/build_tools/cmake/iree_c_module.cmake
index f37ed3c..babf79a 100644
--- a/build_tools/cmake/iree_c_module.cmake
+++ b/build_tools/cmake/iree_c_module.cmake
@@ -72,9 +72,9 @@
   # Check LLVM static library setting. If the static libary output path is set,
   # retrieve the object path and the corresponding header file path.
   if(_RULE_STATIC_LIB_PATH)
-    list(APPEND _ARGS "--iree-llvm-link-embedded=false")
-    list(APPEND _ARGS "--iree-llvm-link-static")
-    list(APPEND _ARGS "--iree-llvm-static-library-output-path=${_RULE_STATIC_LIB_PATH}")
+    list(APPEND _ARGS "--iree-llvmcpu-link-embedded=false")
+    list(APPEND _ARGS "--iree-llvmcpu-link-static")
+    list(APPEND _ARGS "--iree-llvmcpu-static-library-output-path=${_RULE_STATIC_LIB_PATH}")
 
     string(REPLACE ".o" ".h" _STATIC_HDR_PATH "${_RULE_STATIC_LIB_PATH}")
     list(APPEND _OUTPUT_FILES "${_RULE_STATIC_LIB_PATH}" "${_STATIC_HDR_PATH}")
diff --git a/build_tools/cmake/iree_check_test.cmake b/build_tools/cmake/iree_check_test.cmake
index b4e9df4..15dc073 100644
--- a/build_tools/cmake/iree_check_test.cmake
+++ b/build_tools/cmake/iree_check_test.cmake
@@ -13,7 +13,7 @@
 
 # Helper for iree_check_test and iree_trace_runner_test.
 # Just a thin wrapper around iree_bytecode_module, passing it some
-# common flags, including the appropriate --iree-llvm-target-triple in the
+# common flags, including the appropriate --iree-llvmcpu-target-triple in the
 # Android case.
 function(iree_bytecode_module_for_iree_check_test_and_friends)
   if(NOT IREE_BUILD_TESTS)
@@ -34,7 +34,7 @@
 TARGET_BACKEND is not in the list (${IREE_TARGET_BACKENDS_SUPPORTING_TARGET_CPU_FEATURES}). Actual values: \
 TARGET_CPU_FEATURES=${_RULE_TARGET_CPU_FEATURES}, TARGET_BACKEND=${_RULE_TARGET_BACKEND}.")
     endif()
-    list(APPEND _RULE_FLAGS "--iree-llvm-target-cpu-features=${_RULE_TARGET_CPU_FEATURES}")
+    list(APPEND _RULE_FLAGS "--iree-llvmcpu-target-cpu-features=${_RULE_TARGET_CPU_FEATURES}")
   endif()
 
   iree_bytecode_module(
@@ -74,7 +74,7 @@
 #   MODULE_FILE_NAME: Optional, specifies the absolute path to the filename
 #       to use for the generated IREE module (.vmfb).
 #   TARGET_CPU_FEATURES: If specified, a string passed as argument to
-#       --iree-llvm-target-cpu-features.
+#       --iree-llvmcpu-target-cpu-features.
 function(iree_check_test)
   if(NOT IREE_BUILD_TESTS)
     return()
@@ -183,7 +183,7 @@
 #   LABELS: Additional labels to apply to the generated tests. The package path
 #       is added automatically.
 #   TARGET_CPU_FEATURES: If specified, a string passed as argument to
-#       --iree-llvm-target-cpu-features.
+#       --iree-llvmcpu-target-cpu-features.
 function(iree_check_single_backend_test_suite)
   if(NOT IREE_BUILD_TESTS)
     return()
@@ -367,8 +367,8 @@
 #   TARGET_CPU_FEATURES_VARIANTS: list of target cpu features variants. Only used
 #       for drivers that vary based on the target CPU features. For each list
 #       element, a separate test is created, with the list element passed as
-#       argument to --iree-llvm-target-cpu-features. The special value "default"
-#       is interpreted as no --iree-llvm-target-cpu-features flag to work around
+#       argument to --iree-llvmcpu-target-cpu-features. The special value "default"
+#       is interpreted as no --iree-llvmcpu-target-cpu-features flag to work around
 #       corner cases with empty entries in CMake lists.
 function(iree_check_test_suite)
   if(NOT IREE_BUILD_TESTS)
diff --git a/build_tools/cmake/iree_macros.cmake b/build_tools/cmake/iree_macros.cmake
index 68b6fa3..fd4c01a 100644
--- a/build_tools/cmake/iree_macros.cmake
+++ b/build_tools/cmake/iree_macros.cmake
@@ -424,7 +424,7 @@
     # From looking at the toolchain file, ANDROID_PLATFORM_LEVEL seems like it
     # should pretty consistently be just a number we can use for target triple.
     set(_TARGET_TRIPLE "aarch64-none-linux-android${ANDROID_PLATFORM_LEVEL}")
-    list(APPEND _FLAGS "--iree-llvm-target-triple=${_TARGET_TRIPLE}")
+    list(APPEND _FLAGS "--iree-llvmcpu-target-triple=${_TARGET_TRIPLE}")
   endif()
 
   if(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64" AND
@@ -445,7 +445,7 @@
 
   if(EMSCRIPTEN AND NOT IN_FLAGS MATCHES "iree-llvm-target-triple")
     set(_EMSCRIPTEN_TEST_DEFAULT_FLAGS
-      "--iree-llvm-target-triple=wasm32-unknown-emscripten"
+      "--iree-llvmcpu-target-triple=wasm32-unknown-emscripten"
     )
     list(APPEND _FLAGS ${_EMSCRIPTEN_TEST_DEFAULT_FLAGS})
   endif()
diff --git a/build_tools/cmake/iree_static_linker_test.cmake b/build_tools/cmake/iree_static_linker_test.cmake
index 3cc2d26..c7a88f8 100644
--- a/build_tools/cmake/iree_static_linker_test.cmake
+++ b/build_tools/cmake/iree_static_linker_test.cmake
@@ -25,7 +25,7 @@
 #   LABELS: Additional labels to apply to the test. The package path and
 #       "driver=local-sync" are added automatically.
 #   TARGET_CPU_FEATURES: If specified, a string passed as argument to
-#       --iree-llvm-target-cpu-features.
+#       --iree-llvmcpu-target-cpu-features.
 #
 # Example:
 #   iree_static_linker_test(
@@ -82,7 +82,7 @@
   set(_COMPILER_ARGS ${_RULE_COMPILER_FLAGS})
   list(APPEND _COMPILER_ARGS "--iree-hal-target-backends=llvm-cpu")
   if(_RULE_TARGET_CPU_FEATURES)
-    list(APPEND _COMPILER_ARGS "--iree-llvm-target-cpu-features=${_RULE_TARGET_CPU_FEATURES}")
+    list(APPEND _COMPILER_ARGS "--iree-llvmcpu-target-cpu-features=${_RULE_TARGET_CPU_FEATURES}")
   endif()
 
   if(_RULE_EMITC)
diff --git a/build_tools/cmake/iree_trace_runner_test.cmake b/build_tools/cmake/iree_trace_runner_test.cmake
index 7d3264e..96ef411 100644
--- a/build_tools/cmake/iree_trace_runner_test.cmake
+++ b/build_tools/cmake/iree_trace_runner_test.cmake
@@ -28,7 +28,7 @@
 #       generated IREE module (.vmfb). Mandatory, unlike in iree_check_test,
 #       because trace files (.yaml) reference a specific module file path.
 #   TARGET_CPU_FEATURES: If specified, a string passed as argument to
-#       --iree-llvm-target-cpu-features.
+#       --iree-llvmcpu-target-cpu-features.
 function(iree_trace_runner_test)
   if(NOT IREE_BUILD_TESTS)
     return()
@@ -123,7 +123,7 @@
 #       "driver=${DRIVER}" are added automatically.
 #   TRACE_RUNNER: trace-runner program to run.
 #   TARGET_CPU_FEATURES: If specified, a string passed as argument to
-#       --iree-llvm-target-cpu-features.
+#       --iree-llvmcpu-target-cpu-features.
 function(iree_single_backend_generated_trace_runner_test)
   if(NOT IREE_BUILD_TESTS)
     return()
@@ -277,8 +277,8 @@
 #   TARGET_CPU_FEATURES_VARIANTS: list of target cpu features variants. Only used
 #       for drivers that vary based on the target CPU features. For each list
 #       element, a separate test is created, with the list element passed as
-#       argument to --iree-llvm-target-cpu-features. The special value "default"
-#       is interpreted as no --iree-llvm-target-cpu-features flag to work around
+#       argument to --iree-llvmcpu-target-cpu-features. The special value "default"
+#       is interpreted as no --iree-llvmcpu-target-cpu-features flag to work around
 #       corner cases with empty entries in CMake lists.
 function(iree_generated_trace_runner_test)
   if(NOT IREE_BUILD_TESTS)
diff --git a/build_tools/cmake/riscv.toolchain.cmake b/build_tools/cmake/riscv.toolchain.cmake
index 5a9a95a..075b48d 100644
--- a/build_tools/cmake/riscv.toolchain.cmake
+++ b/build_tools/cmake/riscv.toolchain.cmake
@@ -49,10 +49,10 @@
       -march=rv64i2p0ma2p0f2p0d2p0c2p0 -mabi=lp64d")
   set(RISCV_LINKER_FLAGS "${RISCV_LINKER_FLAGS} -lstdc++ -lpthread -lm -ldl")
   set(RISCV64_TEST_DEFAULT_LLVM_FLAGS
-    "--iree-llvm-target-triple=riscv64"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+c,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+c,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     CACHE INTERNAL "Default llvm codegen flags for testing purposes")
 elseif(RISCV_CPU STREQUAL "linux-riscv_32")
@@ -67,10 +67,10 @@
       -Wno-atomic-alignment")
   set(RISCV_LINKER_FLAGS "${RISCV_LINKER_FLAGS} -lstdc++ -lpthread -lm -ldl -latomic")
   set(RISCV32_TEST_DEFAULT_LLVM_FLAGS
-    "--iree-llvm-target-triple=riscv32"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     CACHE INTERNAL "Default llvm codegen flags for testing purposes")
 elseif(RISCV_CPU STREQUAL "generic-riscv_32")
diff --git a/build_tools/python/benchmark_suites/iree/armv8_a_benchmarks.py b/build_tools/python/benchmark_suites/iree/armv8_a_benchmarks.py
index 53eed51..cfb72d4 100644
--- a/build_tools/python/benchmark_suites/iree/armv8_a_benchmarks.py
+++ b/build_tools/python/benchmark_suites/iree/armv8_a_benchmarks.py
@@ -51,7 +51,7 @@
       compile_targets=[ARMV8_A_CPU_TARGET],
       extra_flags=[
           "--iree-flow-enable-data-tiling",
-          "--iree-llvm-target-cpu-features=+dotprod",
+          "--iree-llvmcpu-target-cpu-features=+dotprod",
           "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops",
           "--iree-llvmcpu-enable-pad-consumer-fusion"
       ])
diff --git a/build_tools/python/benchmark_suites/iree/benchmark_collections.py b/build_tools/python/benchmark_suites/iree/benchmark_collections.py
index 2ce0aa7..c2fc7bd 100644
--- a/build_tools/python/benchmark_suites/iree/benchmark_collections.py
+++ b/build_tools/python/benchmark_suites/iree/benchmark_collections.py
@@ -51,7 +51,7 @@
             # Enable zip polyglot to provide component sizes.
             "--iree-vm-emit-polyglot-zip=true",
             # Disable debug symbols to provide correct component sizes.
-            "--iree-llvm-debug-symbols=false"
+            "--iree-llvmcpu-debug-symbols=false"
         ])
     compile_stats_gen_configs.append(
         iree_definitions.ModuleGenerationConfig.with_flag_generation(
diff --git a/build_tools/python/e2e_test_framework/definitions/iree_definitions.py b/build_tools/python/e2e_test_framework/definitions/iree_definitions.py
index a9c1719..978d693 100644
--- a/build_tools/python/e2e_test_framework/definitions/iree_definitions.py
+++ b/build_tools/python/e2e_test_framework/definitions/iree_definitions.py
@@ -322,27 +322,29 @@
 
   if arch_info.architecture == "x86_64":
     flags = [
-        f"--iree-llvm-target-triple=x86_64-unknown-{target.target_abi.value}",
-        f"--iree-llvm-target-cpu={arch_info.microarchitecture.lower()}"
+        f"--iree-llvmcpu-target-triple=x86_64-unknown-{target.target_abi.value}",
+        f"--iree-llvmcpu-target-cpu={arch_info.microarchitecture.lower()}"
     ]
   elif arch_info.architecture == "riscv_64":
     flags = [
-        f"--iree-llvm-target-triple=riscv64-pc-{target.target_abi.value}",
-        "--iree-llvm-target-cpu=generic-rv64", "--iree-llvm-target-abi=lp64d",
-        "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v",
+        f"--iree-llvmcpu-target-triple=riscv64-pc-{target.target_abi.value}",
+        "--iree-llvmcpu-target-cpu=generic-rv64",
+        "--iree-llvmcpu-target-abi=lp64d",
+        "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v",
         "--riscv-v-fixed-length-vector-lmul-max=8"
     ]
   elif arch_info.architecture == "riscv_32":
     # TODO(llvm-project/60463): Replace 'zve32f' with 'zve32x'.
     flags = [
-        f"--iree-llvm-target-triple=riscv32-pc-{target.target_abi.value}",
-        "--iree-llvm-target-cpu=generic-rv32", "--iree-llvm-target-abi=ilp32",
-        "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f",
+        f"--iree-llvmcpu-target-triple=riscv32-pc-{target.target_abi.value}",
+        "--iree-llvmcpu-target-cpu=generic-rv32",
+        "--iree-llvmcpu-target-abi=ilp32",
+        "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f",
         "--riscv-v-fixed-length-vector-lmul-max=8"
     ]
   elif arch_info.architecture == "armv8.2-a":
     flags = [
-        f"--iree-llvm-target-triple=aarch64-none-{target.target_abi.value}",
+        f"--iree-llvmcpu-target-triple=aarch64-none-{target.target_abi.value}",
     ]
   elif arch_info.architecture == "cuda":
     if target.target_abi != TargetABI.LINUX_GNU:
diff --git a/compiler/bindings/python/iree/compiler/tools/core.py b/compiler/bindings/python/iree/compiler/tools/core.py
index 8452f4f..11e321d 100644
--- a/compiler/bindings/python/iree/compiler/tools/core.py
+++ b/compiler/bindings/python/iree/compiler/tools/core.py
@@ -179,7 +179,7 @@
 
   # Tool paths.
   lld_path = find_tool("iree-lld")
-  cl.append(f"--iree-llvm-embedded-linker-path={lld_path}")
+  cl.append(f"--iree-llvmcpu-embedded-linker-path={lld_path}")
 
   # MLIR flags.
   if options.output_mlir_debuginfo:
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LLVMTargetOptions.cpp b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LLVMTargetOptions.cpp
index 65d18dd..fda0895 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LLVMTargetOptions.cpp
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LLVMTargetOptions.cpp
@@ -80,30 +80,31 @@
   auto targetOptions = getDefaultLLVMTargetOptions();
 
   static llvm::cl::opt<std::string> clTargetTriple(
-      "iree-llvm-target-triple", llvm::cl::desc("LLVM target machine triple"),
+      "iree-llvmcpu-target-triple",
+      llvm::cl::desc("LLVM target machine triple"),
       llvm::cl::init(targetOptions.target.triple));
   static llvm::cl::opt<std::string> clTargetCPU(
-      "iree-llvm-target-cpu",
+      "iree-llvmcpu-target-cpu",
       llvm::cl::desc(
           "LLVM target machine CPU; use 'host' for your host native CPU"),
       llvm::cl::init("generic"));
   static llvm::cl::opt<std::string> clTargetCPUFeatures(
-      "iree-llvm-target-cpu-features",
+      "iree-llvmcpu-target-cpu-features",
       llvm::cl::desc("LLVM target machine CPU features; use 'host' for your "
                      "host native CPU"),
       llvm::cl::init(""));
 
   static llvm::cl::opt<bool> llvmLoopInterleaving(
-      "iree-llvm-loop-interleaving", llvm::cl::init(false),
+      "iree-llvmcpu-loop-interleaving", llvm::cl::init(false),
       llvm::cl::desc("Enable LLVM loop interleaving opt"));
   static llvm::cl::opt<bool> llvmLoopVectorization(
-      "iree-llvm-loop-vectorization", llvm::cl::init(false),
+      "iree-llvmcpu-loop-vectorization", llvm::cl::init(false),
       llvm::cl::desc("Enable LLVM loop vectorization opt"));
   static llvm::cl::opt<bool> llvmLoopUnrolling(
-      "iree-llvm-loop-unrolling", llvm::cl::init(true),
+      "iree-llvmcpu-loop-unrolling", llvm::cl::init(true),
       llvm::cl::desc("Enable LLVM loop unrolling opt"));
   static llvm::cl::opt<bool> llvmSLPVectorization(
-      "iree-llvm-slp-vectorization", llvm::cl::init(false),
+      "iree-llvmcpu-slp-vectorization", llvm::cl::init(false),
       llvm::cl::desc("Enable LLVM SLP Vectorization opt"));
 
   targetOptions.target.triple = clTargetTriple;
@@ -133,7 +134,7 @@
   targetOptions.pipelineTuningOptions.SLPVectorization = llvmSLPVectorization;
 
   static llvm::cl::opt<SanitizerKind> clSanitizerKind(
-      "iree-llvm-sanitize", llvm::cl::desc("Apply LLVM sanitize feature"),
+      "iree-llvmcpu-sanitize", llvm::cl::desc("Apply LLVM sanitize feature"),
       llvm::cl::init(SanitizerKind::kNone),
       llvm::cl::values(clEnumValN(SanitizerKind::kAddress, "address",
                                   "Address sanitizer support"),
@@ -142,13 +143,13 @@
   targetOptions.sanitizerKind = clSanitizerKind;
 
   static llvm::cl::opt<std::string> clTargetABI(
-      "iree-llvm-target-abi",
+      "iree-llvmcpu-target-abi",
       llvm::cl::desc("LLVM target machine ABI; specify for -mabi"),
       llvm::cl::init(""));
   targetOptions.options.MCOptions.ABIName = clTargetABI;
 
   static llvm::cl::opt<llvm::FloatABI::ABIType> clTargetFloatABI(
-      "iree-llvm-target-float-abi",
+      "iree-llvmcpu-target-float-abi",
       llvm::cl::desc("LLVM target codegen enables soft float abi e.g "
                      "-mfloat-abi=softfp"),
       llvm::cl::init(targetOptions.options.FloatABIType),
@@ -161,34 +162,34 @@
   targetOptions.options.FloatABIType = clTargetFloatABI;
 
   static llvm::cl::opt<bool> clDebugSymbols(
-      "iree-llvm-debug-symbols",
+      "iree-llvmcpu-debug-symbols",
       llvm::cl::desc("Generate and embed debug information (DWARF, PDB, etc)"),
       llvm::cl::init(targetOptions.debugSymbols));
   targetOptions.debugSymbols = clDebugSymbols;
 
   static llvm::cl::opt<std::string> clSystemLinkerPath(
-      "iree-llvm-system-linker-path",
+      "iree-llvmcpu-system-linker-path",
       llvm::cl::desc("Tool used to link system shared libraries produced by "
-                     "IREE (for --iree-llvm-link-embedded=false)."),
+                     "IREE (for --iree-llvmcpu-link-embedded=false)."),
       llvm::cl::init(""));
   targetOptions.systemLinkerPath = clSystemLinkerPath;
 
   static llvm::cl::opt<std::string> clEmbeddedLinkerPath(
-      "iree-llvm-embedded-linker-path",
+      "iree-llvmcpu-embedded-linker-path",
       llvm::cl::desc("Tool used to link embedded ELFs produced by IREE (for "
-                     "--iree-llvm-link-embedded=true)."),
+                     "--iree-llvmcpu-link-embedded=true)."),
       llvm::cl::init(""));
   targetOptions.embeddedLinkerPath = clEmbeddedLinkerPath;
 
   static llvm::cl::opt<std::string> clWasmLinkerPath(
-      "iree-llvm-wasm-linker-path",
+      "iree-llvmcpu-wasm-linker-path",
       llvm::cl::desc("Tool used to link WebAssembly modules produced by "
-                     "IREE (for --iree-llvm-target-triple=wasm32-*)."),
+                     "IREE (for --iree-llvmcpu-target-triple=wasm32-*)."),
       llvm::cl::init(""));
   targetOptions.wasmLinkerPath = clWasmLinkerPath;
 
   static llvm::cl::opt<bool> clLinkEmbedded(
-      "iree-llvm-link-embedded",
+      "iree-llvmcpu-link-embedded",
       llvm::cl::desc("Links binaries into a platform-agnostic ELF to be loaded "
                      "by the embedded IREE ELF loader"),
       llvm::cl::init(targetOptions.linkEmbedded));
@@ -207,7 +208,7 @@
   }
 
   static llvm::cl::opt<bool> clLinkStatic(
-      "iree-llvm-link-static",
+      "iree-llvmcpu-link-static",
       llvm::cl::desc(
           "Links system libraries into binaries statically to isolate them "
           "from platform dependencies needed at runtime"),
@@ -215,13 +216,13 @@
   targetOptions.linkStatic = clLinkStatic;
 
   static llvm::cl::opt<bool> clKeepLinkerArtifacts(
-      "iree-llvm-keep-linker-artifacts",
+      "iree-llvmcpu-keep-linker-artifacts",
       llvm::cl::desc("Keep LLVM linker target artifacts (.so/.dll/etc)"),
       llvm::cl::init(targetOptions.keepLinkerArtifacts));
   targetOptions.keepLinkerArtifacts = clKeepLinkerArtifacts;
 
   static llvm::cl::opt<std::string> clStaticLibraryOutputPath(
-      "iree-llvm-static-library-output-path",
+      "iree-llvmcpu-static-library-output-path",
       llvm::cl::desc(
           "Path to output static object (EX: '/path/to/static-library.o'). "
           "This will produce the static library at the specified path along "
@@ -230,7 +231,7 @@
   targetOptions.staticLibraryOutput = clStaticLibraryOutputPath;
 
   static llvm::cl::opt<bool> clListTargets(
-      "iree-llvm-list-targets",
+      "iree-llvmcpu-list-targets",
       llvm::cl::desc("Lists all registered targets that the LLVM backend can "
                      "generate code for."),
       llvm::cl::init(false), llvm::cl::ValueDisallowed,
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LinkerTool.cpp b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LinkerTool.cpp
index 69a7265..6193d34 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LinkerTool.cpp
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/LinkerTool.cpp
@@ -101,8 +101,8 @@
 }
 
 std::string LinkerTool::getSystemToolPath() const {
-  // Always use the --iree-llvm-system-linker-path flag when specified as it's
-  // explicitly telling us what to use.
+  // Always use the --iree-llvmcpu-system-linker-path flag when specified as
+  // it's explicitly telling us what to use.
   if (!targetOptions.systemLinkerPath.empty()) {
     return targetOptions.systemLinkerPath;
   }
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/EmbeddedLinkerTool.cpp b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/EmbeddedLinkerTool.cpp
index cbbad26..c1bab82 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/EmbeddedLinkerTool.cpp
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/EmbeddedLinkerTool.cpp
@@ -63,7 +63,7 @@
     llvm::errs()
         << "error: required embedded linker tool (typically `lld`) not found "
            "after searching:\n"
-           "  * --iree-llvm-embedded-linker-path= flag\n"
+           "  * --iree-llvmcpu-embedded-linker-path= flag\n"
            "  * IREE_LLVM_EMBEDDED_LINKER_PATH environment variable\n"
            "  * common locations at relative file paths\n"
            "  * system PATH\n"
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/WasmLinkerTool.cpp b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/WasmLinkerTool.cpp
index 5618382..9d67d5a 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/WasmLinkerTool.cpp
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/internal/WasmLinkerTool.cpp
@@ -32,15 +32,16 @@
 // * https://github.com/WebAssembly/wabt
 // * https://github.com/bytecodealliance/wasmtime
 //
-// Use with `-iree-llvm-target-triple=wasm32-unknown-unknown` (or equivalent).
-// For SIMD support, also set `-iree-llvm-target-cpu-features=+simd128`.
+// Use with `-iree-llvmcpu-target-triple=wasm32-unknown-unknown` (or
+// equivalent). For SIMD support, also set
+// `-iree-llvmcpu-target-cpu-features=+simd128`.
 class WasmLinkerTool : public LinkerTool {
  public:
   using LinkerTool::LinkerTool;
 
   std::string getWasmToolPath() const {
-    // Always use the --iree-llvm-wasm-linker-path flag when specified as it's
-    // explicitly telling us what to use.
+    // Always use the --iree-llvmcpu-wasm-linker-path flag when specified as
+    // it's explicitly telling us what to use.
     if (!targetOptions.wasmLinkerPath.empty()) {
       return targetOptions.wasmLinkerPath;
     }
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_embedded.mlir b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_embedded.mlir
index f47fdc9..c06707b 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_embedded.mlir
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_embedded.mlir
@@ -1,5 +1,5 @@
 // Tests the embedded ELF linker that will work on all targets.
-// RUN: iree-opt --split-input-file --iree-stream-transformation-pipeline --iree-hal-transformation-pipeline --iree-llvm-link-embedded=true %s | FileCheck %s
+// RUN: iree-opt --split-input-file --iree-stream-transformation-pipeline --iree-hal-transformation-pipeline --iree-llvmcpu-link-embedded=true %s | FileCheck %s
 
 module attributes {
   hal.device.targets = [
diff --git a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_system.mlir b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_system.mlir
index 73a222d..a81f583 100644
--- a/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_system.mlir
+++ b/compiler/src/iree/compiler/Dialect/HAL/Target/LLVM/test/smoketest_system.mlir
@@ -1,7 +1,7 @@
 // Tests the system linker; this will fail on Windows and other platforms
 // that cannot generate ELFs using system tools.
 // TODO(benvanik): find a way to make this conditional or host-specific.
-// RUN: iree-opt --split-input-file --iree-stream-transformation-pipeline --iree-hal-transformation-pipeline --iree-llvm-link-embedded=false %s | FileCheck %s
+// RUN: iree-opt --split-input-file --iree-stream-transformation-pipeline --iree-hal-transformation-pipeline --iree-llvmcpu-link-embedded=false %s | FileCheck %s
 
 module attributes {
   hal.device.targets = [
diff --git a/docs/developers/developing_iree/profiling_with_tracy.md b/docs/developers/developing_iree/profiling_with_tracy.md
index 1d2f141..e9c3990 100644
--- a/docs/developers/developing_iree/profiling_with_tracy.md
+++ b/docs/developers/developing_iree/profiling_with_tracy.md
@@ -38,11 +38,11 @@
 Build Tracy profiler (`iree-tracy-profiler`) | Base instructions below for [dependencies](#install-dependencies) and [build](#build-the-tracy-tools) | Same plus [`capstone-next` instructions](#do-you-need-capstone-next) for CPU disassembly to work
 Build the IREE compiler (`iree-compile`) for profiling your own modules  | [Nothing particular](#build-the-iree-compiler-iree-compile) | Same
 Build the IREE compiler (`iree-compile`) for profiling the compiler itself | [Also need](#build-the-iree-compiler-iree-compile) CMake setting: `IREE_ENABLE_COMPILER_TRACING` | Same
-Compile your IREE module (run `iree-compile`) | [Nothing particular](#compile-your-iree-module-run-iree-compile) | [Also need](#additional-steps-for-sampling) to pass `--iree-llvm-link-embedded=false` (and also, for `llvm-cpu` backend, pass `--iree-llvm-debug-symbols=true`, but that is currently default).
+Compile your IREE module (run `iree-compile`) | [Nothing particular](#compile-your-iree-module-run-iree-compile) | [Also need](#additional-steps-for-sampling) to pass `--iree-llvmcpu-link-embedded=false` (and also, for `llvm-cpu` backend, pass `--iree-llvmcpu-debug-symbols=true`, but that is currently default).
 Build IREE device binaries (`iree-run-module` etc) | [Base instructions below](#build-iree-device-binaries-with-tracy-instrumentation-clients) (CMake: set `IREE_ENABLE_RUNTIME_TRACING`) | [Also need](#additional-steps-for-sampling-1) debug information (Set `CMAKE_BUILD_TYPE` to `RelWithDebInfo`).
 Run IREE device binaries loading your modules | [Nothing particular](#running-the-profiled-program) (May need to set the environment variable `TRACY_NO_EXIT=1` for short-running benchmarks) | [Also need](#additional-steps-for-sampling-2) to set the environment variable `IREE_PRESERVE_DYLIB_TEMP_FILES` and adjust device security settings or run as root depending on OS.
 Run Tracy capture (`iree-tracy-capture`) to collect the trace | If device!=host (e.g. Android), [set up TCP port forwarding](#running-the-tracy-capture-cli-connecting-and-saving-profiles). | Same
-Build IREE's own tests and benchmark suites with Tracy instrumentation | [As above](#build-iree-device-binaries-with-tracy-instrumentation-clients), CMake: set `IREE_ENABLE_RUNTIME_TRACING`. | [Also need](#additional-steps-for-sampling) the CMake setting `IREE_BYTECODE_MODULE_FORCE_LLVM_SYSTEM_LINKER` so that `--iree-llvm-link-embedded=false` will be passed to `iree-compile`.
+Build IREE's own tests and benchmark suites with Tracy instrumentation | [As above](#build-iree-device-binaries-with-tracy-instrumentation-clients), CMake: set `IREE_ENABLE_RUNTIME_TRACING`. | [Also need](#additional-steps-for-sampling) the CMake setting `IREE_BYTECODE_MODULE_FORCE_LLVM_SYSTEM_LINKER` so that `--iree-llvmcpu-link-embedded=false` will be passed to `iree-compile`.
 
 ## Install dependencies
 
@@ -152,11 +152,11 @@
 
 ### Additional steps for Sampling
 
-In order for Sampling to work with your compiled modules, add this flag to your `iree-compile` command line: `--iree-llvm-link-embedded=false`.
+In order for Sampling to work with your compiled modules, add this flag to your `iree-compile` command line: `--iree-llvmcpu-link-embedded=false`.
 
-For the `llvm-cpu` target backend, sampling features also rely on debug information in the compiled module, enabled by `--iree-llvm-debug-symbols=true`, but that is currently the default.
+For the `llvm-cpu` target backend, sampling features also rely on debug information in the compiled module, enabled by `--iree-llvmcpu-debug-symbols=true`, but that is currently the default.
 
-When building IREE's own test and benchmark suites, if Tracy Sampling support is wanted, set the CMake setting `IREE_BYTECODE_MODULE_FORCE_LLVM_SYSTEM_LINKER` to `ON`. It has the effect of passing that `--iree-llvm-link-embedded=false` when compiling test/benchmark modules.
+When building IREE's own test and benchmark suites, if Tracy Sampling support is wanted, set the CMake setting `IREE_BYTECODE_MODULE_FORCE_LLVM_SYSTEM_LINKER` to `ON`. It has the effect of passing that `--iree-llvmcpu-link-embedded=false` when compiling test/benchmark modules.
 
 ## Build IREE device binaries with Tracy instrumentation ("clients")
 
diff --git a/docs/developers/developing_iree/sanitizers.md b/docs/developers/developing_iree/sanitizers.md
index 810a519..ec017b9 100644
--- a/docs/developers/developing_iree/sanitizers.md
+++ b/docs/developers/developing_iree/sanitizers.md
@@ -50,8 +50,8 @@
 In practice, `IREE_ENABLE_TSAN` alone would be enough for many targets, but not
 all. The problem is that a IREE runtime built with `IREE_ENABLE_TSAN` cannot
 load a IREE compiled LLVM/CPU module unless the following flags were passed to
-the IREE compiler: `--iree-llvm-sanitize=thread` and
-`--iree-llvm-link-embedded=false`.
+the IREE compiler: `--iree-llvmcpu-sanitize=thread` and
+`--iree-llvmcpu-link-embedded=false`.
 
 The CMake options `IREE_BYTECODE_MODULE_ENABLE_TSAN` and
 `IREE_BYTECODE_MODULE_FORCE_LLVM_SYSTEM_LINKER` ensure that the above flags are
diff --git a/docs/website/docs/building-from-source/riscv.md b/docs/website/docs/building-from-source/riscv.md
index 5457325..5d1b362 100644
--- a/docs/website/docs/building-from-source/riscv.md
+++ b/docs/website/docs/building-from-source/riscv.md
@@ -147,10 +147,10 @@
 ```shell hl_lines="3 4 5 6 7 8"
 tools/iree-compile \
   --iree-hal-target-backends=llvm-cpu \
-  --iree-llvm-target-triple=riscv64 \
-  --iree-llvm-target-cpu=generic-rv64 \
-  --iree-llvm-target-abi=lp64d \
-  --iree-llvm-target-cpu-features="+m,+a,+f,+d,+zvl512b,+v" \
+  --iree-llvmcpu-target-triple=riscv64 \
+  --iree-llvmcpu-target-cpu=generic-rv64 \
+  --iree-llvmcpu-target-abi=lp64d \
+  --iree-llvmcpu-target-cpu-features="+m,+a,+f,+d,+zvl512b,+v" \
   --riscv-v-fixed-length-vector-lmul-max=8 \
   iree_input.mlir -o mobilenet_cpu.vmfb
 ```
diff --git a/docs/website/docs/deployment-configurations/bare-metal.md b/docs/website/docs/deployment-configurations/bare-metal.md
index b970cb1..390d824 100644
--- a/docs/website/docs/deployment-configurations/bare-metal.md
+++ b/docs/website/docs/deployment-configurations/bare-metal.md
@@ -30,8 +30,8 @@
 iree-compile \
     --iree-stream-partitioning-favor=min-peak-memory \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=x86_64-pc-linux-elf \
-    --iree-llvm-debug-symbols=false \
+    --iree-llvmcpu-target-triple=x86_64-pc-linux-elf \
+    --iree-llvmcpu-debug-symbols=false \
     samples/models/simple_abs.mlir \
     -o /tmp/simple_abs_cpu.vmfb
 
@@ -62,7 +62,7 @@
 
 By default, the demo targets the host machine when compiling. To produce a
 bare-metal compatible model, run `iree-compile` as in the previous example
-and add the additional `-iree-llvm-static-library-output-path=` flag to specify
+and add the additional `-iree-llvmcpu-static-library-output-path=` flag to specify
 the static library destination. This will produce a `.h\.o` file to link
 directly into the target application.
 
diff --git a/docs/website/docs/deployment-configurations/cpu.md b/docs/website/docs/deployment-configurations/cpu.md
index 7aa21ac..5feed30 100644
--- a/docs/website/docs/deployment-configurations/cpu.md
+++ b/docs/website/docs/deployment-configurations/cpu.md
@@ -98,9 +98,9 @@
 
 !!! tip
 
-    The `--iree-llvm-target-triple=` flag tells the compiler to generate code
+    The `--iree-llvmcpu-target-triple=` flag tells the compiler to generate code
     for a specific type of CPU. You can see the list of supported targets with
-    `iree-compile --iree-llvm-list-targets`, or omit the flag to let LLVM infer
+    `iree-compile --iree-llvmcpu-list-targets`, or omit the flag to let LLVM infer
     the triple from your host machine (e.g. `x86_64-linux-gnu`).
 
 ### Get IREE runtime with local CPU HAL driver
diff --git a/experimental/web/generate_web_metrics.sh b/experimental/web/generate_web_metrics.sh
index 45af069..1e83f25 100644
--- a/experimental/web/generate_web_metrics.sh
+++ b/experimental/web/generate_web_metrics.sh
@@ -131,7 +131,7 @@
   "${IREE_COMPILE_PATH?}" "${INPUT_FILE}" \
     --iree-input-type=tosa \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=wasm32-unknown-emscripten \
+    --iree-llvmcpu-target-triple=wasm32-unknown-emscripten \
     --iree-hal-dump-executable-sources-to="${ARTIFACTS_DIR}" \
     --iree-hal-dump-executable-binaries-to="${ARTIFACTS_DIR}" \
     --iree-scheduling-dump-statistics-format=csv \
diff --git a/experimental/web/sample_dynamic/build_sample.sh b/experimental/web/sample_dynamic/build_sample.sh
index 8d73322..3f3e6a4 100755
--- a/experimental/web/sample_dynamic/build_sample.sh
+++ b/experimental/web/sample_dynamic/build_sample.sh
@@ -63,8 +63,8 @@
   "${COMPILE_TOOL}" "$2" \
     --iree-input-type=mhlo \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-target-triple=wasm32-unknown-emscripten \
-    --iree-llvm-target-cpu-features=+atomics,+bulk-memory,+simd128 \
+    --iree-llvmcpu-target-triple=wasm32-unknown-emscripten \
+    --iree-llvmcpu-target-cpu-features=+atomics,+bulk-memory,+simd128 \
     --o "${BINARY_DIR}/$1.vmfb"
 }
 
diff --git a/experimental/web/sample_dynamic/index.html b/experimental/web/sample_dynamic/index.html
index 078aed4..d0c9e84 100644
--- a/experimental/web/sample_dynamic/index.html
+++ b/experimental/web/sample_dynamic/index.html
@@ -159,8 +159,8 @@
     <textarea type="text" readonly spellcheck="false"
     class="form-control" style="width:610px; height:90px; resize:none; font-family: monospace;">
 --iree-hal-target-backends=llvm-cpu \
---iree-llvm-target-triple=wasm32-unknown-emscripten \
---iree-llvm-target-cpu-features=+atomics,+bulk-memory,+simd128 \</textarea>
+--iree-llvmcpu-target-triple=wasm32-unknown-emscripten \
+--iree-llvmcpu-target-cpu-features=+atomics,+bulk-memory,+simd128 \</textarea>
 
   </div>
 
diff --git a/experimental/web/sample_dynamic/iree_api.js b/experimental/web/sample_dynamic/iree_api.js
index 4714fd5..5f24bed 100644
--- a/experimental/web/sample_dynamic/iree_api.js
+++ b/experimental/web/sample_dynamic/iree_api.js
@@ -76,7 +76,7 @@
 // In order to call functions on the program it must be compiled in a supported
 // configuration, such as with these flags:
 //     --iree-hal-target-backends=llvm
-//     --iree-llvm-target-triple=wasm32-unknown-emscripten
+//     --iree-llvmcpu-target-triple=wasm32-unknown-emscripten
 //
 // Resolves with an opaque pointer to the program state on success.
 function ireeLoadProgram(vmfbPathOrBuffer) {
diff --git a/experimental/web/sample_static/build_sample.sh b/experimental/web/sample_static/build_sample.sh
index f84e754..c90db55 100755
--- a/experimental/web/sample_static/build_sample.sh
+++ b/experimental/web/sample_static/build_sample.sh
@@ -65,10 +65,10 @@
 "${COMPILE_TOOL}" "${INPUT_PATH}" \
   --iree-input-type=mhlo \
   --iree-hal-target-backends=llvm-cpu \
-  --iree-llvm-target-triple=wasm32-unknown-unknown \
-  --iree-llvm-target-cpu-features=+simd128 \
-  --iree-llvm-link-static \
-  --iree-llvm-static-library-output-path="${BINARY_DIR}/${INPUT_NAME}_static.o" \
+  --iree-llvmcpu-target-triple=wasm32-unknown-unknown \
+  --iree-llvmcpu-target-cpu-features=+simd128 \
+  --iree-llvmcpu-link-static \
+  --iree-llvmcpu-static-library-output-path="${BINARY_DIR}/${INPUT_NAME}_static.o" \
   --o "${BINARY_DIR}/${INPUT_NAME}.vmfb"
 
 echo "=== Embedding bytecode module (.vmfb) into C source files (.h, .c) ==="
diff --git a/runtime/src/iree/hal/local/elf/testdata/generate.sh b/runtime/src/iree/hal/local/elf/testdata/generate.sh
index d1116a9..6cd2392 100755
--- a/runtime/src/iree/hal/local/elf/testdata/generate.sh
+++ b/runtime/src/iree/hal/local/elf/testdata/generate.sh
@@ -39,7 +39,7 @@
       -o="${TESTDATA}/${so_name}"
 
       --iree-hal-target-backends=llvm-cpu
-      --iree-llvm-debug-symbols=false
+      --iree-llvmcpu-debug-symbols=false
 
       "${compile_args[@]}"
   )
@@ -47,38 +47,38 @@
 }
 
 ARM_32=(
-  --iree-llvm-target-triple=armv7a-pc-linux-elf
-  --iree-llvm-target-float-abi=hard
+  --iree-llvmcpu-target-triple=armv7a-pc-linux-elf
+  --iree-llvmcpu-target-float-abi=hard
 )
 compile_and_extract_library "elementwise_mul_arm_32.so" ${ARM_32[@]}
 
 ARM_64=(
-  --iree-llvm-target-triple=aarch64-pc-linux-elf
+  --iree-llvmcpu-target-triple=aarch64-pc-linux-elf
 )
 compile_and_extract_library "elementwise_mul_arm_64.so" ${ARM_64[@]}
 
 RISCV_32=(
-  --iree-llvm-target-triple=riscv32-pc-linux-elf
-  --iree-llvm-target-cpu=generic-rv32
-  --iree-llvm-target-cpu-features=+m,+f
-  --iree-llvm-target-abi=ilp32
+  --iree-llvmcpu-target-triple=riscv32-pc-linux-elf
+  --iree-llvmcpu-target-cpu=generic-rv32
+  --iree-llvmcpu-target-cpu-features=+m,+f
+  --iree-llvmcpu-target-abi=ilp32
 )
 compile_and_extract_library "elementwise_mul_riscv_32.so" ${RISCV_32[@]}
 
 RISCV_64=(
-  --iree-llvm-target-triple=riscv64-pc-linux-elf
-  --iree-llvm-target-cpu=generic-rv64
-  --iree-llvm-target-cpu-features=+m,+a,+f,+d,+c
-  --iree-llvm-target-abi=lp64d
+  --iree-llvmcpu-target-triple=riscv64-pc-linux-elf
+  --iree-llvmcpu-target-cpu=generic-rv64
+  --iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+c
+  --iree-llvmcpu-target-abi=lp64d
 )
 compile_and_extract_library "elementwise_mul_riscv_64.so" ${RISCV_64[@]}
 
 X86_32=(
-  --iree-llvm-target-triple=i686-pc-linux-elf
+  --iree-llvmcpu-target-triple=i686-pc-linux-elf
 )
 compile_and_extract_library "elementwise_mul_x86_32.so" ${X86_32[@]}
 
 X86_64=(
-  --iree-llvm-target-triple=x86_64-pc-linux-elf
+  --iree-llvmcpu-target-triple=x86_64-pc-linux-elf
 )
 compile_and_extract_library "elementwise_mul_x86_64.so" ${X86_64[@]}
diff --git a/runtime/src/iree/hal/local/executable_library_benchmark.md b/runtime/src/iree/hal/local/executable_library_benchmark.md
index 67f850d..29b0f87 100644
--- a/runtime/src/iree/hal/local/executable_library_benchmark.md
+++ b/runtime/src/iree/hal/local/executable_library_benchmark.md
@@ -85,8 +85,8 @@
     iree/hal/local/testdata/elementwise_mul.mlir \
     -o=elementwise_mul.so \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-debug-symbols=false \
-    --iree-llvm-target-triple=x86_64-pc-linux-elf
+    --iree-llvmcpu-debug-symbols=false \
+    --iree-llvmcpu-target-triple=x86_64-pc-linux-elf
 ```
 
 Note that the architecture and other related LLVM flags must be specified by the
@@ -118,8 +118,8 @@
     iree/samples/simple_embedding/simple_embedding_test.mlir \
     -o=module.vmfb \
     --iree-hal-target-backends=llvm-cpu \
-    --iree-llvm-debug-symbols=false \
-    --iree-llvm-target-triple=x86_64-pc-linux-elf \
+    --iree-llvmcpu-debug-symbols=false \
+    --iree-llvmcpu-target-triple=x86_64-pc-linux-elf \
     --mlir-print-ir-after-all \
     >module_dump.mlir 2>&1
 ```
diff --git a/samples/simple_embedding/BUILD b/samples/simple_embedding/BUILD
index 1d8973a..cfa2aaa 100644
--- a/samples/simple_embedding/BUILD
+++ b/samples/simple_embedding/BUILD
@@ -99,8 +99,8 @@
     c_identifier = "iree_samples_simple_embedding_test_module_cpu_x86_64",
     flags = [
         "--iree-hal-target-backends=llvm-cpu",
-        "--iree-llvm-target-triple=x86_64-pc-linux-elf",
-        "--iree-llvm-debug-symbols=false",
+        "--iree-llvmcpu-target-triple=x86_64-pc-linux-elf",
+        "--iree-llvmcpu-debug-symbols=false",
         "--iree-vm-bytecode-module-strip-source-map=true",
         "--iree-vm-emit-polyglot-zip=false",
     ],
@@ -112,11 +112,11 @@
     c_identifier = "iree_samples_simple_embedding_test_module_cpu_riscv_32",
     flags = [
         "--iree-hal-target-backends=llvm-cpu",
-        "--iree-llvm-target-triple=riscv32-pc-linux-elf",
-        "--iree-llvm-target-cpu=generic-rv32",
-        "--iree-llvm-target-cpu-features=+m,+f",
-        "--iree-llvm-target-abi=ilp32",
-        "--iree-llvm-debug-symbols=false",
+        "--iree-llvmcpu-target-triple=riscv32-pc-linux-elf",
+        "--iree-llvmcpu-target-cpu=generic-rv32",
+        "--iree-llvmcpu-target-cpu-features=+m,+f",
+        "--iree-llvmcpu-target-abi=ilp32",
+        "--iree-llvmcpu-debug-symbols=false",
         "--iree-vm-bytecode-module-strip-source-map=true",
         "--iree-vm-emit-polyglot-zip=false",
     ],
@@ -128,11 +128,11 @@
     c_identifier = "iree_samples_simple_embedding_test_module_cpu_riscv_64",
     flags = [
         "--iree-hal-target-backends=llvm-cpu",
-        "--iree-llvm-target-triple=riscv64-pc-linux-elf",
-        "--iree-llvm-target-cpu=generic-rv64",
-        "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+c",
-        "--iree-llvm-target-abi=lp64d",
-        "--iree-llvm-debug-symbols=false",
+        "--iree-llvmcpu-target-triple=riscv64-pc-linux-elf",
+        "--iree-llvmcpu-target-cpu=generic-rv64",
+        "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+c",
+        "--iree-llvmcpu-target-abi=lp64d",
+        "--iree-llvmcpu-debug-symbols=false",
         "--iree-vm-bytecode-module-strip-source-map=true",
         "--iree-vm-emit-polyglot-zip=false",
     ],
@@ -144,9 +144,9 @@
     c_identifier = "iree_samples_simple_embedding_test_module_cpu_arm_32",
     flags = [
         "--iree-hal-target-backends=llvm-cpu",
-        "--iree-llvm-target-triple=armv7a-pc-linux-elf",
-        "--iree-llvm-target-float-abi=hard",
-        "--iree-llvm-debug-symbols=false",
+        "--iree-llvmcpu-target-triple=armv7a-pc-linux-elf",
+        "--iree-llvmcpu-target-float-abi=hard",
+        "--iree-llvmcpu-debug-symbols=false",
         "--iree-vm-bytecode-module-strip-source-map=true",
         "--iree-vm-emit-polyglot-zip=false",
     ],
@@ -158,8 +158,8 @@
     c_identifier = "iree_samples_simple_embedding_test_module_cpu_arm_64",
     flags = [
         "--iree-hal-target-backends=llvm-cpu",
-        "--iree-llvm-target-triple=aarch64-pc-linux-elf",
-        "--iree-llvm-debug-symbols=false",
+        "--iree-llvmcpu-target-triple=aarch64-pc-linux-elf",
+        "--iree-llvmcpu-debug-symbols=false",
         "--iree-vm-bytecode-module-strip-source-map=true",
         "--iree-vm-emit-polyglot-zip=false",
     ],
@@ -245,7 +245,7 @@
     c_identifier = "iree_samples_simple_embedding_test_module_vulkan",
     flags = [
         "--iree-hal-target-backends=vulkan-spirv",
-        "--iree-llvm-debug-symbols=false",
+        "--iree-llvmcpu-debug-symbols=false",
     ],
 )
 
@@ -297,7 +297,7 @@
 #     c_identifier = "iree_samples_simple_embedding_test_module_cuda",
 #     flags = [
 #         "--iree-hal-target-backends=cuda",
-#         "--iree-llvm-debug-symbols=false",
+#         "--iree-llvmcpu-debug-symbols=false",
 #     ],
 # )
 
diff --git a/samples/simple_embedding/CMakeLists.txt b/samples/simple_embedding/CMakeLists.txt
index 715eb8e..8eea77c 100644
--- a/samples/simple_embedding/CMakeLists.txt
+++ b/samples/simple_embedding/CMakeLists.txt
@@ -86,8 +86,8 @@
     "iree_samples_simple_embedding_test_module_cpu_x86_64"
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
-    "--iree-llvm-target-triple=x86_64-pc-linux-elf"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-target-triple=x86_64-pc-linux-elf"
+    "--iree-llvmcpu-debug-symbols=false"
     "--iree-vm-bytecode-module-strip-source-map=true"
     "--iree-vm-emit-polyglot-zip=false"
   PUBLIC
@@ -102,11 +102,11 @@
     "iree_samples_simple_embedding_test_module_cpu_riscv_32"
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
-    "--iree-llvm-target-triple=riscv32-pc-linux-elf"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-cpu-features=+m,+f"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-elf"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-cpu-features=+m,+f"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-debug-symbols=false"
     "--iree-vm-bytecode-module-strip-source-map=true"
     "--iree-vm-emit-polyglot-zip=false"
   PUBLIC
@@ -121,11 +121,11 @@
     "iree_samples_simple_embedding_test_module_cpu_riscv_64"
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
-    "--iree-llvm-target-triple=riscv64-pc-linux-elf"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+c"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-elf"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+c"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-debug-symbols=false"
     "--iree-vm-bytecode-module-strip-source-map=true"
     "--iree-vm-emit-polyglot-zip=false"
   PUBLIC
@@ -140,9 +140,9 @@
     "iree_samples_simple_embedding_test_module_cpu_arm_32"
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
-    "--iree-llvm-target-triple=armv7a-pc-linux-elf"
-    "--iree-llvm-target-float-abi=hard"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-target-triple=armv7a-pc-linux-elf"
+    "--iree-llvmcpu-target-float-abi=hard"
+    "--iree-llvmcpu-debug-symbols=false"
     "--iree-vm-bytecode-module-strip-source-map=true"
     "--iree-vm-emit-polyglot-zip=false"
   PUBLIC
@@ -157,8 +157,8 @@
     "iree_samples_simple_embedding_test_module_cpu_arm_64"
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
-    "--iree-llvm-target-triple=aarch64-pc-linux-elf"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-target-triple=aarch64-pc-linux-elf"
+    "--iree-llvmcpu-debug-symbols=false"
     "--iree-vm-bytecode-module-strip-source-map=true"
     "--iree-vm-emit-polyglot-zip=false"
   PUBLIC
@@ -234,7 +234,7 @@
     "iree_samples_simple_embedding_test_module_vulkan"
   FLAGS
     "--iree-hal-target-backends=vulkan-spirv"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
diff --git a/samples/static_library/CMakeLists.txt b/samples/static_library/CMakeLists.txt
index efce97c..6d60b11 100644
--- a/samples/static_library/CMakeLists.txt
+++ b/samples/static_library/CMakeLists.txt
@@ -14,9 +14,9 @@
 # Setup args for iree-compile.
 set(_COMPILE_ARGS)
 list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
-list(APPEND _COMPILE_ARGS "--iree-llvm-link-embedded=false")
-list(APPEND _COMPILE_ARGS "--iree-llvm-link-static")
-list(APPEND _COMPILE_ARGS "--iree-llvm-static-library-output-path=simple_mul.o")
+list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
+list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")
+list(APPEND _COMPILE_ARGS "--iree-llvmcpu-static-library-output-path=simple_mul.o")
 list(APPEND _COMPILE_ARGS "--iree-vm-target-index-bits=32")
 list(APPEND _COMPILE_ARGS "${CMAKE_CURRENT_SOURCE_DIR}/simple_mul.mlir")
 list(APPEND _COMPILE_ARGS "-o")
@@ -100,9 +100,9 @@
 set(_COMPILE_ARGS)
 list(APPEND _COMPILE_ARGS "--output-format=vm-c")
 list(APPEND _COMPILE_ARGS "--iree-hal-target-backends=llvm-cpu")
-list(APPEND _COMPILE_ARGS "--iree-llvm-link-embedded=false")
-list(APPEND _COMPILE_ARGS "--iree-llvm-link-static")
-list(APPEND _COMPILE_ARGS "--iree-llvm-static-library-output-path=simple_mul_c_module.o")
+list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-embedded=false")
+list(APPEND _COMPILE_ARGS "--iree-llvmcpu-link-static")
+list(APPEND _COMPILE_ARGS "--iree-llvmcpu-static-library-output-path=simple_mul_c_module.o")
 list(APPEND _COMPILE_ARGS "--iree-vm-target-index-bits=32")
 list(APPEND _COMPILE_ARGS "${CMAKE_CURRENT_SOURCE_DIR}/simple_mul.mlir")
 list(APPEND _COMPILE_ARGS "-o")
diff --git a/tests/e2e/matmul/generate_e2e_matmul_tests.py b/tests/e2e/matmul/generate_e2e_matmul_tests.py
index 8275581..13a3c42 100644
--- a/tests/e2e/matmul/generate_e2e_matmul_tests.py
+++ b/tests/e2e/matmul/generate_e2e_matmul_tests.py
@@ -555,7 +555,7 @@
       "--requirements",
       type=str,
       help=
-      "Target requirements for this module. Comma-separated. As in -iree-llvm-target-cpu-features. If the target device does not meet all of the requirements, the test will be skipped.",
+      "Target requirements for this module. Comma-separated. As in -iree-llvmcpu-target-cpu-features. If the target device does not meet all of the requirements, the test will be skipped.",
       required=False)
   return parser.parse_args()
 
diff --git a/tests/e2e/regression/libm_linking.mlir b/tests/e2e/regression/libm_linking.mlir
index acc4f79..353663a 100644
--- a/tests/e2e/regression/libm_linking.mlir
+++ b/tests/e2e/regression/libm_linking.mlir
@@ -1,5 +1,5 @@
 // RUN: iree-opt --split-input-file --iree-transformation-pipeline --iree-hal-target-backends=llvm-cpu %s | FileCheck %s
-// RUN: iree-opt --split-input-file --iree-transformation-pipeline --iree-hal-target-backends=llvm-cpu --iree-llvm-link-embedded=false %s | FileCheck %s
+// RUN: iree-opt --split-input-file --iree-transformation-pipeline --iree-hal-target-backends=llvm-cpu --iree-llvmcpu-link-embedded=false %s | FileCheck %s
 
 // When lowering to CPU code through LLVM, certain LLVM intrinsics require
 // linking against libm (the standard C library of math functions, `-lm`).
diff --git a/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake b/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake
index 167dfd9..e7ac9c1 100644
--- a/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake
+++ b/tests/e2e/test_artifacts/generated_e2e_test_iree_artifacts.cmake
@@ -194,8 +194,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -209,8 +209,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -224,8 +224,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -239,8 +239,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -254,8 +254,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -269,8 +269,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -284,8 +284,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -299,8 +299,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -314,8 +314,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -329,8 +329,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -344,8 +344,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -359,8 +359,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -374,8 +374,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -389,8 +389,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -404,8 +404,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -419,8 +419,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
   PUBLIC
 )
 
@@ -434,8 +434,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -451,8 +451,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -468,8 +468,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -485,8 +485,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -502,8 +502,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -519,8 +519,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -536,8 +536,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -553,8 +553,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -570,8 +570,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -587,8 +587,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -604,8 +604,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -621,8 +621,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -638,8 +638,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -655,8 +655,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -672,8 +672,8 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -759,10 +759,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -777,10 +777,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -795,10 +795,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -813,10 +813,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -831,10 +831,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -849,10 +849,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -867,10 +867,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv32-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -885,10 +885,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv32-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -903,10 +903,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv32-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
   PUBLIC
 )
@@ -921,7 +921,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -935,7 +935,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -949,7 +949,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -963,7 +963,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -977,7 +977,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -991,7 +991,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -1005,7 +1005,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
   PUBLIC
 )
 
@@ -1019,7 +1019,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
@@ -1036,7 +1036,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
@@ -1053,7 +1053,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
@@ -1070,7 +1070,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
@@ -1087,7 +1087,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
@@ -1104,7 +1104,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
@@ -1121,9 +1121,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
-    "--iree-llvm-target-cpu-features=+dotprod"
+    "--iree-llvmcpu-target-cpu-features=+dotprod"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
   PUBLIC
@@ -1856,10 +1856,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1873,10 +1873,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1890,10 +1890,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1907,10 +1907,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1924,10 +1924,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1941,10 +1941,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1958,10 +1958,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1975,10 +1975,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -1992,10 +1992,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2009,10 +2009,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2026,10 +2026,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2043,10 +2043,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2060,10 +2060,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2077,10 +2077,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2094,10 +2094,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2111,10 +2111,10 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2128,12 +2128,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2147,12 +2147,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2166,12 +2166,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2185,12 +2185,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2204,12 +2204,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2223,12 +2223,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2242,12 +2242,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2261,12 +2261,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2280,12 +2280,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2299,12 +2299,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2318,12 +2318,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2337,12 +2337,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2356,12 +2356,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2375,12 +2375,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2394,12 +2394,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-triple=x86_64-unknown-linux-gnu"
-    "--iree-llvm-target-cpu=cascadelake"
+    "--iree-llvmcpu-target-triple=x86_64-unknown-linux-gnu"
+    "--iree-llvmcpu-target-cpu=cascadelake"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2415,7 +2415,7 @@
     "--iree-input-type=mhlo"
     "--iree-hal-cuda-llvm-target-arch=sm_80"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2431,7 +2431,7 @@
     "--iree-input-type=mhlo"
     "--iree-hal-cuda-llvm-target-arch=sm_80"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2447,7 +2447,7 @@
     "--iree-input-type=mhlo"
     "--iree-hal-cuda-llvm-target-arch=sm_80"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2463,7 +2463,7 @@
     "--iree-input-type=mhlo"
     "--iree-hal-cuda-llvm-target-arch=sm_80"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2479,7 +2479,7 @@
     "--iree-input-type=mhlo"
     "--iree-hal-cuda-llvm-target-arch=sm_80"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2493,13 +2493,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2513,13 +2513,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2533,13 +2533,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2553,13 +2553,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2573,13 +2573,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2593,13 +2593,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv64-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv64"
-    "--iree-llvm-target-abi=lp64d"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
+    "--iree-llvmcpu-target-triple=riscv64-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv64"
+    "--iree-llvmcpu-target-abi=lp64d"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+d,+zvl512b,+v"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2613,13 +2613,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv32-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2633,13 +2633,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv32-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2653,13 +2653,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=riscv32-pc-linux-gnu"
-    "--iree-llvm-target-cpu=generic-rv32"
-    "--iree-llvm-target-abi=ilp32"
-    "--iree-llvm-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
+    "--iree-llvmcpu-target-triple=riscv32-pc-linux-gnu"
+    "--iree-llvmcpu-target-cpu=generic-rv32"
+    "--iree-llvmcpu-target-abi=ilp32"
+    "--iree-llvmcpu-target-cpu-features=+m,+a,+f,+zvl512b,+zve32f"
     "--riscv-v-fixed-length-vector-lmul-max=8"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2673,9 +2673,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2689,9 +2689,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2705,9 +2705,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2721,9 +2721,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2737,9 +2737,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2753,9 +2753,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2769,9 +2769,9 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2785,12 +2785,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2804,12 +2804,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2823,12 +2823,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2842,12 +2842,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2861,12 +2861,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2880,12 +2880,12 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2899,13 +2899,13 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=tosa"
-    "--iree-llvm-target-triple=aarch64-none-linux-android29"
+    "--iree-llvmcpu-target-triple=aarch64-none-linux-android29"
     "--iree-flow-enable-data-tiling"
-    "--iree-llvm-target-cpu-features=+dotprod"
+    "--iree-llvmcpu-target-cpu-features=+dotprod"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-llvmcpu-enable-pad-consumer-fusion"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2921,7 +2921,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2937,7 +2937,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2953,7 +2953,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2969,7 +2969,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -2985,7 +2985,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3001,7 +3001,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3018,7 +3018,7 @@
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3035,7 +3035,7 @@
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3052,7 +3052,7 @@
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3069,7 +3069,7 @@
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3086,7 +3086,7 @@
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3103,7 +3103,7 @@
     "--iree-vulkan-target-triple=adreno-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3121,7 +3121,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3139,7 +3139,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3157,7 +3157,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3175,7 +3175,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3191,7 +3191,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3207,7 +3207,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3223,7 +3223,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3239,7 +3239,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3255,7 +3255,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3271,7 +3271,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3288,7 +3288,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-demote-f32-to-f16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3304,7 +3304,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3320,7 +3320,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3336,7 +3336,7 @@
     "--iree-input-type=tosa"
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3353,7 +3353,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3370,7 +3370,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3387,7 +3387,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3404,7 +3404,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3421,7 +3421,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3438,7 +3438,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3456,7 +3456,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-flow-demote-f32-to-f16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3473,7 +3473,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3490,7 +3490,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3507,7 +3507,7 @@
     "--iree-vulkan-target-triple=valhall-unknown-android31"
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3525,7 +3525,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3543,7 +3543,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3561,7 +3561,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3579,7 +3579,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3597,7 +3597,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3615,7 +3615,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3634,7 +3634,7 @@
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-flow-demote-f32-to-f16"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3652,7 +3652,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3670,7 +3670,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3688,7 +3688,7 @@
     "--iree-flow-enable-fuse-padding-into-linalg-consumer-ops"
     "--iree-hal-benchmark-dispatch-repeat-count=32"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3703,7 +3703,7 @@
     "--iree-hal-target-backends=vmvx"
     "--iree-input-type=tosa"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
@@ -3718,7 +3718,7 @@
     "--iree-hal-target-backends=vmvx"
     "--iree-input-type=tosa"
     "--iree-vm-emit-polyglot-zip=true"
-    "--iree-llvm-debug-symbols=false"
+    "--iree-llvmcpu-debug-symbols=false"
   PUBLIC
 )
 
diff --git a/tests/e2e/xla_ops/BUILD b/tests/e2e/xla_ops/BUILD
index e6277dd..92ec444 100644
--- a/tests/e2e/xla_ops/BUILD
+++ b/tests/e2e/xla_ops/BUILD
@@ -463,7 +463,7 @@
     ),
     compiler_flags = [
         "--iree-input-type=mhlo",
-        "--iree-llvm-target-cpu-features=host",
+        "--iree-llvmcpu-target-cpu-features=host",
     ],
     driver = "local-task",
     # Building and testing must be on the same architecture, which doesn't work
diff --git a/tests/e2e/xla_ops/CMakeLists.txt b/tests/e2e/xla_ops/CMakeLists.txt
index 4374f4a..f8bbab4 100644
--- a/tests/e2e/xla_ops/CMakeLists.txt
+++ b/tests/e2e/xla_ops/CMakeLists.txt
@@ -432,7 +432,7 @@
     "local-task"
   COMPILER_FLAGS
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-cpu-features=host"
+    "--iree-llvmcpu-target-cpu-features=host"
   LABELS
     "hostonly"
     "local"
diff --git a/tests/microbenchmarks/CMakeLists.txt b/tests/microbenchmarks/CMakeLists.txt
index 790956c..70f5e53 100644
--- a/tests/microbenchmarks/CMakeLists.txt
+++ b/tests/microbenchmarks/CMakeLists.txt
@@ -16,7 +16,7 @@
   FLAGS
     "--iree-hal-target-backends=llvm-cpu"
     "--iree-input-type=mhlo"
-    "--iree-llvm-target-cpu-features=host"
+    "--iree-llvmcpu-target-cpu-features=host"
 )
 
 # Only target cuda benchmarks if the backend is enabled.
diff --git a/tests/microbenchmarks/dynamic_shape_vectorization.mlir b/tests/microbenchmarks/dynamic_shape_vectorization.mlir
index 71cb553..7d0fbcd 100644
--- a/tests/microbenchmarks/dynamic_shape_vectorization.mlir
+++ b/tests/microbenchmarks/dynamic_shape_vectorization.mlir
@@ -1,4 +1,4 @@
-// RUN: iree-run-mlir --iree-hal-target-backends=llvm-cpu --iree-llvm-link-embedded=true --iree-llvm-target-cpu-features='host' --iree-codegen-llvm-generic-ops-workgroup-size=2048 %s
+// RUN: iree-run-mlir --iree-hal-target-backends=llvm-cpu --iree-llvmcpu-link-embedded=true --iree-llvmcpu-target-cpu-features='host' --iree-codegen-llvm-generic-ops-workgroup-size=2048 %s
 
 //===----------------------------------------------------------------------===//
 // Dynamic shape micro-benchmarks.
diff --git a/tests/microbenchmarks/linalg_transpose.mlir b/tests/microbenchmarks/linalg_transpose.mlir
index fda6d1f..427a942 100644
--- a/tests/microbenchmarks/linalg_transpose.mlir
+++ b/tests/microbenchmarks/linalg_transpose.mlir
@@ -1,4 +1,4 @@
-// RUN: iree-run-mlir --iree-hal-target-backends=llvm-cpu --iree-llvm-link-embedded=true --iree-llvm-target-cpu-features='host' --iree-codegen-llvm-generic-ops-workgroup-size=2048 %s
+// RUN: iree-run-mlir --iree-hal-target-backends=llvm-cpu --iree-llvmcpu-link-embedded=true --iree-llvmcpu-target-cpu-features='host' --iree-codegen-llvm-generic-ops-workgroup-size=2048 %s
 
 //===----------------------------------------------------------------------===//
 // Transpose ops.
diff --git a/tests/microbenchmarks/shared_mem_transpose.mlir b/tests/microbenchmarks/shared_mem_transpose.mlir
index 869055a..1ff2f69 100644
--- a/tests/microbenchmarks/shared_mem_transpose.mlir
+++ b/tests/microbenchmarks/shared_mem_transpose.mlir
@@ -1,4 +1,4 @@
-// RUN: iree-run-mlir --iree-hal-target-backends=cuda --iree-llvm-link-embedded=true  %s
+// RUN: iree-run-mlir --iree-hal-target-backends=cuda --iree-llvmcpu-link-embedded=true  %s
 
 //===----------------------------------------------------------------------===//
 // Transpose ops.