Skip to content

Commit

Permalink
cl_fill_image
Browse files Browse the repository at this point in the history
  • Loading branch information
rjodinchr committed Sep 26, 2023
1 parent a1aabf7 commit e661fde
Show file tree
Hide file tree
Showing 5 changed files with 275 additions and 1 deletion.
1 change: 1 addition & 0 deletions test_conformance/images/clFillImage/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set(MODULE_NAME CL_FILL_IMAGES)
set(${MODULE_NAME}_SOURCES
main.cpp
test_fill_1D.cpp
test_fill_1D_buffer.cpp
test_fill_1D_array.cpp
test_fill_2D.cpp
test_fill_2D_array.cpp
Expand Down
6 changes: 6 additions & 0 deletions test_conformance/images/clFillImage/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,19 @@ int test_2Darray(cl_device_id device, cl_context context, cl_command_queue queue
{
return test_image_set(device, context, queue, k2DArray);
}
int test_1Dbuffer(cl_device_id device, cl_context context,
cl_command_queue queue, int num_elements)
{
return test_image_set(device, context, queue, k1DBuffer);
}

test_definition test_list[] = {
ADD_TEST( 1D ),
ADD_TEST( 2D ),
ADD_TEST( 3D ),
ADD_TEST( 1Darray ),
ADD_TEST( 2Darray ),
ADD_TEST( 1Dbuffer ),
};

const int test_num = ARRAY_SIZE( test_list );
Expand Down
203 changes: 203 additions & 0 deletions test_conformance/images/clFillImage/test_fill_1D_buffer.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
//
// Copyright (c) 2023 The Khronos Group Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#include "../testBase.h"

// Defined in test_fill_2D_3D.cpp
extern int test_fill_image_generic(cl_context context, cl_command_queue queue,
image_descriptor *imageInfo,
const size_t origin[], const size_t region[],
ExplicitType outputType, MTdata d);


int test_fill_image_size_1D_buffer(cl_context context, cl_command_queue queue,
image_descriptor *imageInfo,
ExplicitType outputType, MTdata d)
{
size_t origin[3], region[3];
int ret = 0, retCode;

// First, try just a full covering region fill
origin[0] = origin[1] = origin[2] = 0;
region[0] = imageInfo->width;
region[1] = 1;
region[2] = 1;

retCode = test_fill_image_generic(context, queue, imageInfo, origin, region,
outputType, d);
if (retCode < 0)
return retCode;
else
ret += retCode;

// Now try a sampling of different random regions
for (int i = 0; i < 8; i++)
{
// Pick a random size
region[0] = (imageInfo->width > 8)
? (size_t)random_in_range(8, (int)imageInfo->width - 1, d)
: imageInfo->width;

// Now pick positions within valid ranges
origin[0] = (imageInfo->width > region[0]) ? (size_t)random_in_range(
0, (int)(imageInfo->width - region[0] - 1), d)
: 0;

// Go for it!
retCode = test_fill_image_generic(context, queue, imageInfo, origin,
region, outputType, d);
if (retCode < 0)
return retCode;
else
ret += retCode;
}

return ret;
}


int test_fill_image_set_1D_buffer(cl_device_id device, cl_context context,
cl_command_queue queue,
cl_image_format *format,
ExplicitType outputType)
{
size_t maxWidth;
cl_ulong maxAllocSize, memSize;
image_descriptor imageInfo = { 0 };
RandomSeed seed(gRandomSeed);
const size_t rowPadding_default = 48;
size_t rowPadding = gEnablePitch ? rowPadding_default : 0;
size_t pixelSize;

memset(&imageInfo, 0x0, sizeof(image_descriptor));
imageInfo.type = CL_MEM_OBJECT_IMAGE1D_BUFFER;
imageInfo.format = format;
pixelSize = get_pixel_size(imageInfo.format);

int error = clGetDeviceInfo(device, CL_DEVICE_IMAGE_MAX_BUFFER_SIZE,
sizeof(maxWidth), &maxWidth, NULL);
error |= clGetDeviceInfo(device, CL_DEVICE_MAX_MEM_ALLOC_SIZE,
sizeof(maxAllocSize), &maxAllocSize, NULL);
error |= clGetDeviceInfo(device, CL_DEVICE_GLOBAL_MEM_SIZE, sizeof(memSize),
&memSize, NULL);
test_error(error, "Unable to get max image 2D size from device");

if (memSize > (cl_ulong)SIZE_MAX)
{
memSize = (cl_ulong)SIZE_MAX;
maxAllocSize = (cl_ulong)SIZE_MAX;
}

if (gTestSmallImages)
{
for (imageInfo.width = 1; imageInfo.width < 13; imageInfo.width++)
{
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;

if (gEnablePitch)
{
rowPadding = rowPadding_default;
do
{
rowPadding++;
imageInfo.rowPitch =
imageInfo.width * pixelSize + rowPadding;
} while ((imageInfo.rowPitch % pixelSize) != 0);
}

if (gDebugTrace)
log_info(" at size %d,%d\n", (int)imageInfo.width,
(int)imageInfo.height);

int ret = test_fill_image_size_1D_buffer(context, queue, &imageInfo,
outputType, seed);
if (ret) return -1;
}
}
else if (gTestMaxImages)
{
// Try a specific set of maximum sizes
size_t numbeOfSizes;
size_t sizes[100][3];

get_max_sizes(&numbeOfSizes, 100, sizes, maxWidth, 1, 1, 1,
maxAllocSize, memSize, CL_MEM_OBJECT_IMAGE1D_BUFFER,
imageInfo.format);

for (size_t idx = 0; idx < numbeOfSizes; idx++)
{
imageInfo.width = sizes[idx][0];
imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;

if (gEnablePitch)
{
rowPadding = rowPadding_default;
do
{
rowPadding++;
imageInfo.rowPitch =
imageInfo.width * pixelSize + rowPadding;
} while ((imageInfo.rowPitch % pixelSize) != 0);
}

log_info("Testing %d\n", (int)sizes[idx][0]);
if (gDebugTrace)
log_info(" at max size %d\n", (int)sizes[idx][0]);
if (test_fill_image_size_1D_buffer(context, queue, &imageInfo,
outputType, seed))
return -1;
}
}
else
{
for (int i = 0; i < NUM_IMAGE_ITERATIONS; i++)
{
cl_ulong size;
// Loop until we get a size that a) will fit in the max alloc size
// and b) that an allocation of that image, the result array, plus
// offset arrays, will fit in the global ram space
do
{
imageInfo.width =
(size_t)random_log_in_range(16, (int)maxWidth / 32, seed);

imageInfo.rowPitch = imageInfo.width * pixelSize + rowPadding;

if (gEnablePitch)
{
rowPadding = rowPadding_default;
do
{
rowPadding++;
imageInfo.rowPitch =
imageInfo.width * pixelSize + rowPadding;
} while ((imageInfo.rowPitch % pixelSize) != 0);
}

size = (size_t)imageInfo.rowPitch * 4;
} while (size > maxAllocSize || (size * 3) > memSize);

if (gDebugTrace)
log_info(" at size %d (row pitch %d) out of %d\n",
(int)imageInfo.width, (int)imageInfo.rowPitch,
(int)maxWidth);
int ret = test_fill_image_size_1D_buffer(context, queue, &imageInfo,
outputType, seed);
if (ret) return -1;
}
}

return 0;
}
56 changes: 55 additions & 1 deletion test_conformance/images/clFillImage/test_fill_generic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ static void CL_CALLBACK free_pitch_buffer( cl_mem image, void *buf )
{
free( buf );
}
static void CL_CALLBACK release_cl_buffer(cl_mem image, void *buf)
{
clReleaseMemObject((cl_mem)buf);
}

cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr<char>& data, image_descriptor *imageInfo, int *error )
{
Expand Down Expand Up @@ -70,6 +74,26 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
if ( gEnablePitch )
host_ptr = malloc( imageInfo->arraySize * imageInfo->slicePitch );
break;
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
if (gDebugTrace)
log_info(" - Creating 1D buffer image %d ...\n",
(int)imageInfo->width);
if (gEnablePitch) host_ptr = malloc(imageInfo->rowPitch);
{
cl_int err;
cl_mem buffer =
clCreateBuffer(context, CL_MEM_READ_WRITE,
imageInfo->rowPitch, host_ptr, &err);
if (err != CL_SUCCESS)
{
log_error("ERROR: Could not create buffer for 1D buffer "
"image. %ld bytes\n",
imageInfo->rowPitch);
return NULL;
}
imageDesc.buffer = buffer;
}
break;
}

if (gEnablePitch)
Expand Down Expand Up @@ -101,6 +125,21 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
free(host_ptr);
}

