intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 09:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: respect arg size when setting kernel arg in OCL path"

Browse Source 
This reverts commit c10ff0f3c6.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
This commit is contained in:
Compute-Runtime-Validation
2025-02-27 03:53:44 +01:00
committed by Compute-Runtime-Automation
parent c02dc8208c
commit 5e4238ddb1
5 changed files with 53 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
opencl/test/unit_test/kernel/kernel_immediate_arg_tests.cpp
View File

@@ -221,7 +221,8 @@ TYPED_TEST(KernelArgImmediateTest, givenTooLargePatchSizeWhenSettingArgThenDontR
const auto memoryBeyondLimitBefore = *reinterpret_cast<TypeParam *>(memoryBeyondLimitAddress);
auto retVal = pKernel->setArg(0, sizeof(memory), memory);
this->pKernelInfo->argAsVal(0).elements[0].size = sizeof(TypeParam) + 1;
auto retVal = pKernel->setArg(0, sizeof(TypeParam), &memory[0]);
const auto memoryBeyondLimitAfter = *reinterpret_cast<TypeParam *>(memoryBeyondLimitAddress);
EXPECT_EQ(memoryBeyondLimitBefore, memoryBeyondLimitAfter);
@@ -256,6 +257,43 @@ TYPED_TEST(KernelArgImmediateTest, givenNotTooLargePatchSizeWhenSettingArgThenDo
}
}
TYPED_TEST(KernelArgImmediateTest, givenMulitplePatchesAndFirstPatchSizeTooLargeWhenSettingArgThenDontReadMemoryBeyondLimit) {
if (sizeof(TypeParam) == 1)
return; // multiple patch chars don't make sense
for (auto &rootDeviceIndex : this->context->getRootDeviceIndices()) {
auto pKernel = this->pMultiDeviceKernel->getKernel(rootDeviceIndex);
TypeParam memory[2];
std::memset(&memory[0], 0xaa, sizeof(TypeParam));
std::memset(&memory[1], 0xbb, sizeof(TypeParam));
auto &elements = this->pKernelInfo->argAsVal(3).elements;
const auto destinationMemoryAddress1 = pKernel->getCrossThreadData() +
elements[2].offset;
const auto destinationMemoryAddress2 = pKernel->getCrossThreadData() +
elements[1].offset;
const auto memoryBeyondLimitAddress1 = destinationMemoryAddress1 + sizeof(TypeParam);
const auto memoryBeyondLimitAddress2 = destinationMemoryAddress2 + sizeof(TypeParam) / 2;
const std::vector<unsigned char> memoryBeyondLimitBefore1(memoryBeyondLimitAddress1, memoryBeyondLimitAddress1 + sizeof(TypeParam));
const std::vector<unsigned char> memoryBeyondLimitBefore2(memoryBeyondLimitAddress2, memoryBeyondLimitAddress2 + sizeof(TypeParam) / 2);
elements[2].sourceOffset = 0;
elements[1].sourceOffset = sizeof(TypeParam) / 2;
elements[2].size = sizeof(TypeParam);
elements[1].size = sizeof(TypeParam) / 2;
auto retVal = pKernel->setArg(3, sizeof(TypeParam), &memory[0]);
EXPECT_EQ(0, std::memcmp(memoryBeyondLimitBefore1.data(), memoryBeyondLimitAddress1, sizeof(TypeParam)));
EXPECT_EQ(0, std::memcmp(memoryBeyondLimitBefore2.data(), memoryBeyondLimitAddress2, sizeof(TypeParam) / 2));
EXPECT_EQ(0, std::memcmp(&memory[0], destinationMemoryAddress1, sizeof(TypeParam)));
EXPECT_EQ(0, std::memcmp(&memory[0], destinationMemoryAddress2, sizeof(TypeParam) / 2));
EXPECT_EQ(CL_SUCCESS, retVal);
}
}
TYPED_TEST(KernelArgImmediateTest, givenMulitplePatchesAndSecondPatchSizeTooLargeWhenSettingArgThenDontReadMemoryBeyondLimit) {
if (sizeof(TypeParam) == 1)
return; // multiple patch chars don't make sense
@@ -272,17 +310,17 @@ TYPED_TEST(KernelArgImmediateTest, givenMulitplePatchesAndSecondPatchSizeTooLarg
const auto destinationMemoryAddress2 = pKernel->getCrossThreadData() +
elements[1].offset;
const auto memoryBeyondLimitAddress1 = destinationMemoryAddress1 + sizeof(TypeParam) / 2;
const auto memoryBeyondLimitAddress2 = destinationMemoryAddress2 + sizeof(TypeParam);
const auto memoryBeyondLimitAddress2 = destinationMemoryAddress2 + sizeof(TypeParam) / 2;
const std::vector<unsigned char> memoryBeyondLimitBefore1(memoryBeyondLimitAddress1, memoryBeyondLimitAddress1 + sizeof(TypeParam) / 2);
const std::vector<unsigned char> memoryBeyondLimitBefore2(memoryBeyondLimitAddress2, memoryBeyondLimitAddress2 + sizeof(TypeParam));
const std::vector<unsigned char> memoryBeyondLimitBefore2(memoryBeyondLimitAddress2, memoryBeyondLimitAddress2 + sizeof(TypeParam) / 2);
elements[0].size = 0;
elements[2].sourceOffset = 0;
elements[1].sourceOffset = sizeof(TypeParam) / 2;
elements[2].size = sizeof(TypeParam) / 2;
elements[1].size = sizeof(TypeParam);
auto retVal = pKernel->setArg(3, sizeof(memory), memory);
auto retVal = pKernel->setArg(3, sizeof(TypeParam), &memory[0]);
EXPECT_EQ(0, std::memcmp(memoryBeyondLimitBefore1.data(), memoryBeyondLimitAddress1, sizeof(TypeParam) / 2));
EXPECT_EQ(0, std::memcmp(memoryBeyondLimitBefore2.data(), memoryBeyondLimitAddress2, sizeof(TypeParam) / 2));
@@ -295,9 +333,6 @@ TYPED_TEST(KernelArgImmediateTest, givenMulitplePatchesAndSecondPatchSizeTooLarg
}
TYPED_TEST(KernelArgImmediateTest, givenMultiplePatchesAndOneSourceOffsetBeyondArgumentWhenSettingArgThenDontCopyThisPatch) {
if (sizeof(TypeParam) == 1u) {
GTEST_SKIP();
}
for (auto &rootDeviceIndex : this->context->getRootDeviceIndices()) {
auto pKernel = this->pMultiDeviceKernel->getKernel(rootDeviceIndex);
TypeParam memory[2];
@@ -310,23 +345,22 @@ TYPED_TEST(KernelArgImmediateTest, givenMultiplePatchesAndOneSourceOffsetBeyondA
const auto destinationMemoryAddress2 = pKernel->getCrossThreadData() +
elements[2].offset;
const auto memoryBeyondLimitAddress1 = destinationMemoryAddress1 + sizeof(TypeParam);
const auto memoryBeyondLimitAddress2 = destinationMemoryAddress2 + 1;
const auto memoryBeyondLimitAddress2 = destinationMemoryAddress2;
const std::vector<unsigned char> memoryBeyondLimitBefore1(memoryBeyondLimitAddress1, memoryBeyondLimitAddress1 + sizeof(TypeParam));
const std::vector<unsigned char> memoryBeyondLimitBefore2(memoryBeyondLimitAddress2, memoryBeyondLimitAddress2 + sizeof(TypeParam) - 1);
const std::vector<unsigned char> memoryBeyondLimitBefore2(memoryBeyondLimitAddress2, memoryBeyondLimitAddress2 + sizeof(TypeParam));
elements[0].size = 0;
elements[1].sourceOffset = 0;
elements[1].size = sizeof(TypeParam);
elements[2].sourceOffset = sizeof(TypeParam);
elements[2].size = 1;
auto retVal = pKernel->setArg(3, sizeof(memory), memory);
auto retVal = pKernel->setArg(3, sizeof(TypeParam), &memory[0]);
EXPECT_EQ(0, std::memcmp(memoryBeyondLimitBefore1.data(), memoryBeyondLimitAddress1, memoryBeyondLimitBefore1.size()));
EXPECT_EQ(0, std::memcmp(memoryBeyondLimitBefore2.data(), memoryBeyondLimitAddress2, memoryBeyondLimitBefore2.size()));
EXPECT_EQ(0, std::memcmp(&memory[0], destinationMemoryAddress1, sizeof(TypeParam)));
EXPECT_EQ(0, std::memcmp(&memory[1], destinationMemoryAddress2, 1));
EXPECT_EQ(CL_SUCCESS, retVal);
}