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 <stellaraccident@gmail.com>
Signed-off-by: Kent Russell <kent.russell@amd.com>
[ROCm/ROCR-Runtime commit: a180fea5ad]
Этот коммит содержится в:
Stella Laurenzo
коммит произвёл
Kent Russell
Kent Russell
родитель
78ad630632
Коммит
2fea138040
@@ -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.
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
#include "libhsakmt.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <unistd.h>
|
||||
#include <sys/mman.h>
|
||||
#include <stdio.h>
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include "fmm.h"
|
||||
|
||||
static HSAuint64 *events_page = NULL;
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "libhsakmt.h"
|
||||
#include "fmm.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#ifndef FMM_H_
|
||||
#define FMM_H_
|
||||
|
||||
#include "hsakmttypes.h"
|
||||
#include "hsakmt/hsakmttypes.h"
|
||||
#include <stddef.h>
|
||||
|
||||
typedef enum {
|
||||
|
||||
@@ -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 <pthread.h>
|
||||
#include <stdint.h>
|
||||
#include <limits.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
#include "libhsakmt.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
#include "libhsakmt.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <assert.h>
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include <sys/syscall.h>
|
||||
#include "libhsakmt.h"
|
||||
#include "pmc_table.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <unistd.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <errno.h>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "libhsakmt.h"
|
||||
#include "fmm.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
*/
|
||||
|
||||
#include "libhsakmt.h"
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "libhsakmt.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
|
||||
HsaVersionInfo kfd_version_info;
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <sys/mman.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <linux/kfd_ioctl.h>
|
||||
#include <hsakmt/linux/kfd_ioctl.h>
|
||||
#include <fcntl.h>
|
||||
#include "unistd.h"
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#ifndef __KFD_BASE_DEBUG__H__
|
||||
#define __KFD_BASE_DEBUG__H__
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
#include <poll.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#define __GOOGLETEST_EXTENSION__H__
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
#include "KFDTestFlags.hpp"
|
||||
|
||||
enum LOGTYPE {
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
#include <amdgpu.h>
|
||||
#include <amdgpu_drm.h>
|
||||
#include <sys/param.h>
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
#include "OSWrapper.hpp"
|
||||
#include "KFDTestUtil.hpp"
|
||||
#include "Assemble.hpp"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include "KFDDBGTest.hpp"
|
||||
#include <sys/ptrace.h>
|
||||
#include <poll.h>
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include "KFDQMTest.hpp"
|
||||
#include "PM4Queue.hpp"
|
||||
#include "PM4Packet.hpp"
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
*/
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#ifndef __KFD_OPEN_CLOSE_KFD_TEST__H__
|
||||
#define __KFD_OPEN_CLOSE_KFD_TEST__H__
|
||||
|
||||
@@ -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 */
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#include <math.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "linux/kfd_ioctl.h"
|
||||
#include "hsakmt/linux/kfd_ioctl.h"
|
||||
#include "KFDRASTest.hpp"
|
||||
#include "PM4Queue.hpp"
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <vector>
|
||||
#include "OSWrapper.hpp"
|
||||
#include "GoogleTestExtension.hpp"
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
class BaseQueue;
|
||||
#define ARRAY_SIZE(_x) (sizeof(_x)/sizeof(_x[0]))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#ifndef __KFD__TEST__UTIL__QUEUE__H__
|
||||
#define __KFD__TEST__UTIL__QUEUE__H__
|
||||
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
#include <vector>
|
||||
|
||||
typedef struct {
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <string>
|
||||
|
||||
#include "KFDTestFlags.hpp"
|
||||
#include "hsakmt.h"
|
||||
#include "hsakmt/hsakmt.h"
|
||||
|
||||
#ifndef __OS__WRAPPER__H__
|
||||
#define __OS__WRAPPER__H__
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include "PM4Packet.hpp"
|
||||
#include "hsakmttypes.h"
|
||||
#include "hsakmt/hsakmttypes.h"
|
||||
#include "KFDBaseComponentTest.hpp"
|
||||
|
||||
#include "asic_reg/gfx_7_2_enum.h"
|
||||
|
||||
Ссылка в новой задаче
Block a user