From 2fea138040fb6494814954f8b79777587bb85aa2 Mon Sep 17 00:00:00 2001 From: Stella Laurenzo Date: Tue, 12 Mar 2024 13:26:41 -0700 Subject: [PATCH] Properly nest build time headers to match arrangement at install time. The build tree was missing a level of nesting, causing diversions based on in-tree/out-of-tree use. KR: Also fixed kfdtest paths Change-Id: I8638b6d6227daabddd8eaa2aa387ba578b8dfab8 Signed-off-by: Stella Laurenzo Signed-off-by: Kent Russell [ROCm/ROCR-Runtime commit: a180fea5adb3ab3f11312bafba7c78d90d41c857] --- projects/rocr-runtime/CMakeLists.txt | 2 +- projects/rocr-runtime/include/{ => hsakmt}/hsakmt.h | 0 projects/rocr-runtime/include/{ => hsakmt}/hsakmttypes.h | 0 projects/rocr-runtime/include/{ => hsakmt}/linux/kfd_ioctl.h | 0 projects/rocr-runtime/src/debug.c | 2 +- projects/rocr-runtime/src/events.c | 2 +- projects/rocr-runtime/src/fmm.c | 2 +- projects/rocr-runtime/src/fmm.h | 2 +- projects/rocr-runtime/src/libhsakmt.h | 4 ++-- projects/rocr-runtime/src/memory.c | 2 +- projects/rocr-runtime/src/pc_sampling.c | 4 ++-- projects/rocr-runtime/src/perfctr.c | 2 +- projects/rocr-runtime/src/queues.c | 2 +- projects/rocr-runtime/src/spm.c | 2 +- projects/rocr-runtime/src/time.c | 2 +- projects/rocr-runtime/src/version.c | 2 +- projects/rocr-runtime/tests/kfdtest/src/BaseDebug.cpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/BaseDebug.hpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp | 2 +- .../rocr-runtime/tests/kfdtest/src/GoogleTestExtension.hpp | 2 +- .../rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDMemoryTest.cpp | 2 +- .../rocr-runtime/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDPCSamplingTest.cpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDRASTest.cpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/KFDTestUtilQueue.hpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp | 2 +- projects/rocr-runtime/tests/kfdtest/src/PM4Packet.cpp | 2 +- 31 files changed, 30 insertions(+), 30 deletions(-) rename projects/rocr-runtime/include/{ => hsakmt}/hsakmt.h (100%) rename projects/rocr-runtime/include/{ => hsakmt}/hsakmttypes.h (100%) rename projects/rocr-runtime/include/{ => hsakmt}/linux/kfd_ioctl.h (100%) diff --git a/projects/rocr-runtime/CMakeLists.txt b/projects/rocr-runtime/CMakeLists.txt index 19b97133af..5f8af72ef7 100644 --- a/projects/rocr-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/CMakeLists.txt @@ -209,7 +209,7 @@ install ( TARGETS ${HSAKMT_TARGET} #install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT devel ) # Install public headers -install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HSAKMT_TARGET} +install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/${HSAKMT_TARGET} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT devel PATTERN "linux" EXCLUDE ) # Option to build header path migration helpers. diff --git a/projects/rocr-runtime/include/hsakmt.h b/projects/rocr-runtime/include/hsakmt/hsakmt.h similarity index 100% rename from projects/rocr-runtime/include/hsakmt.h rename to projects/rocr-runtime/include/hsakmt/hsakmt.h diff --git a/projects/rocr-runtime/include/hsakmttypes.h b/projects/rocr-runtime/include/hsakmt/hsakmttypes.h similarity index 100% rename from projects/rocr-runtime/include/hsakmttypes.h rename to projects/rocr-runtime/include/hsakmt/hsakmttypes.h diff --git a/projects/rocr-runtime/include/linux/kfd_ioctl.h b/projects/rocr-runtime/include/hsakmt/linux/kfd_ioctl.h similarity index 100% rename from projects/rocr-runtime/include/linux/kfd_ioctl.h rename to projects/rocr-runtime/include/hsakmt/linux/kfd_ioctl.h diff --git a/projects/rocr-runtime/src/debug.c b/projects/rocr-runtime/src/debug.c index d438a2826e..932e8294c9 100644 --- a/projects/rocr-runtime/src/debug.c +++ b/projects/rocr-runtime/src/debug.c @@ -24,7 +24,7 @@ */ #include "libhsakmt.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include #include diff --git a/projects/rocr-runtime/src/events.c b/projects/rocr-runtime/src/events.c index 464612be7a..ae92c37f11 100644 --- a/projects/rocr-runtime/src/events.c +++ b/projects/rocr-runtime/src/events.c @@ -31,7 +31,7 @@ #include #include #include -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include "fmm.h" static HSAuint64 *events_page = NULL; diff --git a/projects/rocr-runtime/src/fmm.c b/projects/rocr-runtime/src/fmm.c index 4b78bba0ed..8aaf6ffd08 100644 --- a/projects/rocr-runtime/src/fmm.c +++ b/projects/rocr-runtime/src/fmm.c @@ -25,7 +25,7 @@ #include "libhsakmt.h" #include "fmm.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include #include diff --git a/projects/rocr-runtime/src/fmm.h b/projects/rocr-runtime/src/fmm.h index 854ae1ba2c..80ccfd559f 100644 --- a/projects/rocr-runtime/src/fmm.h +++ b/projects/rocr-runtime/src/fmm.h @@ -26,7 +26,7 @@ #ifndef FMM_H_ #define FMM_H_ -#include "hsakmttypes.h" +#include "hsakmt/hsakmttypes.h" #include typedef enum { diff --git a/projects/rocr-runtime/src/libhsakmt.h b/projects/rocr-runtime/src/libhsakmt.h index fd298e2832..71cef9cef8 100644 --- a/projects/rocr-runtime/src/libhsakmt.h +++ b/projects/rocr-runtime/src/libhsakmt.h @@ -26,8 +26,8 @@ #ifndef LIBHSAKMT_H_INCLUDED #define LIBHSAKMT_H_INCLUDED -#include "linux/kfd_ioctl.h" -#include "hsakmt.h" +#include "hsakmt/linux/kfd_ioctl.h" +#include "hsakmt/hsakmt.h" #include #include #include diff --git a/projects/rocr-runtime/src/memory.c b/projects/rocr-runtime/src/memory.c index 964becdc0a..8e2b49b1d4 100644 --- a/projects/rocr-runtime/src/memory.c +++ b/projects/rocr-runtime/src/memory.c @@ -24,7 +24,7 @@ */ #include "libhsakmt.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include #include diff --git a/projects/rocr-runtime/src/pc_sampling.c b/projects/rocr-runtime/src/pc_sampling.c index 3cb81dc97b..ca0b99e055 100644 --- a/projects/rocr-runtime/src/pc_sampling.c +++ b/projects/rocr-runtime/src/pc_sampling.c @@ -24,7 +24,7 @@ */ #include "libhsakmt.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include #include @@ -207,4 +207,4 @@ HSAKMT_STATUS HSAKMTAPI hsaKmtPcSamplingStop(HSAuint32 NodeId, HsaPcSamplingTrac (ret == -EALREADY) ? HSAKMT_STATUS_KERNEL_ALREADY_OPENED : ret ? HSAKMT_STATUS_ERROR : HSAKMT_STATUS_SUCCESS; -} \ No newline at end of file +} diff --git a/projects/rocr-runtime/src/perfctr.c b/projects/rocr-runtime/src/perfctr.c index ed051bece2..32df25a74d 100644 --- a/projects/rocr-runtime/src/perfctr.c +++ b/projects/rocr-runtime/src/perfctr.c @@ -30,7 +30,7 @@ #include #include "libhsakmt.h" #include "pmc_table.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include #include diff --git a/projects/rocr-runtime/src/queues.c b/projects/rocr-runtime/src/queues.c index 29bffce03f..fffce67668 100644 --- a/projects/rocr-runtime/src/queues.c +++ b/projects/rocr-runtime/src/queues.c @@ -25,7 +25,7 @@ #include "libhsakmt.h" #include "fmm.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include #include diff --git a/projects/rocr-runtime/src/spm.c b/projects/rocr-runtime/src/spm.c index c4eb33e5b1..9571197fe4 100644 --- a/projects/rocr-runtime/src/spm.c +++ b/projects/rocr-runtime/src/spm.c @@ -24,7 +24,7 @@ */ #include "libhsakmt.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include #include diff --git a/projects/rocr-runtime/src/time.c b/projects/rocr-runtime/src/time.c index 96729a1074..286350bdb9 100644 --- a/projects/rocr-runtime/src/time.c +++ b/projects/rocr-runtime/src/time.c @@ -24,7 +24,7 @@ */ #include "libhsakmt.h" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" HSAKMT_STATUS HSAKMTAPI hsaKmtGetClockCounters(HSAuint32 NodeId, HsaClockCounters *Counters) diff --git a/projects/rocr-runtime/src/version.c b/projects/rocr-runtime/src/version.c index 34e51e0811..c6e2e8dfc1 100644 --- a/projects/rocr-runtime/src/version.c +++ b/projects/rocr-runtime/src/version.c @@ -26,7 +26,7 @@ #include "libhsakmt.h" #include #include -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" HsaVersionInfo kfd_version_info; diff --git a/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.cpp b/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.cpp index a04afe3b01..68a2fb8588 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include "unistd.h" diff --git a/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.hpp b/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.hpp index fc9343e59d..7915072fc6 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/BaseDebug.hpp @@ -24,7 +24,7 @@ #ifndef __KFD_BASE_DEBUG__H__ #define __KFD_BASE_DEBUG__H__ -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include #include diff --git a/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp b/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp index dd1620168c..fdbc7b5a17 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/BaseQueue.cpp @@ -25,7 +25,7 @@ #include "SDMAQueue.hpp" #include "PM4Queue.hpp" #include "AqlQueue.hpp" -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "KFDBaseComponentTest.hpp" BaseQueue::BaseQueue() diff --git a/projects/rocr-runtime/tests/kfdtest/src/GoogleTestExtension.hpp b/projects/rocr-runtime/tests/kfdtest/src/GoogleTestExtension.hpp index 196b7242c4..57cb38cb24 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/GoogleTestExtension.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/GoogleTestExtension.hpp @@ -25,7 +25,7 @@ #define __GOOGLETEST_EXTENSION__H__ #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "KFDTestFlags.hpp" enum LOGTYPE { diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp index 7fddd23844..66337d0cab 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDBaseComponentTest.hpp @@ -31,7 +31,7 @@ #include #include #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include "OSWrapper.hpp" #include "KFDTestUtil.hpp" #include "Assemble.hpp" diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp index e43a253daf..a287d8c768 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp @@ -25,7 +25,7 @@ #include "KFDDBGTest.hpp" #include #include -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include "KFDQMTest.hpp" #include "PM4Queue.hpp" #include "PM4Packet.hpp" diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDMemoryTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDMemoryTest.cpp index a94449fc3e..29cefcb891 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDMemoryTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDMemoryTest.cpp @@ -37,7 +37,7 @@ #include "PM4Packet.hpp" #include "SDMAQueue.hpp" #include "SDMAPacket.hpp" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" /* Captures user specified time (seconds) to sleep */ extern unsigned int g_SleepTime; diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp index 96b48277f2..40ba4919b4 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp @@ -22,7 +22,7 @@ */ #include -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #ifndef __KFD_OPEN_CLOSE_KFD_TEST__H__ #define __KFD_OPEN_CLOSE_KFD_TEST__H__ diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDPCSamplingTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDPCSamplingTest.cpp index 996421cb64..800e46487d 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDPCSamplingTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDPCSamplingTest.cpp @@ -37,7 +37,7 @@ #include "PM4Packet.hpp" #include "SDMAQueue.hpp" #include "SDMAPacket.hpp" -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #define N_PROCESSES (2) /* Number of processes running in parallel, must be at least 2 */ diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp index 98c2348a8c..17dfa91025 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDPMTest.cpp @@ -25,7 +25,7 @@ #include "KFDTestUtil.hpp" #include "PM4Packet.hpp" #include "PM4Queue.hpp" -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" void KFDPMTest::SetUp() { ROUTINE_START diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDRASTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDRASTest.cpp index 69a4719a1d..3ae18cc736 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDRASTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDRASTest.cpp @@ -24,7 +24,7 @@ #include #include -#include "linux/kfd_ioctl.h" +#include "hsakmt/linux/kfd_ioctl.h" #include "KFDRASTest.hpp" #include "PM4Queue.hpp" diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp index aab10a9ae4..43d19b1b69 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtil.hpp @@ -28,7 +28,7 @@ #include #include "OSWrapper.hpp" #include "GoogleTestExtension.hpp" -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" class BaseQueue; #define ARRAY_SIZE(_x) (sizeof(_x)/sizeof(_x[0])) diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtilQueue.hpp b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtilQueue.hpp index dac222b623..c98917be27 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtilQueue.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDTestUtilQueue.hpp @@ -24,7 +24,7 @@ #ifndef __KFD__TEST__UTIL__QUEUE__H__ #define __KFD__TEST__UTIL__QUEUE__H__ -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #include typedef struct { diff --git a/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp b/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp index d7d69b7f73..a91aed83f1 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/OSWrapper.hpp @@ -26,7 +26,7 @@ #include #include "KFDTestFlags.hpp" -#include "hsakmt.h" +#include "hsakmt/hsakmt.h" #ifndef __OS__WRAPPER__H__ #define __OS__WRAPPER__H__ diff --git a/projects/rocr-runtime/tests/kfdtest/src/PM4Packet.cpp b/projects/rocr-runtime/tests/kfdtest/src/PM4Packet.cpp index 3d26ef3fe6..6cacf17b06 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/PM4Packet.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/PM4Packet.cpp @@ -25,7 +25,7 @@ #include #include #include "PM4Packet.hpp" -#include "hsakmttypes.h" +#include "hsakmt/hsakmttypes.h" #include "KFDBaseComponentTest.hpp" #include "asic_reg/gfx_7_2_enum.h"