Run bazel to cmake across the project in strict mode

Depends on https://github.com/google/iree/pull/671

Mostly updates things to use relative targets.

Tested:
Same 8 tests fail before and after
	 68 - iree_compiler_Dialect_HAL_Target_test_lit_smoketest.mlir_test (Failed)
	 69 - iree_compiler_Dialect_HAL_Transforms_test_lit_transformation.mlir_test (Failed)
	151 - iree_compiler_Translation_SPIRV_LinalgToSPIRV_test_lit_single_pw_op.mlir_test (Failed)
	155 - iree_compiler_Translation_test_lit_do_not_optimize.mlir_test (Failed)
	157 - iree_tools_vm_util_test (Failed)
	158 - iree_tools_test_lit_multiple_args.mlir_test (Failed)
	159 - iree_tools_test_lit_scalar.mlir_test (Failed)
	160 - iree_tools_test_lit_simple.mlir_test (Failed)

Closes https://github.com/google/iree/pull/675

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/675 from GMNGeoffrey:bazel-to-cmake 6bcd47461e67cbde66586a31463969c11416cc2c
PiperOrigin-RevId: 293217983
diff --git a/iree/base/internal/CMakeLists.txt b/iree/base/internal/CMakeLists.txt
index eca63d8..179d538 100644
--- a/iree/base/internal/CMakeLists.txt
+++ b/iree/base/internal/CMakeLists.txt
@@ -35,7 +35,7 @@
     "file_io_posix.cc"
     "file_io_win32.cc"
   DEPS
-    iree::base::internal::file_handle_win32
+    ::file_handle_win32
     iree::base::file_io_hdrs
     iree::base::platform_headers
     iree::base::status
@@ -52,7 +52,7 @@
     "file_mapping_posix.cc"
     "file_mapping_win32.cc"
   DEPS
-    iree::base::internal::file_handle_win32
+    ::file_handle_win32
     iree::base::file_mapping_hdrs
     iree::base::platform_headers
     iree::base::target_platform
@@ -117,7 +117,7 @@
     "status_win32_errors.cc"
     "statusor.cc"
   DEPS
-    iree::base::internal::logging_internal
+    ::logging_internal
     iree::base::platform_headers
     iree::base::source_location
     iree::base::target_platform
