Bazel to cmake: Sort target lists

There's been some previous discussion about sorting cmake dependencies vs preserving the order from bazel (https://github.com/google/iree/issues/538).

I think we've come to a point where we're going to have to switch to alphabetical order. I've just about got bazel_to_cmake working upstream, where the order of dependencies is different, so there's no way we can have it preserve order and have that.

The good news is that this means it should be possible to enforce that people run the tool as a presubmit, which should keep those files up to date much better.

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

COPYBARA_INTEGRATE_REVIEW=https://github.com/google/iree/pull/777 from GMNGeoffrey:bazel-to-cmake-sorting 80caba353983abf30440d6f6c602d417f52dd5f2
PiperOrigin-RevId: 295780072

build_tools/bazel_to_cmake/bazel_to_cmake.py

diff --git a/build_tools/bazel_to_cmake/bazel_to_cmake.py b/build_tools/bazel_to_cmake/bazel_to_cmake.py
index 55d5ff9..6977ad8 100755
--- a/build_tools/bazel_to_cmake/bazel_to_cmake.py
+++ b/build_tools/bazel_to_cmake/bazel_to_cmake.py
@@ -31,7 +31,6 @@
 import datetime
 import os
 import textwrap
-from collections import OrderedDict
 from itertools import repeat, chain
 import glob
 import re
@@ -234,8 +233,12 @@
     targets = [self._convert_target(t) for t in targets]
     # Flatten lists
     targets = list(chain.from_iterable(targets))
-    # Remove Falsey (None and empty string) values and duplicates, preserving the original ordering.
-    targets = list(filter(None, OrderedDict(zip(targets, repeat(None)))))
+    # Remove duplicates
+    targets = set(targets)
+    # Remove Falsey (None and empty string) values
+    targets = filter(None, targets)
+    # Sort the targets and convert to a list
+    targets = sorted(targets)
     target_list_string = "\n".join(["    %s" % (t,) for t in targets])
     return "  %s\n%s\n" % (
         list_name,

iree/base/internal/CMakeLists.txt

diff --git a/iree/base/internal/CMakeLists.txt b/iree/base/internal/CMakeLists.txt
index d2f3fee..268982c 100644
--- a/iree/base/internal/CMakeLists.txt
+++ b/iree/base/internal/CMakeLists.txt
@@ -20,11 +20,11 @@
   SRCS
     "file_handle_win32.cc"
   DEPS
+    absl::memory
+    absl::strings
     iree::base::platform_headers
     iree::base::status
     iree::base::target_platform
-    absl::memory
-    absl::strings
   PUBLIC
 )
 
@@ -36,12 +36,12 @@
     "file_io_win32.cc"
   DEPS
     ::file_handle_win32
+    absl::memory
+    absl::strings
     iree::base::file_io_hdrs
     iree::base::platform_headers
     iree::base::status
     iree::base::target_platform
-    absl::memory
-    absl::strings
   PUBLIC
 )
 
@@ -53,12 +53,12 @@
     "file_mapping_win32.cc"
   DEPS
     ::file_handle_win32
+    absl::memory
+    absl::strings
     iree::base::file_mapping_hdrs
     iree::base::platform_headers
     iree::base::target_platform
     iree::base::tracing
-    absl::memory
-    absl::strings
   PUBLIC
 )
 
@@ -70,9 +70,9 @@
   SRCS
     "init_internal.cc"
   DEPS
+    absl::flags_parse
     iree::base::initializer
     iree::base::target_platform
-    absl::flags_parse
   PUBLIC
 )
 
@@ -84,9 +84,9 @@
   SRCS
     "logging.cc"
   DEPS
-    iree::base::platform_headers
     absl::core_headers
     absl::flags
+    iree::base::platform_headers
   PUBLIC
 )
 
@@ -129,14 +129,14 @@
   DEPS
     ::logging_internal
     ::ostringstream
+    absl::core_headers
+    absl::flags
+    absl::memory
+    absl::stacktrace
+    absl::strings
     iree::base::platform_headers
     iree::base::source_location
     iree::base::target_platform
-    absl::core_headers
-    absl::stacktrace
-    absl::flags
-    absl::memory
-    absl::strings
   PUBLIC
 )
 
@@ -146,10 +146,10 @@
   HDRS
     "status_matchers.h"
   DEPS
+    absl::optional
+    absl::strings
     iree::base::status
     iree::testing::gtest
-    absl::strings
-    absl::optional
   TESTONLY
   PUBLIC
 )

iree/compiler/Dialect/Flow/Analysis/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Flow/Analysis/CMakeLists.txt b/iree/compiler/Dialect/Flow/Analysis/CMakeLists.txt
index 6b5fbdf..9e6a9c4 100644
--- a/iree/compiler/Dialect/Flow/Analysis/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Analysis/CMakeLists.txt
@@ -23,14 +23,14 @@
     "Dispatchability.cpp"
     "DispatchabilityTest.cpp"
   DEPS
-    iree::compiler::Dialect::Flow::IR
-    iree::compiler::Dialect::Flow::Utils
-    iree::compiler::Dialect::IREE::IR
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRSupport
+    iree::compiler::Dialect::Flow::IR
+    iree::compiler::Dialect::Flow::Utils
+    iree::compiler::Dialect::IREE::IR
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/Flow/Conversion/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Flow/Conversion/CMakeLists.txt b/iree/compiler/Dialect/Flow/Conversion/CMakeLists.txt
index d0f88d0..8bb979c 100644
--- a/iree/compiler/Dialect/Flow/Conversion/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Conversion/CMakeLists.txt
@@ -23,9 +23,9 @@
   SRCS
     "TypeConverter.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRParser
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
   PUBLIC
 )

iree/compiler/Dialect/Flow/Conversion/HLOToFlow/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Flow/Conversion/HLOToFlow/CMakeLists.txt b/iree/compiler/Dialect/Flow/Conversion/HLOToFlow/CMakeLists.txt
index 6230a92..7220449 100644
--- a/iree/compiler/Dialect/Flow/Conversion/HLOToFlow/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Conversion/HLOToFlow/CMakeLists.txt
@@ -22,12 +22,12 @@
   SRCS
     "ConvertHLOToFlow.cpp"
   DEPS
-    iree::compiler::Dialect::Flow::IR
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::Flow::IR
+    iree::compiler::Dialect::IREE::IR
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/Flow/Conversion/StandardToFlow/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Flow/Conversion/StandardToFlow/CMakeLists.txt b/iree/compiler/Dialect/Flow/Conversion/StandardToFlow/CMakeLists.txt
index 8da403c..29adf70 100644
--- a/iree/compiler/Dialect/Flow/Conversion/StandardToFlow/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Conversion/StandardToFlow/CMakeLists.txt
@@ -22,12 +22,12 @@
   SRCS
     "ConvertStandardToFlow.cpp"
   DEPS
-    iree::compiler::Dialect::Flow::IR
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::Flow::IR
+    iree::compiler::Dialect::IREE::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt b/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt
index 839a4cd..34e2f5d 100644
--- a/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Transforms/CMakeLists.txt
@@ -36,14 +36,6 @@
     "PrePostPartitioningConversion.cpp"
     "RematerializeDispatchConstants.cpp"
   DEPS
