diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d5880d2f7..15b1fd2178 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,24 +1,30 @@
 #
-# This file is licensed under the Apache License v2.0 with LLVM Exceptions.
-# See https://llvm.org/LICENSE.txt for license information.
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+# This file is licensed under the Apache License v2.0 with LLVM Exceptions. See
+# https://llvm.org/LICENSE.txt for license information. SPDX-License-Identifier:
+# Apache-2.0 WITH LLVM-exception
 #
 # (c) Copyright 2021 Xilinx Inc.
 
-# optional parameters
-#  -DTOOLCHAINFILES_PATH: path to cross compilation toolchain files, default: <mlir-aie-root-dir>/cmake/toolchainFiles
-#  -DLibXAIE_x86_64_DIR: search path for x86_64 libxaiengine 
-#  -DLibXAIE_aarch64_DIR: search path for aarch64 libxaiengine 
-#  -DSysrootAarch64: sysroot for aarch crosscompile, if not specified and aarch64 in AIE_RUNTIME_TARGETS then default to  Vitis aarch64 sysroot
-#  -DAIE_RUNTIME_TARGETS: list of targets (x86_64,aarch64) to build runtime libs for, default: x86_64; cross compilation for aarch64 against default Vitis Sysroot
-#  -DAIE_RUNTIME_TEST_TARGET: runtime test target (x86_64 or aarch64) used for running unit test and tutorials, default x86_64
+# optional parameters -DTOOLCHAINFILES_PATH: path to cross compilation toolchain
+# files, default: <mlir-aie-root-dir>/cmake/toolchainFiles -DLibXAIE_x86_64_DIR:
+# search path for x86_64 libxaiengine -DLibXAIE_aarch64_DIR: search path for
+# aarch64 libxaiengine -DSysrootAarch64: sysroot for aarch crosscompile, if not
+# specified and aarch64 in AIE_RUNTIME_TARGETS then default to  Vitis aarch64
+# sysroot -DAIE_RUNTIME_TARGETS: list of targets (x86_64,aarch64) to build
+# runtime libs for, default: x86_64; cross compilation for aarch64 against
+# default Vitis Sysroot -DAIE_RUNTIME_TEST_TARGET: runtime test target (x86_64
+# or aarch64) used for running unit test and tutorials, default x86_64
 
 cmake_minimum_required(VERSION 3.21)
 
 set(TOOLCHAINFILES_PATH ${CMAKE_SOURCE_DIR}/cmake/modulesXilinx)
 
-set(AIE_RUNTIME_TARGETS "x86_64" CACHE STRING "Architectures to compile the runtime libraries for.")
-set(AIE_RUNTIME_TEST_TARGET "x86_64" CACHE STRING "Runtime architecture to test with.")
+set(AIE_RUNTIME_TARGETS
+    "x86_64"
+    CACHE STRING "Architectures to compile the runtime libraries for.")
+set(AIE_RUNTIME_TEST_TARGET
+    "x86_64"
+    CACHE STRING "Runtime architecture to test with.")
 
 if(POLICY CMP0068)
   cmake_policy(SET CMP0068 NEW)
@@ -39,20 +45,29 @@ endif()
 
 if(POLICY CMP0116)
   cmake_policy(SET CMP0116 OLD)
-endif() 
+endif()
 
 project(AIE LANGUAGES CXX C)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
-set(AIE_COMPILER "XCHESSCC" CACHE STRING "Backend compiler selection")
-set(AIE_LINKER "XCHESSCC" CACHE STRING "Backend linker selection")
-set(HOST_COMPILER "CLANG" CACHE STRING "Host program compiler selection")
-set(PEANO_INSTALL_DIR "<unset>" CACHE STRING "Location of Peano compiler")
+set(AIE_COMPILER
+    "XCHESSCC"
+    CACHE STRING "Backend compiler selection")
+set(AIE_LINKER
+    "XCHESSCC"
+    CACHE STRING "Backend linker selection")
+set(HOST_COMPILER
+    "CLANG"
+    CACHE STRING "Host program compiler selection")
+set(PEANO_INSTALL_DIR
+    "<unset>"
+    CACHE STRING "Location of Peano compiler")
 
 option(LLVM_INCLUDE_TOOLS "Generate build targets for the LLVM tools." ON)
