Rename c_output to c_identifier and set for embedded bytecode modules.

bindings/tflite/smoke_test.cc

diff --git a/bindings/tflite/smoke_test.cc b/bindings/tflite/smoke_test.cc
index 61f24ea..835beff 100644
--- a/bindings/tflite/smoke_test.cc
+++ b/bindings/tflite/smoke_test.cc
@@ -35,14 +35,14 @@
 // embedding the module directly in a binary.
 #include "bindings/tflite/testdata/add_dynamic_c.h"
 #define IREE_BINDINGS_TFLITE_TESTDATA_ADD_DYNAMIC_EMBEDDED_DATA \
-  add_dynamic_c_create()->data
+  iree_tflite_testdata_add_dynamic_create()->data
 #define IREE_BINDINGS_TFLITE_TESTDATA_ADD_DYNAMIC_EMBEDDED_SIZE \
-  add_dynamic_c_create()->size
+  iree_tflite_testdata_add_dynamic_create()->size
 #include "bindings/tflite/testdata/add_static_c.h"
 #define IREE_BINDINGS_TFLITE_TESTDATA_ADD_STATIC_EMBEDDED_DATA \
-  add_static_c_create()->data
+  iree_tflite_testdata_add_static_create()->data
 #define IREE_BINDINGS_TFLITE_TESTDATA_ADD_STATIC_EMBEDDED_SIZE \
-  add_static_c_create()->size
+  iree_tflite_testdata_add_static_create()->size
 
 // TODO(#3971): currently can't nicely load these due to cmake issues.
 #define IREE_BINDINGS_TFLITE_TESTDATA_ADD_STATIC_PATH \

bindings/tflite/testdata/BUILD

diff --git a/bindings/tflite/testdata/BUILD b/bindings/tflite/testdata/BUILD
index 53d9003..8c38e4c 100644
--- a/bindings/tflite/testdata/BUILD
+++ b/bindings/tflite/testdata/BUILD
@@ -24,7 +24,7 @@
     name = "add_dynamic",
     testonly = True,
     src = "add_dynamic.mlir",