diff --git a/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt b/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt
index c30ee88..40d7f08 100644
--- a/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt
+++ b/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt
@@ -14,13 +14,14 @@
 
 iree_cc_library(
   NAME
-    XLA
+    XlaHloShapeBuilder
   HDRS
     "XlaHloShapeBuilder.h"
   SRCS
     "XlaHloShapeBuilder.cpp"
   DEPS
     iree::compiler::Dialect::Shape::IR
+    LLVMSupport
     MLIRIR
     tensorflow::mlir_xla
   PUBLIC
diff --git a/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt b/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt
index 2d77824..21f5f3f 100644
--- a/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt
@@ -26,7 +26,7 @@
     "MaterializeShapeCalculations.cpp"
   DEPS
     iree::compiler::Dialect::Shape::IR
-    iree::compiler::Dialect::Shape::Plugins::XLA
+    iree::compiler::Dialect::Shape::Plugins::XLA::XlaHloShapeBuilder
     MLIRIR
     MLIRPass
     MLIRStandardOps
diff --git a/iree/compiler/Dialect/Shape/Transforms/test/CMakeLists.txt b/iree/compiler/Dialect/Shape/Transforms/test/CMakeLists.txt
index 100e798..0ff81b6 100644
--- a/iree/compiler/Dialect/Shape/Transforms/test/CMakeLists.txt
+++ b/iree/compiler/Dialect/Shape/Transforms/test/CMakeLists.txt
@@ -16,6 +16,7 @@
   NAME
     lit
   SRCS
+    "convert-hlo-to-shape-dialect.mlir"
     "expand_function_dynamic_dims.mlir"
     "materialize_shape_calculations.mlir"
   DATA
diff --git a/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt
index 70db8a0..b43bbb6 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt
@@ -26,8 +26,8 @@
     iree::compiler::Dialect::VM::Conversion
     iree::compiler::Dialect::VM::Conversion::StandardToVM
     iree::compiler::Dialect::VM::IR
-    iree::compiler::Dialect::VMLA::IR
     iree::compiler::Dialect::VMLA::vmla_imports
+    iree::compiler::Dialect::VMLA::IR
     MLIRIR
     MLIRPass
     MLIRStandardOps
diff --git a/iree/compiler/Dialect/VMLA/IR/test/CMakeLists.txt b/iree/compiler/Dialect/VMLA/IR/test/CMakeLists.txt
index 04f426a..981f929 100644
--- a/iree/compiler/Dialect/VMLA/IR/test/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/IR/test/CMakeLists.txt
@@ -15,7 +15,6 @@
 iree_lit_test_suite(
   NAME
     lit
-  SRCS
   DATA
     iree::tools::IreeFileCheck
     iree::tools::iree-opt
diff --git a/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt
index 00a4609..a5ef099 100644
--- a/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt
@@ -27,13 +27,10 @@
     iree::compiler::Dialect::VMLA::Conversion::HLOToVMLA
     iree::compiler::Dialect::VMLA::Conversion::StandardToVMLA
     iree::compiler::Dialect::VMLA::IR
-    iree::compiler::Utils
     LLVMSupport
     MLIRIR
     MLIRPass
-    MLIRStandardOps
     MLIRSupport
-    MLIRTransformUtils
     MLIRTransforms
     tensorflow::mlir_xla
   ALWAYSLINK
diff --git a/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt b/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt
index 5bb4c77..53fbb2f 100644
--- a/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt
@@ -18,7 +18,7 @@
   NAME
     IndexComputationAttrGen
   TD_FILE
-    IndexComputationAttr.td
+    "IndexComputationAttr.td"
   OUTS
     -gen-struct-attr-decls IndexComputationAttr.h.inc
     -gen-struct-attr-defs IndexComputationAttr.cpp.inc
@@ -43,6 +43,7 @@
     "XLAIndexPropagation.cpp"
   DEPS
     iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::SPIRV::IndexComputation::IndexComputationAttrGen
     iree::compiler::Utils
     LLVMSupport
     MLIRIR
diff --git a/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt b/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt
index 89b865b..1dc2cd3 100644
--- a/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt
+++ b/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt
@@ -37,7 +37,7 @@
 
 iree_cc_library(
   NAME
-    "IREELinalgTensorToBuffer"
+    IREELinalgTensorToBuffer
   HDRS
     "LinalgTensorToBuffer.h"
   SRCS
diff --git a/iree/compiler/Translation/XLAToLinalg/test/CMakeLists.txt b/iree/compiler/Translation/XLAToLinalg/test/CMakeLists.txt
index 30e5597..324053c 100644
--- a/iree/compiler/Translation/XLAToLinalg/test/CMakeLists.txt
+++ b/iree/compiler/Translation/XLAToLinalg/test/CMakeLists.txt
@@ -19,8 +19,9 @@
     "arithmetic_ops.mlir"
     "dynamic_shape.mlir"
     "exp.mlir"
+    "linalg_tensor_to_buffer.mlir"
   DATA
     iree::tools::IreeFileCheck
     iree::tools::iree-opt
-    MLIRmlir-translate
+    mlir-translate
 )
diff --git a/iree/hal/CMakeLists.txt b/iree/hal/CMakeLists.txt
index 5f706a8..ec6e839 100644
--- a/iree/hal/CMakeLists.txt
+++ b/iree/hal/CMakeLists.txt
@@ -26,7 +26,7 @@
   SRCS
     "allocator.cc"
   DEPS
-    iree::hal::buffer
+    ::buffer
     iree::base::ref_ptr
     iree::base::source_location
     iree::base::status
@@ -44,19 +44,19 @@
   SRCS
     "api.cc"
   DEPS
-    iree::hal::api_hdrs
-    iree::hal::buffer
-    iree::hal::buffer_view
-    iree::hal::command_buffer
-    iree::hal::descriptor_set
-    iree::hal::descriptor_set_layout
-    iree::hal::device
-    iree::hal::driver
-    iree::hal::driver_registry
-    iree::hal::executable_layout
-    iree::hal::fence
-    iree::hal::heap_buffer
-    iree::hal::semaphore
+    ::api_hdrs
+    ::buffer
+    ::buffer_view
+    ::command_buffer
+    ::descriptor_set
+    ::descriptor_set_layout
+    ::device
+    ::driver
+    ::driver_registry
+    ::executable_layout
+    ::fence
+    ::heap_buffer
+    ::semaphore
     iree::base::api
     iree::base::api_util
     iree::base::ref_ptr
@@ -85,7 +85,7 @@
   SRCS
     "buffer.cc"
   DEPS
-    iree::hal::resource
+    ::resource
     iree::base::bitfield
     iree::base::logging
     iree::base::source_location
@@ -104,8 +104,8 @@
     "buffer_mapping_test.cc"
     "buffer_test.cc"
   DEPS
-    iree::hal::buffer
-    iree::hal::heap_buffer
+    ::buffer
+    ::heap_buffer
     iree::base::status
     iree::base::status_matchers
     iree::testing::gtest_main
@@ -120,7 +120,7 @@
   SRCS
     "buffer_view.cc"
   DEPS
-    iree::hal::buffer
+    ::buffer
     iree::base::shape
     iree::base::source_location
     iree::base::status
@@ -135,9 +135,9 @@
   SRCS
     "buffer_view_test.cc"
   DEPS
-    iree::hal::buffer
-    iree::hal::buffer_view
-    iree::hal::heap_buffer
+    ::buffer
+    ::buffer_view
+    ::heap_buffer
     iree::base::status
     iree::base::status_matchers
     iree::testing::gtest_main
@@ -151,9 +151,9 @@
   SRCS
     "buffer_view_string_util.cc"
   DEPS
-    iree::hal::allocator
-    iree::hal::buffer_view
-    iree::hal::heap_buffer
+    ::allocator
+    ::buffer_view
+    ::heap_buffer
     iree::base::buffer_string_util
     iree::base::source_location
     iree::base::status
@@ -168,7 +168,7 @@
   SRCS
     "buffer_view_string_util_test.cc"
   DEPS
-    iree::hal::buffer_view_string_util
+    ::buffer_view_string_util
     iree::base::status
     iree::base::status_matchers
     iree::testing::gtest_main
@@ -182,12 +182,12 @@
   SRCS
     "command_buffer.cc"
   DEPS
-    iree::hal::allocator
-    iree::hal::buffer
-    iree::hal::buffer_view
-    iree::hal::event
-    iree::hal::executable
-    iree::hal::resource
+    ::allocator
+    ::buffer
+    ::buffer_view
+    ::event
+    ::executable
+    ::resource
     iree::base::bitfield
     iree::base::shape
     iree::base::status
@@ -203,7 +203,7 @@
   SRCS
     "command_buffer_validation.cc"
   DEPS
-    iree::hal::command_buffer
+    ::command_buffer
     iree::base::logging
     iree::base::status
   PUBLIC
@@ -215,9 +215,9 @@
   HDRS
     "command_queue.h"
   DEPS
-    iree::hal::command_buffer
-    iree::hal::fence
-    iree::hal::semaphore
+    ::command_buffer
+    ::fence
+    ::semaphore
     iree::base::bitfield
     iree::base::status
     iree::base::time
@@ -234,8 +234,8 @@
   SRCS
     "deferred_buffer.cc"
   DEPS
-    iree::hal::allocator
-    iree::hal::buffer
+    ::allocator
+    ::buffer
     iree::base::status
   PUBLIC
 )
@@ -246,8 +246,8 @@
   SRCS
     "deferred_buffer_test.cc"
   DEPS
-    iree::hal::deferred_buffer
-    iree::hal::heap_buffer
+    ::deferred_buffer
+    ::heap_buffer
     iree::base::status_matchers
     iree::hal::testing::mock_allocator
     iree::testing::gtest_main
@@ -260,8 +260,8 @@
   HDRS
     "descriptor_set.h"
   DEPS
-    iree::hal::buffer
-    iree::hal::resource
+    ::buffer
+    ::resource
     iree::base::status
   PUBLIC
 )
