Use mem obj offset when returning cpu ptr for read write

Change-Id: Ia624559f94e6af0ed602687814e3c11f6693f8a6
Signed-off-by: Mateusz Jablonski <mateusz.jablonski@intel.com>

Author: JablonskiMateusz

runtime/helpers/properties_helper.cpp

@@ -41,7 +41,7 @@ TransferProperties::TransferProperties(MemObj *memObj, cl_command_type cmdType,
 }
 
 void *TransferProperties::getCpuPtrForReadWrite() {
-    return ptrOffset(lockedPtr ? lockedPtr : memObj->getCpuAddressForMemoryTransfer(), offset[0]);
+    return ptrOffset(lockedPtr ? ptrOffset(lockedPtr, memObj->getOffset()) : memObj->getCpuAddressForMemoryTransfer(), offset[0]);
 }
 
 } // namespace OCLRT

unit_tests/helpers/transfer_properties_tests.cpp

@@ -91,3 +91,18 @@ TEST(TransferPropertiesTest, givenTransferPropertiesWhenLockedPtrIsNotSetThenItI
     ASSERT_EQ(nullptr, transferProperties.lockedPtr);
     EXPECT_NE(transferProperties.lockedPtr, transferProperties.getCpuPtrForReadWrite());
 }
+
+TEST(TransferPropertiesTest, givenTransferPropertiesWhenLockedPtrIsSetThenLockedPtrWithMemObjOffsetIsReturnedForReadWrite) {
+    MockBuffer buffer;
+
+    void *lockedPtr = reinterpret_cast<void *>(0x1000);
+    auto memObjOffset = MemoryConstants::cacheLineSize;
+    buffer.offset = memObjOffset;
+
+    size_t offset = 0;
+    size_t size = 4096u;
+    TransferProperties transferProperties(&buffer, CL_COMMAND_MAP_BUFFER, 0, false, &offset, &size, nullptr);
+    transferProperties.lockedPtr = lockedPtr;
+    auto expectedPtr = ptrOffset(lockedPtr, memObjOffset);
+    EXPECT_EQ(expectedPtr, transferProperties.getCpuPtrForReadWrite());
+}

unit_tests/mocks/mock_buffer.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 Intel Corporation
+ * Copyright (C) 2017-2019 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,6 +28,7 @@ class MockBufferStorage {
 class MockBuffer : public MockBufferStorage, public Buffer {
   public:
     using Buffer::magic;
+    using Buffer::offset;
     using MockBufferStorage::device;
 
     MockBuffer(GraphicsAllocation &alloc)