if (imageDesc.buffer != NULL)
{
int callbackError = clSetMemObjectDestructorCallback(
img, release_cl_buffer, imageDesc.buffer);
if (callbackError != CL_SUCCESS)
{
log_error("Error: Unable to attach destructor callback to 1d "
"buffer image. Err: %d\n",
callbackError);
clReleaseMemObject(imageDesc.buffer);
clReleaseMemObject(img);
return NULL;
}
}

if ( *error != CL_SUCCESS )
{
long long unsigned imageSize = get_image_size_mb( imageInfo );
Expand All @@ -122,6 +161,12 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
case CL_MEM_OBJECT_IMAGE2D_ARRAY:
log_error( "ERROR: Unable to create 2D image array of size %d x %d x %d (%llu MB): %s\n", (int)imageInfo->width, (int)imageInfo->height, (int)imageInfo->arraySize, imageSize, IGetErrorString( *error ) );
break;
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
log_error(
"ERROR: Unable to create 1D buffer image of size %d (%llu "
"MB):(%s)",
(int)imageInfo->width, imageSize, IGetErrorString(*error));
break;
}
return NULL;
}
Expand All @@ -139,6 +184,7 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
depth = 1;
imageSize = imageInfo->rowPitch * imageInfo->arraySize;
break;
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
case CL_MEM_OBJECT_IMAGE1D:
height = depth = 1;
imageSize = imageInfo->rowPitch;
Expand Down Expand Up @@ -194,6 +240,7 @@ cl_mem create_image( cl_context context, cl_command_queue queue, BufferOwningPtr
break;
case CL_MEM_OBJECT_IMAGE1D_ARRAY:
case CL_MEM_OBJECT_IMAGE1D:
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
dstPitch2D = mappedSlice;
break;
}
Expand Down Expand Up @@ -286,6 +333,9 @@ int test_fill_image_generic( cl_context context, cl_command_queue queue, image_d
case CL_MEM_OBJECT_IMAGE2D_ARRAY:
dataBytes = imageInfo->arraySize * imageInfo->slicePitch;
break;
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
dataBytes = imageInfo->rowPitch;
break;
}