@@ -272,8 +272,8 @@
   HDRS
     "descriptor_set_layout.h"
   DEPS
-    iree::hal::buffer
-    iree::hal::resource
+    ::buffer
+    ::resource
     iree::base::status
   PUBLIC
 )
@@ -284,16 +284,16 @@
   HDRS
     "device.h"
   DEPS
-    iree::hal::allocator
-    iree::hal::buffer
-    iree::hal::command_queue
-    iree::hal::descriptor_set
-    iree::hal::descriptor_set_layout
-    iree::hal::device_info
-    iree::hal::event
-    iree::hal::executable_cache
-    iree::hal::executable_layout
-    iree::hal::semaphore
+    ::allocator
+    ::buffer
+    ::command_queue
+    ::descriptor_set
+    ::descriptor_set_layout
+    ::device_info
+    ::event
+    ::executable_cache
+    ::executable_layout
+    ::semaphore
     iree::base::ref_ptr
     iree::base::status
     iree::base::time
@@ -320,14 +320,14 @@
   SRCS
     "device_manager.cc"
   DEPS
-    iree::hal::allocator
-    iree::hal::buffer
-    iree::hal::command_queue
-    iree::hal::device
-    iree::hal::device_placement
-    iree::hal::executable_format
-    iree::hal::fence
-    iree::hal::heap_buffer
+    ::allocator
+    ::buffer
+    ::command_queue
+    ::device
+    ::device_placement
+    ::executable_format
+    ::fence
+    ::heap_buffer
     iree::base::source_location
     iree::base::status
     iree::base::time
