Sort cmake libs/files lists (#23708)
Formatted using https://github.com/Hardcode84/3
---------
Signed-off-by: Ivan Butygin <ivan.butygin@gmail.com>
diff --git a/build_tools/llvm/llvm_config.cmake b/build_tools/llvm/llvm_config.cmake
index 53d0e53..5ec2e53 100644
--- a/build_tools/llvm/llvm_config.cmake
+++ b/build_tools/llvm/llvm_config.cmake
@@ -51,8 +51,8 @@
### Distributions ###
set(LLVM_DISTRIBUTIONS
- Toolchain
Development
+ Toolchain
CACHE STRING "")
set(LLVM_TOOLCHAIN_TOOLS
@@ -67,8 +67,8 @@
llvm-nm
llvm-objcopy
llvm-objdump
- llvm-rc
llvm-ranlib
+ llvm-rc
llvm-readelf
llvm-readobj
llvm-size
@@ -80,8 +80,8 @@
set(LLVM_BUILD_UTILS ON CACHE BOOL "")
set(LLVM_INSTALL_UTILS ON CACHE BOOL "")
set(LLVM_TOOLCHAIN_UTILITIES
- FileCheck
count
+ FileCheck
not
CACHE STRING "")
@@ -90,7 +90,6 @@
set(LLVM_Toolchain_DISTRIBUTION_COMPONENTS
builtins
- runtimes
clang
clang-cpp
clang-format
@@ -102,6 +101,7 @@
lld
LLVM
LTO
+ runtimes
${LLVM_TOOLCHAIN_TOOLS}
${LLVM_TOOLCHAIN_UTILITIES}
CACHE STRING "")
@@ -110,19 +110,19 @@
# LLVM
cmake-exports
development-cmake-exports
- toolchain-cmake-exports
llc
llvm-config
llvm-headers
llvm-libraries
opt
Remarks
+ toolchain-cmake-exports
# Clang
clang-cmake-exports
clang-development-cmake-exports
- clang-toolchain-cmake-exports
clang-headers
clang-libraries
+ clang-toolchain-cmake-exports
# LLD
lld-cmake-exports
lld-toolchain-cmake-exports
diff --git a/build_tools/llvm/mlir_config.cmake b/build_tools/llvm/mlir_config.cmake
index 4fbef27..98fd909 100644
--- a/build_tools/llvm/mlir_config.cmake
+++ b/build_tools/llvm/mlir_config.cmake
@@ -50,8 +50,8 @@
CACHE STRING "")
set(LLVM_MLIR_Python_COMPONENTS
- MLIRPythonModules
mlir-python-sources
+ MLIRPythonModules
CACHE STRING "")
set(LLVM_MlirDevelopment_DISTRIBUTION_COMPONENTS
diff --git a/compiler/bindings/python/CMakeLists.txt b/compiler/bindings/python/CMakeLists.txt
index 2e695bc..0b69f19 100644
--- a/compiler/bindings/python/CMakeLists.txt
+++ b/compiler/bindings/python/CMakeLists.txt
@@ -241,6 +241,7 @@
MLIRPythonSources.Dialects.gpu
MLIRPythonSources.Dialects.linalg
MLIRPythonSources.Dialects.llvm
+ MLIRPythonSources.Dialects.loop_transform
MLIRPythonSources.Dialects.math
MLIRPythonSources.Dialects.memref
MLIRPythonSources.Dialects.nvvm
@@ -257,11 +258,10 @@
MLIRPythonSources.Dialects.transform.interpreter
MLIRPythonSources.Dialects.vector
MLIRPythonSources.Dialects.vector_transform
- MLIRPythonSources.Dialects.loop_transform
# iree-dialects project.
- IREEDialectsPythonSources
IREEDialectsPythonExtensions
+ IREEDialectsPythonSources
)
add_mlir_python_modules(IREECompilerPythonModules
diff --git a/compiler/src/iree/compiler/API/CMakeLists.txt b/compiler/src/iree/compiler/API/CMakeLists.txt
index 30f6c7a..8d76da8 100644
--- a/compiler/src/iree/compiler/API/CMakeLists.txt
+++ b/compiler/src/iree/compiler/API/CMakeLists.txt
@@ -73,30 +73,30 @@
################################################################################
set(_EXPORT_OBJECT_LIBS
- obj.MLIRCAPIAMDGPU
- obj.IREEDialectsCAPI
- obj.MLIRCAPIDebug
- obj.MLIRCAPIIR
- obj.MLIRCAPIInterfaces
- obj.MLIRCAPIGPU
- obj.MLIRCAPILLVM
- obj.MLIRCAPILinalg
- obj.MLIRCAPIPDL
- obj.MLIRCAPISMT
- obj.MLIRCAPIExportSMTLIB
- obj.MLIRCAPITarget
- obj.MLIRCAPITransforms
- obj.MLIRCAPITransformDialect
- obj.MLIRCAPITransformDialectTransforms
iree_compiler_API_Internal_CompilerDriver.objects
- iree_compiler_API_Internal_IREECompileToolEntryPoint.objects
iree_compiler_API_Internal_IREECodegenDialectCAPI.objects
+ iree_compiler_API_Internal_IREECompileToolEntryPoint.objects
iree_compiler_API_Internal_IREEGPUDialectCAPI.objects
iree_compiler_API_Internal_IREELinkToolEntryPoint.objects
iree_compiler_API_Internal_IREEMLIRLSPServerToolEntryPoint.objects
iree_compiler_API_Internal_IREEOptToolEntryPoint.objects
iree_compiler_API_Internal_IREEReduceToolEntryPoint.objects
iree_compiler_API_Internal_LLDToolEntryPoint.objects
+ obj.IREEDialectsCAPI
+ obj.MLIRCAPIAMDGPU
+ obj.MLIRCAPIDebug
+ obj.MLIRCAPIExportSMTLIB
+ obj.MLIRCAPIGPU
+ obj.MLIRCAPIInterfaces
+ obj.MLIRCAPIIR
+ obj.MLIRCAPILinalg
+ obj.MLIRCAPILLVM
+ obj.MLIRCAPIPDL
+ obj.MLIRCAPISMT
+ obj.MLIRCAPITarget
+ obj.MLIRCAPITransformDialect
+ obj.MLIRCAPITransformDialectTransforms
+ obj.MLIRCAPITransforms
)
if(DEFINED IREE_COMPILER_API_ADDL_EXPORT_OBJECTS)
@@ -201,8 +201,8 @@
# Link MLIRTargetLLVMIRImport and MLIRExportSMTLIB directly since they are
# not exported as object libraries.
target_link_libraries(iree_compiler_API_SharedImpl PRIVATE
- MLIRTargetLLVMIRImport
MLIRExportSMTLIB
+ MLIRTargetLLVMIRImport
)
# If not using sanitizers, ask linkers to error on undefined symbols.
diff --git a/experimental/web/sample_dynamic/CMakeLists.txt b/experimental/web/sample_dynamic/CMakeLists.txt
index 8efc430..28f5130 100644
--- a/experimental/web/sample_dynamic/CMakeLists.txt
+++ b/experimental/web/sample_dynamic/CMakeLists.txt
@@ -16,8 +16,8 @@
add_executable(${_NAME} "")
target_sources(${_NAME}
PRIVATE
- main.c
device_sync.c
+ main.c
)
set_target_properties(${_NAME} PROPERTIES OUTPUT_NAME "web-sample-dynamic-sync")
@@ -28,11 +28,11 @@
# The general purpose libraries link in multiple executable loaders and HAL
# drivers/devices, which include code not compatible with Emscripten.
target_link_libraries(${_NAME}
- iree_runtime_runtime
+ iree_hal_drivers_local_sync_sync_driver
iree_hal_local_executable_plugin_manager
iree_hal_local_loaders_system_library_loader
iree_hal_local_loaders_vmvx_module_loader
- iree_hal_drivers_local_sync_sync_driver
+ iree_runtime_runtime
)
target_link_options(${_NAME} PRIVATE
diff --git a/experimental/web/sample_static/CMakeLists.txt b/experimental/web/sample_static/CMakeLists.txt
index d7f09a0..3665528 100644
--- a/experimental/web/sample_static/CMakeLists.txt
+++ b/experimental/web/sample_static/CMakeLists.txt
@@ -28,8 +28,8 @@
)
target_sources(${_NAME}
PRIVATE
- main.c
device_sync.c
+ main.c
${CMAKE_CURRENT_BINARY_DIR}/mnist_static.h
${CMAKE_CURRENT_BINARY_DIR}/mnist_bytecode.h
${CMAKE_CURRENT_BINARY_DIR}/mnist_bytecode.c
@@ -44,10 +44,10 @@
# drivers/devices, which include code not compatible with Emscripten.
target_link_libraries(${_NAME}
${_MNIST_OBJECT_NAME}
- iree_runtime_runtime
+ iree_hal_drivers_local_sync_sync_driver
iree_hal_hal
iree_hal_local_loaders_static_library_loader
- iree_hal_drivers_local_sync_sync_driver
+ iree_runtime_runtime
)
target_link_options(${_NAME} PRIVATE
@@ -73,8 +73,8 @@
)
target_sources(${_NAME}
PRIVATE
- main.c
device_multithreaded.c
+ main.c
${CMAKE_CURRENT_BINARY_DIR}/mnist_static.h
${CMAKE_CURRENT_BINARY_DIR}/mnist_bytecode.h
${CMAKE_CURRENT_BINARY_DIR}/mnist_bytecode.c
@@ -89,10 +89,10 @@
# drivers/devices, which include code not compatible with Emscripten.
target_link_libraries(${_NAME}
${_MNIST_OBJECT_NAME}
- iree_runtime_runtime
+ iree_hal_drivers_local_task_task_driver
iree_hal_hal
iree_hal_local_loaders_static_library_loader
- iree_hal_drivers_local_task_task_driver
+ iree_runtime_runtime
iree_task_api
)
diff --git a/experimental/web/sample_webgpu/CMakeLists.txt b/experimental/web/sample_webgpu/CMakeLists.txt
index c3ceaf0..776747c 100644
--- a/experimental/web/sample_webgpu/CMakeLists.txt
+++ b/experimental/web/sample_webgpu/CMakeLists.txt
@@ -12,8 +12,8 @@
add_executable(${_NAME} "")
target_sources(${_NAME}
PRIVATE
- main.c
device_webgpu.c
+ main.c
)
set_target_properties(${_NAME} PROPERTIES OUTPUT_NAME "web-sample-webgpu")
@@ -26,9 +26,9 @@
target_link_libraries(${_NAME}
# C sources
iree_base_loop_emscripten
- iree_runtime_runtime
- iree_experimental_webgpu_webgpu
iree_experimental_webgpu_platform_emscripten_emscripten
+ iree_experimental_webgpu_webgpu
+ iree_runtime_runtime
# JS sources
"--js-library ${IREE_ROOT_DIR}/runtime/src/iree/base/internal/wait_handle_emscripten.js"
"--js-library ${IREE_ROOT_DIR}/runtime/src/iree/base/loop_emscripten.js"
diff --git a/llvm-external-projects/iree-dialects/lib/CAPI/CMakeLists.txt b/llvm-external-projects/iree-dialects/lib/CAPI/CMakeLists.txt
index 1ce438d..78eec8e 100644
--- a/llvm-external-projects/iree-dialects/lib/CAPI/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/lib/CAPI/CMakeLists.txt
@@ -1,11 +1,11 @@
add_mlir_public_c_api_library(IREEDialectsCAPI
Dialects.cpp
LINK_LIBS PUBLIC
+ IREELinalgTransformDialect
+ IREELinalgTransformDialectPasses
MLIRIR
MLIRLinalgTransformOps
MLIRTransformDialect
- IREELinalgTransformDialect
- IREELinalgTransformDialectPasses
)
iree_dialects_target_includes(IREEDialectsCAPI)
diff --git a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/CMakeLists.txt b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/CMakeLists.txt
index 4b3202b..6eb51d3 100644
--- a/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/lib/Dialect/LinalgTransform/IR/CMakeLists.txt
@@ -30,9 +30,9 @@
# Conversions
MLIRAsyncToLLVM
MLIRIndexToLLVM
- MLIRMemRefToLLVM
MLIRMathToLLVM
+ MLIRMemRefToLLVM
+ MLIRSCFToControlFlow
MLIRVectorToLLVM
MLIRVectorToLLVMPass
- MLIRSCFToControlFlow
)
diff --git a/llvm-external-projects/iree-dialects/lib/Transforms/CMakeLists.txt b/llvm-external-projects/iree-dialects/lib/Transforms/CMakeLists.txt
index 95034ec..da2cbd9 100644
--- a/llvm-external-projects/iree-dialects/lib/Transforms/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/lib/Transforms/CMakeLists.txt
@@ -5,8 +5,8 @@
LINK_LIBS PRIVATE
# TODO: break dialect dependency by implementing the transformation separately
# and registering it.
- MLIRAsyncDialect
MLIRArithDialect
+ MLIRAsyncDialect
MLIRFuncDialect
MLIRLinalgDialect
MLIRLinalgTransforms
diff --git a/llvm-external-projects/iree-dialects/python/CMakeLists.txt b/llvm-external-projects/iree-dialects/python/CMakeLists.txt
index e89813c..0fc3506 100644
--- a/llvm-external-projects/iree-dialects/python/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/python/CMakeLists.txt
@@ -52,14 +52,14 @@
# build burden by ~5x. Make it stop.
MLIRPythonExtension.RegisterEverything
+ IREEDialectsPythonExtensions
+ IREEDialectsPythonSources
MLIRPythonSources.Core
MLIRPythonSources.Dialects.builtin
MLIRPythonSources.Dialects.cf
MLIRPythonSources.Dialects.func
MLIRPythonSources.Dialects.pdl
MLIRPythonSources.Dialects.transform
- IREEDialectsPythonSources
- IREEDialectsPythonExtensions
)
add_mlir_python_common_capi_library(IREEDialectsAggregateCAPI
diff --git a/llvm-external-projects/iree-dialects/tools/iree-dialects-opt/CMakeLists.txt b/llvm-external-projects/iree-dialects/tools/iree-dialects-opt/CMakeLists.txt
index ed8d3e7..dcaa61a 100644
--- a/llvm-external-projects/iree-dialects/tools/iree-dialects-opt/CMakeLists.txt
+++ b/llvm-external-projects/iree-dialects/tools/iree-dialects-opt/CMakeLists.txt
@@ -12,10 +12,10 @@
MLIRFuncDialect
MLIRFuncInlinerExtension
MLIRIndexToLLVM
- MLIRLLVMDialect
- MLIRLLVMIRTransforms
MLIRLinalgDialect
MLIRLinalgTransformOps
+ MLIRLLVMDialect
+ MLIRLLVMIRTransforms
MLIRMemRefDialect
MLIRMemRefTransforms
MLIROptLib
@@ -26,8 +26,8 @@
MLIRSCFTransforms
MLIRTensorDialect
MLIRTensorTransformOps
- MLIRTransforms
MLIRTransformPDLExtension
+ MLIRTransforms
MLIRVectorTransformOps
)
diff --git a/runtime/bindings/python/CMakeLists.txt b/runtime/bindings/python/CMakeLists.txt
index db3e5f6..140d6b1 100644
--- a/runtime/bindings/python/CMakeLists.txt
+++ b/runtime/bindings/python/CMakeLists.txt
@@ -73,11 +73,11 @@
target_link_libraries(iree_runtime_bindings_python_PyExtRt
PRIVATE
iree::base
+ iree::base::internal::path
iree::base::tooling::flags
iree::hal
iree::hal::drivers
iree::hal::utils::allocators
- iree::base::internal::path
iree::io::file_handle
iree::io::formats::irpa
iree::io::formats::parser_registry
@@ -85,8 +85,8 @@
iree::io::parameter_index_provider
iree::io::parameter_provider
iree::io::scope_map
- iree::modules::io::parameters
iree::modules::hal
+ iree::modules::io::parameters
iree::schemas::parameter_archive
iree::tooling::device_util
iree::tooling::modules
diff --git a/samples/custom_module/basic/CMakeLists.txt b/samples/custom_module/basic/CMakeLists.txt
index 5427842..0516913 100644
--- a/samples/custom_module/basic/CMakeLists.txt
+++ b/samples/custom_module/basic/CMakeLists.txt
@@ -23,8 +23,8 @@
target_link_libraries(${_NAME}
iree_base_base
iree_io_file_handle
- iree_vm_vm
iree_vm_bytecode_module
+ iree_vm_vm
)
add_subdirectory(test)
diff --git a/samples/custom_module/dynamic/CMakeLists.txt b/samples/custom_module/dynamic/CMakeLists.txt
index ab66bbd..759f628 100644
--- a/samples/custom_module/dynamic/CMakeLists.txt
+++ b/samples/custom_module/dynamic/CMakeLists.txt
@@ -18,8 +18,8 @@
iree_base_base
iree_hal_hal
iree_modules_hal_types
- iree_vm_vm
iree_vm_dynamic_api
+ iree_vm_vm
)
# NOTE: this is only required because we want this sample to run on all
