Bazel to CMake: Hardcode imported functions and variables
A bit of a hack, but these are just a few of these and they're not changing much. This makes it possible to run bazel_to_cmake across more files in strict and non-strict mode. I ran it in strict mode across the repo.
Closes https://github.com/google/iree/pull/832
COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/832 from GMNGeoffrey:bazel-to-cmake fd2fbe8f659dccfae414147194e62c888a4472a4
PiperOrigin-RevId: 297171406
diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake.py b/build_tools/bazel_to_cmake/bazel_to_cmake.py
index e52cc22..2ad125f 100755
--- a/build_tools/bazel_to_cmake/bazel_to_cmake.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake.py
@@ -96,6 +96,11 @@
def __init__(self, converter):
self.converter = converter
+ # TODO(gcmn): Do this in a less hard-coded way
+ self.PLATFORM_VULKAN_DEPS = []
+ self.PLATFORM_VULKAN_TEST_DEPS = ["//iree/testing:gtest_main"]
+ self.FLATBUFFER_SUPPORTS_REFLECTIONS = False
+ self.PLATFORM_VULKAN_LOADER_COPTS = []
# ------------------------------------------------------------------------- #
# Conversion utilities, written to reduce boilerplate and allow for reuse #
@@ -296,6 +301,9 @@
# Cross-package dependencies and complicated globs could be hard to handle.
self._convert_unimplemented_function("filegroup", name)
+ def sh_binary(self, name, **kwargs):
+ self._convert_unimplemented_function("sh_binary", name)
+
def exports_files(self, *args, **kwargs):
# No mapping to CMake, ignore.
pass
@@ -329,6 +337,14 @@
}
return glob_vars
+ # TODO(gcmn) implement these types of functions in a less hard-coded way
+ def platform_trampoline_deps(self, basename, path="base"):
+ return ["//iree/%s/internal:%s_internal" % (path, basename)]
+
+ def select(self, d):
+ self._convert_unimplemented_function("select", str(d))
+ return d["//conditions:default"]
+
def config_setting(self, **kwargs):
# No mapping to CMake, ignore.
pass
diff --git a/iree/hal/CMakeLists.txt b/iree/hal/CMakeLists.txt
index 02db9ef..ddffcf1 100644
--- a/iree/hal/CMakeLists.txt
+++ b/iree/hal/CMakeLists.txt
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+add_subdirectory(cts)
add_subdirectory(host)
add_subdirectory(interpreter)
add_subdirectory(llvmjit)
diff --git a/iree/hal/cts/CMakeLists.txt b/iree/hal/cts/CMakeLists.txt
new file mode 100644
index 0000000..36b99e0
--- /dev/null
+++ b/iree/hal/cts/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+iree_cc_library(
+ NAME
+ cts_test_base
+ HDRS
+ "cts_test_base.h"
+ DEPS
+ iree::base::status
+ iree::base::status_matchers
+ iree::hal::driver_registry
+ iree::hal::interpreter::interpreter_driver_module
+ iree::hal::vulkan::vulkan_driver_module
+ iree::testing::gtest_main
+ TESTONLY
+ PUBLIC
+)
+
+iree_cc_test(
+ NAME
+ allocator_test
+ SRCS
+ "allocator_test.cc"
+ DEPS
+ ::cts_test_base
+ iree::base::status
+ iree::base::status_matchers
+ iree::hal::driver_registry
+ iree::testing::gtest
+)
+
+iree_cc_test(
+ NAME
+ command_buffer_test
+ SRCS
+ "command_buffer_test.cc"
+ DEPS
+ ::cts_test_base
+ iree::base::status
+ iree::base::status_matchers
+ iree::hal::driver_registry
+ iree::testing::gtest
+)
diff --git a/iree/modules/check/CMakeLists.txt b/iree/modules/check/CMakeLists.txt
index 01f9651..759119c 100644
--- a/iree/modules/check/CMakeLists.txt
+++ b/iree/modules/check/CMakeLists.txt
@@ -52,10 +52,10 @@
iree_cc_binary(
NAME
iree-check-module
- SRCS
- "check_module_main.cc"
OUT
iree-check-module
+ SRCS
+ "check_module_main.cc"
DEPS
::native_module
absl::flags
@@ -66,7 +66,6 @@
iree::base::init
iree::base::source_location
iree::base::status
- # TODO(marbre): Add PLATFORM_VULKAN_DEPS
iree::hal::interpreter::interpreter_driver_module
iree::hal::vmla::vmla_driver_module
iree::hal::vulkan::vulkan_driver_module
@@ -74,8 +73,6 @@
iree::tools::vm_util
iree::vm::bytecode_module
)
-add_executable(iree-check-module ALIAS iree_modules_check_iree-check-module)
-
iree_cc_library(
NAME
diff --git a/iree/samples/simple_embedding/CMakeLists.txt b/iree/samples/simple_embedding/CMakeLists.txt
index e9e54d0..9bd405f 100644
--- a/iree/samples/simple_embedding/CMakeLists.txt
+++ b/iree/samples/simple_embedding/CMakeLists.txt
@@ -19,6 +19,8 @@
"simple_embedding_test.mlir"
CC_NAMESPACE
"iree::samples"
+ TRANSLATE_TOOL
+ iree_tools_iree-translate
TRANSLATION
"-iree-mlir-to-vm-bytecode-module"
PUBLIC
@@ -30,20 +32,17 @@
SRCS
"simple_embedding_test.cc"
DEPS
- iree::samples::simple_embedding::simple_embedding_test_bytecode_module_cc
+ ::simple_embedding_test_bytecode_module_cc
absl::core_headers
absl::strings
iree::base::api
iree::base::api_util
iree::base::logging
iree::hal::api
- iree::modules::hal
- iree::vm::bytecode_module
- iree::vm
- # These are the drivers we support running with and can produce
- # executables for from the source MLIR.
iree::hal::interpreter::interpreter_driver_module
iree::hal::vulkan::vulkan_driver_module
- # TODO(marbre): Set PLATFORM_VULKAN_TEST_DEPS somewhere instead of adding dependencies directly
+ iree::modules::hal
iree::testing::gtest_main
+ iree::vm
+ iree::vm::bytecode_module
)
diff --git a/iree/schemas/CMakeLists.txt b/iree/schemas/CMakeLists.txt
index 55951eb..2977391 100644
--- a/iree/schemas/CMakeLists.txt
+++ b/iree/schemas/CMakeLists.txt
@@ -19,6 +19,11 @@
buffer_data_def_cc_fbs
SRCS
"buffer_data_def.fbs"
+ FLATC_ARGS
+ "--keep-prefix"
+ "--scoped-enums"
+ "--reflect-names"
+ "--gen-object-api"
PUBLIC
)
@@ -27,6 +32,11 @@
bytecode_module_def_cc_fbs
SRCS
"bytecode_module_def.fbs"
+ FLATC_ARGS
+ "--keep-prefix"
+ "--scoped-enums"
+ "--reflect-names"
+ "--gen-object-api"
PUBLIC
)
@@ -35,6 +45,11 @@
interpreter_module_def_cc_fbs
SRCS
"interpreter_module_def.fbs"
+ FLATC_ARGS
+ "--keep-prefix"
+ "--scoped-enums"
+ "--reflect-names"
+ "--gen-object-api"
PUBLIC
)
@@ -43,6 +58,11 @@
spirv_executable_def_cc_fbs
SRCS
"spirv_executable_def.fbs"
+ FLATC_ARGS
+ "--keep-prefix"
+ "--scoped-enums"
+ "--reflect-names"
+ "--gen-object-api"
PUBLIC
)
@@ -51,6 +71,11 @@
vmla_executable_def_cc_fbs
SRCS
"vmla_executable_def.fbs"
+ FLATC_ARGS
+ "--keep-prefix"
+ "--scoped-enums"
+ "--reflect-names"
+ "--gen-object-api"
PUBLIC
)
@@ -59,5 +84,22 @@
llvmir_executable_def_cc_fbs
SRCS
"llvmir_executable_def.fbs"
+ FLATC_ARGS
+ "--keep-prefix"
+ "--scoped-enums"
+ "--reflect-names"
+ "--gen-object-api"
+ PUBLIC
+)
+
+iree_cc_embed_data(
+ NAME
+ reflection_data
+ CC_FILE_OUTPUT
+ "reflection_data.cc"
+ H_FILE_OUTPUT
+ "reflection_data.h"
+ CPP_NAMESPACE
+ "iree::schemas"
PUBLIC
)
diff --git a/iree/testing/CMakeLists.txt b/iree/testing/CMakeLists.txt
index 14db582..6b8c95c 100644
--- a/iree/testing/CMakeLists.txt
+++ b/iree/testing/CMakeLists.txt
@@ -12,44 +12,39 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# Testing utilities for IREE.
-
add_subdirectory(internal)
-if(${IREE_BUILD_TESTS})
+iree_cc_library(
+ NAME
+ benchmark_main
+ SRCS
+ "benchmark_main.cc"
+ DEPS
+ benchmark
+ iree::base::init
+ ALWAYSLINK
+ TESTONLY
+ PUBLIC
+)
- iree_cc_library(
- NAME
- benchmark_main
- SRCS
- "benchmark_main.cc"
- DEPS
- iree::base::init
- benchmark
- ALWAYSLINK
- PUBLIC
- )
+iree_cc_library(
+ NAME
+ gtest
+ HDRS
+ "gtest.h"
+ DEPS
+ iree::testing::internal::gtest_internal
+ TESTONLY
+ PUBLIC
+)
- iree_cc_library(
- NAME
- gtest
- HDRS
- "gtest.h"
- DEPS
- iree::testing::internal::gtest_internal
- iree::testing::internal::gtest_main_internal
- PUBLIC
- )
-
- iree_cc_library(
- NAME
- gtest_main
- HDRS
- "gtest.h"
- DEPS
- iree::testing::internal::gtest_internal
- iree::testing::internal::gtest_main_internal
- PUBLIC
- )
-
-endif()
+iree_cc_library(
+ NAME
+ gtest_main
+ HDRS
+ "gtest.h"
+ DEPS
+ iree::testing::internal::gtest_main_internal
+ TESTONLY
+ PUBLIC
+)