@@ -352,8 +352,8 @@
   HDRS
     "driver.h"
   DEPS
-    iree::hal::device
-    iree::hal::device_info
+    ::device
+    ::device_info
     iree::base::ref_ptr
     iree::base::status
   PUBLIC
@@ -367,7 +367,7 @@
   SRCS
     "driver_registry.cc"
   DEPS
-    iree::hal::driver
+    ::driver
     iree::base::initializer
     iree::base::ref_ptr
     iree::base::status
@@ -382,7 +382,7 @@
   HDRS
     "event.h"
   DEPS
-    iree::hal::resource
+    ::resource
   PUBLIC
 )
 
@@ -392,7 +392,7 @@
   HDRS
     "executable.h"
   DEPS
-    iree::hal::resource
+    ::resource
   PUBLIC
 )
 
@@ -404,9 +404,9 @@
   SRCS
     "executable_cache.cc"
   DEPS
-    iree::hal::executable
-    iree::hal::executable_format
-    iree::hal::executable_spec
+    ::executable
+    ::executable_format
+    ::executable_spec
     iree::base::bitfield
     iree::base::ref_ptr
     iree::base::status
@@ -429,7 +429,7 @@
   HDRS
     "executable_layout.h"
   DEPS
-    iree::hal::resource
+    ::resource
     iree::base::status
   PUBLIC
 )
@@ -440,7 +440,7 @@
   HDRS
     "executable_spec.h"
   DEPS
-    iree::hal::executable_format
+    ::executable_format
     absl::span
   PUBLIC
 )
@@ -451,7 +451,7 @@
   HDRS
     "fence.h"
   DEPS
-    iree::hal::resource
+    ::resource
     iree::base::status
   PUBLIC
 )
@@ -464,8 +464,8 @@
   SRCS
     "heap_buffer.cc"
   DEPS
-    iree::hal::allocator
-    iree::hal::buffer
+    ::allocator
+    ::buffer
     iree::base::source_location
     iree::base::status
     iree::base::tracing
@@ -490,7 +490,7 @@
   HDRS
     "semaphore.h"
   DEPS
-    iree::hal::resource
+    ::resource
     absl::variant
   PUBLIC
 )
diff --git a/iree/hal/host/CMakeLists.txt b/iree/hal/host/CMakeLists.txt
index cf565a3..f11c825 100644
--- a/iree/hal/host/CMakeLists.txt
+++ b/iree/hal/host/CMakeLists.txt
@@ -20,7 +20,7 @@
   SRCS
     "async_command_queue.cc"
   DEPS
-    iree::hal::host::host_submission_queue
+    ::host_submission_queue
     iree::base::status
     iree::base::tracing
     iree::hal::command_queue