-option(LLVM_BUILD_TOOLS "Build the LLVM tools. If OFF, just generate build targets." ON)
+option(LLVM_BUILD_TOOLS
+       "Build the LLVM tools. If OFF, just generate build targets." ON)
 option(AIE_INCLUDE_INTEGRATION_TESTS
        "Generate build targets for the mlir-aie integration tests." OFF)
 
@@ -73,29 +88,39 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(AIE_TOOLS_BINARY_DIR ${AIE_BINARY_DIR}/bin)
 
 find_package(Vitis 2022.2 COMPONENTS AIE AIE2)
-configure_file(./utils/vitisVariables.config.in ${CMAKE_BINARY_DIR}/utils/vitisVariables.config @ONLY)
+configure_file(./utils/vitisVariables.config.in
+               ${CMAKE_BINARY_DIR}/utils/vitisVariables.config @ONLY)
 find_package(Python3 COMPONENTS Interpreter)
 
 # Set up default Vitis Sysroot as sysroot when testing on aarch64
 list(FIND AIE_RUNTIME_TARGETS "aarch64" indexAarch64)
-if(NOT DEFINED SysrootAarch64 AND DEFINED VITIS_ROOT AND ${indexAarch64} GREATER -1)
-set(Sysroot ${VITIS_ROOT}/gnu/aarch64/lin/aarch64-linux/aarch64-xilinx-linux/)
-if(AIE_RUNTIME_TEST_TARGET STREQUAL "aarch64")
-set(LIBCXX_VERSION "11.2.0")
-set(extraAieCcFlags "-I${CMAKE_INSTALL_PREFIX}/runtime_lib/aarch64/xaiengine/include -I${Sysroot}/usr/include -I${Sysroot}/usr/include/c++/${LIBCXX_VERSION} -I${Sysroot}/usr/include/c++/${LIBCXX_VERSION}/aarch64-xilinx-linux -L${Sysroot}/usr/lib/aarch64-xilinx-linux/${LIBCXX_VERSION} -L${CMAKE_INSTALL_PREFIX}/runtime_lib/aarch64/xaiengine/lib -B${Sysroot}/usr/lib/aarch64-xilinx-linux/${LIBCXX_VERSION}")
-endif()
-message (STATUS "aarch64 specified as runtime target but no sysroot set, using default Vitis Sysroot for cross compilation: ${Sysroot}")
+if(NOT DEFINED SysrootAarch64
+   AND DEFINED VITIS_ROOT
+   AND ${indexAarch64} GREATER -1)
+  set(Sysroot ${VITIS_ROOT}/gnu/aarch64/lin/aarch64-linux/aarch64-xilinx-linux/)
+  if(AIE_RUNTIME_TEST_TARGET STREQUAL "aarch64")
+    set(LIBCXX_VERSION "11.2.0")
+    set(extraAieCcFlags
+        "-I${CMAKE_INSTALL_PREFIX}/runtime_lib/aarch64/xaiengine/include -I${Sysroot}/usr/include -I${Sysroot}/usr/include/c++/${LIBCXX_VERSION} -I${Sysroot}/usr/include/c++/${LIBCXX_VERSION}/aarch64-xilinx-linux -L${Sysroot}/usr/lib/aarch64-xilinx-linux/${LIBCXX_VERSION} -L${CMAKE_INSTALL_PREFIX}/runtime_lib/aarch64/xaiengine/lib -B${Sysroot}/usr/lib/aarch64-xilinx-linux/${LIBCXX_VERSION}"
+    )
+  endif()
+  message(
+    STATUS
+      "aarch64 specified as runtime target but no sysroot set, using default Vitis Sysroot for cross compilation: ${Sysroot}"
+  )
 elseif(SysrootAarch64 AND ${indexAarch64} GREATER -1)
