From 4f4950feeea530d435a6980138010c5e1f26dde1 Mon Sep 17 00:00:00 2001 From: ellnor01 <51320439+ellnor01@users.noreply.github.com> Date: Wed, 17 Jun 2020 10:14:11 +0100 Subject: [PATCH] Remove test_stream_struct_write test (#825) Test has been commented out. This is effecting clang-format checks in the file. Removing test as it is not in use. Change-Id: Ic9a7ab68a514fa6dc01e4d86a7bda1a9856a75e8 Signed-off-by: Ellen Norris-Thompson --- test_conformance/profiling/writeArray.cpp | 144 ---------------------- 1 file changed, 144 deletions(-) diff --git a/test_conformance/profiling/writeArray.cpp b/test_conformance/profiling/writeArray.cpp index 550294a6..c8147ccf 100644 --- a/test_conformance/profiling/writeArray.cpp +++ b/test_conformance/profiling/writeArray.cpp @@ -834,150 +834,6 @@ int test_stream_write( cl_device_id device, cl_context context, cl_command_queue } // end test_stream_write() - -/* - int test_stream_struct_write( cl_device_group device, cl_device id, cl_context context, int num_elements ) - { - cl_mem streams[10]; - void *outptr[5]; - TestStruct *inptr[5]; - cl_program program[5]; - cl_kernel kernel[5]; - void *values[2]; - size_t sizes[2] = { sizeof(cl_stream), sizeof(cl_stream) }; - size_t ptrSizes[5]; - size_t size = sizeof( TestStruct ); - size_t threads[1]; - #ifdef USE_LOCAL_THREADS - size_t localThreads[1]; - #endif - int err; - int i, ii, j; - int loops = 1; // no vector for structs - - threads[0] = (size_t)num_elements; - - #ifdef USE_LOCAL_THREADS - err = clGetDeviceConfigInfo( id, CL_DEVICE_MAX_THREAD_GROUP_SIZE, localThreads, sizeof( cl_uint ), NULL ); - if( err != CL_SUCCESS ){ - log_error( "Unable to get thread group max size: %d", err ); - return -1; - } - if( localThreads[0] > threads[0] ) - localThreads[0] = threads[0]; - #endif - - ptrSizes[0] = size; - ptrSizes[1] = ptrSizes[0] << 1; - ptrSizes[2] = ptrSizes[1] << 1; - ptrSizes[3] = ptrSizes[2] << 1; - ptrSizes[4] = ptrSizes[3] << 1; - - - loops = ( loops < 5 ? loops : 5 ); - for( i = 0; i < loops; i++ ){ - - inptr[i] = (TestStruct *)malloc(ptrSizes[i] * num_elements); - - for( j = 0; j < ptrSizes[i] * num_elements / ptrSizes[0]; j++ ){ - inptr[i][j].a = (int)random_float( -2147483648.f, 2147483647.0f ); - inptr[i][j].b = random_float( -FLT_MAX, FLT_MAX ); - } - - ii = i << 1; - streams[ii] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), ptrSizes[i] * num_elements, NULL); - if( ! streams[ii] ){ - free( outptr[i] ); - log_error( " clCreateBuffer failed\n" ); - return -1; - } - outptr[i] = malloc( ptrSizes[i] * num_elements ); - streams[ii+1] = clCreateBuffer( context, (cl_mem_flags)(CL_MEM_READ_WRITE), ptrSizes[i] * num_elements, NULL); - if( ! streams[ii+1] ){ - clReleaseMemObject(streams[ii]); - free( outptr[i] ); - log_error( " clCreateBuffer failed\n" ); - return -1; - } - - err = clWriteArray(context, streams[ii], false, 0, ptrSizes[i]*num_elements, inptr[i], NULL); - if( err != CL_SUCCESS ){ - clReleaseMemObject(streams[ii]); - clReleaseMemObject(streams[ii+1]); - free( outptr[i] ); - print_error( err, " clWriteArray failed" ); - return -1; - } - - err = create_program_and_kernel( device, struct_kernel_code, "read_write_struct", &program[i], &kernel[i] ); - if( err ){ - clReleaseMemObject(streams[ii]); - clReleaseMemObject(streams[ii+1]); - free( outptr[i] ); - log_error( " Error creating program for struct\n" ); - return -1; - } - - err = clSetKernelArg( kernel[i], 0, sizeof( cl_mem ), (void *)&streams[ii] ); - err |= clSetKernelArg( kernel[i], 1, sizeof( cl_mem ), (void *)&streams[ii+1] ); - if (err != CL_SUCCESS){ - clReleaseProgram( program[i] ); - clReleaseKernel( kernel[i] ); - clReleaseMemObject( streams[ii] ); - clReleaseMemObject( streams[ii+1] ); - free( outptr[i] ); - print_error( err, " clSetKernelArg failed" ); - return -1; - } - - #ifdef USE_LOCAL_THREADS - err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, localThreads, 0, NULL, NULL ); - #else - err = clEnqueueNDRangeKernel( queue, kernel[i], 1, NULL, threads, NULL, 0, NULL, NULL ); - #endif - if( err != CL_SUCCESS ){ - print_error( err, " clEnqueueNDRangeKernel failed" ); - clReleaseMemObject( streams[ii] ); - clReleaseMemObject( streams[ii+1] ); - clReleaseKernel( kernel[i] ); - clReleaseProgram( program[i] ); - free( outptr[i] ); - return -1; - } - - err = clEnqueueReadBuffer( queue, streams[ii+1], true, 0, ptrSizes[i]*num_elements, outptr[i], 0, NULL, NULL ); - if( err != CL_SUCCESS ){ - clReleaseMemObject( streams[ii] ); - clReleaseMemObject( streams[ii+1] ); - clReleaseKernel( kernel[i] ); - clReleaseProgram( program[i] ); - free( outptr[i] ); - print_error( err, " clEnqueueReadBuffer failed" ); - return -1; - } - - if( verify_write_struct( inptr[i], outptr[i], ptrSizes[i] * num_elements / ptrSizes[0] ) ){ - log_error( " STREAM_WRITE struct%d test failed\n", 1<