Run bazel_to_cmake in strict mode
Ran across the entire IREE directory
Depends on https://github.com/google/iree/pull/775
Closes https://github.com/google/iree/pull/774
COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/774 from GMNGeoffrey:bazel-to-cmake 9a81cb56837949a8381cd73eef908dd933d280b1
PiperOrigin-RevId: 295771115
diff --git a/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt b/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt
index 5974918..839a4cd 100644
--- a/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt
@@ -45,6 +45,7 @@
iree::compiler::Dialect::Flow::Utils
iree::compiler::Utils
LLVMSupport
+ MLIRAnalysis
MLIRIR
MLIRPass
MLIRStandardOps
diff --git a/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt b/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt
new file mode 100644
index 0000000..e8f46bf
--- /dev/null
+++ b/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt
@@ -0,0 +1,31 @@
+# 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.
+
+add_subdirectory(test)
+
+iree_cc_library(
+ NAME
+ Conversion
+ HDRS
+ "ConvertHALToVM.h"
+ SRCS
+ "ConvertHALToVM.cpp"
+ DEPS
+ iree::compiler::Dialect::HAL::Conversion
+ iree::compiler::Dialect::Modules::TensorList::IR
+ iree::compiler::Dialect::VM::Conversion
+ MLIRPass
+ MLIRTransforms
+ PUBLIC
+)
diff --git a/iree/compiler/Dialect/Modules/TensorList/Conversion/test/CMakeLists.txt b/iree/compiler/Dialect/Modules/TensorList/Conversion/test/CMakeLists.txt
new file mode 100644
index 0000000..c1d1c62
--- /dev/null
+++ b/iree/compiler/Dialect/Modules/TensorList/Conversion/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+# 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.
+
+file(GLOB _GLOB_X_MLIR CONFIGURE_DEPENDS *.mlir)
+iree_lit_test_suite(
+ NAME
+ lit
+ SRCS
+ "${_GLOB_X_MLIR}"
+ DATA
+ iree::compiler::Dialect::Modules::TensorList::tensorlist-opt
+ iree::tools::IreeFileCheck
+)
diff --git a/iree/compiler/Dialect/Modules/TensorList/IR/test/CMakeLists.txt b/iree/compiler/Dialect/Modules/TensorList/IR/test/CMakeLists.txt
new file mode 100644
index 0000000..c1d1c62
--- /dev/null
+++ b/iree/compiler/Dialect/Modules/TensorList/IR/test/CMakeLists.txt
@@ -0,0 +1,24 @@
+# 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.
+
+file(GLOB _GLOB_X_MLIR CONFIGURE_DEPENDS *.mlir)
+iree_lit_test_suite(
+ NAME
+ lit
+ SRCS
+ "${_GLOB_X_MLIR}"
+ DATA
+ iree::compiler::Dialect::Modules::TensorList::tensorlist-opt
+ iree::tools::IreeFileCheck
+)
diff --git a/iree/compiler/Translation/CMakeLists.txt b/iree/compiler/Translation/CMakeLists.txt
index e49396b..2ac3d3b 100644
--- a/iree/compiler/Translation/CMakeLists.txt
+++ b/iree/compiler/Translation/CMakeLists.txt
@@ -38,7 +38,6 @@
MLIRAllDialects
MLIRIR
MLIRPass
- MLIRStandardOps
MLIRSupport
MLIRTranslation
tensorflow::mlir_xla
diff --git a/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt b/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
index f420484..6bdfee9 100644
--- a/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
@@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# TODO(ravishankarm): Vulkan not supported in OSS build testing, so
-# disabling this for now.
-# add_subdirectory(test)
+add_subdirectory(test)
iree_cc_library(
NAME
@@ -33,8 +31,8 @@
MLIRAffineOps
MLIRAffineToStandard
MLIREDSC
- MLIRGPUtoSPIRVTransforms
MLIRGPU
+ MLIRGPUtoSPIRVTransforms
MLIRIR
MLIRLinalgOps
MLIRLinalgTransforms
diff --git a/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt b/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt
index 6d3d175..a1957bf 100644
--- a/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt
@@ -27,6 +27,7 @@
MLIRIR
MLIRPass
MLIRSPIRV
+ MLIRSPIRVTransforms
MLIRStandardOps
MLIRTransforms
tensorflow::mlir_xla
diff --git a/iree/hal/CMakeLists.txt b/iree/hal/CMakeLists.txt
index 4dd13b6..11e4069 100644
--- a/iree/hal/CMakeLists.txt
+++ b/iree/hal/CMakeLists.txt
@@ -14,6 +14,7 @@
add_subdirectory(host)
add_subdirectory(interpreter)
+add_subdirectory(llvmjit)
add_subdirectory(testing)
add_subdirectory(vmla)
add_subdirectory(vulkan)
diff --git a/iree/hal/llvmjit/CMakeLists.txt b/iree/hal/llvmjit/CMakeLists.txt
index 81f36ee..512166d 100644
--- a/iree/hal/llvmjit/CMakeLists.txt
+++ b/iree/hal/llvmjit/CMakeLists.txt
@@ -14,6 +14,36 @@
iree_cc_library(
NAME
+ llvmjit_executable
+ HDRS
+ "llvmjit_executable.h"
+ SRCS
+ "llvmjit_executable.cc"
+ DEPS
+ iree::base::status
+ iree::hal::allocator
+ iree::hal::executable
+ iree::hal::executable_spec
+ absl::span
+ PUBLIC
+)
+
+iree_cc_library(
+ NAME
+ llvmjit_command_processor
+ HDRS
+ "llvmjit_command_processor.h"
+ SRCS
+ "llvmjit_command_processor.cc"
+ DEPS
+ ::llvmjit_executable
+ iree::base::tracing
+ iree::hal::host::host_local_command_processor
+ PUBLIC
+)
+
+iree_cc_library(
+ NAME
llvmjit_executable_cache
HDRS
"llvmjit_executable_cache.h"
@@ -28,26 +58,6 @@
iree::hal::executable
iree::hal::executable_cache
iree::hal::executable_format
- iree::vm::instance
- iree::vm::module
- PUBLIC
-)
-
-iree_cc_library(
- NAME
- llvmjit_command_processor
- HDRS
- "llvmjit_command_processor.h"
- SRCS
- "llvmjit_command_processor.cc"
- DEPS
- ::llvmjit_executable
- iree::base::api_util
- iree::base::status
- iree::base::tracing
- iree::hal::host::host_local_command_processor
- iree::vm::invocation
- iree::vm::variant_list
PUBLIC
)
@@ -59,8 +69,8 @@
SRCS
"llvmjit_device.cc"
DEPS
- ::llvmjit_executable_cache
::llvmjit_command_processor
+ ::llvmjit_executable_cache
iree::base::memory
iree::base::status
iree::base::tracing
@@ -73,8 +83,6 @@
iree::hal::host::host_local_allocator
iree::hal::host::host_submission_queue
iree::hal::host::inproc_command_buffer
- iree::vm::instance
- iree::vm::module
absl::inlined_vector
absl::memory
absl::span
@@ -90,13 +98,8 @@
"llvmjit_driver.cc"
DEPS
::llvmjit_device
- ::llvmjit_module
- iree::base::api_util
- iree::base::tracing
iree::hal::device_info
iree::hal::driver
- iree::vm::instance
- iree::vm::module
PUBLIC
)
@@ -113,46 +116,3 @@
ALWAYSLINK
PUBLIC
)
-
-iree_cc_library(
- NAME
- llvmjit_executable
- HDRS
- "llvmjit_executable.h"
- SRCS
- "llvmjit_executable.cc"
- DEPS
- iree::base::api_util
- iree::base::status
- iree::base::tracing
- iree::hal::allocator
- iree::hal::executable
- iree::hal::executable_spec
- iree::vm::bytecode_module
- iree::vm::context
- iree::vm::instance
- iree::vm::module
- absl::inlined_vector
- absl::span
- PUBLIC
-)
-
-iree_cc_library(
- NAME
- llvmjit_module
- HDRS
- "llvmjit_module.h"
- SRCS
- "llvmjit_module.cc"
- DEPS
- ::op_kernels
- iree::base::api
- iree::base::memory
- iree::base::ref_ptr
- iree::base::tracing
- iree::vm
- iree::vm::module_abi_cc
- iree::vm::types
- absl::span
- PUBLIC
-)
