Reduce diff with master branch (#399)

A first round of whitespace, formatting and uncontroversial changes.

Signed-off-by: Kevin Petit <kevin.petit@arm.com>

CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 
 set( CONFORMANCE_SUFFIX "" )
-
 set(CLConform_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 project(CLConform${CONFORMANCE_SUFFIX})
@@ -26,6 +25,7 @@ add_definitions(-DCL_USE_DEPRECATED_OPENCL_2_1_APIS=1)
 add_definitions(-DCL_USE_DEPRECATED_OPENCL_2_0_APIS=1)
 add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_2_APIS=1)
 add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_1_APIS=1)
+add_definitions(-DCL_USE_DEPRECATED_OPENCL_1_0_APIS=1)
 
 
 # Support both VS2008 and VS2012.
@@ -103,14 +103,11 @@ if(APPLE)
     list(APPEND CLConform_LIBRARIES ${iokit})
 endif(APPLE)
 
-list(APPEND CLConform_INCLUDE_DIR ${OPENCL_INCLUDE_DIR})
+include_directories(SYSTEM ${OPENCL_INCLUDE_DIR})
-
+include_directories(${CLConform_SOURCE_DIR}/test_common/harness
-include_directories (${CLConform_SOURCE_DIR}/test_common/harness
+                    ${CLConform_SOURCE_DIR}/test_common/gles
-                     ${CLConform_SOURCE_DIR}/test_common/gles
+                    ${CLConform_SOURCE_DIR}/test_common/gl
-                     ${CLConform_SOURCE_DIR}/test_common/gl
+                    ${CMAKE_CURRENT_SOURCE_DIR}/test_common/harness)
-                     ${CLConform_INCLUDE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}/test_common/harness
-                    )
 
 if(CMAKE_BUILD_TYPE STREQUAL "release")
     set (BUILD_FLAVOR "release")
@@ -128,13 +125,13 @@ set (DLL_FILES "${VS_BUILD_DIR}/Debug/*.dll")
 set (DST_DIR   "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/")
 
 if (WIN32)
-set (COPY "echo")
+    set (COPY "echo")
-add_custom_target( COPY_DLL${CONFORMANCE_SUFFIX} ALL
+    add_custom_target(COPY_DLL${CONFORMANCE_SUFFIX} ALL
-                   COMMAND ${COPY} \"${DLL_FILES}\" \"${DST_DIR}\"
+                      COMMAND ${COPY} "${DLL_FILES}" "${DST_DIR}"
-                   COMMENT "Copying dll files.. ")
+                      COMMENT "Copying dll files.. ")
 else (WIN32)
-set (COPY cp)
+    set (COPY cp)
-add_custom_target( COPY_DLL${CONFORMANCE_SUFFIX} )
+    add_custom_target(COPY_DLL${CONFORMANCE_SUFFIX})
 endif(WIN32)
 
 set_property(TARGET COPY_DLL${CONFORMANCE_SUFFIX} PROPERTY FOLDER "CONFORMANCE${CONFORMANCE_SUFFIX}")

build_win.bat

@@ -25,11 +25,8 @@ IF NOT EXIST CLConform.sln (
    echo "Solution file found CLConform.sln "
 )
 
-
-
 echo Building CLConform.sln...
 %VCPATH% CLConform.sln /build
 
 
 GOTO:EOF
-

test_common/harness/kernelHelpers.c