-    iree::base::signature_mangle
-    iree::compiler::Dialect::Flow::Analysis
-    iree::compiler::Dialect::Flow::Conversion
-    iree::compiler::Dialect::Flow::Conversion::HLOToFlow
-    iree::compiler::Dialect::Flow::Conversion::StandardToFlow
-    iree::compiler::Dialect::Flow::IR
-    iree::compiler::Dialect::Flow::Utils
-    iree::compiler::Utils
     LLVMSupport
     MLIRAnalysis
     MLIRIR
@@ -52,6 +44,14 @@
     MLIRSupport
     MLIRTransformUtils
     MLIRTransforms
+    iree::base::signature_mangle
+    iree::compiler::Dialect::Flow::Analysis
+    iree::compiler::Dialect::Flow::Conversion
+    iree::compiler::Dialect::Flow::Conversion::HLOToFlow
+    iree::compiler::Dialect::Flow::Conversion::StandardToFlow
+    iree::compiler::Dialect::Flow::IR
+    iree::compiler::Dialect::Flow::Utils
+    iree::compiler::Utils
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/Flow/Utils/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Flow/Utils/CMakeLists.txt b/iree/compiler/Dialect/Flow/Utils/CMakeLists.txt
index 83df7d4..39f9b8d 100644
--- a/iree/compiler/Dialect/Flow/Utils/CMakeLists.txt
+++ b/iree/compiler/Dialect/Flow/Utils/CMakeLists.txt
@@ -22,11 +22,11 @@
     "DispatchUtils.cpp"
     "WorkloadUtils.cpp"
   DEPS
-    iree::compiler::Dialect::Flow::IR
     LLVMSupport
     MLIRIR
     MLIRStandardOps
     MLIRSupport
+    iree::compiler::Dialect::Flow::IR
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt b/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt
index d8ab65f..04b155d 100644
--- a/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Conversion/CMakeLists.txt
@@ -26,12 +26,12 @@
     "ConversionTarget.cpp"
     "TypeConverter.cpp"
   DEPS
+    MLIRIR
+    MLIRStandardOps
+    MLIRTransforms
     iree::compiler::Dialect::HAL::IR
     iree::compiler::Dialect::HAL::IR::HALDialect
     iree::compiler::Dialect::HAL::Utils
     iree::compiler::Dialect::IREE::IR
-    MLIRIR
-    MLIRStandardOps
-    MLIRTransforms
   PUBLIC
 )

iree/compiler/Dialect/HAL/Conversion/FlowToHAL/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Conversion/FlowToHAL/CMakeLists.txt b/iree/compiler/Dialect/HAL/Conversion/FlowToHAL/CMakeLists.txt
index 35ac9c5..c7019d0 100644
--- a/iree/compiler/Dialect/HAL/Conversion/FlowToHAL/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Conversion/FlowToHAL/CMakeLists.txt
@@ -26,6 +26,11 @@
     "ConvertTensorOps.cpp"
     "ConvertVariableOps.cpp"
   DEPS
+    LLVMSupport
+    MLIRIR
+    MLIRPass
+    MLIRStandardOps
+    MLIRTransforms
     iree::compiler::Dialect::Flow::IR
     iree::compiler::Dialect::HAL::Conversion
     iree::compiler::Dialect::HAL::IR
@@ -35,11 +40,6 @@
     iree::compiler::Dialect::IREE::Conversion::PreserveCompilerHints
     iree::compiler::Dialect::IREE::IR
     iree::compiler::Dialect::VM::IR
-    LLVMSupport
-    MLIRIR
-    MLIRPass
-    MLIRStandardOps
-    MLIRTransforms
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt b/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt
index 2b9e51b..338cb28 100644
--- a/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Conversion/HALToVM/CMakeLists.txt
@@ -30,18 +30,18 @@
     "ConvertHALToVM.cpp"
     "ConvertVariableOps.cpp"
   DEPS
-    iree::compiler::Dialect::HAL::hal_imports
-    iree::compiler::Dialect::HAL::IR
-    iree::compiler::Dialect::HAL::Utils
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::VM::Conversion
-    iree::compiler::Dialect::VM::Conversion::StandardToVM
-    iree::compiler::Dialect::VM::IR
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::HAL::IR
+    iree::compiler::Dialect::HAL::Utils
+    iree::compiler::Dialect::HAL::hal_imports
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Dialect::VM::Conversion::StandardToVM
+    iree::compiler::Dialect::VM::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/HAL/Target/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Target/CMakeLists.txt b/iree/compiler/Dialect/HAL/Target/CMakeLists.txt
index f427fce..ef2ab49 100644
--- a/iree/compiler/Dialect/HAL/Target/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Target/CMakeLists.txt
@@ -28,13 +28,13 @@
     "ExecutableTarget.cpp"
     "LegacyUtil.cpp"
   DEPS
+    LLVMSupport
+    MLIRIR
+    MLIRStandardOps
     iree::compiler::Dialect::Flow::IR
     iree::compiler::Dialect::HAL::IR
     iree::compiler::Dialect::IREE::IR
     iree::compiler::Utils
-    LLVMSupport
-    MLIRIR
-    MLIRStandardOps
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/HAL/Target/LLVM/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Target/LLVM/CMakeLists.txt b/iree/compiler/Dialect/HAL/Target/LLVM/CMakeLists.txt
index a6b9209..3330f4f 100644
--- a/iree/compiler/Dialect/HAL/Target/LLVM/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Target/LLVM/CMakeLists.txt
@@ -22,20 +22,20 @@
   SRCS
     "LLVMTarget.cpp"
   DEPS
+    LLVMCore
+    MLIRIR
+    MLIRLinalgOps
+    MLIRLinalgTransforms
+    MLIRLoopToStandard
+    MLIRStandardOps
+    MLIRStandardToLLVM
+    MLIRSupport
+    MLIRTargetLLVMIR
+    MLIRTransforms
     iree::compiler::Dialect::HAL::Target::ExecutableTarget
     iree::compiler::Translation::XLAToLinalg
     iree::compiler::Translation::XLAToLinalg::IREELinalgTensorToBuffer
     iree::schemas::llvmir_executable_def_cc_fbs
-    LLVMCore
-    MLIRLoopToStandard
-    MLIRIR
-    MLIRStandardToLLVM
-    MLIRLinalgOps
-    MLIRLinalgTransforms
-    MLIRStandardOps
-    MLIRSupport
-    MLIRTargetLLVMIR
-    MLIRTransforms
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/HAL/Target/LegacyInterpreter/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Target/LegacyInterpreter/CMakeLists.txt b/iree/compiler/Dialect/HAL/Target/LegacyInterpreter/CMakeLists.txt
index e92e8e4..1640636 100644
--- a/iree/compiler/Dialect/HAL/Target/LegacyInterpreter/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Target/LegacyInterpreter/CMakeLists.txt
@@ -20,6 +20,12 @@
   SRCS
     "LegacyInterpreterTarget.cpp"
   DEPS
+    LLVMSupport
+    MLIRIR
+    MLIRPass
+    MLIRSupport
+    MLIRTransforms
+    flatbuffers
     iree::compiler::Dialect::Flow::IR
     iree::compiler::Dialect::HAL::IR
     iree::compiler::Dialect::HAL::Target::ExecutableTarget
