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]

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 <errno.h>
 #include <stdlib.h>
 #include <string.h>

projects/rocr-runtime/src/events.c

@@ -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;

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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>

projects/rocr-runtime/src/fmm.h

@@ -26,7 +26,7 @@
 #ifndef FMM_H_
 #define FMM_H_
 
-#include "hsakmttypes.h"
+#include "hsakmt/hsakmttypes.h"
 #include <stddef.h>
 
 typedef enum {

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 <pthread.h>
 #include <stdint.h>
 #include <limits.h>

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 <stdlib.h>
 #include <stdio.h>
 #include <string.h>

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 <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;
-}
+}

projects/rocr-runtime/src/perfctr.c

@@ -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>

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 <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>

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 <stdlib.h>
 #include <stdio.h>
 

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)

projects/rocr-runtime/src/version.c

@@ -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;