AI/rocm-systems
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hsakmt: Undo HSAKMT prefix for PAGE_SHIFT

Browse Source 
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>
This commit is contained in:
Kent Russell committed 2024-09-20 11:04:34 -04:00
1 parent ff6e1b44bf
commit daad183bf8
8 files changed
+30 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
+4 -4
View File
@@ -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
+2 -2
View File
@@ -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
+5 -1
View File
@@ -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 {
libhsakmt/tests/rdma/simple/drv/amdp2ptest.c
+2 -2
View File
@@ -304,7 +304,7 @@ static int amdp2ptest_mmap(struct file *filp, struct vm_area_struct *vma)
struct va_pages_node *va_pages = NULL;
struct amdp2ptest_pages_list *list = filp->private_data;
struct list_head *p, *n;
uint64_t gpu_va = vma->vm_pgoff << HSAKMT_PAGE_SHIFT;
uint64_t gpu_va = vma->vm_pgoff << PAGE_SHIFT;
MSG_INFO("Mapping to CPU user space\n");
MSG_INFO("Begin vm_start 0x%lx, vm_end 0x%lx\n", vma->vm_start, vma->vm_end);
@@ -340,7 +340,7 @@ static int amdp2ptest_mmap(struct file *filp, struct vm_area_struct *vma)
addr, sg->dma_address, size);
ret = remap_pfn_range(vma,
addr,
sg->dma_address >> HSAKMT_PAGE_SHIFT,
sg->dma_address >> PAGE_SHIFT,
size,
vma->vm_page_prot);
if (ret) {