@@ -29,12 +35,6 @@
     iree::compiler::Translation::Interpreter::Serialization
     iree::compiler::Translation::Interpreter::Transforms
     iree::compiler::Utils
-    flatbuffers
-    LLVMSupport
-    MLIRIR
-    MLIRPass
-    MLIRSupport
-    MLIRTransforms
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/HAL/Target/VMLA/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Target/VMLA/CMakeLists.txt b/iree/compiler/Dialect/HAL/Target/VMLA/CMakeLists.txt
index bf24a6e..fa4ff91 100644
--- a/iree/compiler/Dialect/HAL/Target/VMLA/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Target/VMLA/CMakeLists.txt
@@ -20,9 +20,9 @@
   SRCS
     "VMLATarget.cpp"
   DEPS
-    iree::compiler::Dialect::HAL::Target::ExecutableTarget
     LLVMSupport
     MLIRSupport
+    iree::compiler::Dialect::HAL::Target::ExecutableTarget
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/HAL/Target/VulkanSPIRV/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/CMakeLists.txt b/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/CMakeLists.txt
index f43ccdb..88609c5 100644
--- a/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Target/VulkanSPIRV/CMakeLists.txt
@@ -20,6 +20,16 @@
   SRCS
     "VulkanSPIRVTarget.cpp"
   DEPS
+    LLVMSupport
+    MLIRAllDialects
+    MLIRIR
+    MLIRPass
+    MLIRSPIRV
+    MLIRSPIRVSerialization
+    MLIRSPIRVTransforms
+    MLIRSupport
+    MLIRTransforms
+    flatbuffers
     iree::compiler::Dialect::Flow::IR
     iree::compiler::Dialect::HAL::Target::ExecutableTarget
     iree::compiler::Dialect::IREE::IR
@@ -27,16 +37,6 @@
     iree::compiler::Translation::SPIRV::LinalgToSPIRV
     iree::compiler::Translation::SPIRV::XLAToSPIRV
     iree::schemas::spirv_executable_def_cc_fbs
-    flatbuffers
-    LLVMSupport
-    MLIRAllDialects
-    MLIRIR
-    MLIRPass
-    MLIRSPIRV
-    MLIRSPIRVTransforms
-    MLIRSPIRVSerialization
-    MLIRSupport
-    MLIRTransforms
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt b/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt
index ea2592d..c9591f0 100644
--- a/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Transforms/CMakeLists.txt
@@ -23,15 +23,15 @@
     "Passes.cpp"
     "TranslateExecutables.cpp"
   DEPS
-    iree::compiler::Dialect::Flow::IR
-    iree::compiler::Dialect::HAL::Conversion::FlowToHAL
-    iree::compiler::Dialect::HAL::IR
-    iree::compiler::Dialect::HAL::Target::ExecutableTarget
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRSupport
     MLIRTransforms
+    iree::compiler::Dialect::Flow::IR
+    iree::compiler::Dialect::HAL::Conversion::FlowToHAL
+    iree::compiler::Dialect::HAL::IR
+    iree::compiler::Dialect::HAL::Target::ExecutableTarget
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/HAL/Utils/CMakeLists.txt

diff --git a/iree/compiler/Dialect/HAL/Utils/CMakeLists.txt b/iree/compiler/Dialect/HAL/Utils/CMakeLists.txt
index b98aa31..25c3708 100644
--- a/iree/compiler/Dialect/HAL/Utils/CMakeLists.txt
+++ b/iree/compiler/Dialect/HAL/Utils/CMakeLists.txt
@@ -20,11 +20,11 @@
   SRCS
     "TypeUtils.cpp"
   DEPS
-    iree::compiler::Dialect::HAL::IR
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::HAL::IR
+    iree::compiler::Dialect::IREE::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/IREE/Conversion/CMakeLists.txt

diff --git a/iree/compiler/Dialect/IREE/Conversion/CMakeLists.txt b/iree/compiler/Dialect/IREE/Conversion/CMakeLists.txt
index 9ca827a..25bf422 100644
--- a/iree/compiler/Dialect/IREE/Conversion/CMakeLists.txt
+++ b/iree/compiler/Dialect/IREE/Conversion/CMakeLists.txt
@@ -20,9 +20,9 @@
   SRCS
     "PreserveCompilerHints.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/IREE/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Dialect/IREE/Transforms/CMakeLists.txt b/iree/compiler/Dialect/IREE/Transforms/CMakeLists.txt
index df27366..a21488a 100644
--- a/iree/compiler/Dialect/IREE/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/IREE/Transforms/CMakeLists.txt
@@ -22,9 +22,9 @@
   SRCS
     "DropCompilerHints.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRPass
+    iree::compiler::Dialect::IREE::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt b/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt
index e8f46bf..28371a9 100644
--- a/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt
+++ b/iree/compiler/Dialect/Modules/TensorList/Conversion/CMakeLists.txt
@@ -22,10 +22,10 @@
   SRCS
     "ConvertHALToVM.cpp"
   DEPS
+    MLIRPass
+    MLIRTransforms
     iree::compiler::Dialect::HAL::Conversion
     iree::compiler::Dialect::Modules::TensorList::IR
     iree::compiler::Dialect::VM::Conversion
-    MLIRPass
-    MLIRTransforms
   PUBLIC
 )

iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt b/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt
index 40d7f08..c99a0c8 100644
--- a/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt
+++ b/iree/compiler/Dialect/Shape/Plugins/XLA/CMakeLists.txt
@@ -20,9 +20,9 @@
   SRCS
     "XlaHloShapeBuilder.cpp"
   DEPS
-    iree::compiler::Dialect::Shape::IR
     LLVMSupport
     MLIRIR
+    iree::compiler::Dialect::Shape::IR
     tensorflow::mlir_xla
   PUBLIC
 )

iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt b/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt
index df12fca..ed9aee8 100644
--- a/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/Shape/Transforms/CMakeLists.txt
@@ -26,12 +26,12 @@
     "MaterializeShapeCalculations.cpp"
     "TieDynamicShapes.cpp"
   DEPS
-    iree::compiler::Dialect::Shape::IR
-    iree::compiler::Dialect::Shape::Plugins::XLA::XlaHloShapeBuilder
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::Shape::IR
+    iree::compiler::Dialect::Shape::Plugins::XLA::XlaHloShapeBuilder
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/VM/Analysis/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VM/Analysis/CMakeLists.txt b/iree/compiler/Dialect/VM/Analysis/CMakeLists.txt
index 5a63af0..f41d060 100644
--- a/iree/compiler/Dialect/VM/Analysis/CMakeLists.txt
+++ b/iree/compiler/Dialect/VM/Analysis/CMakeLists.txt
@@ -26,13 +26,13 @@
     "ValueLiveness.cpp"
     "ValueLivenessTest.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::VM::IR
     LLVMSupport
     MLIRAnalysis
     MLIRIR
     MLIRPass
     MLIRSupport
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Dialect::VM::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VM/Conversion/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt b/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt
index ca0212f..8c1ba05 100644
--- a/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt
+++ b/iree/compiler/Dialect/VM/Conversion/CMakeLists.txt
@@ -27,12 +27,12 @@
     "ImportUtils.cpp"
     "TypeConverter.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::Shape::IR
