ahmed/OpenCL-CTS
1
0
Fork 0
mirror of https://github.com/KhronosGroup/OpenCL-CTS.git synced 2026-03-19 06:09:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

cl20: Fix spirv path in bruteforce tests (#371)

Browse Source 
* Fix spirv path in bruteforce tests

* Compilation fix - align_malloc already defined in kernelHelpers.c

* Fix spirv path in bruteforce tests - more places

* Specific fix for cl20_trunk branch
This commit is contained in:
Grzegorz Wawiorko
2019-07-10 14:57:16 +02:00
committed by Kévin Petit
parent 26777a0126
commit 5e22db59ae
1 changed files with 20 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
test_conformance/math_brute_force/main.c
View File

@@ -24,6 +24,9 @@
#include "FunctionList.h"
#include "Sleep.h"
#include "../../test_common/harness/errorHelpers.h"
#include "../../test_common/harness/kernelHelpers.h"
#if defined( __APPLE__ )
#include <sys/sysctl.h>
#include <sys/mman.h>
@@ -1249,42 +1252,6 @@ static void CL_CALLBACK bruteforce_notify_callback(const char *errinfo, const vo
vlog( "%s (%p, %zd, %p)\n", errinfo, private_info, cb, user_data );
}
static void * align_malloc(size_t size, size_t alignment)
{
#if defined(_WIN32) && defined(_MSC_VER)
return _aligned_malloc(size, alignment);
#elif defined(__linux__) || defined (linux) || defined(__APPLE__)
void * ptr = NULL;
#if defined(__ANDROID__)
ptr = memalign(alignment, size);
if( ptr )
return ptr;
#else
if (0 == posix_memalign(&ptr, alignment, size))
return ptr;
#endif
return NULL;
#elif defined(__MINGW32__)
return __mingw_aligned_malloc(size, alignment);
#else
#error "Please add support OS for aligned malloc"
#endif
}
void align_free(void * ptr)
{
#if defined(_WIN32) && defined(_MSC_VER)
_aligned_free(ptr);
#elif defined(__linux__) || defined (linux) || defined(__APPLE__)
return free(ptr);
#elif defined(__MINGW32__)
return __mingw_aligned_free(ptr);
#else
#error "Please add support OS for aligned free"
#endif
}
test_status InitCL( cl_device_id device )
{
int error;
@@ -1649,20 +1616,13 @@ int InitILogbConstants( void )
" out[1] = FP_ILOGBNAN;\n"
"}\n";
cl_program query = clCreateProgramWithSource(gContext, 1, &kernel, NULL, &error);
if( NULL == query || error)
cl_program query;
error = create_single_kernel_helper(gContext, &query, NULL, 1, &kernel, NULL);
if (NULL == query || error)
{
vlog_error( "Error: Unable to create program to get FP_ILOGB0 and FP_ILOGBNAN for the device. (%d)", error );
return error;
}
if(( error = clBuildProgram( query, 1, &gDevice, NULL, NULL, NULL ) ))
{
vlog_error( "Error: Unable to build program to get FP_ILOGB0 and FP_ILOGBNAN for the device. Err = %d\n", error );
char log_msg[2048] = "";
clGetProgramBuildInfo(query, gDevice, CL_PROGRAM_BUILD_LOG, sizeof( log_msg), log_msg, NULL);
vlog_error( "Log:\n%s\n", log_msg );
return error;
}
cl_kernel k = clCreateKernel( query, "GetILogBConstants", &error );
if( NULL == k || error)
@@ -1711,20 +1671,12 @@ int IsTininessDetectedBeforeRounding( void )
" out[0] = a * b;\n"
"}\n";
cl_program query = clCreateProgramWithSource(gContext, 1, &kernel, NULL, &error);
if( NULL == query || error)
{
cl_program query;
error = create_single_kernel_helper(gContext, &query, NULL, 1, &kernel, NULL);
if (error != CL_SUCCESS) {
vlog_error( "Error: Unable to create program to detect how tininess is detected for the device. (%d)", error );
return error;
}
if(( error = clBuildProgram( query, 1, &gDevice, NULL, NULL, NULL ) ))
{
vlog_error( "Error: Unable to build program to detect how tininess is detected for the device. Err = %d\n", error );
char log_msg[2048] = "";
clGetProgramBuildInfo(query, gDevice, CL_PROGRAM_BUILD_LOG, sizeof( log_msg), log_msg, NULL);
vlog_error( "Log:\n%s\n", log_msg );
return error;
}
cl_kernel k = clCreateKernel( query, "IsTininessDetectedBeforeRounding", &error );
if( NULL == k || error)
@@ -1779,24 +1731,10 @@ int MakeKernel( const char **c, cl_uint count, const char *name, cl_kernel *k, c
strcat(options, " -cl-fast-relaxed-math");
}
*p = clCreateProgramWithSource( gContext, count, c, NULL, &error );
if( NULL == *p || error )
error = create_single_kernel_helper_with_build_options(gContext, p, NULL, count, c, NULL, options);
if (error != CL_SUCCESS)
{
vlog_error( "\t\tFAILED -- Failed to create program. (%d)\n", error );
return -1;
}
// build it
if( (error = clBuildProgram( *p, 1, &gDevice, options, NULL, NULL )) )
{
char buffer[2048] = "";
vlog_error("\t\tFAILED -- clBuildProgram() failed: (%d)\n", error);
clGetProgramBuildInfo(*p, gDevice, CL_PROGRAM_BUILD_LOG, sizeof(buffer), buffer, NULL);
vlog_error("Log: %s\n", buffer);
clReleaseProgram( *p );
*p = NULL;
vlog_error("\t\tFAILED -- Failed to create program. (%d)\n", error);
return error;
}
@@ -1838,27 +1776,14 @@ int MakeKernels( const char **c, cl_uint count, const char *name, cl_uint kernel
strcat(options, " -cl-fast-relaxed-math");
}
*p = clCreateProgramWithSource( gContext, count, c, NULL, &error );
if( NULL == *p || error )
error = create_single_kernel_helper_with_build_options(gContext, p, NULL, count, c, NULL, options);
if ( error != CL_SUCCESS )
{
vlog_error( "\t\tFAILED -- Failed to create program. (%d)\n", error );
return -1;
}
// build it
if( (error = clBuildProgram( *p, 1, &gDevice, options, NULL, NULL )) )
{
char buffer[2048] = "";
vlog_error("\t\tFAILED -- clBuildProgram() failed: (%d)\n", error);
clGetProgramBuildInfo(*p, gDevice, CL_PROGRAM_BUILD_LOG, sizeof(buffer), buffer, NULL);
vlog_error("Log: %s\n", buffer);
clReleaseProgram( *p );
*p = NULL;
return error;
}
memset( k, 0, kernel_count * sizeof( *k) );
for( i = 0; i< kernel_count; i++ )
{
@@ -1875,7 +1800,7 @@ int MakeKernels( const char **c, cl_uint count, const char *name, cl_uint kernel
}
}
return 0;
return error;
}
@@ -1890,25 +1815,17 @@ static int IsInRTZMode( void )
" out[0] = (a + 0x1.fffffep-1f == a) && (b - 0x1.fffffep-1f == b);\n"
"}\n";
cl_program query = clCreateProgramWithSource(gContext, 1, &kernel, NULL, &error);
if( NULL == query || error)
{
cl_program query;
error = create_single_kernel_helper(gContext, &query, NULL, 1, &kernel, NULL);
if (error != CL_SUCCESS) {
vlog_error( "Error: Unable to create program to detect RTZ mode for the device. (%d)", error );
return error;
}
if(( error = clBuildProgram( query, 1, &gDevice, NULL, NULL, NULL ) ))
{
vlog_error( "Error: Unable to build program to detect RTZ mode for the device. Err = %d\n", error );
char log_msg[2048] = "";
clGetProgramBuildInfo(query, gDevice, CL_PROGRAM_BUILD_LOG, sizeof( log_msg), log_msg, NULL);
vlog_error( "Log:\n%s\n", log_msg );
return error;
}
cl_kernel k = clCreateKernel( query, "GetRoundingMode", &error );
if( NULL == k || error)
{
vlog_error( "Error: Unable to create kernel to gdetect RTZ mode for the device. Err = %d", error );
vlog_error( "Error: Unable to create kernel to gdetect RTZ mode for the device. Err = %d", error );
return error;
}