Revert "SWDEV-554608 - Add hipHostRegisterIoMemory for hipHostRegister (#1266…" (#1397)

This reverts commit c695c26.

Author: JeniferC99

hipamd/src/hip_memory.cpp

@@ -1287,7 +1287,7 @@ hipError_t hipHostGetFlags(unsigned int* flagsPtr, void* hostPtr) {
 hipError_t ihipHostRegister(void* hostPtr, size_t sizeBytes, unsigned int flags) {
   if (hostPtr == nullptr || sizeBytes == 0 ||
       flags & ~(hipHostRegisterPortable | hipHostRegisterMapped | hipExtHostRegisterCoarseGrained |
-                hipExtHostRegisterUncached | hipHostRegisterIoMemory)) {
+                hipExtHostRegisterUncached)) {
     return hipErrorInvalidValue;
   } else {
     unsigned int memFlags = CL_MEM_USE_HOST_PTR | CL_MEM_SVM_ATOMICS;
@@ -1296,11 +1296,6 @@ hipError_t ihipHostRegister(void* hostPtr, size_t sizeBytes, unsigned int flags)
         return hipErrorInvalidValue;
       }
       memFlags |= ROCCLR_MEM_HSA_UNCACHED;
-    } else if (flags & hipHostRegisterIoMemory) {
-      if (IS_WINDOWS) {
-        return hipErrorInvalidValue;
-      }
-      memFlags |= ROCCLR_MEM_IO_MEMORY;
     }
 
     amd::Memory* mem =

rocclr/device/device.hpp

@@ -1648,8 +1648,7 @@ class Device : public RuntimeObject {
     kNoAtomics = 0,
     kAtomics = 1,
     kKernArg = 2,
-    kUncachedAtomics = 4,
-    kIoMemory = 8
+    kUncachedAtomics = 4
   } MemorySegment;
 
   typedef enum CacheState {

rocclr/device/rocm/rocdevice.cpp

@@ -1976,7 +1976,6 @@ hsa_amd_memory_pool_t Device::getHostMemoryPool(MemorySegment mem_seg,
       segment = agentInfo->fine_grain_pool;
       break;
     case kUncachedAtomics:
-    case kIoMemory:
       if (agentInfo->ext_fine_grain_pool.handle != 0) {
         ClPrint(amd::LOG_DETAIL_DEBUG, amd::LOG_MEM,
                 "Using extended fine grained access system memory pool");
@@ -1999,7 +1998,6 @@ void* Device::hostAlloc(size_t size, size_t alignment, MemorySegment mem_seg,
   if (mem_seg == kKernArg) {
     memFlags |= HSA_AMD_MEMORY_POOL_EXECUTABLE_FLAG;
   }
-
   hsa_amd_memory_pool_t pool =
       getHostMemoryPool(mem_seg, static_cast<const amd::roc::AgentInfo*>(agentInfo));
   hsa_status_t stat = Hsa::memory_pool_allocate(pool, size, memFlags, &ptr);
@@ -2067,13 +2065,8 @@ void* Device::hostNumaAlloc(size_t size, size_t alignment, MemorySegment mem_seg
 void* Device::hostLock(void* hostMem, size_t size, const MemorySegment memSegment) const {
   hsa_amd_memory_pool_t pool = getHostMemoryPool(memSegment);
   void* deviceMemory = nullptr;
-  uint32_t memFlags = 0;
-  if (memSegment == kIoMemory) {
-    memFlags |= HSA_AMD_MEMORY_POOL_UNCACHED_FLAG;
-  }
-
   hsa_status_t status = Hsa::memory_lock_to_pool(
-      hostMem, size, const_cast<hsa_agent_t*>(&bkendDevice_), 1, pool, memFlags, &deviceMemory);
+      hostMem, size, const_cast<hsa_agent_t*>(&bkendDevice_), 1, pool, 0, &deviceMemory);
   ClPrint(amd::LOG_DEBUG, amd::LOG_MEM,
           "Locking to pool %p, size 0x%zx, hostMem = %p,"
           " deviceMemory = %p, memSegment = %d",

rocclr/device/rocm/rocmemory.hpp

@@ -154,9 +154,7 @@ class Memory : public device::Memory {
     return (memFlags & CL_MEM_SVM_ATOMICS) == 0 ? Device::MemorySegment::kNoAtomics
                                                 : ((memFlags & ROCCLR_MEM_HSA_UNCACHED) != 0
                                                        ? Device::MemorySegment::kUncachedAtomics
-                                                : ((memFlags & ROCCLR_MEM_IO_MEMORY) != 0
-                                                       ? Device::MemorySegment::kIoMemory
-                                                       : Device::MemorySegment::kAtomics));
+                                                       : Device::MemorySegment::kAtomics);
   }
 
  private:

rocclr/platform/memory.hpp

@@ -44,7 +44,6 @@
 #define ROCCLR_MEM_INTERPROCESS (1u << 26)
 #define ROCCLR_MEM_PHYMEM (1u << 25)
 #define ROCCLR_MEM_HSA_CONTIGUOUS (1u << 24)
-#define ROCCLR_MEM_IO_MEMORY (1u << 23)
 
 namespace amd::device {
 class Memory;