-    iree::compiler::Dialect::VM::IR
     MLIRIR
     MLIRParser
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Dialect::Shape::IR
+    iree::compiler::Dialect::VM::IR
   PUBLIC
 )

iree/compiler/Dialect/VM/Conversion/StandardToVM/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VM/Conversion/StandardToVM/CMakeLists.txt b/iree/compiler/Dialect/VM/Conversion/StandardToVM/CMakeLists.txt
index 6f02622..d203703 100644
--- a/iree/compiler/Dialect/VM/Conversion/StandardToVM/CMakeLists.txt
+++ b/iree/compiler/Dialect/VM/Conversion/StandardToVM/CMakeLists.txt
@@ -23,9 +23,6 @@
     "ConvertStandardToVM.cpp"
     "ConvertStandardToVMPass.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::VM::Conversion
-    iree::compiler::Dialect::VM::IR
     LLVMSupport
     MLIRIR
     MLIRPass
@@ -33,6 +30,9 @@
     MLIRSupport
     MLIRTransformUtils
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Dialect::VM::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt b/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt
index df93217..a10fc1c 100644
--- a/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt
+++ b/iree/compiler/Dialect/VM/Target/Bytecode/CMakeLists.txt
@@ -29,18 +29,18 @@
     "TranslationFlags.cpp"
     "TranslationRegistration.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::VM::Analysis
-    iree::compiler::Dialect::VM::IR
-    iree::compiler::Dialect::VM::Transforms
-    iree::schemas::bytecode_module_def_cc_fbs
-    flatbuffers
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRSupport
     MLIRTransforms
     MLIRTranslation
+    flatbuffers
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Dialect::VM::Analysis
+    iree::compiler::Dialect::VM::IR
+    iree::compiler::Dialect::VM::Transforms
+    iree::schemas::bytecode_module_def_cc_fbs
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VM/Tools/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VM/Tools/CMakeLists.txt b/iree/compiler/Dialect/VM/Tools/CMakeLists.txt
index a66a7bb..7773381 100644
--- a/iree/compiler/Dialect/VM/Tools/CMakeLists.txt
+++ b/iree/compiler/Dialect/VM/Tools/CMakeLists.txt
@@ -19,10 +19,10 @@
     "VMOpEncoderGen.cpp"
     "VMOpTableGen.cpp"
   DEPS
+    LLVMMLIRTableGen
     LLVMSupport
     LLVMTableGen
     MLIRSupport
-    LLVMMLIRTableGen
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VM/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VM/Transforms/CMakeLists.txt b/iree/compiler/Dialect/VM/Transforms/CMakeLists.txt
index b1c0d3b..7489209 100644
--- a/iree/compiler/Dialect/VM/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/VM/Transforms/CMakeLists.txt
@@ -25,16 +25,16 @@
     "OrdinalAllocation.cpp"
     "Passes.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::Conversion::PreserveCompilerHints
-    iree::compiler::Dialect::VM::Conversion
-    iree::compiler::Dialect::VM::Conversion::StandardToVM
-    iree::compiler::Dialect::VM::IR
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRSupport
     MLIRTransformUtils
     MLIRTransforms
+    iree::compiler::Dialect::IREE::Conversion::PreserveCompilerHints
+    iree::compiler::Dialect::VM::Conversion
+    iree::compiler::Dialect::VM::Conversion::StandardToVM
+    iree::compiler::Dialect::VM::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VMLA/Conversion/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VMLA/Conversion/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Conversion/CMakeLists.txt
index 314da4e..b458510 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Conversion/CMakeLists.txt
@@ -26,12 +26,12 @@
     "ConversionTarget.cpp"
     "TypeConverter.cpp"
   DEPS
+    MLIRIR
+    MLIRStandardOps
+    MLIRTransforms
     iree::compiler::Dialect::IREE::IR
     iree::compiler::Dialect::Shape::IR
     iree::compiler::Dialect::VMLA::IR
     iree::compiler::Dialect::VMLA::IR::VMLADialect
-    MLIRIR
-    MLIRStandardOps
-    MLIRTransforms
   PUBLIC
 )

iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/CMakeLists.txt
index 7ced493..a3975e6 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/CMakeLists.txt
@@ -22,15 +22,15 @@
   SRCS
     "ConvertHLOToVMLA.cpp"
   DEPS
+    MLIRIR
+    MLIRPass
+    MLIRStandardOps
+    MLIRTransforms
     iree::compiler::Dialect::IREE::IR
     iree::compiler::Dialect::Shape::IR
     iree::compiler::Dialect::VMLA::Conversion
     iree::compiler::Dialect::VMLA::IR
     iree::compiler::Dialect::VMLA::IR::VMLADialect
-    MLIRIR
-    MLIRPass
-    MLIRStandardOps
-    MLIRTransforms
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Dialect/VMLA/Conversion/StandardToVMLA/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VMLA/Conversion/StandardToVMLA/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Conversion/StandardToVMLA/CMakeLists.txt
index 672faae..35b48e3 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/StandardToVMLA/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Conversion/StandardToVMLA/CMakeLists.txt
@@ -22,14 +22,14 @@
   SRCS
     "ConvertStandardToVMLA.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::VMLA::Conversion
-    iree::compiler::Dialect::VMLA::IR
-    iree::compiler::Dialect::VMLA::IR::VMLADialect
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Dialect::VMLA::Conversion
+    iree::compiler::Dialect::VMLA::IR
+    iree::compiler::Dialect::VMLA::IR::VMLADialect
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt
index b43bbb6..6168464 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Conversion/VMLAToVM/CMakeLists.txt
@@ -22,16 +22,16 @@
   SRCS
     "ConvertVMLAToVM.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Dialect::VM::Conversion
-    iree::compiler::Dialect::VM::Conversion::StandardToVM
-    iree::compiler::Dialect::VM::IR
-    iree::compiler::Dialect::VMLA::vmla_imports
-    iree::compiler::Dialect::VMLA::IR
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    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
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt b/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt
index a9c2c5f..67f9dc7 100644
--- a/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt
+++ b/iree/compiler/Dialect/VMLA/Transforms/CMakeLists.txt
@@ -23,18 +23,18 @@
     "Conversion.cpp"
     "Passes.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::Transforms
-    iree::compiler::Dialect::Shape::IR
-    iree::compiler::Dialect::VMLA::Conversion
-    iree::compiler::Dialect::VMLA::Conversion::HLOToVMLA
-    iree::compiler::Dialect::VMLA::Conversion::StandardToVMLA
-    iree::compiler::Dialect::VMLA::IR
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRStandardOps
     MLIRSupport
     MLIRTransforms
+    iree::compiler::Dialect::IREE::Transforms
+    iree::compiler::Dialect::Shape::IR
+    iree::compiler::Dialect::VMLA::Conversion
+    iree::compiler::Dialect::VMLA::Conversion::HLOToVMLA
+    iree::compiler::Dialect::VMLA::Conversion::StandardToVMLA
+    iree::compiler::Dialect::VMLA::IR
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/CMakeLists.txt