@@ -36,8 +36,8 @@
   SRCS
     "async_command_queue_test.cc"
   DEPS
-    iree::hal::host::async_command_queue
-    iree::hal::host::host_submission_queue
+    ::async_command_queue
+    ::host_submission_queue
     iree::base::status
     iree::base::status_matchers
     iree::base::time
@@ -101,7 +101,7 @@
   SRCS
     "host_fence_test.cc"
   DEPS
-    iree::hal::host::host_fence
+    ::host_fence
     iree::base::status
     iree::base::status_matchers
     iree::testing::gtest_main
@@ -116,7 +116,7 @@
   SRCS
     "host_local_allocator.cc"
   DEPS
-    iree::hal::host::host_buffer
+    ::host_buffer
     iree::base::source_location
     iree::base::status
     iree::base::tracing
@@ -148,7 +148,7 @@
   SRCS
     "host_submission_queue.cc"
   DEPS
-    iree::hal::host::host_fence
+    ::host_fence
     iree::base::intrusive_list
     iree::base::status
     iree::base::tracing
@@ -167,7 +167,7 @@
   SRCS
     "host_submission_queue_test.cc"
   DEPS
-    iree::hal::host::host_submission_queue
+    ::host_submission_queue
     iree::testing::gtest_main
 )
 
diff --git a/iree/hal/interpreter/CMakeLists.txt b/iree/hal/interpreter/CMakeLists.txt
index 311c1d8..77a1f53 100644
--- a/iree/hal/interpreter/CMakeLists.txt
+++ b/iree/hal/interpreter/CMakeLists.txt
@@ -20,7 +20,7 @@
   SRCS
     "bytecode_cache.cc"
   DEPS
-    iree::hal::interpreter::bytecode_executable
+    ::bytecode_executable
     iree::base::source_location
     iree::base::status
     iree::base::tracing
@@ -54,7 +54,7 @@
     "stack.cc"
     "type.cc"
   DEPS
-    iree::hal::interpreter::bytecode_kernels
+    ::bytecode_kernels
     iree::base::flatbuffer_util
     iree::base::logging
     iree::base::memory
@@ -106,7 +106,7 @@
   SRCS
     "bytecode_kernels_test.cc"
   DEPS
-    iree::hal::interpreter::bytecode_kernels
+    ::bytecode_kernels
     iree::base::memory
     iree::base::status_matchers
     iree::testing::gtest_main
@@ -120,7 +120,7 @@
   SRCS
     "interpreter_command_processor.cc"
   DEPS
-    iree::hal::interpreter::bytecode_executable
+    ::bytecode_executable
     iree::base::source_location
     iree::base::status
     iree::base::tracing
@@ -139,9 +139,9 @@
   SRCS
     "interpreter_device.cc"
   DEPS
-    iree::hal::interpreter::bytecode_cache
-    iree::hal::interpreter::bytecode_kernels
-    iree::hal::interpreter::interpreter_command_processor
+    ::bytecode_cache
+    ::bytecode_kernels
+    ::interpreter_command_processor
     iree::base::memory
     iree::base::status
     iree::base::tracing
@@ -168,7 +168,7 @@
   SRCS
     "interpreter_driver.cc"
   DEPS
-    iree::hal::interpreter::interpreter_device
+    ::interpreter_device
     iree::hal::device_info
     iree::hal::driver
   PUBLIC
@@ -180,7 +180,7 @@
   SRCS
     "interpreter_driver_module.cc"
   DEPS
-    iree::hal::interpreter::interpreter_driver
+    ::interpreter_driver
     iree::base::init
     iree::base::status
     iree::hal::driver_registry
diff --git a/iree/hal/vmla/CMakeLists.txt b/iree/hal/vmla/CMakeLists.txt
index 26cfb30..36d588f 100644
--- a/iree/hal/vmla/CMakeLists.txt
+++ b/iree/hal/vmla/CMakeLists.txt
@@ -40,7 +40,7 @@
   SRCS
     "op_kernels_test.cc"
   DEPS
-    iree::hal::vmla::op_kernels
+    ::op_kernels
     iree::base::memory
     iree::base::status_matchers
     iree::testing::gtest_main
@@ -54,7 +54,7 @@
   SRCS
     "vmla_cache.cc"
   DEPS