-    c_output = True,
+    c_identifier = "iree_tflite_testdata_add_dynamic",
     flags = [
         "-iree-native-bindings-support=false",
         "-iree-tflite-bindings-support",
@@ -37,7 +37,7 @@
     name = "add_multi",
     testonly = True,
     src = "add_multi.mlir",
-    c_output = True,
+    c_identifier = "iree_tflite_testdata_add_multi",
     flags = [
         "-iree-native-bindings-support=false",
         "-iree-tflite-bindings-support",
@@ -50,7 +50,7 @@
     name = "add_static",
     testonly = True,
     src = "add_static.mlir",
-    c_output = True,
+    c_identifier = "iree_tflite_testdata_add_static",
     flags = [
         "-iree-native-bindings-support=false",
         "-iree-tflite-bindings-support",

bindings/tflite/testdata/CMakeLists.txt

diff --git a/bindings/tflite/testdata/CMakeLists.txt b/bindings/tflite/testdata/CMakeLists.txt
index e62ba68..0253cc8 100644
--- a/bindings/tflite/testdata/CMakeLists.txt
+++ b/bindings/tflite/testdata/CMakeLists.txt
@@ -23,7 +23,8 @@
     add_dynamic
   SRC
     "add_dynamic.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_tflite_testdata_add_dynamic"
   FLAGS
     "-iree-native-bindings-support=false"
     "-iree-tflite-bindings-support"
@@ -38,7 +39,8 @@
     add_multi
   SRC
     "add_multi.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_tflite_testdata_add_multi"
   FLAGS
     "-iree-native-bindings-support=false"
     "-iree-tflite-bindings-support"
@@ -53,7 +55,8 @@
     add_static
   SRC
     "add_static.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_tflite_testdata_add_static"
   FLAGS
     "-iree-native-bindings-support=false"
     "-iree-tflite-bindings-support"

build_tools/bazel_to_cmake/bazel_to_cmake_converter.py

diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
index b80d855..9616447 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
@@ -469,11 +469,11 @@
                            src,
                            flags=None,
                            translate_tool=None,
-                           c_output=None,
+                           c_identifier=None,
                            testonly=None):
     name_block = _convert_string_arg_block("NAME", name, quote=False)
     src_block = _convert_string_arg_block("SRC", src)
-    c_output_block = _convert_option_block("C_OUTPUT", c_output)
+    c_identifier_block = _convert_string_arg_block("C_IDENTIFIER", c_identifier)
     translate_tool_block = _convert_translate_tool_block(translate_tool)
     flags_block = _convert_string_list_block("FLAGS", flags)
     testonly_block = _convert_option_block("TESTONLY", testonly)
@@ -481,7 +481,7 @@
     self.converter.body += (f"iree_bytecode_module(\n"
                             f"{name_block}"
                             f"{src_block}"
-                            f"{c_output_block}"
+                            f"{c_identifier_block}"
                             f"{translate_tool_block}"
                             f"{flags_block}"
                             f"{testonly_block}"

build_tools/cmake/iree_bytecode_module.cmake

diff --git a/build_tools/cmake/iree_bytecode_module.cmake b/build_tools/cmake/iree_bytecode_module.cmake
index 0de922c..82f467d 100644
--- a/build_tools/cmake/iree_bytecode_module.cmake
+++ b/build_tools/cmake/iree_bytecode_module.cmake
@@ -25,7 +25,8 @@
 #     default flag set is "-iree-mlir-to-vm-bytecode-module".
 # TRANSLATE_TOOL: Translation tool to invoke (CMake target). The default
 #     tool is "iree-translate".
-# C_OUTPUT: Control flag to generate c embed code.
+# C_IDENTIFIER: Identifier to use for generate c embed code.
+#     If omitted then no C embed code will be generated.
 # PUBLIC: Add this so that this library will be exported under ${PACKAGE}::
 #     Also in IDE, target will appear in ${PACKAGE} folder while non PUBLIC
 #     will be in ${PACKAGE}/internal.
@@ -39,8 +40,8 @@
 function(iree_bytecode_module)
   cmake_parse_arguments(
     _RULE
-    "PUBLIC;TESTONLY;C_OUTPUT"
-    "NAME;SRC;TRANSLATE_TOOL"
+    "PUBLIC;TESTONLY"
+    "NAME;SRC;TRANSLATE_TOOL;C_IDENTIFIER"
     "FLAGS"
     ${ARGN}
   )
@@ -85,12 +86,12 @@
     set(_PUBLIC_ARG "PUBLIC")
   endif()
 
-  if(_RULE_C_OUTPUT)
+  if(_RULE_C_IDENTIFIER)
     iree_c_embed_data(
       NAME
         "${_RULE_NAME}_c"
       IDENTIFIER
-        "${_RULE_NAME}_c"
+        "${_RULE_C_IDENTIFIER}"
       GENERATED_SRCS
         "${_RULE_NAME}.vmfb"
       C_FILE_OUTPUT

experimental/bindings/java/com/google/iree/tests/CMakeLists.txt

diff --git a/experimental/bindings/java/com/google/iree/tests/CMakeLists.txt b/experimental/bindings/java/com/google/iree/tests/CMakeLists.txt
index 3ed7d6c..03a9d96 100644
--- a/experimental/bindings/java/com/google/iree/tests/CMakeLists.txt
+++ b/experimental/bindings/java/com/google/iree/tests/CMakeLists.txt
@@ -18,7 +18,8 @@
       simple_mul_bytecode_module
     SRC
       "simple_mul.mlir"
-    C_OUTPUT
+    C_IDENTIFIER
+      "iree_java_testdata_simple_mul_bytecode_module"
     FLAGS
       "-iree-mlir-to-vm-bytecode-module"
       "-iree-hal-target-backends=vmla"

experimental/bindings/java/com/google/iree/tests/integration_test.cc

diff --git a/experimental/bindings/java/com/google/iree/tests/integration_test.cc b/experimental/bindings/java/com/google/iree/tests/integration_test.cc
index 458dee7..0240f16 100644
--- a/experimental/bindings/java/com/google/iree/tests/integration_test.cc
+++ b/experimental/bindings/java/com/google/iree/tests/integration_test.cc
@@ -36,7 +36,7 @@
 
   auto module = std::make_unique<ModuleWrapper>();
   const struct iree_file_toc_t* module_file =
-      simple_mul_bytecode_module_c_create();
+      iree_java_testdata_simple_mul_bytecode_module_create();
   auto module_status = module->Create(
       reinterpret_cast<const uint8_t*>(module_file->data), module_file->size);
   if (!module_status.ok()) {

iree/modules/strings/BUILD

diff --git a/iree/modules/strings/BUILD b/iree/modules/strings/BUILD
index 61a10c6..11d0f79 100644
--- a/iree/modules/strings/BUILD
+++ b/iree/modules/strings/BUILD
@@ -64,7 +64,7 @@
     name = "strings_module_test_module",
     testonly = True,
     src = "strings_module_test.mlir",
-    c_output = True,
+    c_identifier = "iree_strings_module_test_module",
     flags = [
         "-iree-mlir-to-vm-bytecode-module",
         "-iree-hal-target-backends=dylib-llvm-aot",

iree/modules/strings/CMakeLists.txt

diff --git a/iree/modules/strings/CMakeLists.txt b/iree/modules/strings/CMakeLists.txt
index 4f804a5..8b663d2 100644
--- a/iree/modules/strings/CMakeLists.txt
+++ b/iree/modules/strings/CMakeLists.txt
@@ -63,7 +63,8 @@
     strings_module_test_module
   SRC
     "strings_module_test.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_strings_module_test_module"
   FLAGS
     "-iree-mlir-to-vm-bytecode-module"
     "-iree-hal-target-backends=dylib-llvm-aot"

iree/modules/strings/strings_module_test.cc

diff --git a/iree/modules/strings/strings_module_test.cc b/iree/modules/strings/strings_module_test.cc
index 5985432..ec810b0 100644
--- a/iree/modules/strings/strings_module_test.cc
+++ b/iree/modules/strings/strings_module_test.cc
@@ -68,7 +68,7 @@
     iree_hal_driver_release(hal_driver);
 
     // Setup the test module.
-    const auto* module_file_toc = strings_module_test_module_c_create();
+    const auto* module_file_toc = iree_strings_module_test_module_create();
     IREE_CHECK_OK(iree_vm_bytecode_module_create(
         iree_const_byte_span_t{
             reinterpret_cast<const uint8_t*>(module_file_toc->data),

iree/modules/tensorlist/BUILD

diff --git a/iree/modules/tensorlist/BUILD b/iree/modules/tensorlist/BUILD
index 1f9f6f1..7bddfa7 100644
--- a/iree/modules/tensorlist/BUILD
+++ b/iree/modules/tensorlist/BUILD
@@ -49,7 +49,7 @@
     name = "tensorlist_test_module",
     testonly = True,
     src = "tensorlist_test.mlir",
-    c_output = True,
+    c_identifier = "iree_tensorlist_test_module",
     flags = [
         "-iree-mlir-to-vm-bytecode-module",
         "-iree-hal-target-backends=dylib-llvm-aot",

iree/modules/tensorlist/CMakeLists.txt

diff --git a/iree/modules/tensorlist/CMakeLists.txt b/iree/modules/tensorlist/CMakeLists.txt
index 39f4528..f311446 100644
--- a/iree/modules/tensorlist/CMakeLists.txt
+++ b/iree/modules/tensorlist/CMakeLists.txt
@@ -37,7 +37,8 @@
     tensorlist_test_module
   SRC
     "tensorlist_test.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_tensorlist_test_module"
   FLAGS
     "-iree-mlir-to-vm-bytecode-module"
     "-iree-hal-target-backends=dylib-llvm-aot"

iree/modules/tensorlist/tensorlist_test.cc

diff --git a/iree/modules/tensorlist/tensorlist_test.cc b/iree/modules/tensorlist/tensorlist_test.cc
index 23b4674..ab00b29 100644
--- a/iree/modules/tensorlist/tensorlist_test.cc
+++ b/iree/modules/tensorlist/tensorlist_test.cc
@@ -62,7 +62,7 @@
         iree_tensorlist_module_create(iree_allocator_system(), &native_module_))
         << "Native module failed to init";
 
-    const auto* module_file_toc = tensorlist_test_module_c_create();
+    const auto* module_file_toc = iree_tensorlist_test_module_create();
     IREE_CHECK_OK(iree_vm_bytecode_module_create(
         iree_const_byte_span_t{
             reinterpret_cast<const uint8_t*>(module_file_toc->data),

iree/runtime/demo/hello_world_explained.c

diff --git a/iree/runtime/demo/hello_world_explained.c b/iree/runtime/demo/hello_world_explained.c
index 82e1c8a..9d30863 100644
--- a/iree/runtime/demo/hello_world_explained.c
+++ b/iree/runtime/demo/hello_world_explained.c
@@ -60,7 +60,8 @@
 // custom allocator can be provided to get a callback instead.
 static iree_status_t iree_runtime_demo_load_module(
     iree_runtime_session_t* session) {
-  const iree_file_toc_t* module_file = simple_mul_module_c_create();
+  const iree_file_toc_t* module_file =
+      iree_runtime_testdata_simple_mul_module_create();
   return iree_runtime_session_append_bytecode_module_from_memory(
       session, iree_make_const_byte_span(module_file->data, module_file->size),
       iree_allocator_null());

iree/runtime/demo/hello_world_terse.c

diff --git a/iree/runtime/demo/hello_world_terse.c b/iree/runtime/demo/hello_world_terse.c
index db8703b..1225fe5 100644
--- a/iree/runtime/demo/hello_world_terse.c
+++ b/iree/runtime/demo/hello_world_terse.c
@@ -59,7 +59,8 @@
   iree_hal_device_release(device);
 
   // Load your user module into the session (from memory, from file, etc).
-  const iree_file_toc_t* module_file = simple_mul_module_c_create();
+  const iree_file_toc_t* module_file =
+      iree_runtime_testdata_simple_mul_module_create();
   IREE_CHECK_OK(iree_runtime_session_append_bytecode_module_from_memory(
       session, iree_make_const_byte_span(module_file->data, module_file->size),
       iree_allocator_null()));

iree/runtime/testdata/BUILD

diff --git a/iree/runtime/testdata/BUILD b/iree/runtime/testdata/BUILD
index b5b76c8..a95f949 100644
--- a/iree/runtime/testdata/BUILD
+++ b/iree/runtime/testdata/BUILD
@@ -33,7 +33,7 @@
 iree_bytecode_module(
     name = "simple_mul_module",
     src = "simple_mul.mlir",
-    c_output = True,
+    c_identifier = "iree_runtime_testdata_simple_mul_module",
     flags = [
         "-iree-mlir-to-vm-bytecode-module",
         "-iree-hal-target-backends=vmla",

iree/runtime/testdata/CMakeLists.txt

diff --git a/iree/runtime/testdata/CMakeLists.txt b/iree/runtime/testdata/CMakeLists.txt
index 9d25169..087bd00 100644
--- a/iree/runtime/testdata/CMakeLists.txt
+++ b/iree/runtime/testdata/CMakeLists.txt
@@ -19,7 +19,8 @@
     simple_mul_module
   SRC
     "simple_mul.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_runtime_testdata_simple_mul_module"
   FLAGS
     "-iree-mlir-to-vm-bytecode-module"
     "-iree-hal-target-backends=vmla"

iree/samples/custom_modules/BUILD

diff --git a/iree/samples/custom_modules/BUILD b/iree/samples/custom_modules/BUILD
index 210a635..705f968 100644
--- a/iree/samples/custom_modules/BUILD
+++ b/iree/samples/custom_modules/BUILD
@@ -33,7 +33,7 @@
 iree_bytecode_module(
     name = "custom_modules_test_module",
     src = "custom_modules_test.mlir",
-    c_output = True,
+    c_identifier = "iree_samples_custom_modules_test_module",
     flags = [
         "-iree-mlir-to-vm-bytecode-module",
         "-iree-hal-target-backends=dylib-llvm-aot",

iree/samples/custom_modules/CMakeLists.txt

diff --git a/iree/samples/custom_modules/CMakeLists.txt b/iree/samples/custom_modules/CMakeLists.txt
index 40c6950..5ffbb22 100644
--- a/iree/samples/custom_modules/CMakeLists.txt
+++ b/iree/samples/custom_modules/CMakeLists.txt
@@ -20,7 +20,8 @@
     custom_modules_test_module
   SRC
     "custom_modules_test.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_samples_custom_modules_test_module"
   TRANSLATE_TOOL
     iree_samples_custom_modules_dialect_custom-translate
   FLAGS

iree/samples/custom_modules/custom_modules_test.cc

diff --git a/iree/samples/custom_modules/custom_modules_test.cc b/iree/samples/custom_modules/custom_modules_test.cc
index b57e4b7..263765c 100644
--- a/iree/samples/custom_modules/custom_modules_test.cc
+++ b/iree/samples/custom_modules/custom_modules_test.cc
@@ -60,7 +60,8 @@
                                                    &native_module_))
         << "Native module failed to init";
 
-    const auto* module_file_toc = custom_modules_test_module_c_create();
+    const auto* module_file_toc =
+        iree_samples_custom_modules_test_module_create();
     IREE_CHECK_OK(iree_vm_bytecode_module_create(
         iree_const_byte_span_t{
             reinterpret_cast<const uint8_t*>(module_file_toc->data),

iree/samples/simple_embedding/BUILD

diff --git a/iree/samples/simple_embedding/BUILD b/iree/samples/simple_embedding/BUILD
index d99638a..77aa122 100644
--- a/iree/samples/simple_embedding/BUILD
+++ b/iree/samples/simple_embedding/BUILD
@@ -42,6 +42,7 @@
     c_file_output = "simple_embedding_test_llvm_aot_rv64.c",
     flatten = True,
     h_file_output = "simple_embedding_test_llvm_aot_rv64.h",
+    identifier = "iree_samples_simple_embedding_rv64_test_module",
 )
 
 iree_cmake_extra_content(
@@ -117,7 +118,7 @@
 iree_bytecode_module(
     name = "simple_embedding_test_bytecode_module",
     src = "simple_embedding_test.mlir",
-    c_output = True,
+    c_identifier = "iree_samples_simple_embedding_test_module",
     flags = [
         "-iree-mlir-to-vm-bytecode-module",
         "-iree-hal-target-backends=dylib-llvm-aot",

iree/samples/simple_embedding/CMakeLists.txt

diff --git a/iree/samples/simple_embedding/CMakeLists.txt b/iree/samples/simple_embedding/CMakeLists.txt
index fd1500b..d811f32 100644
--- a/iree/samples/simple_embedding/CMakeLists.txt
+++ b/iree/samples/simple_embedding/CMakeLists.txt
@@ -19,6 +19,8 @@
     "simple_embedding_test_llvm_aot_rv64.c"
   H_FILE_OUTPUT
     "simple_embedding_test_llvm_aot_rv64.h"
+  IDENTIFIER
+    "iree_samples_simple_embedding_rv64_test_module"
   FLATTEN
   PUBLIC
 )
@@ -90,7 +92,8 @@
     simple_embedding_test_bytecode_module
   SRC
     "simple_embedding_test.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_samples_simple_embedding_test_module"
   FLAGS
     "-iree-mlir-to-vm-bytecode-module"
     "-iree-hal-target-backends=dylib-llvm-aot"

iree/samples/simple_embedding/simple_embedding.c

diff --git a/iree/samples/simple_embedding/simple_embedding.c b/iree/samples/simple_embedding/simple_embedding.c
index cba4345..b28ded9 100644
--- a/iree/samples/simple_embedding/simple_embedding.c
+++ b/iree/samples/simple_embedding/simple_embedding.c
@@ -53,13 +53,13 @@
   // Load bytecode module from the embedded data.
 #if IREE_ARCH_RISCV_64
   const struct iree_file_toc_t* module_file_toc =
-      simple_embedding_test_llvm_aot_rv64_create();
+      iree_samples_simple_embedding_rv64_test_module_create();
 #else
   // Note the setup here only supports native build. The bytecode is not built
   // for the cross-compile execution. The code can be compiled but it will
   // hit runtime error in a cross-compile environment.
   const struct iree_file_toc_t* module_file_toc =
-      simple_embedding_test_bytecode_module_c_create();
+      iree_samples_simple_embedding_test_module_create();
 #endif
 
   iree_vm_module_t* bytecode_module = NULL;

iree/samples/vulkan/CMakeLists.txt

diff --git a/iree/samples/vulkan/CMakeLists.txt b/iree/samples/vulkan/CMakeLists.txt
index 62c8d7c..aada407 100644
--- a/iree/samples/vulkan/CMakeLists.txt
+++ b/iree/samples/vulkan/CMakeLists.txt
@@ -22,7 +22,8 @@
     simple_mul_bytecode_module
   SRC
     "simple_mul.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_samples_vulkan_simple_mul_bytecode_module"
   FLAGS
     "-iree-mlir-to-vm-bytecode-module"
     "-iree-hal-target-backends=vulkan-spirv"

iree/samples/vulkan/vulkan_inference_gui.cc

diff --git a/iree/samples/vulkan/vulkan_inference_gui.cc b/iree/samples/vulkan/vulkan_inference_gui.cc
index 36a7e32..35b1f06 100644
--- a/iree/samples/vulkan/vulkan_inference_gui.cc
+++ b/iree/samples/vulkan/vulkan_inference_gui.cc
@@ -235,7 +235,7 @@
   // Load bytecode module from embedded data.
   IREE_LOG(INFO) << "Loading simple_mul.mlir...";
   const struct iree_file_toc_t* module_file_toc =
-      simple_mul_bytecode_module_c_create();
+      iree_samples_vulkan_simple_mul_bytecode_module_create();
   iree_vm_module_t* bytecode_module = nullptr;
   IREE_CHECK_OK(iree_vm_bytecode_module_create(
       iree_const_byte_span_t{

iree/tools/compilation.bzl

diff --git a/iree/tools/compilation.bzl b/iree/tools/compilation.bzl
index 2e43c9c..ff38286 100644
--- a/iree/tools/compilation.bzl
+++ b/iree/tools/compilation.bzl
@@ -22,7 +22,7 @@
         src,
         flags = ["-iree-mlir-to-vm-bytecode-module"],
         translate_tool = "//iree/tools:iree-translate",
-        c_output = False,
+        c_identifier = "",
         **kwargs):
     native.genrule(
         name = name,
@@ -45,10 +45,10 @@
     )
 
     # Embed the module for use in C.
-    if c_output:
+    if c_identifier:
         c_embed_data(
             name = "%s_c" % (name),
-            identifier = "%s_c" % (name),
+            identifier = c_identifier,
             srcs = ["%s.vmfb" % (name)],
             c_file_output = "%s_c.c" % (name),
             h_file_output = "%s_c.h" % (name),

iree/vm/BUILD

diff --git a/iree/vm/BUILD b/iree/vm/BUILD
index 2904d38..3cbd750 100644
--- a/iree/vm/BUILD
+++ b/iree/vm/BUILD
@@ -286,7 +286,7 @@
     name = "bytecode_module_benchmark_module",
     testonly = True,
     src = "bytecode_module_benchmark.mlir",
-    c_output = True,
+    c_identifier = "iree_vm_bytecode_module_benchmark_module",
     flags = ["-iree-vm-ir-to-bytecode-module"],
 )
 
@@ -305,7 +305,7 @@
     name = "bytecode_module_size_benchmark_module",
     testonly = True,
     src = "bytecode_module_size_benchmark.mlir",
-    c_output = True,
+    c_identifier = "iree_vm_bytecode_module_size_benchmark_module",
     flags = ["-iree-vm-ir-to-bytecode-module"],
 )
 

iree/vm/CMakeLists.txt

diff --git a/iree/vm/CMakeLists.txt b/iree/vm/CMakeLists.txt
index 2c5dcff..8579f5f 100644
--- a/iree/vm/CMakeLists.txt
+++ b/iree/vm/CMakeLists.txt
@@ -243,7 +243,8 @@
     bytecode_module_benchmark_module
   SRC
     "bytecode_module_benchmark.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_vm_bytecode_module_benchmark_module"
   FLAGS
     "-iree-vm-ir-to-bytecode-module"
   TESTONLY
@@ -267,7 +268,8 @@
     bytecode_module_size_benchmark_module
   SRC
     "bytecode_module_size_benchmark.mlir"
-  C_OUTPUT
+  C_IDENTIFIER
+    "iree_vm_bytecode_module_size_benchmark_module"
   FLAGS
     "-iree-vm-ir-to-bytecode-module"
   TESTONLY

iree/vm/bytecode_module_benchmark.cc

diff --git a/iree/vm/bytecode_module_benchmark.cc b/iree/vm/bytecode_module_benchmark.cc
index 6409b3d..35158d9 100644
--- a/iree/vm/bytecode_module_benchmark.cc
+++ b/iree/vm/bytecode_module_benchmark.cc
@@ -85,7 +85,8 @@
   IREE_CHECK_OK(
       native_import_module_create(iree_allocator_system(), &import_module));
 
-  const auto* module_file_toc = bytecode_module_benchmark_module_c_create();
+  const auto* module_file_toc =
+      iree_vm_bytecode_module_benchmark_module_create();
   iree_vm_module_t* bytecode_module = nullptr;
   IREE_CHECK_OK(iree_vm_bytecode_module_create(
       iree_const_byte_span_t{
@@ -136,7 +137,8 @@
 
 static void BM_ModuleCreate(benchmark::State& state) {
   while (state.KeepRunning()) {
-    const auto* module_file_toc = bytecode_module_benchmark_module_c_create();
+    const auto* module_file_toc =
+        iree_vm_bytecode_module_benchmark_module_create();
     iree_vm_module_t* module = nullptr;
     IREE_CHECK_OK(iree_vm_bytecode_module_create(
         iree_const_byte_span_t{
@@ -153,7 +155,8 @@
 BENCHMARK(BM_ModuleCreate);
 
 static void BM_ModuleCreateState(benchmark::State& state) {
-  const auto* module_file_toc = bytecode_module_benchmark_module_c_create();
+  const auto* module_file_toc =
+      iree_vm_bytecode_module_benchmark_module_create();
   iree_vm_module_t* module = nullptr;
   IREE_CHECK_OK(iree_vm_bytecode_module_create(
       iree_const_byte_span_t{
@@ -178,7 +181,8 @@
 
 static void BM_FullModuleInit(benchmark::State& state) {
   while (state.KeepRunning()) {
-    const auto* module_file_toc = bytecode_module_benchmark_module_c_create();
+    const auto* module_file_toc =
+        iree_vm_bytecode_module_benchmark_module_create();
     iree_vm_module_t* module = nullptr;
     IREE_CHECK_OK(iree_vm_bytecode_module_create(
         iree_const_byte_span_t{

iree/vm/bytecode_module_size_benchmark.cc

diff --git a/iree/vm/bytecode_module_size_benchmark.cc b/iree/vm/bytecode_module_size_benchmark.cc
index 98ce411..77ccf76 100644
--- a/iree/vm/bytecode_module_size_benchmark.cc
+++ b/iree/vm/bytecode_module_size_benchmark.cc
@@ -22,7 +22,7 @@
   iree_vm_instance_create(iree_allocator_system(), &instance);
 
   const auto* module_file_toc =
-      bytecode_module_size_benchmark_module_c_create();
+      iree_vm_bytecode_module_size_benchmark_module_create();
   iree_vm_module_t* module = nullptr;
   iree_vm_bytecode_module_create(
       iree_const_byte_span_t{