diff --git a/iree/compiler/Translation/CMakeLists.txt b/iree/compiler/Translation/CMakeLists.txt
index 2ac3d3b..9dc0dc7 100644
--- a/iree/compiler/Translation/CMakeLists.txt
+++ b/iree/compiler/Translation/CMakeLists.txt
@@ -25,6 +25,12 @@
   SRCS
     "IREEVM.cpp"
   DEPS
+    LLVMSupport
+    MLIRAllDialects
+    MLIRIR
+    MLIRPass
+    MLIRSupport
+    MLIRTranslation
     iree::compiler::Dialect::Flow::IR
     iree::compiler::Dialect::Flow::Transforms
     iree::compiler::Dialect::HAL::Conversion::HALToVM
@@ -34,12 +40,6 @@
     iree::compiler::Dialect::VM::Conversion::StandardToVM
     iree::compiler::Dialect::VM::Target::Bytecode
     iree::compiler::Dialect::VM::Transforms
-    LLVMSupport
-    MLIRAllDialects
-    MLIRIR
-    MLIRPass
-    MLIRSupport
-    MLIRTranslation
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/Interpreter/Serialization/CMakeLists.txt

diff --git a/iree/compiler/Translation/Interpreter/Serialization/CMakeLists.txt b/iree/compiler/Translation/Interpreter/Serialization/CMakeLists.txt
index 2384647..bccd260 100644
--- a/iree/compiler/Translation/Interpreter/Serialization/CMakeLists.txt
+++ b/iree/compiler/Translation/Interpreter/Serialization/CMakeLists.txt
@@ -28,14 +28,14 @@
     "VMFunctionTableBuilder.cpp"
     "VMModuleBuilder.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Translation::Interpreter::Utils
-    iree::schemas::interpreter_module_def_cc_fbs
-    iree::schemas::bytecode::interpreter_bytecode_v0
-    flatbuffers
     LLVMSupport
     MLIRIR
     MLIRStandardOps
     MLIRSupport
+    flatbuffers
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::Interpreter::Utils
+    iree::schemas::bytecode::interpreter_bytecode_v0
+    iree::schemas::interpreter_module_def_cc_fbs
   PUBLIC
 )

iree/compiler/Translation/Interpreter/Transforms/CMakeLists.txt

diff --git a/iree/compiler/Translation/Interpreter/Transforms/CMakeLists.txt b/iree/compiler/Translation/Interpreter/Transforms/CMakeLists.txt
index 2d89632..e5cf231 100644
--- a/iree/compiler/Translation/Interpreter/Transforms/CMakeLists.txt
+++ b/iree/compiler/Translation/Interpreter/Transforms/CMakeLists.txt
@@ -37,13 +37,6 @@
     "LowerXLAToIreeDialect.cpp"
     "MakeExecutableABI.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Translation::Interpreter::IR
-    iree::compiler::Translation::Interpreter::IR::Common
-    iree::compiler::Translation::Interpreter::Serialization
-    iree::compiler::Translation::Interpreter::Utils
-    iree::compiler::Utils
-    iree::schemas::bytecode::interpreter_bytecode_v0
     LLVMSupport
     MLIRAnalysis
     MLIRIR
@@ -52,6 +45,13 @@
     MLIRSupport
     MLIRTransformUtils
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::Interpreter::IR
+    iree::compiler::Translation::Interpreter::IR::Common
+    iree::compiler::Translation::Interpreter::Serialization
+    iree::compiler::Translation::Interpreter::Utils
+    iree::compiler::Utils
+    iree::schemas::bytecode::interpreter_bytecode_v0
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/Interpreter/Utils/CMakeLists.txt

diff --git a/iree/compiler/Translation/Interpreter/Utils/CMakeLists.txt b/iree/compiler/Translation/Interpreter/Utils/CMakeLists.txt
index 842e9f7..ea17921 100644
--- a/iree/compiler/Translation/Interpreter/Utils/CMakeLists.txt
+++ b/iree/compiler/Translation/Interpreter/Utils/CMakeLists.txt
@@ -23,8 +23,6 @@
     "MemRefUtils.cpp"
     "OpCreationUtils.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Translation::Interpreter::IR::Common
     LLVMSupport
     MLIRIR
     MLIRPass
@@ -32,6 +30,8 @@
     MLIRSupport
     MLIRTransformUtils
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::Interpreter::IR::Common
     tensorflow::mlir_xla
   PUBLIC
 )

iree/compiler/Translation/SPIRV/EmbeddedKernels/CMakeLists.txt

diff --git a/iree/compiler/Translation/SPIRV/EmbeddedKernels/CMakeLists.txt b/iree/compiler/Translation/SPIRV/EmbeddedKernels/CMakeLists.txt
index d094712..ea4b480 100644
--- a/iree/compiler/Translation/SPIRV/EmbeddedKernels/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/EmbeddedKernels/CMakeLists.txt
@@ -22,11 +22,11 @@
   SRCS
     "EmbeddedKernels.cpp"
   DEPS
-    iree::compiler::Translation::SPIRV::EmbeddedKernels::Kernels
-    iree::schemas::spirv_executable_def_cc_fbs
-    flatbuffers
     MLIRIR
     MLIRSupport
+    flatbuffers
+    iree::compiler::Translation::SPIRV::EmbeddedKernels::Kernels
+    iree::schemas::spirv_executable_def_cc_fbs
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt

diff --git a/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt b/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt
index 53fbb2f..a94c898 100644
--- a/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/IndexComputation/CMakeLists.txt
@@ -42,14 +42,14 @@
     "IndexComputationPass.cpp"
     "XLAIndexPropagation.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Translation::SPIRV::IndexComputation::IndexComputationAttrGen
-    iree::compiler::Utils
     LLVMSupport
     MLIRIR
     MLIRPass
     MLIRSPIRV
     MLIRStandardOps
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::SPIRV::IndexComputation::IndexComputationAttrGen
+    iree::compiler::Utils
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt

diff --git a/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt b/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
index 6bdfee9..a18b6fa 100644
--- a/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/LinalgToSPIRV/CMakeLists.txt
@@ -24,9 +24,6 @@
     "LinalgFusion.cpp"
     "LowerToSPIRV.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Translation::XLAToLinalg::IREELinalgTensorToBuffer
-    iree::compiler::Utils
     LLVMSupport
     MLIRAffineOps
     MLIRAffineToStandard
@@ -45,6 +42,9 @@
     MLIRStandardToSPIRVTransforms
     MLIRSupport
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::XLAToLinalg::IREELinalgTensorToBuffer
+    iree::compiler::Utils
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt

diff --git a/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt b/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt
index a1957bf..268699d 100644
--- a/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/ReductionCodegen/CMakeLists.txt
@@ -23,13 +23,13 @@
     "PrepareReductionDispatch.cpp"
     "ReductionFnLowering.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRPass
     MLIRSPIRV
     MLIRSPIRVTransforms
     MLIRStandardOps
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
     tensorflow::mlir_xla
   PUBLIC
 )

iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt

diff --git a/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt b/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt
index 7a8ab40..5199a5a 100644
--- a/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt
+++ b/iree/compiler/Translation/SPIRV/XLAToSPIRV/CMakeLists.txt
@@ -29,11 +29,6 @@
     "SPIRVLowering.cpp"
     "XLAToSPIRV.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
-    iree::compiler::Translation::SPIRV::IndexComputation
-    iree::compiler::Translation::SPIRV::Passes
-    iree::compiler::Translation::SPIRV::ReductionCodegen
-    iree::compiler::Utils
     LLVMSupport
     MLIRAffineOps
     MLIRAffineToStandard
@@ -45,6 +40,11 @@
     MLIRStandardToSPIRVTransforms
     MLIRSupport
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
+    iree::compiler::Translation::SPIRV::IndexComputation
+    iree::compiler::Translation::SPIRV::Passes
+    iree::compiler::Translation::SPIRV::ReductionCodegen
+    iree::compiler::Utils
     tensorflow::mlir_xla
   ALWAYSLINK
   PUBLIC

iree/compiler/Translation/XLAToLinalg/CMakeLists.txt

diff --git a/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt b/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt
index 1dc2cd3..6a04816 100644
--- a/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt
+++ b/iree/compiler/Translation/XLAToLinalg/CMakeLists.txt
@@ -43,13 +43,13 @@
   SRCS
     "LinalgTensorToBuffer.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
     MLIRIR
     MLIRLinalgOps
     MLIRPass
     MLIRStandardOps
     MLIRSupport
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
   ALWAYSLINK
   PUBLIC
 )

iree/compiler/Utils/CMakeLists.txt

diff --git a/iree/compiler/Utils/CMakeLists.txt b/iree/compiler/Utils/CMakeLists.txt
index c361f20..3094d47 100644
--- a/iree/compiler/Utils/CMakeLists.txt
+++ b/iree/compiler/Utils/CMakeLists.txt
@@ -24,7 +24,6 @@
     "IREECodegenUtils.cpp"
     "TypeConversionUtils.cpp"
   DEPS
-    iree::compiler::Dialect::IREE::IR
     LLVMSupport
     MLIRIR
     MLIRPass
@@ -32,6 +31,7 @@
     MLIRSupport
     MLIRTransformUtils
     MLIRTransforms
+    iree::compiler::Dialect::IREE::IR
     tensorflow::mlir_xla
   PUBLIC
 )

iree/hal/CMakeLists.txt

diff --git a/iree/hal/CMakeLists.txt b/iree/hal/CMakeLists.txt
index 11e4069..02db9ef 100644
--- a/iree/hal/CMakeLists.txt
+++ b/iree/hal/CMakeLists.txt
@@ -28,11 +28,11 @@
     "allocator.cc"
   DEPS
     ::buffer
+    absl::span
     iree::base::ref_ptr
     iree::base::source_location
     iree::base::status
     iree::base::tracing
-    absl::span
   PUBLIC
 )
 
@@ -58,13 +58,13 @@
     ::fence
     ::heap_buffer
     ::semaphore
+    absl::span
+    absl::strings
     iree::base::api
     iree::base::api_util
     iree::base::ref_ptr
     iree::base::shape
     iree::base::tracing
-    absl::strings
-    absl::span
   PUBLIC
 )
 
@@ -87,14 +87,14 @@
     "buffer.cc"
   DEPS
     ::resource
+    absl::core_headers
+    absl::span
+    absl::strings
+    absl::variant
     iree::base::bitfield
     iree::base::logging
     iree::base::source_location
     iree::base::status
-    absl::core_headers
-    absl::strings
-    absl::span
-    absl::variant
   PUBLIC
 )
 
@@ -107,10 +107,10 @@
   DEPS
     ::buffer
     ::heap_buffer
+    absl::span
     iree::base::status
     iree::base::status_matchers
     iree::testing::gtest_main
-    absl::span
 )
 
 iree_cc_library(
@@ -122,11 +122,11 @@
     "buffer_view.cc"
   DEPS
     ::buffer
+    absl::inlined_vector
+    absl::strings
     iree::base::shape
     iree::base::source_location
     iree::base::status
-    absl::inlined_vector
-    absl::strings
   PUBLIC
 )
 
@@ -155,11 +155,11 @@
     ::allocator
     ::buffer_view
     ::heap_buffer
+    absl::optional
+    absl::strings
     iree::base::buffer_string_util
     iree::base::source_location
     iree::base::status
-    absl::strings
-    absl::optional
   PUBLIC
 )
 
@@ -189,10 +189,10 @@
     ::event
     ::executable
     ::resource
+    absl::core_headers
     iree::base::bitfield
     iree::base::shape
     iree::base::status
-    absl::core_headers
   PUBLIC
 )
 
@@ -219,11 +219,11 @@
     ::command_buffer
     ::fence
     ::semaphore
+    absl::span
+    absl::time
     iree::base::bitfield
     iree::base::status
     iree::base::time
-    absl::time
-    absl::span
   PUBLIC
 )
 
@@ -259,10 +259,10 @@
   DEPS
     ::deferred_buffer
     ::heap_buffer
+    absl::memory
     iree::base::status_matchers
     iree::hal::testing::mock_allocator
     iree::testing::gtest_main
-    absl::memory
 )
 
 iree_cc_library(
@@ -305,10 +305,10 @@
     ::executable_cache
     ::executable_layout
     ::semaphore
+    absl::time
     iree::base::ref_ptr
     iree::base::status
     iree::base::time
-    absl::time
   PUBLIC
 )
 
@@ -318,8 +318,8 @@
   HDRS
     "device_info.h"
   DEPS
-    iree::base::bitfield
     absl::core_headers
+    iree::base::bitfield
   PUBLIC
 )
 
@@ -339,13 +339,13 @@
     ::executable_format
     ::fence
     ::heap_buffer
+    absl::span
+    absl::synchronization
+    absl::time
     iree::base::source_location
     iree::base::status
     iree::base::time
     iree::base::tracing
-    absl::synchronization
-    absl::time
-    absl::span
   PUBLIC
 )
 
@@ -380,11 +380,11 @@
     "driver_registry.cc"
   DEPS
     ::driver
+    absl::core_headers
+    absl::synchronization
     iree::base::initializer
     iree::base::ref_ptr
     iree::base::status
-    absl::core_headers
-    absl::synchronization
   PUBLIC
 )
 
@@ -478,11 +478,11 @@
   DEPS
     ::allocator
     ::buffer
+    absl::core_headers
     iree::base::source_location
     iree::base::status
     iree::base::tracing
     iree::hal::host::host_buffer
-    absl::core_headers
   PUBLIC
 )
 

iree/hal/host/CMakeLists.txt

diff --git a/iree/hal/host/CMakeLists.txt b/iree/hal/host/CMakeLists.txt
index f11c825..9ebfd2e 100644
--- a/iree/hal/host/CMakeLists.txt
+++ b/iree/hal/host/CMakeLists.txt
@@ -21,12 +21,12 @@
     "async_command_queue.cc"
   DEPS
     ::host_submission_queue
+    absl::core_headers
+    absl::synchronization
     iree::base::status
     iree::base::tracing
     iree::hal::command_queue
     iree::hal::fence
-    absl::core_headers
-    absl::synchronization
   PUBLIC
 )
 
