diff options
-rw-r--r-- | src/backends/backendsCommon/test/EndToEndTestImpl.hpp | 6 | ||||
-rw-r--r-- | src/backends/reference/RefTensorHandle.cpp | 5 | ||||
-rw-r--r-- | src/backends/reference/test/RefTensorHandleTests.cpp | 10 |
3 files changed, 11 insertions, 10 deletions
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp index 8a3e44fcca..040782bf68 100644 --- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp +++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp @@ -210,14 +210,12 @@ inline void ImportNonAlignedPointerTest(std::vector<BackendId> backends) }; // Misaligned input - float * misalignedInputData = inputData.data(); - misalignedInputData++; + float* misalignedInputData = reinterpret_cast<float*>(reinterpret_cast<char*>(inputData.data()) + 1); std::vector<float> outputData(5); // Misaligned output - float * misalignedOutputData = outputData.data(); - misalignedOutputData++; + float* misalignedOutputData = reinterpret_cast<float*>(reinterpret_cast<char*>(outputData.data()) + 1); InputTensors inputTensors { diff --git a/src/backends/reference/RefTensorHandle.cpp b/src/backends/reference/RefTensorHandle.cpp index 42ac7f0826..84a74edc1d 100644 --- a/src/backends/reference/RefTensorHandle.cpp +++ b/src/backends/reference/RefTensorHandle.cpp @@ -110,8 +110,9 @@ bool RefTensorHandle::Import(void* memory, MemorySource source) { if (source == MemorySource::Malloc) { - // Checks the 16 byte memory alignment. - if (reinterpret_cast<uint64_t>(memory) % 16) + // Check memory alignment + constexpr uintptr_t alignment = sizeof(size_t); + if (reinterpret_cast<uintptr_t>(memory) % alignment) { if (m_Imported) { diff --git a/src/backends/reference/test/RefTensorHandleTests.cpp b/src/backends/reference/test/RefTensorHandleTests.cpp index 2c5d6d49ec..be229bf844 100644 --- a/src/backends/reference/test/RefTensorHandleTests.cpp +++ b/src/backends/reference/test/RefTensorHandleTests.cpp @@ -92,15 +92,17 @@ BOOST_AUTO_TEST_CASE(MisalignedPointer) TensorInfo info({2}, DataType::Float32); RefTensorHandle handle(info, memoryManager, static_cast<unsigned int>(MemorySource::Malloc)); - // Allocates a 2 int array + // Allocate a 2 int array int* testPtr = new int[2]; - int* misalignedPtr = testPtr + 1; - BOOST_CHECK(!handle.Import(static_cast<void *>(misalignedPtr), MemorySource::Malloc)); + // Increment pointer by 1 byte + void* misalignedPtr = static_cast<void*>(reinterpret_cast<char*>(testPtr) + 1); + + BOOST_CHECK(!handle.Import(misalignedPtr, MemorySource::Malloc)); delete[] testPtr; } #endif -BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file +BOOST_AUTO_TEST_SUITE_END() |