Revert "Always reserve 48 bit window on 57 bit CPU"

This reverts commit 8f10db0c7ff13a72526141269ad09142a5d74e5f.

Signed-off-by: Bartosz Dunajski <bartosz.dunajski@intel.com>

Author: BartoszDunajski

opencl/test/unit_test/memory_manager/gfx_partition_tests.inl

@@ -9,29 +9,11 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/ptr_math.h"
 #include "shared/source/os_interface/os_memory.h"
-#include "shared/source/utilities/cpu_info.h"
 
 #include "opencl/test/unit_test/mocks/mock_gfx_partition.h"
 
 #include "gtest/gtest.h"
 
-// CpuInfo is a singleton object so we have to patch it in place
-class CpuInfoOverrideCpuVirtualAddressSize {
-  public:
-    class MockCpuInfo : public CpuInfo {
-      public:
-        using CpuInfo::virtualAddressSize;
-    } *mockCpuInfo = reinterpret_cast<MockCpuInfo *>(const_cast<CpuInfo *>(&CpuInfo::getInstance()));
-    CpuInfoOverrideCpuVirtualAddressSize(uint32_t newCpuVirtualAddressSize) {
-        virtualAddressSizeSave = mockCpuInfo->getVirtualAddressSize();
-        mockCpuInfo->virtualAddressSize = newCpuVirtualAddressSize;
-    }
-    ~CpuInfoOverrideCpuVirtualAddressSize() {
-        mockCpuInfo->virtualAddressSize = virtualAddressSizeSave;
-    }
-    uint32_t virtualAddressSizeSave = 0;
-};
-
 using namespace NEO;
 
 constexpr size_t reservedCpuAddressRangeSize = is64bit ? (6 * 4 * GB) : 0;
@@ -159,16 +141,6 @@ TEST(GfxPartitionTest, testGfxPartitionUnsupportedRange) {
     EXPECT_FALSE(gfxPartition.init(maxNBitValue(48 + 1), reservedCpuAddressRangeSize, 0, 1));
 }
 
-TEST(GfxPartitionTest, testGfxPartitionUnsupportedCpuVirualAddressSize) {
-    if (is32bit) {
-        GTEST_SKIP();
-    }
-
-    CpuInfoOverrideCpuVirtualAddressSize overrideCpuVirtualAddressSize(48 + 1);
-    MockGfxPartition gfxPartition;
-    EXPECT_FALSE(gfxPartition.init(maxNBitValue(48), reservedCpuAddressRangeSize, 0, 1));
-}
-
 TEST(GfxPartitionTest, testGfxPartitionFullRange48BitSVMHeap64KBSplit) {
     uint32_t rootDeviceIndex = 3;
     size_t numRootDevices = 5;
@@ -358,4 +330,4 @@ TEST(GfxPartitionTest, givenInternalHeapWhenAllocatingSmallOrBigChunkThenAddress
         EXPECT_EQ(gfxPartition.getHeapBase(heaps[i]) + GfxPartition::internalFrontWindowPoolSize, address);
         gfxPartition.heapFree(heaps[i], address, sizeToAlloc);
     }
-}
+}

shared/source/memory_manager/gfx_partition.cpp

@@ -10,7 +10,6 @@
 #include "shared/source/helpers/aligned_memory.h"
 #include "shared/source/helpers/heap_assigner.h"
 #include "shared/source/memory_manager/memory_manager.h"
-#include "shared/source/utilities/cpu_info.h"
 
 namespace NEO {
 
@@ -139,8 +138,7 @@ bool GfxPartition::init(uint64_t gpuAddressSpace, size_t cpuAddressRangeSizeToRe
         gfxBase = maxNBitValue(32) + 1;
         heapInit(HeapIndex::HEAP_SVM, 0ull, gfxBase);
     } else {
-        auto cpuVirtualAddressSize = CpuInfo::getInstance().getVirtualAddressSize();
-        if (cpuVirtualAddressSize == 48 && gpuAddressSpace == maxNBitValue(48)) {
+        if (gpuAddressSpace == maxNBitValue(48)) {
             gfxBase = maxNBitValue(48 - 1) + 1;
             heapInit(HeapIndex::HEAP_SVM, 0ull, gfxBase);
         } else if (gpuAddressSpace == maxNBitValue(47)) {
@@ -163,7 +161,7 @@ bool GfxPartition::init(uint64_t gpuAddressSpace, size_t cpuAddressRangeSizeToRe
             gfxBase = 0ull;
             heapInit(HeapIndex::HEAP_SVM, 0ull, 0ull);
         } else {
-            if (!initAdditionalRange(cpuVirtualAddressSize, gpuAddressSpace, gfxBase, gfxTop, rootDeviceIndex, numRootDevices)) {
+            if (!initAdditionalRange(gpuAddressSpace, gfxBase, gfxTop, rootDeviceIndex, numRootDevices)) {
                 return false;
             }
         }

shared/source/memory_manager/gfx_partition.h

@@ -107,7 +107,7 @@ class GfxPartition {
     static const std::array<HeapIndex, 7> heapNonSvmNames;
 
   protected:
-    bool initAdditionalRange(uint32_t cpuAddressWidth, uint64_t gpuAddressSpace, uint64_t &gfxBase, uint64_t &gfxTop, uint32_t rootDeviceIndex, size_t numRootDevices);
+    bool initAdditionalRange(uint64_t gpuAddressSpace, uint64_t &gfxBase, uint64_t &gfxTop, uint32_t rootDeviceIndex, size_t numRootDevices);
 
     class Heap {
       public:

shared/source/memory_manager/gfx_partition_init_additional_range.cpp

@@ -9,7 +9,7 @@
 
 namespace NEO {
 
-bool GfxPartition::initAdditionalRange(uint32_t cpuVirtualAddressSize, uint64_t gpuAddressSpace, uint64_t &gfxBase, uint64_t &gfxTop, uint32_t rootDeviceIndex, size_t numRootDevices) {
+bool GfxPartition::initAdditionalRange(uint64_t gpuAddressSpace, uint64_t &gfxBase, uint64_t &gfxTop, uint32_t rootDeviceIndex, size_t numRootDevices) {
     return false;
 }