@@ -38,6 +38,8 @@
   DEPS
     ::async_command_queue
     ::host_submission_queue
+    absl::memory
+    absl::time
     iree::base::status
     iree::base::status_matchers
     iree::base::time
@@ -45,8 +47,6 @@
     iree::hal::testing::mock_command_buffer
     iree::hal::testing::mock_command_queue
     iree::testing::gtest_main
-    absl::memory
-    absl::time
 )
 
 iree_cc_library(
@@ -57,11 +57,11 @@
   SRCS
     "host_buffer.cc"
   DEPS
+    absl::core_headers
     iree::base::logging
     iree::base::source_location
     iree::base::status
     iree::hal::buffer
-    absl::core_headers
   PUBLIC
 )
 
@@ -85,13 +85,13 @@
   SRCS
     "host_fence.cc"
   DEPS
+    absl::core_headers
+    absl::inlined_vector
+    absl::span
+    absl::synchronization
     iree::base::status
     iree::base::tracing
     iree::hal::fence
-    absl::core_headers
-    absl::inlined_vector
-    absl::synchronization
-    absl::span
   PUBLIC
 )
 
@@ -102,10 +102,10 @@
     "host_fence_test.cc"
   DEPS
     ::host_fence
+    absl::time
     iree::base::status
     iree::base::status_matchers
     iree::testing::gtest_main
-    absl::time
 )
 
 iree_cc_library(
@@ -149,15 +149,15 @@
     "host_submission_queue.cc"
   DEPS
     ::host_fence
+    absl::core_headers
+    absl::inlined_vector
+    absl::synchronization
     iree::base::intrusive_list
     iree::base::status
     iree::base::tracing
     iree::hal::command_queue
     iree::hal::fence
     iree::hal::semaphore
-    absl::core_headers
-    absl::inlined_vector
-    absl::synchronization
   PUBLIC
 )
 

iree/hal/interpreter/CMakeLists.txt

diff --git a/iree/hal/interpreter/CMakeLists.txt b/iree/hal/interpreter/CMakeLists.txt
index 77a1f53..49383d1 100644
--- a/iree/hal/interpreter/CMakeLists.txt
+++ b/iree/hal/interpreter/CMakeLists.txt
@@ -55,6 +55,11 @@
     "type.cc"
   DEPS
     ::bytecode_kernels
+    absl::core_headers
+    absl::inlined_vector
+    absl::optional
+    absl::span
+    absl::strings
     iree::base::flatbuffer_util
     iree::base::logging
     iree::base::memory
@@ -67,13 +72,8 @@
     iree::hal::executable
     iree::hal::executable_spec
     iree::hal::heap_buffer
-    iree::schemas::interpreter_module_def_cc_fbs
     iree::schemas::bytecode::interpreter_bytecode_v0
-    absl::core_headers
-    absl::inlined_vector
-    absl::strings
-    absl::optional
-    absl::span
+    iree::schemas::interpreter_module_def_cc_fbs
   PUBLIC
 )
 
@@ -86,16 +86,16 @@
     "bytecode_kernels_generic.h"
     "bytecode_kernels_ruy.h"
   DEPS
-    iree::base::shape
-    iree::base::status
-    iree::base::tracing
-    iree::hal::buffer_view
     absl::algorithm
     absl::core_headers
     absl::flat_hash_set
     absl::inlined_vector
     absl::memory
     absl::span
+    iree::base::shape
+    iree::base::status
+    iree::base::tracing
+    iree::hal::buffer_view
     ruy
   PUBLIC
 )
@@ -121,13 +121,13 @@
     "interpreter_command_processor.cc"
   DEPS
     ::bytecode_executable
+    absl::inlined_vector
+    absl::span
     iree::base::source_location
     iree::base::status
     iree::base::tracing
     iree::hal::buffer_view
     iree::hal::host::host_local_command_processor
-    absl::inlined_vector
-    absl::span
   PUBLIC
 )
 
@@ -142,6 +142,9 @@
     ::bytecode_cache
     ::bytecode_kernels
     ::interpreter_command_processor
+    absl::inlined_vector
+    absl::memory
+    absl::span
     iree::base::memory
     iree::base::status
     iree::base::tracing
@@ -154,9 +157,6 @@
     iree::hal::host::host_local_allocator
     iree::hal::host::host_submission_queue
     iree::hal::host::inproc_command_buffer
-    absl::inlined_vector
-    absl::memory
-    absl::span
   PUBLIC
 )
 

iree/hal/llvmjit/CMakeLists.txt

diff --git a/iree/hal/llvmjit/CMakeLists.txt b/iree/hal/llvmjit/CMakeLists.txt
index 512166d..7da8e3b 100644
--- a/iree/hal/llvmjit/CMakeLists.txt
+++ b/iree/hal/llvmjit/CMakeLists.txt
@@ -20,11 +20,11 @@
   SRCS
     "llvmjit_executable.cc"
   DEPS
+    absl::span
     iree::base::status
     iree::hal::allocator
     iree::hal::executable
     iree::hal::executable_spec
-    absl::span
   PUBLIC
 )
 
@@ -71,6 +71,9 @@
   DEPS
     ::llvmjit_command_processor
     ::llvmjit_executable_cache
+    absl::inlined_vector
+    absl::memory
+    absl::span
     iree::base::memory
     iree::base::status
     iree::base::tracing
@@ -83,9 +86,6 @@
     iree::hal::host::host_local_allocator
     iree::hal::host::host_submission_queue
     iree::hal::host::inproc_command_buffer
-    absl::inlined_vector
-    absl::memory
-    absl::span
   PUBLIC
 )
 

iree/hal/vmla/CMakeLists.txt

diff --git a/iree/hal/vmla/CMakeLists.txt b/iree/hal/vmla/CMakeLists.txt
index 36d588f..0d51c5c 100644
--- a/iree/hal/vmla/CMakeLists.txt
+++ b/iree/hal/vmla/CMakeLists.txt
@@ -21,15 +21,15 @@
     "op_kernels_generic.h"
     "op_kernels_ruy.h"
   DEPS
-    iree::base::shape
-    iree::base::status
-    iree::base::tracing
     absl::algorithm
     absl::core_headers
     absl::flat_hash_set
     absl::inlined_vector
     absl::memory
     absl::span
+    iree::base::shape
+    iree::base::status
+    iree::base::tracing
     ruy
   PUBLIC
 )
@@ -95,6 +95,9 @@
   DEPS
     ::vmla_cache
     ::vmla_command_processor
+    absl::inlined_vector
+    absl::memory
+    absl::span
     iree::base::memory
     iree::base::status
     iree::base::tracing
@@ -109,9 +112,6 @@
     iree::hal::host::inproc_command_buffer
     iree::vm::instance
     iree::vm::module
-    absl::inlined_vector
-    absl::memory
-    absl::span
   PUBLIC
 )
 
@@ -156,6 +156,8 @@
   SRCS
     "vmla_executable.cc"
   DEPS
+    absl::inlined_vector
+    absl::span
     iree::base::api_util
     iree::base::status
     iree::base::tracing
@@ -166,8 +168,6 @@
     iree::vm::context
     iree::vm::instance
     iree::vm::module
