Change width programming for GMM

Change-Id: If2a1a0d582cbebb209de182895d1f6decedcfb73
Signed-off-by: Dunajski, Bartosz <bartosz.dunajski@intel.com>

Author: BartoszDunajski

runtime/gmm_helper/gmm.cpp

@@ -21,7 +21,7 @@ Gmm::Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable) : Gmm(ali
 Gmm::Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable, bool preferRenderCompressed, bool systemMemoryPool) {
     resourceParams.Type = RESOURCE_BUFFER;
     resourceParams.Format = GMM_FORMAT_GENERIC_8BIT;
-    resourceParams.BaseWidth = static_cast<uint32_t>(alignedSize);
+    resourceParams.BaseWidth64 = static_cast<uint64_t>(alignedSize);
     resourceParams.BaseHeight = 1;
     resourceParams.Depth = 1;
     if (!uncacheable) {
@@ -41,7 +41,7 @@ Gmm::Gmm(const void *alignedPtr, size_t alignedSize, bool uncacheable, bool pref
         resourceParams.NoGfxMemory = 1u;
     }
 
-    if (resourceParams.BaseWidth >= GmmHelper::maxPossiblePitch) {
+    if (resourceParams.BaseWidth64 >= GmmHelper::maxPossiblePitch) {
         resourceParams.Flags.Gpu.NoRestriction = 1;
     }
 
@@ -61,7 +61,7 @@ Gmm::Gmm(ImageInfo &inputOutputImgInfo) {
 
 void Gmm::queryImageParams(ImageInfo &imgInfo) {
     this->resourceParams = {};
-    uint32_t imageWidth = static_cast<uint32_t>(imgInfo.imgDesc->image_width);
+    uint64_t imageWidth = static_cast<uint64_t>(imgInfo.imgDesc->image_width);
     uint32_t imageHeight = 1;
     uint32_t imageDepth = 1;
     uint32_t imageCount = 1;
@@ -101,7 +101,7 @@ void Gmm::queryImageParams(ImageInfo &imgInfo) {
     this->resourceParams.Usage = GMM_RESOURCE_USAGE_TYPE::GMM_RESOURCE_USAGE_OCL_IMAGE;
     this->resourceParams.Format = imgInfo.surfaceFormat->GMMSurfaceFormat;
     this->resourceParams.Flags.Gpu.Texture = 1;
-    this->resourceParams.BaseWidth = imageWidth;
+    this->resourceParams.BaseWidth64 = imageWidth;
     this->resourceParams.BaseHeight = imageHeight;
     this->resourceParams.Depth = imageDepth;
     this->resourceParams.ArraySize = imageCount;

runtime/gmm_helper/gmm_helper.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -35,7 +35,7 @@ class GmmHelper {
 
     static constexpr uint32_t cacheDisabledIndex = 0;
     static constexpr uint32_t cacheEnabledIndex = 4;
-    static constexpr uint32_t maxPossiblePitch = 2147483648;
+    static constexpr uint64_t maxPossiblePitch = 2147483648;
 
     static uint64_t canonize(uint64_t address);
     static uint64_t decanonize(uint64_t address);

unit_tests/gmm_helper/gmm_helper_tests.cpp

@@ -94,7 +94,7 @@ TEST_F(GmmTests, resourceCleanupOnDelete) {
 }
 
 TEST_F(GmmTests, GivenBufferSizeLargerThenMaxPitchWhenAskedForGmmCreationThenGMMResourceIsCreatedWithNoRestrictionsFlag) {
-    auto maxSize = GmmHelper::maxPossiblePitch;
+    auto maxSize = static_cast<size_t>(GmmHelper::maxPossiblePitch);
 
     MemoryManager *mm = new OsAgnosticMemoryManager(false, false, executionEnvironment);
     void *pSysMem = mm->allocateSystemMemory(4096, 4096);
@@ -170,13 +170,20 @@ TEST_F(GmmTests, validImageTypeQuery) {
     EXPECT_EQ(static_cast<uint32_t>(queryGmm->resourceParams.Format),
               static_cast<uint32_t>(GMM_RESOURCE_FORMAT::GMM_FORMAT_R8G8B8A8_UNORM));
     EXPECT_EQ(queryGmm->resourceParams.Flags.Gpu.Texture, 1u);
-    EXPECT_EQ(queryGmm->resourceParams.BaseWidth, 17u);
+    EXPECT_EQ(queryGmm->resourceParams.BaseWidth64, 17u);
     EXPECT_EQ(queryGmm->resourceParams.BaseHeight, 17u);
     EXPECT_EQ(queryGmm->resourceParams.Depth, 17u);
     EXPECT_EQ(queryGmm->resourceParams.ArraySize, 1u);
     EXPECT_EQ(queryGmm->resourceParams.Flags.Wa.__ForceOtherHVALIGN4, 1u);
 }
 
+TEST_F(GmmTests, givenWidthWhenCreatingResourceThenSetWidth64Field) {
+    const void *dummyPtr = reinterpret_cast<void *>(0x123);
+    size_t allocationSize = std::numeric_limits<size_t>::max();
+    Gmm gmm(dummyPtr, allocationSize, false);
+    EXPECT_EQ(static_cast<uint64_t>(allocationSize), gmm.resourceParams.BaseWidth64);
+}
+
 TEST_F(GmmTests, givenNullptrWhenGmmConstructorIsCalledThenNoGfxMemoryIsProperlySet) {
     void *pSysMem = nullptr;
     std::unique_ptr<Gmm> gmm(new Gmm(pSysMem, 4096, false));
@@ -644,7 +651,7 @@ TEST(GmmTest, whenResourceIsCreatedThenHandleItsOwnership) {
     GMM_RESCREATE_PARAMS gmmParams = {};
     gmmParams.Type = RESOURCE_BUFFER;
     gmmParams.Format = GMM_FORMAT_GENERIC_8BIT;
-    gmmParams.BaseWidth = 1;
+    gmmParams.BaseWidth64 = 1;
     gmmParams.BaseHeight = 1;
     gmmParams.Depth = 1;
     gmmParams.Flags.Info.Linear = 1;

unit_tests/mocks/mock_gmm_resource_info.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -70,7 +70,7 @@ void MockGmmResourceInfo::computeRowPitch() {
     if (mockResourceCreateParams.OverridePitch) {
         rowPitch = mockResourceCreateParams.OverridePitch;
     } else {
-        rowPitch = static_cast<size_t>(mockResourceCreateParams.BaseWidth * (surfaceFormatInfo->PerChannelSizeInBytes * surfaceFormatInfo->NumChannels));
+        rowPitch = static_cast<size_t>(mockResourceCreateParams.BaseWidth64 * (surfaceFormatInfo->PerChannelSizeInBytes * surfaceFormatInfo->NumChannels));
         rowPitch = alignUp(rowPitch, 64);
     }
 }