Skip to content

Commit 88c6c9d

Browse files
Enable support for half_float images on BCS OCL
Signed-off-by: Kamil Kopryk <[email protected]> Related-To: NEO-4692
1 parent ad5735c commit 88c6c9d

File tree

2 files changed

+5
-23
lines changed

2 files changed

+5
-23
lines changed

opencl/source/command_queue/command_queue.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -767,17 +767,16 @@ bool CommandQueue::blitEnqueuePreferred(cl_command_type cmdType, const BuiltinOp
767767
bool CommandQueue::blitEnqueueImageAllowed(const size_t *origin, const size_t *region, const Image &image) {
768768
const auto &hwInfo = device->getHardwareInfo();
769769
const auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
770-
auto blitEnqueuImageAllowed = hwHelper.isBlitterForImagesSupported(hwInfo);
770+
auto blitEnqueueImageAllowed = hwHelper.isBlitterForImagesSupported(hwInfo);
771771

772772
if (DebugManager.flags.EnableBlitterForReadWriteImage.get() != -1) {
773-
blitEnqueuImageAllowed = DebugManager.flags.EnableBlitterForReadWriteImage.get();
773+
blitEnqueueImageAllowed = DebugManager.flags.EnableBlitterForReadWriteImage.get();
774774
}
775775

776-
blitEnqueuImageAllowed &= (origin[0] + region[0] <= BlitterConstants::maxBlitWidth) && (origin[1] + region[1] <= BlitterConstants::maxBlitHeight);
777-
blitEnqueuImageAllowed &= !isMipMapped(image.getImageDesc());
778-
blitEnqueuImageAllowed &= !(image.getImageFormat().image_channel_data_type == CL_HALF_FLOAT);
776+
blitEnqueueImageAllowed &= (origin[0] + region[0] <= BlitterConstants::maxBlitWidth) && (origin[1] + region[1] <= BlitterConstants::maxBlitHeight);
777+
blitEnqueueImageAllowed &= !isMipMapped(image.getImageDesc());
779778

780-
return blitEnqueuImageAllowed;
779+
return blitEnqueueImageAllowed;
781780
}
782781

783782
bool CommandQueue::isBlockedCommandStreamRequired(uint32_t commandType, const EventsRequest &eventsRequest, bool blockedQueue) const {

opencl/test/unit_test/command_queue/command_queue_tests.cpp

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,23 +1353,6 @@ TEST(CommandQueue, givenMipMappedImageWhenCallingBlitEnqueueImageAllowedThenCorr
13531353
EXPECT_FALSE(queue.blitEnqueueImageAllowed(correctOrigin, correctRegion, image));
13541354
}
13551355

1356-
TEST(CommandQueue, givenHalfFloatImageWhenCallingBlitEnqueueImageAllowedThenCorrectResultIsReturned) {
1357-
DebugManagerStateRestore restorer;
1358-
DebugManager.flags.EnableBlitterForReadWriteImage.set(1);
1359-
MockContext context{};
1360-
MockCommandQueue queue(&context, context.getDevice(0), 0, false);
1361-
1362-
size_t correctRegion[3] = {10u, 10u, 0};
1363-
size_t correctOrigin[3] = {1u, 1u, 0};
1364-
MockImageBase image;
1365-
1366-
image.imageFormat.image_channel_data_type = CL_HALF_FLOAT;
1367-
EXPECT_FALSE(queue.blitEnqueueImageAllowed(correctOrigin, correctRegion, image));
1368-
1369-
image.imageFormat.image_channel_data_type = CL_UNORM_INT8;
1370-
EXPECT_TRUE(queue.blitEnqueueImageAllowed(correctOrigin, correctRegion, image));
1371-
}
1372-
13731356
TEST(CommandQueue, givenImageWithDifferentImageTypesWhenCallingBlitEnqueueImageAllowedThenCorrectResultIsReturned) {
13741357
DebugManagerStateRestore restorer;
13751358
DebugManager.flags.EnableBlitterForReadWriteImage.set(1);

0 commit comments

Comments
 (0)