Enable aie_kernels includes + cleanup cmake scripts (#2596)

Co-authored-by: AndraBisca <[email protected]>

Author: AndraBisca

CMakeLists.txt

@@ -285,6 +285,13 @@ if(NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
     PATTERN "CMakeFiles" EXCLUDE
     PATTERN "config.h" EXCLUDE)
 
+  include("${AIE_SOURCE_DIR}/cmake/install_headers.cmake")
+  install_headers(${CMAKE_CURRENT_SOURCE_DIR}/aie_kernels
+          ${AIE_BINARY_DIR}/include
+          ${CMAKE_INSTALL_PREFIX}/include
+          "aie_kernels"
+  )
+
   if(NOT LLVM_ENABLE_IDE)
     add_llvm_install_targets(install-aie-headers DEPENDS aie-headers COMPONENT
                              aie-headers)

cmake/install_headers.cmake

@@ -0,0 +1,34 @@
+#
+# 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 2025 Advanced Micro Devices Inc.
+
+function(install_headers SRCPATH BUILDPATH INSTALLPATH HEADERS_NAME)
+  message("Installing ${HEADERS_NAME} includes from ${SRCPATH} in ${INSTALLPATH}/${HEADERS_NAME}")
+
+  # copy header files into install area
+  install(DIRECTORY ${SRCPATH}/ DESTINATION ${INSTALLPATH}/${HEADERS_NAME})
+
+  message("Copying ${HEADERS_NAME} includes from ${SRCPATH} to ${BUILDPATH}/${HEADERS_NAME}")
+  
+  # copy header files into build area
+  file(GLOB_RECURSE headers_to_copy ${SRCPATH}/*.h ${SRCPATH}/*.hpp)
+  foreach(header ${headers_to_copy})
+      file(RELATIVE_PATH rel_path ${SRCPATH} ${header})
+
+      # create target name from file's path to avoid duplication
+      get_filename_component(file_name "${header}" NAME)
+      get_filename_component(parent_dir ${header} DIRECTORY)
+      get_filename_component(module_name ${parent_dir} NAME)
+
+      set(dest ${BUILDPATH}/${HEADERS_NAME}/${rel_path})
+      add_custom_target(aie-copy-runtime-libs-${module_name}-${file_name} ALL DEPENDS ${dest})
+      add_custom_command(OUTPUT ${dest}
+                      COMMAND ${CMAKE_COMMAND} -E copy ${header} ${dest}
+                      DEPENDS ${header}
+      )
+  endforeach()
+
+endfunction()

programming_examples/getting_started/00_memcpy/passThrough.cc

@@ -14,21 +14,7 @@
 #include <stdlib.h>
 
 #include <aie_api/aie.hpp>
-
-#if defined(__chess__)
-#define AIE_PREPARE_FOR_PIPELINING [[chess::prepare_for_pipelining]]
-#define AIE_LOOP_MIN_ITERATION_COUNT(x) [[chess::min_loop_count(x)]]
-#elif defined(__AIECC__)
-#ifndef __STRINGIFY
-#define __STRINGIFY(a) #a
-#endif
-#define AIE_LOOP_MIN_ITERATION_COUNT(x)                                        \
-  _Pragma(__STRINGIFY(clang loop min_iteration_count(x)))
-#define AIE_PREPARE_FOR_PIPELINING
-#else
-#define AIE_LOOP_MIN_ITERATION_COUNT(x)
-#define AIE_PREPARE_FOR_PIPELINING
-#endif
+#include <aie_kernels/aie_kernel_utils.h>
 
 template <typename T, int N>
 __attribute__((noinline)) void passThrough_aie(T *restrict in, T *restrict out,

programming_examples/getting_started/02_vector_reduce_max/reduce_max_vector.cc

@@ -15,21 +15,7 @@
 #include <type_traits>
 
 #include <aie_api/aie.hpp>
-
-#if defined(__chess__)
-#define AIE_PREPARE_FOR_PIPELINING [[chess::prepare_for_pipelining]]
-#define AIE_LOOP_MIN_ITERATION_COUNT(x) [[chess::min_loop_count(x)]]
-#elif defined(__AIECC__)
-#ifndef __STRINGIFY
-#define __STRINGIFY(a) #a
-#endif
-#define AIE_LOOP_MIN_ITERATION_COUNT(x)                                        \
-  _Pragma(__STRINGIFY(clang loop min_iteration_count(x)))
-#define AIE_PREPARE_FOR_PIPELINING
-#else
-#define AIE_LOOP_MIN_ITERATION_COUNT(x)
-#define AIE_PREPARE_FOR_PIPELINING
-#endif
+#include <aie_kernels/aie_kernel_utils.h>
 
 template <typename T, typename V>
 void _reduce_max_vector(T *restrict in, T *restrict out,

programming_examples/getting_started/03_matrix_multiplication_single_core/matrix_multiplication.cc

@@ -10,21 +10,7 @@
 //===----------------------------------------------------------------------===//
 
 #include <aie_api/aie.hpp>
-
-#if defined(__chess__)
-#define AIE_PREPARE_FOR_PIPELINING [[chess::prepare_for_pipelining]]
-#define AIE_LOOP_MIN_ITERATION_COUNT(x) [[chess::min_loop_count(x)]]
-#elif defined(__AIECC__)
-#ifndef __STRINGIFY
-#define __STRINGIFY(a) #a
-#endif
-#define AIE_LOOP_MIN_ITERATION_COUNT(x)                                        \
-  _Pragma(__STRINGIFY(clang loop min_iteration_count(x)))
-#define AIE_PREPARE_FOR_PIPELINING
-#else
-#define AIE_LOOP_MIN_ITERATION_COUNT(x)
-#define AIE_PREPARE_FOR_PIPELINING
-#endif
+#include <aie_kernels/aie_kernel_utils.h>
 
 // Make sure the following tile and intrinsic sizes match the sizes in the
 // data layout transformations described in

runtime_lib/CMakeLists.txt

@@ -141,10 +141,10 @@ install(TARGETS xaienginecdo_static DESTINATION lib EXPORT xaienginecdo_static)
 install(EXPORT xaienginecdo_static DESTINATION lib/cmake/aie)
 target_include_directories(xaienginecdo_static SYSTEM PRIVATE ${BOOTGEN_SOURCE_DIR}/cdo-driver)
 
-include("aie_api/aieapi.cmake")
-set(AIEAPI_SOURCE_DIR "../third_party/aie_api/include/aie_api")
-add_aie_api_headers(${AIEAPI_SOURCE_DIR}
+include("${AIE_SOURCE_DIR}/cmake/install_headers.cmake")
+set(AIEAPI_SOURCE_DIR "${AIE_SOURCE_DIR}/third_party/aie_api/include/aie_api")
+install_headers(${AIEAPI_SOURCE_DIR}
         ${AIE_BINARY_DIR}/include
         ${CMAKE_INSTALL_PREFIX}/include
+        "aie_api"
 )
-