-    iree::hal::vmla::vmla_executable
+    ::vmla_executable
     iree::base::source_location
     iree::base::status
     iree::base::tracing
@@ -75,7 +75,7 @@
   SRCS
     "vmla_command_processor.cc"
   DEPS
-    iree::hal::vmla::vmla_executable
+    ::vmla_executable
     iree::base::api_util
     iree::base::status
     iree::base::tracing
@@ -93,8 +93,8 @@
   SRCS
     "vmla_device.cc"
   DEPS
-    iree::hal::vmla::vmla_cache
-    iree::hal::vmla::vmla_command_processor
+    ::vmla_cache
+    ::vmla_command_processor
     iree::base::memory
     iree::base::status
     iree::base::tracing
@@ -123,8 +123,8 @@
   SRCS
     "vmla_driver.cc"
   DEPS
-    iree::hal::vmla::vmla_device
-    iree::hal::vmla::vmla_module
+    ::vmla_device
+    ::vmla_module
     iree::base::api_util
     iree::base::tracing
     iree::hal::device_info
@@ -140,7 +140,7 @@
   SRCS
     "vmla_driver_module.cc"
   DEPS
-    iree::hal::vmla::vmla_driver
+    ::vmla_driver
     iree::base::init
     iree::base::status
     iree::hal::driver_registry
@@ -179,7 +179,7 @@
   SRCS
     "vmla_module.cc"
   DEPS
-    iree::hal::vmla::op_kernels
+    ::op_kernels
     iree::base::api
     iree::base::memory
     iree::base::ref_ptr
diff --git a/iree/samples/custom_modules/CMakeLists.txt b/iree/samples/custom_modules/CMakeLists.txt
index 6455477..9a21206 100644
--- a/iree/samples/custom_modules/CMakeLists.txt
+++ b/iree/samples/custom_modules/CMakeLists.txt
@@ -34,8 +34,8 @@
   SRCS
     "custom_modules_test.cc"
   DEPS
-    iree::samples::custom_modules::custom_modules_test_module_cc
-    iree::samples::custom_modules::native_module
+    ::custom_modules_test_module_cc
+    ::native_module
     iree::base::api
     iree::base::logging
     iree::hal::api
diff --git a/iree/samples/vulkan/CMakeLists.txt b/iree/samples/vulkan/CMakeLists.txt
index 98955be..1c84455 100644
--- a/iree/samples/vulkan/CMakeLists.txt
+++ b/iree/samples/vulkan/CMakeLists.txt
@@ -21,6 +21,8 @@
     "iree::samples::vulkan"
 )
 
+# bazel_to_cmake: DO NOT EDIT
+# TODO(scotttodd): handle vulkan in bazel_to_cmake
 # Statically link against Vulkan.
 # Requires installing the Vulkan SDK from https://vulkan.lunarg.com/.
 include(FindVulkan)
diff --git a/iree/tools/test/CMakeLists.txt b/iree/tools/test/CMakeLists.txt
index b7bde70..ecbb8d0 100644
--- a/iree/tools/test/CMakeLists.txt
+++ b/iree/tools/test/CMakeLists.txt
@@ -17,7 +17,7 @@
     lit
   SRCS
     "multiple_args.mlir"
-    "scalar.mlir"
+    "scalars.mlir"
     "simple.mlir"
   DATA
     iree::tools::IreeFileCheck
diff --git a/iree/vm/CMakeLists.txt b/iree/vm/CMakeLists.txt
index 77d12aa..4f0bbee 100644
--- a/iree/vm/CMakeLists.txt
+++ b/iree/vm/CMakeLists.txt
@@ -18,12 +18,12 @@
   SRCS
     "bytecode_dispatch_test.cc"
   DEPS
-    iree::vm::bytecode_dispatch_test_module_cc
-    iree::vm::bytecode_module
-    iree::vm::context
-    iree::vm::instance
-    iree::vm::invocation
-    iree::vm::module
+    ::bytecode_dispatch_test_module_cc
+    ::bytecode_module
+    ::context
+    ::instance
+    ::invocation
+    ::module
     iree::base::logging
     iree::testing::gtest_main
     absl::strings