-set(Sysroot ${SysrootAarch64})
+  set(Sysroot ${SysrootAarch64})
 endif()
 
 # Define the default arguments to use with 'lit', and an option for the user to
 # override.
 set(LIT_ARGS_DEFAULT "-j 8 -sv")
-if (MSVC_IDE OR XCODE)
+if(MSVC_IDE OR XCODE)
   set(LIT_ARGS_DEFAULT "${LIT_ARGS_DEFAULT} --no-progress-bar")
 endif()
-set(LLVM_LIT_ARGS "${LIT_ARGS_DEFAULT}" CACHE STRING "Default options for lit")
+set(LLVM_LIT_ARGS
+    "${LIT_ARGS_DEFAULT}"
+    CACHE STRING "Default options for lit")
 
 list(APPEND CMAKE_MODULE_PATH "${MLIR_CMAKE_DIR}")
 list(APPEND CMAKE_MODULE_PATH "${LLVM_CMAKE_DIR}")
@@ -118,11 +143,11 @@ set_target_properties(aie-headers PROPERTIES FOLDER "Misc")
 add_dependencies(aie-headers mlir-headers)
 
 option(AIE_INCLUDE_DOCS "Generate build targets for the MLIR AIE docs." OFF)
-if (AIE_INCLUDE_DOCS)
-    # Make sure we build the docs
-    add_custom_target(docs ALL)
-    add_subdirectory(docs)
-    add_dependencies(docs mlir-doc)
+if(AIE_INCLUDE_DOCS)
+  # Make sure we build the docs
+  add_custom_target(docs ALL)
+  add_subdirectory(docs)
+  add_dependencies(docs mlir-doc)
 endif()
 
 # python install directory
@@ -136,7 +161,10 @@ if(NOT AIE_PYTHON_INSTALL_DIR)
 endif()
 
 # setup python
-find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+find_package(
+  Python3
+  COMPONENTS Interpreter Development
+  REQUIRED)
 include(MLIRDetectPythonEnv)
 mlir_detect_pybind11_install()
 find_package(pybind11 2.6 REQUIRED)
@@ -151,8 +179,9 @@ add_subdirectory(test)
 add_subdirectory(tutorials)
 add_subdirectory(tools)
 
-if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
-  install(DIRECTORY include/aie
+if(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
+  install(
+    DIRECTORY include/aie
     DESTINATION include
     COMPONENT aie-headers
     FILES_MATCHING
@@ -160,10 +189,10 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     PATTERN "*.h"
     PATTERN "*.inc"
     PATTERN "*.td"
-    PATTERN "LICENSE.TXT"
-    )
+    PATTERN "LICENSE.TXT")
 
-  install(DIRECTORY ${PROJECT_BINARY_DIR}/include/aie
+  install(
+    DIRECTORY ${PROJECT_BINARY_DIR}/include/aie
     DESTINATION include
     COMPONENT aie-headers
     FILES_MATCHING
@@ -173,13 +202,11 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     PATTERN "*.inc"
     PATTERN "*.td"
     PATTERN "CMakeFiles" EXCLUDE
-    PATTERN "config.h" EXCLUDE
-    )
+    PATTERN "config.h" EXCLUDE)
 
-  if (NOT LLVM_ENABLE_IDE)
-    add_llvm_install_targets(install-aie-headers
-                             DEPENDS aie-headers
-                             COMPONENT aie-headers)
+  if(NOT LLVM_ENABLE_IDE)
+    add_llvm_install_targets(install-aie-headers DEPENDS aie-headers COMPONENT
+                             aie-headers)
   endif()
 endif()