diff --git a/opencl/source/mem_obj/buffer.cpp b/opencl/source/mem_obj/buffer.cpp index b4b8a2193d..c3e6a4814f 100644 --- a/opencl/source/mem_obj/buffer.cpp +++ b/opencl/source/mem_obj/buffer.cpp @@ -43,7 +43,7 @@ ValidateInputAndCreateBufferFunc validateInputAndCreateBuffer = Buffer::validate } // namespace BufferFunctions Buffer::Buffer(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -175,7 +175,7 @@ Buffer *Buffer::create(Context *context, } Buffer *Buffer::create(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -456,7 +456,7 @@ Buffer *Buffer::createSharedBuffer(Context *context, cl_mem_flags flags, Sharing return sharedBuffer; } -void Buffer::checkMemory(MemoryProperties memoryProperties, +void Buffer::checkMemory(const MemoryProperties &memoryProperties, size_t size, void *hostPtr, cl_int &errcodeRet, @@ -506,7 +506,6 @@ void Buffer::checkMemory(MemoryProperties memoryProperties, errcodeRet = CL_INVALID_HOST_PTR; } } - return; } AllocationType Buffer::getGraphicsAllocationTypeAndCompressionPreference(const MemoryProperties &properties, Context &context, @@ -669,7 +668,7 @@ bool Buffer::isReadWriteOnCpuPreferred(void *ptr, size_t size, const Device &dev } Buffer *Buffer::createBufferHw(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, diff --git a/opencl/source/mem_obj/buffer.h b/opencl/source/mem_obj/buffer.h index a5b96fb777..5dc32c5a1f 100644 --- a/opencl/source/mem_obj/buffer.h +++ b/opencl/source/mem_obj/buffer.h @@ -27,7 +27,7 @@ class MemoryManager; struct EncodeSurfaceStateArgs; using BufferCreatFunc = Buffer *(*)(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -79,7 +79,7 @@ class Buffer : public MemObj { cl_int &errcodeRet); static Buffer *create(Context *context, - MemoryProperties properties, + const MemoryProperties &properties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -92,7 +92,7 @@ class Buffer : public MemObj { MultiGraphicsAllocation multiGraphicsAllocation); static Buffer *createBufferHw(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -163,11 +163,11 @@ class Buffer : public MemObj { bool isCompressed(uint32_t rootDeviceIndex) const; - static bool validateHandleType(MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem); + static bool validateHandleType(const MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem); protected: Buffer(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -180,7 +180,7 @@ class Buffer : public MemObj { Buffer(); - static void checkMemory(MemoryProperties memoryProperties, + static void checkMemory(const MemoryProperties &memoryProperties, size_t size, void *hostPtr, cl_int &errcodeRet, @@ -202,7 +202,7 @@ template class BufferHw : public Buffer { public: BufferHw(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, @@ -219,7 +219,7 @@ class BufferHw : public Buffer { bool isReadOnlyArgument, const Device &device, bool useGlobalAtomics, bool areMultipleSubDevicesInContext) override; static Buffer *create(Context *context, - MemoryProperties memoryProperties, + const MemoryProperties &memoryProperties, cl_mem_flags flags, cl_mem_flags_intel flagsIntel, size_t size, diff --git a/opencl/source/mem_obj/buffer_linux.cpp b/opencl/source/mem_obj/buffer_linux.cpp index 18442c1e6b..4a00d3f55a 100644 --- a/opencl/source/mem_obj/buffer_linux.cpp +++ b/opencl/source/mem_obj/buffer_linux.cpp @@ -8,7 +8,7 @@ #include "opencl/source/mem_obj/buffer.h" namespace NEO { -bool Buffer::validateHandleType(MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem) { +bool Buffer::validateHandleType(const MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem) { if (memoryProperties.handleType == static_cast(UnifiedSharingHandleType::LinuxFd)) { extMem.type = UnifiedSharingHandleType::LinuxFd; return true; diff --git a/opencl/source/mem_obj/buffer_windows.cpp b/opencl/source/mem_obj/buffer_windows.cpp index f000c5974a..dc371fc9f0 100644 --- a/opencl/source/mem_obj/buffer_windows.cpp +++ b/opencl/source/mem_obj/buffer_windows.cpp @@ -8,7 +8,7 @@ #include "opencl/source/mem_obj/buffer.h" namespace NEO { -bool Buffer::validateHandleType(MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem) { +bool Buffer::validateHandleType(const MemoryProperties &memoryProperties, UnifiedSharingMemoryDescription &extMem) { if (memoryProperties.handleType == static_cast(UnifiedSharingHandleType::Win32Nt)) { extMem.type = UnifiedSharingHandleType::Win32Nt; return true; diff --git a/opencl/test/unit_test/mem_obj/buffer_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_tests.cpp index 17395a906b..321e30bec7 100644 --- a/opencl/test/unit_test/mem_obj/buffer_tests.cpp +++ b/opencl/test/unit_test/mem_obj/buffer_tests.cpp @@ -902,7 +902,7 @@ TEST_P(NoHostPtr, GivenNoHostPtrWhenHwBufferCreationFailsThenReturnNullptr) { bufferFuncsBackup[i] = bufferFactory[i]; bufferFactory[i].createBufferFunction = [](Context *, - MemoryProperties, + const MemoryProperties &, cl_mem_flags, cl_mem_flags_intel, size_t, diff --git a/shared/source/helpers/memory_properties_helpers.h b/shared/source/helpers/memory_properties_helpers.h index 1697c18ca8..343aa09a46 100644 --- a/shared/source/helpers/memory_properties_helpers.h +++ b/shared/source/helpers/memory_properties_helpers.h @@ -22,7 +22,7 @@ class MemoryPropertiesHelper { }; static AllocationProperties getAllocationProperties( - uint32_t rootDeviceIndex, MemoryProperties memoryProperties, bool allocateMemory, size_t size, + uint32_t rootDeviceIndex, const MemoryProperties &memoryProperties, bool allocateMemory, size_t size, AllocationType type, bool multiStorageResource, const HardwareInfo &hwInfo, DeviceBitfield subDevicesBitfieldParam, bool deviceOnlyVisibilty); diff --git a/shared/source/helpers/memory_properties_helpers_base.inl b/shared/source/helpers/memory_properties_helpers_base.inl index 874b62fee0..05679cf3ac 100644 --- a/shared/source/helpers/memory_properties_helpers_base.inl +++ b/shared/source/helpers/memory_properties_helpers_base.inl @@ -12,7 +12,7 @@ namespace NEO { AllocationProperties MemoryPropertiesHelper::getAllocationProperties( - uint32_t rootDeviceIndex, MemoryProperties memoryProperties, bool allocateMemory, size_t size, + uint32_t rootDeviceIndex, const MemoryProperties &memoryProperties, bool allocateMemory, size_t size, AllocationType type, bool multiStorageResource, const HardwareInfo &hwInfo, DeviceBitfield subDevicesBitfieldParam, bool deviceOnlyVisibilty) {