@@ -54,11 +54,11 @@
     "bytecode_module_impl.h"
     "bytecode_op_table.h"
   DEPS
-    iree::vm::module
-    iree::vm::ref
-    iree::vm::stack
-    iree::vm::types
-    iree::vm::value
+    ::module
+    ::ref
+    ::stack
+    ::types
+    ::value
     iree::base::api
     iree::base::flatbuffer_util
     iree::base::target_platform
@@ -73,10 +73,10 @@
   SRCS
     "bytecode_module_benchmark.cc"
   DEPS
-    iree::vm::bytecode_module
-    iree::vm::bytecode_module_benchmark_module_cc
-    iree::vm::module
-    iree::vm::stack
+    ::bytecode_module
+    ::bytecode_module_benchmark_module_cc
+    ::module
+    ::stack
     iree::base::api
     iree::base::logging
     iree::testing::benchmark_main
@@ -105,7 +105,7 @@
   SRCS
     "bytecode_module_test.cc"
   DEPS
-    iree::vm::bytecode_module
+    ::bytecode_module
     iree::testing::gtest_main
 )
 
@@ -128,9 +128,9 @@
   SRCS
     "context.c"
   DEPS
-    iree::vm::instance
-    iree::vm::module
-    iree::vm::stack
+    ::instance
+    ::module
+    ::stack
     iree::base::api
   PUBLIC
 )
@@ -143,7 +143,7 @@
   SRCS
     "instance.c"
   DEPS
-    iree::vm::types
+    ::types
     iree::base::api
   PUBLIC
 )
@@ -156,9 +156,9 @@
   SRCS
     "invocation.c"
   DEPS
-    iree::vm::context
-    iree::vm::module
-    iree::vm::variant_list
+    ::context
+    ::module
+    ::variant_list
     iree::base::api
   PUBLIC
 )
@@ -182,11 +182,11 @@
     "module_abi_cc.h"
     "module_abi_packing.h"
   DEPS
-    iree::vm::module
-    iree::vm::ref
-    iree::vm::ref_cc
-    iree::vm::stack
-    iree::vm::types
+    ::module
+    ::ref
+    ::ref_cc
+    ::stack
+    ::types
     iree::base::api
     iree::base::api_util
     iree::base::ref_ptr
@@ -214,7 +214,7 @@
   SRCS
     "ref_test.cc"
   DEPS
-    iree::vm::ref
+    ::ref
     iree::base::api
     iree::base::ref_ptr
     iree::testing::gtest_main
@@ -226,8 +226,8 @@
   HDRS
     "ref_cc.h"
   DEPS
-    iree::vm::ref
-    iree::vm::types
+    ::ref
+    ::types
     iree::base::api
     absl::core_headers
   PUBLIC
@@ -241,8 +241,8 @@
   SRCS
     "stack.c"
   DEPS
-    iree::vm::module
-    iree::vm::ref
+    ::module
+    ::ref
     iree::base::api
   PUBLIC
 )
@@ -253,8 +253,8 @@
   SRCS
     "stack_test.cc"
   DEPS
-    iree::vm::ref
-    iree::vm::stack
+    ::ref
+    ::stack
     iree::base::api
     iree::base::ref_ptr
     iree::testing::gtest_main
@@ -268,7 +268,7 @@
   SRCS
     "types.c"
   DEPS
-    iree::vm::ref
+    ::ref
     iree::base::api
   PUBLIC
 )
@@ -289,8 +289,8 @@
   SRCS
     "variant_list.c"
   DEPS
-    iree::vm::ref
-    iree::vm::value
+    ::ref
+    ::value
   PUBLIC
 )
 
@@ -300,15 +300,15 @@
   HDRS
     "api.h"
   DEPS
-    iree::vm::context
-    iree::vm::instance
-    iree::vm::invocation
-    iree::vm::module
-    iree::vm::ref
-    iree::vm::stack
-    iree::vm::types
-    iree::vm::value
-    iree::vm::variant_list
+    ::context
+    ::instance
+    ::invocation
+    ::module
+    ::ref
+    ::stack
+    ::types
+    ::value
+    ::variant_list
     iree::base::api
   PUBLIC
 )