if (dataBytes > imgData.getSize())
Expand Down Expand Up @@ -398,6 +448,7 @@ int test_fill_image_generic( cl_context context, cl_command_queue queue, image_d
size_t imageRegion[ 3 ] = { imageInfo->width, 1, 1 };
switch (imageInfo->type)
{
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
case CL_MEM_OBJECT_IMAGE1D:
break;
case CL_MEM_OBJECT_IMAGE2D:
Expand Down Expand Up @@ -437,6 +488,7 @@ int test_fill_image_generic( cl_context context, cl_command_queue queue, image_d
size_t secondDim = 1;

switch (imageInfo->type) {
case CL_MEM_OBJECT_IMAGE1D_BUFFER:
case CL_MEM_OBJECT_IMAGE1D:
secondDim = 1;
thirdDim = 1;
Expand Down Expand Up @@ -485,7 +537,9 @@ int test_fill_image_generic( cl_context context, cl_command_queue queue, image_d

total_matched += scanlineSize;
sourcePtr += imageInfo->rowPitch;
if((imageInfo->type == CL_MEM_OBJECT_IMAGE1D_ARRAY || imageInfo->type == CL_MEM_OBJECT_IMAGE1D))
if ((imageInfo->type == CL_MEM_OBJECT_IMAGE1D_ARRAY
|| imageInfo->type == CL_MEM_OBJECT_IMAGE1D
|| imageInfo->type == CL_MEM_OBJECT_IMAGE1D_BUFFER))
destPtr += mappedSlice;
else
destPtr += mappedRow;
Expand Down
10 changes: 10 additions & 0 deletions test_conformance/images/clFillImage/test_loops.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ extern int test_fill_image_set_2D( cl_device_id device, cl_context context, cl_c
extern int test_fill_image_set_3D( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, ExplicitType outputType );
extern int test_fill_image_set_1D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, ExplicitType outputType );
extern int test_fill_image_set_2D_array( cl_device_id device, cl_context context, cl_command_queue queue, cl_image_format *format, ExplicitType outputType );
extern int test_fill_image_set_1D_buffer(cl_device_id device,
cl_context context,
cl_command_queue queue,
cl_image_format *format,
ExplicitType outputType);
typedef int (*test_func)(cl_device_id device, cl_context context,
cl_command_queue queue, cl_image_format *format,
ExplicitType outputType);
Expand Down Expand Up @@ -60,6 +65,11 @@ int test_image_type( cl_device_id device, cl_context context, cl_command_queue q
imageType = CL_MEM_OBJECT_IMAGE3D;
test_fn = &test_fill_image_set_3D;
break;
case k1DBuffer:
name = "1D Image Buffer Fill";
imageType = CL_MEM_OBJECT_IMAGE1D_BUFFER;
test_fn = &test_fill_image_set_1D_buffer;
break;
default: log_error("Unhandled method\n"); return -1;
}

Expand Down

0 comments on commit e661fde

Please sign in to comment.