@@ -312,17 +312,17 @@ static int invoke_offline_compiler(cl_context context,
                                    const std::string &sourceFilename,
                                    const std::string &outputFilename)
 {
-    std::string scriptToRunString =
+    std::string runString =
         get_offline_compilation_command(device_address_space_size, compilationMode, bOptions,
                                         sourceFilename, outputFilename);
 
     // execute script
-    log_info("Executing command: %s\n", scriptToRunString.c_str());
+    log_info("Executing command: %s\n", runString.c_str());
     fflush(stdout);
-    int returnCode = system(scriptToRunString.c_str());
+    int returnCode = system(runString.c_str());
     if (returnCode != 0)
     {
-        log_error("Command finished with error: 0x%x\n", returnCode);
+        log_error("ERROR: Command finished with error: 0x%x\n", returnCode);
         return CL_COMPILE_PROGRAM_FAILURE;
     }
 
@@ -568,139 +568,151 @@ int create_single_kernel_helper(cl_context context, cl_program *outProgram, cl_k
     test_error(error, "Create program failed");
 
     /* Compile the program */
-  int buildProgramFailed = 0;
+    int buildProgramFailed = 0;
-  int printedSource = 0;
+    int printedSource = 0;
-  error = clBuildProgram(*outProgram, 0, NULL, buildOptions, NULL, NULL);
+    error = clBuildProgram(*outProgram, 0, NULL, buildOptions, NULL, NULL);
-  if (error != CL_SUCCESS)
+    if (error != CL_SUCCESS)
-  {
-    unsigned int i;
-    print_error(error, "clBuildProgram failed");
-    buildProgramFailed = 1;
-    printedSource = 1;
-    log_error( "Build options: %s\n", buildOptions );
-    log_error( "Original source is: ------------\n" );
-    for( i = 0; i < numKernelLines; i++ )
-      log_error( "%s", kernelProgram[ i ] );
-  }
-
-  // Verify the build status on all devices
-  cl_uint deviceCount = 0;
-  error = clGetProgramInfo( *outProgram, CL_PROGRAM_NUM_DEVICES, sizeof( deviceCount ), &deviceCount, NULL );
-  if (error != CL_SUCCESS) {
-    print_error(error, "clGetProgramInfo CL_PROGRAM_NUM_DEVICES failed");
-      return error;
-  }
-
-  if (deviceCount == 0) {
-    log_error("No devices found for program.\n");
-    return -1;
-  }
-
-  cl_device_id    *devices = (cl_device_id*) malloc( deviceCount * sizeof( cl_device_id ) );
-  if( NULL == devices )
-    return -1;
-  BufferOwningPtr<cl_device_id> devicesBuf(devices);
-
-  memset( devices, 0, deviceCount * sizeof( cl_device_id ));
-  error = clGetProgramInfo( *outProgram, CL_PROGRAM_DEVICES, sizeof( cl_device_id ) * deviceCount, devices, NULL );
-  if (error != CL_SUCCESS) {
-    print_error(error, "clGetProgramInfo CL_PROGRAM_DEVICES failed");
-    return error;
-  }
-
-  cl_uint z;
-  bool buildFailed = false;
-  for( z = 0; z < deviceCount; z++ )
-  {
-    char deviceName[4096] = "";
-    error = clGetDeviceInfo(devices[z], CL_DEVICE_NAME, sizeof( deviceName), deviceName, NULL);
-    if (error != CL_SUCCESS || deviceName[0] == '\0') {
-      log_error("Device \"%d\" failed to return a name\n", z);
-      print_error(error, "clGetDeviceInfo CL_DEVICE_NAME failed");
-    }
-
-    cl_build_status buildStatus;
-    error = clGetProgramBuildInfo(*outProgram, devices[z], CL_PROGRAM_BUILD_STATUS, sizeof(buildStatus), &buildStatus, NULL);
-    if (error != CL_SUCCESS) {
-      print_error(error, "clGetProgramBuildInfo CL_PROGRAM_BUILD_STATUS failed");
-      return error;
-    }
-
-    if (buildStatus == CL_BUILD_SUCCESS && buildProgramFailed && deviceCount == 1)
     {
-        buildFailed = true;
+        unsigned int i;
-        log_error("clBuildProgram returned an error, but buildStatus is marked as CL_BUILD_SUCCESS.\n");
+        print_error(error, "clBuildProgram failed");
+        buildProgramFailed = 1;
+        printedSource = 1;
+        log_error("Build options: %s\n", buildOptions);
+        log_error("Original source is: ------------\n");
+        for (i = 0; i < numKernelLines; i++)
+            log_error("%s", kernelProgram[i]);
     }
 
-    if (buildStatus != CL_BUILD_SUCCESS) {
+    // Verify the build status on all devices
+    cl_uint deviceCount = 0;
+    error = clGetProgramInfo(*outProgram, CL_PROGRAM_NUM_DEVICES, sizeof(deviceCount), &deviceCount, NULL);
+    if (error != CL_SUCCESS)
+    {
+        print_error(error, "clGetProgramInfo CL_PROGRAM_NUM_DEVICES failed");
+        return error;
+    }
 
-        char statusString[64] = "";
+    if (deviceCount == 0)
-        if (buildStatus == (cl_build_status)CL_BUILD_SUCCESS)
+    {
-            sprintf(statusString, "CL_BUILD_SUCCESS");
+        log_error("No devices found for program.\n");
-        else if (buildStatus == (cl_build_status)CL_BUILD_NONE)
+        return -1;
-            sprintf(statusString, "CL_BUILD_NONE");
+    }
-        else if (buildStatus == (cl_build_status)CL_BUILD_ERROR)
-            sprintf(statusString, "CL_BUILD_ERROR");
-        else if (buildStatus == (cl_build_status)CL_BUILD_IN_PROGRESS)
-            sprintf(statusString, "CL_BUILD_IN_PROGRESS");
-        else
-            sprintf(statusString, "UNKNOWN (%d)", buildStatus);
 
-        if (buildStatus != CL_BUILD_SUCCESS) log_error("Build not successful for device \"%s\", status: %s\n", deviceName, statusString);
+    cl_device_id *devices = (cl_device_id *)malloc(deviceCount * sizeof(cl_device_id));
-        size_t paramSize = 0;
+    if (NULL == devices)
-        error = clGetProgramBuildInfo(*outProgram, devices[z], CL_PROGRAM_BUILD_LOG, 0, NULL, &paramSize);
+        return -1;
-        if (error != CL_SUCCESS) {
+    BufferOwningPtr<cl_device_id> devicesBuf(devices);
 
-            print_error(error, "clGetProgramBuildInfo CL_PROGRAM_BUILD_LOG failed");
+    memset(devices, 0, deviceCount * sizeof(cl_device_id));
+    error = clGetProgramInfo(*outProgram, CL_PROGRAM_DEVICES, sizeof(cl_device_id) * deviceCount, devices, NULL);
+    if (error != CL_SUCCESS)
+    {
+        print_error(error, "clGetProgramInfo CL_PROGRAM_DEVICES failed");
+        return error;
+    }
+
+    cl_uint z;
+    bool buildFailed = false;
+    for (z = 0; z < deviceCount; z++)
+    {
+        char deviceName[4096] = "";
+        error = clGetDeviceInfo(devices[z], CL_DEVICE_NAME, sizeof(deviceName), deviceName, NULL);
+        if (error != CL_SUCCESS || deviceName[0] == '\0')
+        {
+            log_error("Device \"%d\" failed to return a name\n", z);
+            print_error(error, "clGetDeviceInfo CL_DEVICE_NAME failed");
+        }
+
+        cl_build_status buildStatus;
+        error = clGetProgramBuildInfo(*outProgram, devices[z], CL_PROGRAM_BUILD_STATUS, sizeof(buildStatus), &buildStatus, NULL);
+        if (error != CL_SUCCESS)
+        {
+            print_error(error, "clGetProgramBuildInfo CL_PROGRAM_BUILD_STATUS failed");
             return error;
         }
 
-        std::string log;
+        if (buildStatus == CL_BUILD_SUCCESS && buildProgramFailed && deviceCount == 1)
-        log.resize(paramSize / sizeof(char));
+        {
-        error = clGetProgramBuildInfo(*outProgram, devices[z], CL_PROGRAM_BUILD_LOG, paramSize, &log[0], NULL);
+            buildFailed = true;
-        if (error != CL_SUCCESS || log[0] == '\0'){
+            log_error("clBuildProgram returned an error, but buildStatus is marked as CL_BUILD_SUCCESS.\n");
-            log_error("Device %d (%s) failed to return a build log\n", z, deviceName);
+        }
-            if (error) {
+
+        if (buildStatus != CL_BUILD_SUCCESS)
+        {
+
+            char statusString[64] = "";
+            if (buildStatus == (cl_build_status)CL_BUILD_SUCCESS)
+                sprintf(statusString, "CL_BUILD_SUCCESS");
+            else if (buildStatus == (cl_build_status)CL_BUILD_NONE)
+                sprintf(statusString, "CL_BUILD_NONE");
+            else if (buildStatus == (cl_build_status)CL_BUILD_ERROR)
+                sprintf(statusString, "CL_BUILD_ERROR");
+            else if (buildStatus == (cl_build_status)CL_BUILD_IN_PROGRESS)
+                sprintf(statusString, "CL_BUILD_IN_PROGRESS");
+            else
+                sprintf(statusString, "UNKNOWN (%d)", buildStatus);
+
+            if (buildStatus != CL_BUILD_SUCCESS)
+                log_error("Build not successful for device \"%s\", status: %s\n", deviceName, statusString);
+            size_t paramSize = 0;
+            error = clGetProgramBuildInfo(*outProgram, devices[z], CL_PROGRAM_BUILD_LOG, 0, NULL, &paramSize);
+            if (error != CL_SUCCESS)
+            {
+
                 print_error(error, "clGetProgramBuildInfo CL_PROGRAM_BUILD_LOG failed");
                 return error;
-            } else {
-                log_error("clGetProgramBuildInfo returned an empty log.\n");
-                return -1;
             }
+
+            std::string log;
+            log.resize(paramSize / sizeof(char));
+            error = clGetProgramBuildInfo(*outProgram, devices[z], CL_PROGRAM_BUILD_LOG, paramSize, &log[0], NULL);
+            if (error != CL_SUCCESS || log[0] == '\0')
+            {
+                log_error("Device %d (%s) failed to return a build log\n", z, deviceName);
+                if (error)
+                {
+                    print_error(error, "clGetProgramBuildInfo CL_PROGRAM_BUILD_LOG failed");
+                    return error;
+                }
+                else
+                {
+                    log_error("clGetProgramBuildInfo returned an empty log.\n");
+                    return -1;
+                }
+            }
+            // In this case we've already printed out the code above.
+            if (!printedSource)
+            {
+                unsigned int i;
+                log_error("Original source is: ------------\n");
+                for (i = 0; i < numKernelLines; i++)
+                    log_error("%s", kernelProgram[i]);
+                printedSource = 1;
+            }
+            log_error("Build log for device \"%s\" is: ------------\n", deviceName);
+            log_error("%s\n", log.c_str());
+            log_error("\n----------\n");
+            return -1;
         }
-        // In this case we've already printed out the code above.
+    }
-        if (!printedSource)
+
-        {
+    if (buildFailed)
-            unsigned int i;
+    {
-            log_error("Original source is: ------------\n");
-            for (i = 0; i < numKernelLines; i++)
-                log_error("%s", kernelProgram[i]);
-            printedSource = 1;
-        }
-        log_error("Build log for device \"%s\" is: ------------\n", deviceName);
-        log_error("%s\n", log.c_str());
-        log_error("\n----------\n");
         return -1;
     }
-  }
 
-  if (buildFailed)
+    /* And create a kernel from it */
-  {
+    if (kernelName != NULL)
-      return -1;
+    {
-  }
+        *outKernel = clCreateKernel(*outProgram, kernelName, &error);
+        if (*outKernel == NULL || error != CL_SUCCESS)
+        {
+            print_error(error, "Unable to create kernel");
+            return error;
+        }
+    }
 
-  /* And create a kernel from it */
+    return 0;
-  if (kernelName != NULL)
-  {
-      *outKernel = clCreateKernel(*outProgram, kernelName, &error);
-      if (*outKernel == NULL || error != CL_SUCCESS)
-      {
-          print_error(error, "Unable to create kernel");
-          return error;
-      }
-  }
-
-  return 0;
 }
 
 int get_device_version( cl_device_id id, size_t* major, size_t* minor)

test_common/harness/kernelHelpers.h

@@ -61,10 +61,25 @@ extern "C" {
 const int MAX_LEN_FOR_KERNEL_LIST = 20;
 
 /* Helper that creates a single program and kernel from a single-kernel program source */
-extern int create_single_kernel_helper( cl_context context, cl_program *outProgram, cl_kernel *outKernel, unsigned int numKernelLines, const char **kernelProgram, const char *kernelName, const char *buildOptions=NULL );
+extern int create_single_kernel_helper(cl_context context, 
-extern int create_single_kernel_helper_with_build_options( cl_context context, cl_program *outProgram, cl_kernel *outKernel, unsigned int numKernelLines,
+                                       cl_program *outProgram,
-                                                          const char **kernelProgram, const char *kernelName, const char *buildOptions );
+                                       cl_kernel *outKernel,
-extern int create_single_kernel_helper_create_program(cl_context context, cl_program *outProgram, unsigned int numKernelLines, const char **kernelProgram, const char *buildOptions = NULL);
+                                       unsigned int numKernelLines,
+                                       const char **kernelProgram,
+                                       const char *kernelName,
+                                       const char *buildOptions = NULL);
+extern int create_single_kernel_helper_with_build_options(cl_context context, 
+                                                          cl_program *outProgram,
+                                                          cl_kernel *outKernel,
+                                                          unsigned int numKernelLines,
+                                                          const char **kernelProgram,
+                                                          const char *kernelName,
+                                                          const char *buildOptions);
+extern int create_single_kernel_helper_create_program(cl_context context, 
+                                                      cl_program *outProgram,
+                                                      unsigned int numKernelLines,
+                                                      const char **kernelProgram,
+                                                      const char *buildOptions = NULL);
 
 /* Helper to obtain the biggest fit work group size for all the devices in a given group and for the given global thread size */
 extern int get_max_common_work_group_size( cl_context context, cl_kernel kernel, size_t globalThreadSize, size_t *outSize );

test_conformance/CMakeCommon.txt

@@ -1,5 +1,4 @@
-set_source_files_properties(
+set_source_files_properties(COMPILE_FLAGS -msse2)
-        COMPILE_FLAGS -msse2)
 
 string(TOLOWER ${MODULE_NAME} MODULE_NAME_LOWER)
 

test_conformance/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Remember curren source directory (`test_conformance').
+# Remember current source directory (`test_conformance').
 set( CLConf_Install_Base_Dir "${CMAKE_CURRENT_SOURCE_DIR}" )
 
 add_subdirectory( allocations )

test_conformance/opencl_conformance_tests_full_no_math_or_conversions.csv

@@ -67,6 +67,10 @@ Headers (cl.h standalone), headers/test_cl_h
 Headers (cl_platform.h standalone), headers/test_cl_platform_h
 Headers (cl_gl.h standalone), headers/test_cl_gl_h
 Headers (opencl.h standalone), headers/test_opencl_h
+Headers (cl.h standalone C99), headers/test_cl_h_c99
+Headers (cl_platform.h standalone C99), headers/test_cl_platform_h_c99
+Headers (cl_gl.h standalone C99), headers/test_cl_gl_h_c99
+Headers (opencl.h standalone C99), headers/test_opencl_h_c99
 
 # #########################################
 # CPU is required to pass linear and normalized image filtering