The library is the authority on include dir locations, not the consum…

…ers (#16164) ### Ticket #14001 ### Problem description The tests are not delegating to the library to be informed of include dirs. This hinders refactoring. ### What's changed Have the tests get a list of include dirs from the library itself. Still not ideal, but this will ease refactoring to improve matters further. ### Checklist - [x] Post commit CI passes https://github.com/tenstorrent/tt-metal/actions/runs/12422615897
tenstorrent · Jan 7, 2025 · ebbdece · ebbdece
1 parent 282a7b2
commit ebbdece
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 47 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 enable_testing()
 include(GoogleTest)
 add_library(test_common_libs INTERFACE)
+target_include_directories(test_common_libs INTERFACE "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>")
 target_link_libraries(
     test_common_libs
     INTERFACE

diff --git a/tests/tt_metal/distributed/CMakeLists.txt b/tests/tt_metal/distributed/CMakeLists.txt
@@ -8,12 +8,7 @@ target_link_libraries(
         test_common_libs
 )
 
-target_include_directories(
-    distributed_unit_tests
-    PRIVATE
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/distributed
-)
+target_include_directories(distributed_unit_tests PRIVATE "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>")
 
 set_target_properties(
     distributed_unit_tests

diff --git a/tests/tt_metal/tt_metal/CMakeLists.txt b/tests/tt_metal/tt_metal/CMakeLists.txt
@@ -45,9 +45,7 @@ foreach(TEST_SRC ${TT_METAL_TESTS_SRCS})
     target_include_directories(
         ${TEST}
         PRIVATE
-            ${PROJECT_SOURCE_DIR}
-            ${PROJECT_SOURCE_DIR}/tt_metal
-            ${PROJECT_SOURCE_DIR}/tt_metal/common
+            "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
             ${PROJECT_SOURCE_DIR}/tests
             ${CMAKE_CURRENT_SOURCE_DIR}
     )

diff --git a/tests/tt_metal/tt_metal/api/CMakeLists.txt b/tests/tt_metal/tt_metal/api/CMakeLists.txt
@@ -46,9 +46,7 @@ target_link_libraries(
 target_include_directories(
     unit_tests_api
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/debug_tools/CMakeLists.txt b/tests/tt_metal/tt_metal/debug_tools/CMakeLists.txt
@@ -27,9 +27,7 @@ target_link_libraries(unit_tests_debug_tools PRIVATE test_metal_common_libs)
 target_include_directories(
     unit_tests_debug_tools
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/device/CMakeLists.txt b/tests/tt_metal/tt_metal/device/CMakeLists.txt
@@ -13,9 +13,7 @@ target_link_libraries(unit_tests_device PUBLIC test_metal_common_libs)
 target_include_directories(
     unit_tests_device
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/dispatch/CMakeLists.txt b/tests/tt_metal/tt_metal/dispatch/CMakeLists.txt
@@ -17,9 +17,7 @@ target_include_directories(
     unit_tests_dispatch
     PRIVATE
         ${UMD_HOME}
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_buffer/CMakeLists.txt b/tests/tt_metal/tt_metal/dispatch/dispatch_buffer/CMakeLists.txt
@@ -10,8 +10,7 @@ target_link_libraries(unit_tests_dispatch_buffer_o PRIVATE test_metal_common_lib
 target_include_directories(
     unit_tests_dispatch_buffer_o
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/dispatch

diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_event/CMakeLists.txt b/tests/tt_metal/tt_metal/dispatch/dispatch_event/CMakeLists.txt
@@ -10,8 +10,7 @@ target_link_libraries(unit_tests_dispatch_event_o PRIVATE test_metal_common_libs
 target_include_directories(
     unit_tests_dispatch_event_o
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/dispatch

diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_program/CMakeLists.txt b/tests/tt_metal/tt_metal/dispatch/dispatch_program/CMakeLists.txt
@@ -13,8 +13,7 @@ target_link_libraries(unit_tests_dispatch_program_o PRIVATE test_metal_common_li
 target_include_directories(
     unit_tests_dispatch_program_o
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/dispatch

diff --git a/tests/tt_metal/tt_metal/dispatch/dispatch_trace/CMakeLists.txt b/tests/tt_metal/tt_metal/dispatch/dispatch_trace/CMakeLists.txt
@@ -10,8 +10,7 @@ target_link_libraries(unit_tests_dispatch_trace_o PRIVATE test_metal_common_libs
 target_include_directories(
     unit_tests_dispatch_trace_o
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/dispatch

diff --git a/tests/tt_metal/tt_metal/eth/CMakeLists.txt b/tests/tt_metal/tt_metal/eth/CMakeLists.txt
@@ -12,9 +12,7 @@ target_link_libraries(unit_tests_eth PUBLIC test_metal_common_libs)
 target_include_directories(
     unit_tests_eth
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/integration/CMakeLists.txt b/tests/tt_metal/tt_metal/integration/CMakeLists.txt
@@ -18,9 +18,7 @@ target_link_libraries(unit_tests_integration PUBLIC test_metal_common_libs)
 target_include_directories(
     unit_tests_integration
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/llk/CMakeLists.txt b/tests/tt_metal/tt_metal/llk/CMakeLists.txt
@@ -20,9 +20,7 @@ target_link_libraries(unit_tests_llk PUBLIC test_metal_common_libs)
 target_include_directories(
     unit_tests_llk
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/noc/CMakeLists.txt b/tests/tt_metal/tt_metal/noc/CMakeLists.txt
@@ -8,9 +8,7 @@ target_link_libraries(unit_tests_noc PUBLIC test_metal_common_libs)
 target_include_directories(
     unit_tests_noc
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tests/tt_metal/tt_metal/perf_microbenchmark/CMakeLists.txt b/tests/tt_metal/tt_metal/perf_microbenchmark/CMakeLists.txt
@@ -60,10 +60,8 @@ foreach(TEST_SRC ${PERF_MICROBENCH_TESTS_SRCS})
     target_include_directories(
         ${TEST_TARGET}
         PRIVATE
-            ${PROJECT_SOURCE_DIR}
-            ${PROJECT_SOURCE_DIR}/tt_metal
+            "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
             ${PROJECT_SOURCE_DIR}/ttnn/cpp/ttnn/deprecated # this all should go away and be replaced with link to ttnn
-            ${PROJECT_SOURCE_DIR}/tt_metal/common
             ${PROJECT_SOURCE_DIR}/tests
             ${CMAKE_CURRENT_SOURCE_DIR}
     )

diff --git a/tests/tt_metal/tt_metal/stl/CMakeLists.txt b/tests/tt_metal/tt_metal/stl/CMakeLists.txt
@@ -11,9 +11,7 @@ target_link_libraries(unit_tests_stl PUBLIC test_metal_common_libs)
 target_include_directories(
     unit_tests_stl
     PRIVATE
-        ${PROJECT_SOURCE_DIR}
-        ${PROJECT_SOURCE_DIR}/tt_metal
-        ${PROJECT_SOURCE_DIR}/tt_metal/common
+        "$<TARGET_PROPERTY:Metalium::Metal,INCLUDE_DIRECTORIES>"
         ${PROJECT_SOURCE_DIR}/tests
         ${PROJECT_SOURCE_DIR}/tests/tt_metal/tt_metal/common
         ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/tt_metal/CMakeLists.txt b/tt_metal/CMakeLists.txt
@@ -48,6 +48,8 @@ target_include_directories(
         ${PROJECT_SOURCE_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}
         include
+    PRIVATE
+        common # FIXME: Clean up the tests and remove this
 )
 target_compile_options(tt_metal PUBLIC -Wno-int-to-pointer-cast)
 add_dependencies(tt_metal hw_toolchain)