Set iree_ prefixed identifiers for some iree_c_embed_data uses.
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 cda1073..c2d254b 100644
--- a/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake_converter.py
@@ -469,9 +469,6 @@
flatten=None,
identifier=None,
**kwargs):
- if identifier:
- self._convert_unimplemented_function("c_embed_data",
- name + " has identifier")
name_block = _convert_string_arg_block("NAME", name, quote=False)
srcs_block = _convert_srcs_block(srcs)
c_file_output_block = _convert_string_arg_block("C_FILE_OUTPUT",
@@ -479,6 +476,7 @@
h_file_output_block = _convert_string_arg_block("H_FILE_OUTPUT",
h_file_output)
testonly_block = _convert_option_block("TESTONLY", testonly)
+ identifier_block = _convert_string_arg_block("IDENTIFIER", identifier)
flatten_block = _convert_option_block("FLATTEN", flatten)
self.converter.body += (f"iree_c_embed_data(\n"
@@ -486,6 +484,7 @@
f"{srcs_block}"
f"{c_file_output_block}"
f"{h_file_output_block}"
+ f"{identifier_block}"
f"{testonly_block}"
f"{flatten_block}"
f" PUBLIC\n)\n\n")
diff --git a/iree/compiler/Dialect/HAL/BUILD b/iree/compiler/Dialect/HAL/BUILD
index 2291037..97ece2f 100644
--- a/iree/compiler/Dialect/HAL/BUILD
+++ b/iree/compiler/Dialect/HAL/BUILD
@@ -26,4 +26,5 @@
c_file_output = "hal.imports.c",
flatten = True,
h_file_output = "hal.imports.h",
+ identifier = "iree_hal_imports",
)
diff --git a/iree/compiler/Dialect/HAL/CMakeLists.txt b/iree/compiler/Dialect/HAL/CMakeLists.txt
index 6630212..293e5de 100644
--- a/iree/compiler/Dialect/HAL/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/CMakeLists.txt
@@ -19,6 +19,8 @@
"hal.imports.c"
H_FILE_OUTPUT
"hal.imports.h"
+ IDENTIFIER
+ "iree_hal_imports"
FLATTEN
PUBLIC
)
diff --git a/iree/compiler/Dialect/HAL/Conversion/HALToVM/ConvertHALToVM.cpp b/iree/compiler/Dialect/HAL/Conversion/HALToVM/ConvertHALToVM.cpp
index c67b0a0..28e17e1 100644
--- a/iree/compiler/Dialect/HAL/Conversion/HALToVM/ConvertHALToVM.cpp
+++ b/iree/compiler/Dialect/HAL/Conversion/HALToVM/ConvertHALToVM.cpp
@@ -124,9 +124,9 @@
std::tie(outerModuleOp, innerModuleOp) =
VMConversionTarget::nestModuleForConversion(getOperation());
- (void)appendImportModule(
- StringRef(hal_imports_create()->data, hal_imports_create()->size),
- innerModuleOp);
+ (void)appendImportModule(StringRef(iree_hal_imports_create()->data,
+ iree_hal_imports_create()->size),
+ innerModuleOp);
OwningRewritePatternList conversionPatterns(&getContext());
populateStandardToVMPatterns(context, typeConverter, conversionPatterns);
diff --git a/iree/compiler/Dialect/HAL/IR/HALDialect.cpp b/iree/compiler/Dialect/HAL/IR/HALDialect.cpp
index b8579be..c1e22b0 100644
--- a/iree/compiler/Dialect/HAL/IR/HALDialect.cpp
+++ b/iree/compiler/Dialect/HAL/IR/HALDialect.cpp
@@ -64,9 +64,9 @@
using VMConversionDialectInterface::VMConversionDialectInterface;
OwningModuleRef parseVMImportModule() const override {
- return mlir::parseSourceString(
- StringRef(hal_imports_create()->data, hal_imports_create()->size),
- getDialect()->getContext());
+ return mlir::parseSourceString(StringRef(iree_hal_imports_create()->data,
+ iree_hal_imports_create()->size),
+ getDialect()->getContext());
}
void populateVMConversionPatterns(
diff --git a/iree/compiler/Dialect/Modules/Check/BUILD b/iree/compiler/Dialect/Modules/Check/BUILD
index 262dfa6..30ce4fe 100644
--- a/iree/compiler/Dialect/Modules/Check/BUILD
+++ b/iree/compiler/Dialect/Modules/Check/BUILD
@@ -26,4 +26,5 @@
c_file_output = "check.imports.c",
flatten = True,
h_file_output = "check.imports.h",
+ identifier = "iree_check_imports",
)
diff --git a/iree/compiler/Dialect/Modules/Check/CMakeLists.txt b/iree/compiler/Dialect/Modules/Check/CMakeLists.txt
index 22aef94..a3efc1c 100644
--- a/iree/compiler/Dialect/Modules/Check/CMakeLists.txt
+++ b/iree/compiler/Dialect/Modules/Check/CMakeLists.txt
@@ -19,6 +19,8 @@
"check.imports.c"
H_FILE_OUTPUT
"check.imports.h"
+ IDENTIFIER
+ "iree_check_imports"
FLATTEN
PUBLIC
)
diff --git a/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp b/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp
index 6b0cca6..fa0774a 100644
--- a/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp
+++ b/iree/compiler/Dialect/Modules/Check/IR/CheckDialect.cpp
@@ -34,9 +34,9 @@
using VMConversionDialectInterface::VMConversionDialectInterface;
OwningModuleRef parseVMImportModule() const override {
- return mlir::parseSourceString(
- StringRef(check_imports_create()->data, check_imports_create()->size),
- getDialect()->getContext());
+ return mlir::parseSourceString(StringRef(iree_check_imports_create()->data,
+ iree_check_imports_create()->size),
+ getDialect()->getContext());
}
void populateVMConversionPatterns(
diff --git a/iree/compiler/Dialect/Modules/Strings/BUILD b/iree/compiler/Dialect/Modules/Strings/BUILD
index 4213a1e..f46d092 100644
--- a/iree/compiler/Dialect/Modules/Strings/BUILD
+++ b/iree/compiler/Dialect/Modules/Strings/BUILD
@@ -26,4 +26,5 @@
c_file_output = "strings.imports.c",
flatten = True,
h_file_output = "strings.imports.h",
+ identifier = "iree_strings_imports",
)
diff --git a/iree/compiler/Dialect/Modules/Strings/CMakeLists.txt b/iree/compiler/Dialect/Modules/Strings/CMakeLists.txt
index fe34b10..b5e78fe 100644
--- a/iree/compiler/Dialect/Modules/Strings/CMakeLists.txt
+++ b/iree/compiler/Dialect/Modules/Strings/CMakeLists.txt
@@ -19,6 +19,8 @@
"strings.imports.c"
H_FILE_OUTPUT
"strings.imports.h"
+ IDENTIFIER
+ "iree_strings_imports"
FLATTEN
PUBLIC
)
diff --git a/iree/compiler/Dialect/Modules/Strings/IR/Dialect.cc b/iree/compiler/Dialect/Modules/Strings/IR/Dialect.cc
index b44572d..c080ac5 100644
--- a/iree/compiler/Dialect/Modules/Strings/IR/Dialect.cc
+++ b/iree/compiler/Dialect/Modules/Strings/IR/Dialect.cc
@@ -39,9 +39,10 @@
using VMConversionDialectInterface::VMConversionDialectInterface;
OwningModuleRef parseVMImportModule() const override {
- return mlir::parseSourceString(StringRef(strings_imports_create()->data,
- strings_imports_create()->size),
- getDialect()->getContext());
+ return mlir::parseSourceString(
+ StringRef(iree_strings_imports_create()->data,
+ iree_strings_imports_create()->size),
+ getDialect()->getContext());
}
void populateVMConversionPatterns(
diff --git a/iree/compiler/Dialect/Modules/TensorList/BUILD b/iree/compiler/Dialect/Modules/TensorList/BUILD
index 4767c28..691c41b 100644
--- a/iree/compiler/Dialect/Modules/TensorList/BUILD
+++ b/iree/compiler/Dialect/Modules/TensorList/BUILD
@@ -26,4 +26,5 @@
c_file_output = "tensorlist.imports.c",
flatten = True,
h_file_output = "tensorlist.imports.h",
+ identifier = "iree_tensorlist_imports",
)
diff --git a/iree/compiler/Dialect/Modules/TensorList/CMakeLists.txt b/iree/compiler/Dialect/Modules/TensorList/CMakeLists.txt
index e9b07e1..b9d2f43 100644
--- a/iree/compiler/Dialect/Modules/TensorList/CMakeLists.txt
+++ b/iree/compiler/Dialect/Modules/TensorList/CMakeLists.txt
@@ -19,6 +19,8 @@
"tensorlist.imports.c"
H_FILE_OUTPUT
"tensorlist.imports.h"
+ IDENTIFIER
+ "iree_tensorlist_imports"
FLATTEN
PUBLIC
)
diff --git a/iree/compiler/Dialect/Modules/TensorList/IR/TensorListDialect.cpp b/iree/compiler/Dialect/Modules/TensorList/IR/TensorListDialect.cpp
index 4d25e7b..6192791 100644
--- a/iree/compiler/Dialect/Modules/TensorList/IR/TensorListDialect.cpp
+++ b/iree/compiler/Dialect/Modules/TensorList/IR/TensorListDialect.cpp
@@ -51,9 +51,10 @@
using VMConversionDialectInterface::VMConversionDialectInterface;
OwningModuleRef parseVMImportModule() const override {
- return mlir::parseSourceString(StringRef(tensorlist_imports_create()->data,
- tensorlist_imports_create()->size),
- getDialect()->getContext());
+ return mlir::parseSourceString(
+ StringRef(iree_tensorlist_imports_create()->data,
+ iree_tensorlist_imports_create()->size),
+ getDialect()->getContext());
}
void populateVMConversionPatterns(
diff --git a/iree/compiler/Dialect/VMLA/BUILD b/iree/compiler/Dialect/VMLA/BUILD
index 09dd946..34b653c 100644
--- a/iree/compiler/Dialect/VMLA/BUILD
+++ b/iree/compiler/Dialect/VMLA/BUILD
@@ -26,4 +26,5 @@
c_file_output = "vmla.imports.c",
flatten = True,
h_file_output = "vmla.imports.h",
+ identifier = "iree_vmla_imports",
)
diff --git a/iree/compiler/Dialect/VMLA/CMakeLists.txt b/iree/compiler/Dialect/VMLA/CMakeLists.txt
index dc0b6eb..81371fc 100644
--- a/iree/compiler/Dialect/VMLA/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/CMakeLists.txt
@@ -19,6 +19,8 @@
"vmla.imports.c"
H_FILE_OUTPUT
"vmla.imports.h"
+ IDENTIFIER
+ "iree_vmla_imports"
FLATTEN
PUBLIC
)
diff --git a/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/ConvertVMLAToVM.cpp b/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/ConvertVMLAToVM.cpp
index 5475b46..45712d3 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/ConvertVMLAToVM.cpp
+++ b/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/ConvertVMLAToVM.cpp
@@ -398,9 +398,9 @@
std::tie(outerModuleOp, innerModuleOp) =
VMConversionTarget::nestModuleForConversion(getOperation());
- (void)appendImportModule(
- StringRef(vmla_imports_create()->data, vmla_imports_create()->size),
- innerModuleOp);
+ (void)appendImportModule(StringRef(iree_vmla_imports_create()->data,
+ iree_vmla_imports_create()->size),
+ innerModuleOp);
OwningRewritePatternList conversionPatterns(&getContext());
populateStandardToVMPatterns(context, typeConverter, conversionPatterns);
diff --git a/iree/compiler/Dialect/VMLA/IR/VMLADialect.cpp b/iree/compiler/Dialect/VMLA/IR/VMLADialect.cpp
index 529cc5b..2fbc4a0 100644
--- a/iree/compiler/Dialect/VMLA/IR/VMLADialect.cpp
+++ b/iree/compiler/Dialect/VMLA/IR/VMLADialect.cpp
@@ -36,9 +36,9 @@
using VMConversionDialectInterface::VMConversionDialectInterface;
OwningModuleRef parseVMImportModule() const override {
- return mlir::parseSourceString(
- StringRef(vmla_imports_create()->data, vmla_imports_create()->size),
- getDialect()->getContext());
+ return mlir::parseSourceString(StringRef(iree_vmla_imports_create()->data,
+ iree_vmla_imports_create()->size),
+ getDialect()->getContext());
}
void populateVMConversionPatterns(
diff --git a/iree/samples/custom_modules/dialect/BUILD b/iree/samples/custom_modules/dialect/BUILD
index 4a609b2..d46610b 100644
--- a/iree/samples/custom_modules/dialect/BUILD
+++ b/iree/samples/custom_modules/dialect/BUILD
@@ -80,6 +80,7 @@
c_file_output = "custom.imports.c",
flatten = True,
h_file_output = "custom.imports.h",
+ identifier = "iree_custom_imports",
)
cc_library(
diff --git a/iree/samples/custom_modules/dialect/CMakeLists.txt b/iree/samples/custom_modules/dialect/CMakeLists.txt
index 7cee0ec..be71ff3 100644
--- a/iree/samples/custom_modules/dialect/CMakeLists.txt
+++ b/iree/samples/custom_modules/dialect/CMakeLists.txt
@@ -55,6 +55,8 @@
"custom.imports.c"
H_FILE_OUTPUT
"custom.imports.h"
+ IDENTIFIER
+ "iree_custom_imports"
FLATTEN
PUBLIC
)
diff --git a/iree/samples/custom_modules/dialect/custom_dialect.cc b/iree/samples/custom_modules/dialect/custom_dialect.cc
index 0b48e8e..bd1e59f 100644
--- a/iree/samples/custom_modules/dialect/custom_dialect.cc
+++ b/iree/samples/custom_modules/dialect/custom_dialect.cc
@@ -54,7 +54,8 @@
OwningModuleRef parseVMImportModule() const override {
return mlir::parseSourceString(
- StringRef(custom_imports_create()->data, custom_imports_create()->size),
+ StringRef(iree_custom_imports_create()->data,
+ iree_custom_imports_create()->size),
getDialect()->getContext());
}
