Move files to reduce levels

aiebu/src/cpp/aiebu/src/* -> aiebu/src/cpp/* Wrap legacy headers to include from new location, which is now aiebu/src/cpp/include/aiebu/*. This extra aieby level is so that end-user exported files can be added under include/aiebu rather than directly under include. Ensure that clients including legacy top-level headers can still build when including from legacy location when using aiebu as a submodule. Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com> Move headers Signed-off-by: Soren Soe <2106410+stsoe@users.noreply.github.com>
Xilinx · Mar 1, 2025 · 1c549e4 · 1c549e4
1 parent 8404aa4
commit 1c549e4
Show file tree

Hide file tree

Showing 65 changed files with 287 additions and 581 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(AIEBU HOMEPAGE_URL https://github.com/Xilinx/aiebu VERSION 1.0)
 
 include(cmake/settings.cmake)
 
-add_subdirectory(src/cpp/aiebu)
+add_subdirectory(src/cpp)
 
 add_subdirectory(specification)
 

diff --git a/src/cpp/aiebu/.dir-locals.el → src/cpp/.dir-locals.el b/src/cpp/aiebu/.dir-locals.el → src/cpp/.dir-locals.el
diff --git a/src/cpp/aiebu/src/CMakeLists.txt → src/cpp/CMakeLists.txt b/src/cpp/aiebu/src/CMakeLists.txt → src/cpp/CMakeLists.txt
@@ -1,5 +1,7 @@
 # SPDX-License-Identifier: MIT
 # Copyright (C) 2024-2025, Advanced Micro Devices, Inc. All rights reserved.
+add_subdirectory(utils)
+
 add_library(aiebu_library_objects OBJECT
   analyzer/reporter.cpp
   analyzer/transaction.cpp
@@ -26,7 +28,7 @@ target_include_directories(aiebu_library_objects
   ${AIEBU_SOURCE_DIR}/src/cpp/ELFIO
 
   # The following should be spelled out in code
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/aiebu
   ${CMAKE_CURRENT_SOURCE_DIR}/preprocessor
   ${CMAKE_CURRENT_SOURCE_DIR}/preprocessor/aie2
   ${CMAKE_CURRENT_SOURCE_DIR}/encoder
@@ -87,9 +89,9 @@ install (TARGETS aiebu aiebu_static
 )
 
 install(FILES
-  include/aiebu.h
-  include/aiebu_assembler.h
-  include/aiebu_error.h
+  include/aiebu/aiebu.h
+  include/aiebu/aiebu_assembler.h
+  include/aiebu/aiebu_error.h
   DESTINATION ${AIEBU_INSTALL_INCLUDE_DIR}
   CONFIGURATIONS Debug Release COMPONENT Runtime
 )
diff --git a/src/cpp/aiebu/CMakeLists.txt b/src/cpp/aiebu/CMakeLists.txt
diff --git a/src/cpp/aiebu/src/.clang-tidy b/src/cpp/aiebu/src/.clang-tidy