hsakmt: Undo HSAKMT prefix for PAGE_SHIFT

We had skipped doing it for PAGE_SIZE, but it should be left as the
regular PAGE_SHIFT name, especially for users who are using different
headers. We want PAGE_SHIFT and PAGE_SIZE to be consistent with one
another, so set them both explicitly to the same value if either
of them is undefined

Change-Id: I121d81c48409dd77351b59a192d824e2419a2410
Signed-off-by: Kent Russell <kent.russell@amd.com>

libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp

@@ -57,7 +57,7 @@ void KFDSVMEvictTest::TearDown() {
 }
 
 HSAint32 KFDSVMEvictTest::GetBufferCounter(HSAuint64 vramSize, HSAuint64 vramBufSize) {
-    HSAuint64 vramBufSizeInPages = vramBufSize >> HSAKMT_PAGE_SHIFT;
+    HSAuint64 vramBufSizeInPages = vramBufSize >> PAGE_SHIFT;
     HSAuint64 sysMemSize = GetSysMemSize();
     HSAuint64 size, sizeInPages;
     HSAuint32 count;
@@ -79,7 +79,7 @@ HSAint32 KFDSVMEvictTest::GetBufferCounter(HSAuint64 vramSize, HSAuint64 vramBuf
     if (!xnack_enable && size > (sysMemSize - (sysMemSize >> 4)))
         return 0;
 
-    sizeInPages = size >> HSAKMT_PAGE_SHIFT;
+    sizeInPages = size >> PAGE_SHIFT;
     count = sizeInPages / (vramBufSizeInPages * N_PROCESSES);
 
     return count;
@@ -105,10 +105,10 @@ HSAint64 KFDSVMEvictTest::GetBufferSize(HSAuint64 vramSize, HSAuint32 count,
     if (!xnack_enable && size > (sysMemSize - (sysMemSize >> 4)))
         return 0;
 
-    sizeInPages = size >> HSAKMT_PAGE_SHIFT;
+    sizeInPages = size >> PAGE_SHIFT;
     vramBufSizeInPages = sizeInPages / (count * N_PROCESSES);
 
-    return vramBufSizeInPages << HSAKMT_PAGE_SHIFT;
+    return vramBufSizeInPages << PAGE_SHIFT;
 }
 
 void KFDSVMEvictTest::AllocBuffers(HSAuint32 defaultGPUNode, HSAuint32 count, HSAuint64 vramBufSize,

libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp

@@ -1452,8 +1452,8 @@ unsigned int ReadSMIEventThread(void* p) {
     EXPECT_EQ(sscanf(msg, "%x %ld -%d @%lx(%d) %d->%x %x:%d %d\n", &event_id, &timestamp, &pid,
                      &addr, &size, &unused, &unused, &unused, &unused, &trigger), 10);
     EXPECT_EQ(event_id, HSA_SMI_EVENT_MIGRATE_START);
-    EXPECT_EQ((HSAuint64 *)(addr << HSAKMT_PAGE_SHIFT), pArgs->pBuf);
-    EXPECT_EQ(size << HSAKMT_PAGE_SHIFT, pArgs->BufSize);
+    EXPECT_EQ((HSAuint64 *)(addr << PAGE_SHIFT), pArgs->pBuf);
+    EXPECT_EQ(size << PAGE_SHIFT, pArgs->BufSize);
     EXPECT_EQ(pid, getpid());
     EXPECT_EQ(trigger, HSA_MIGRATE_TRIGGER_PREFETCH);
     close(fd);

libhsakmt/tests/kfdtest/src/OSWrapper.hpp

@@ -33,7 +33,11 @@
 
 #ifndef PAGE_SIZE
 #define PAGE_SIZE   (1<<12)
-#define HSAKMT_PAGE_SHIFT  (12)
+#define PAGE_SHIFT  (12)
+#endif
+#ifndef PAGE_SHIFT
+#define PAGE_SIZE   (1<<12)
+#define PAGE_SHIFT  (12)
 #endif
 
 enum TEXTCOLOR {