-    absl::inlined_vector
-    absl::span
   PUBLIC
 )
 
@@ -180,6 +180,7 @@
     "vmla_module.cc"
   DEPS
     ::op_kernels
+    absl::span
     iree::base::api
     iree::base::memory
     iree::base::ref_ptr
@@ -187,6 +188,5 @@
     iree::vm
     iree::vm::module_abi_cc
     iree::vm::types
-    absl::span
   PUBLIC
 )

iree/modules/check/CMakeLists.txt

diff --git a/iree/modules/check/CMakeLists.txt b/iree/modules/check/CMakeLists.txt
index e28b783..998a543 100644
--- a/iree/modules/check/CMakeLists.txt
+++ b/iree/modules/check/CMakeLists.txt
@@ -36,6 +36,8 @@
   DEPS
     ::check_test_module_cc
     ::native_module
+    absl::core_headers
+    absl::strings
     iree::base::api
     iree::base::logging
     iree::hal::api
@@ -44,8 +46,6 @@
     iree::vm
     iree::vm::bytecode_module
     iree::vm::ref
-    absl::core_headers
-    absl::strings
 )
 
 iree_cc_library(
@@ -56,6 +56,7 @@
   SRCS
     "native_module.cc"
   DEPS
+    absl::strings
     iree::base::api
     iree::base::api_util
     iree::base::buffer_string_util
@@ -63,6 +64,5 @@
     iree::modules::hal
     iree::vm
     iree::vm::module_abi_cc
-    absl::strings
   PUBLIC
 )

iree/modules/hal/CMakeLists.txt

diff --git a/iree/modules/hal/CMakeLists.txt b/iree/modules/hal/CMakeLists.txt
index c06c6e8..dec39cb 100644
--- a/iree/modules/hal/CMakeLists.txt
+++ b/iree/modules/hal/CMakeLists.txt
@@ -20,6 +20,11 @@
   SRCS
     "hal_module.cc"
   DEPS
+    absl::core_headers
+    absl::inlined_vector
+    absl::memory
+    absl::span
+    absl::strings
     iree::base::api
     iree::base::api_util
     iree::base::tracing
@@ -28,10 +33,5 @@
     iree::hal::device
     iree::vm
     iree::vm::module_abi_cc
-    absl::core_headers
-    absl::inlined_vector
-    absl::memory
-    absl::strings
-    absl::span
   PUBLIC
 )

iree/modules/strings/CMakeLists.txt

diff --git a/iree/modules/strings/CMakeLists.txt b/iree/modules/strings/CMakeLists.txt
index 6f181d4..4396a7c 100644
--- a/iree/modules/strings/CMakeLists.txt
+++ b/iree/modules/strings/CMakeLists.txt
@@ -22,6 +22,10 @@
   SRCS
     "strings_module.cc"
   DEPS
+    absl::inlined_vector
+    absl::span
+    absl::strings
+    benchmark
     iree::base::api
     iree::base::logging
     iree::vm
@@ -31,10 +35,6 @@
     iree::vm::ref
     iree::vm::stack
     iree::vm::types
-    absl::inlined_vector
-    absl::strings
-    absl::span
-    benchmark
   PUBLIC
 )
 
@@ -46,6 +46,9 @@
   DEPS
     ::strings_module
     ::strings_module_test_module_cc
+    absl::inlined_vector
+    absl::strings
+    benchmark
     iree::base::api
     iree::base::logging
     iree::testing::gtest_main
@@ -56,9 +59,6 @@
     iree::vm::ref
     iree::vm::stack
     iree::vm::types
-    absl::inlined_vector
-    absl::strings
-    benchmark
 )
 
 iree_bytecode_module(

iree/samples/custom_modules/CMakeLists.txt

diff --git a/iree/samples/custom_modules/CMakeLists.txt b/iree/samples/custom_modules/CMakeLists.txt
index 9a21206..358f790 100644
--- a/iree/samples/custom_modules/CMakeLists.txt
+++ b/iree/samples/custom_modules/CMakeLists.txt
@@ -36,6 +36,8 @@
   DEPS
     ::custom_modules_test_module_cc
     ::native_module
+    absl::core_headers
+    absl::strings
     iree::base::api
     iree::base::logging
     iree::hal::api
@@ -45,8 +47,6 @@
     iree::vm
     iree::vm::bytecode_module
     iree::vm::ref
-    absl::core_headers
-    absl::strings
 )
 
 iree_cc_library(

iree/schemas/bytecode/CMakeLists.txt

diff --git a/iree/schemas/bytecode/CMakeLists.txt b/iree/schemas/bytecode/CMakeLists.txt
index ab53bfb..6d6a015 100644
--- a/iree/schemas/bytecode/CMakeLists.txt
+++ b/iree/schemas/bytecode/CMakeLists.txt
@@ -18,7 +18,7 @@
   HDRS
     "interpreter_bytecode_v0.h"
   DEPS
-    iree::base::bitfield
     absl::core_headers
+    iree::base::bitfield
   PUBLIC
 )

iree/testing/internal/CMakeLists.txt

diff --git a/iree/testing/internal/CMakeLists.txt b/iree/testing/internal/CMakeLists.txt
index b752593..75f5126 100644
--- a/iree/testing/internal/CMakeLists.txt
+++ b/iree/testing/internal/CMakeLists.txt
@@ -31,8 +31,8 @@
   SRCS
     "gtest_main_internal.cc"
   DEPS
-    iree::base::init
     gtest
+    iree::base::init
   TESTONLY
   PUBLIC
 )

iree/vm/CMakeLists.txt

diff --git a/iree/vm/CMakeLists.txt b/iree/vm/CMakeLists.txt
index 4f0bbee..2eb25fa 100644
--- a/iree/vm/CMakeLists.txt
+++ b/iree/vm/CMakeLists.txt
@@ -24,9 +24,9 @@
     ::instance
     ::invocation
     ::module
+    absl::strings
     iree::base::logging
     iree::testing::gtest_main
-    absl::strings
 )
 
 iree_bytecode_module(
@@ -59,11 +59,11 @@
     ::stack
     ::types
     ::value
+    flatbuffers
     iree::base::api
     iree::base::flatbuffer_util
     iree::base::target_platform
     iree::schemas::bytecode_module_def_cc_fbs
-    flatbuffers
   PUBLIC
 )
 
@@ -77,12 +77,12 @@
     ::bytecode_module_benchmark_module_cc
     ::module
     ::stack
-    iree::base::api
-    iree::base::logging
-    iree::testing::benchmark_main
     absl::inlined_vector
     absl::strings
     benchmark
+    iree::base::api
+    iree::base::logging
+    iree::testing::benchmark_main
 )
 
 iree_bytecode_module(
@@ -187,12 +187,12 @@
     ::ref_cc
     ::stack
     ::types
+    absl::span
+    absl::strings
     iree::base::api
     iree::base::api_util
     iree::base::ref_ptr
     iree::base::status
-    absl::strings
-    absl::span
   PUBLIC
 )
 
@@ -228,8 +228,8 @@
   DEPS
     ::ref
     ::types
-    iree::base::api
     absl::core_headers
+    iree::base::api
   PUBLIC
 )