Merge pull request #258 from kknox/unit-test-improvements

Unit test improvements

Author: Kent Knox

src/CMakeLists.txt

@@ -1,12 +1,12 @@
 # ########################################################################
 # Copyright 2013 Advanced Micro Devices, 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.
@@ -41,33 +41,33 @@ set( OPENCL_OFFLINE_BUILD_TAHITI_KERNEL OFF)
   #use dynamic generated kernels
 #  MESSAGE(STATUS "Build dynamic Hawaii kernels.")
 #  MESSAGE(STATUS "Check OPENCL_OFFLINE_BUILD_HAWAII_KERNEL to build kernls at compile-time. This will eliminates clBuildProgram() overhead and better kernel performance with certain driver.")
-  add_definitions(-DCLBLAS_HAWAII_DYNAMIC_KERNEL) 
+  add_definitions(-DCLBLAS_HAWAII_DYNAMIC_KERNEL)
 #else()
 #  MESSAGE(STATUS "Build static Hawaii kernels.")
 #  MESSAGE(STATUS "Uncheck OPENCL_OFFLINE_BUILD_HAWAII_KERNEL to build kernls at run-time")
-#  MESSAGE(STATUS "Please ensure the presence of Hawaii device in the system. With certain driver/compiler flags, this might result in compile-time error.")  
+#  MESSAGE(STATUS "Please ensure the presence of Hawaii device in the system. With certain driver/compiler flags, this might result in compile-time error.")
 #endif( )
 
 #if( NOT OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL )
   #use dynamic generated kernels
 #  MESSAGE(STATUS "Build dynamic Bonaire kernels.")
 #  MESSAGE(STATUS "Check OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL to build kernls at compile-time. This will eliminates clBuildProgram() overhead and better kernel performance with certain driver.")
-  add_definitions(-DCLBLAS_BONAIRE_DYNAMIC_KERNEL) 
+  add_definitions(-DCLBLAS_BONAIRE_DYNAMIC_KERNEL)
 #else()
 #  MESSAGE(STATUS "Build static Bonaire kernels.")
 #  MESSAGE(STATUS "Uncheck OPENCL_OFFLINE_BUILD_BONAIRE_KERNEL to build kernls at run-time")
-#  MESSAGE(STATUS "Please ensure the presence of Bonaire device in the system. With certain driver/compiler flags, this might result in compile-time error.")    
+#  MESSAGE(STATUS "Please ensure the presence of Bonaire device in the system. With certain driver/compiler flags, this might result in compile-time error.")
 #endif( )
 
 #if( NOT OPENCL_OFFLINE_BUILD_TAHITI_KERNEL )
   #use dynamic generated kernels
 #  MESSAGE(STATUS "Build dynamic Tahiti kernels.")
 #  MESSAGE(STATUS "Check OPENCL_OFFLINE_BUILD_TAHITI_KERNEL to build kernls at compile-time. This will eliminates clBuildProgram() overhead and better kernel performance with certain driver.")
-  add_definitions(-DCLBLAS_TAHITI_DYNAMIC_KERNEL) 
+  add_definitions(-DCLBLAS_TAHITI_DYNAMIC_KERNEL)
 #else( )
 #  MESSAGE(STATUS "Build static Tahiti kernels.")
 #  MESSAGE(STATUS "Uncheck OPENCL_OFFLINE_BUILD_TAHITI_KERNEL to build kernls at run-time")
-#  MESSAGE(STATUS "Please ensure the presence of Tahiti device in the system. With certain driver/compiler flags, this might result in compile-time error.")    
+#  MESSAGE(STATUS "Please ensure the presence of Tahiti device in the system. With certain driver/compiler flags, this might result in compile-time error.")
 #endif( )
 
 
@@ -135,8 +135,8 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif()
 
-# These variables are meant to contain string which should be appended to the installation paths 
-# of library and executable binaries, respectively.  They are meant to be user configurable/overridable.  
+# These variables are meant to contain string which should be appended to the installation paths
+# of library and executable binaries, respectively.  They are meant to be user configurable/overridable.
 set( SUFFIX_LIB_DEFAULT "" )
 set( SUFFIX_BIN_DEFAULT "" )
 
@@ -170,7 +170,7 @@ if( MSVC_IDE )
 endif( )
 
 # add the math library for Linux
-if( UNIX ) 
+if( UNIX )
     set(MATH_LIBRARY "m")
 endif()
 
@@ -220,7 +220,7 @@ if( BUILD_TEST )
 		else()
 			message(WARNING "Cannot find acml.h")
 		endif()
-		
+
 		if( UNIX )
 			find_library(ACML_LIBRARIES acml_mp
 				HINTS
@@ -238,7 +238,7 @@ if( BUILD_TEST )
 			)
 			mark_as_advanced(_acml_mv_library)
 		endif( )
-		
+
 		if(WIN32)
 			find_library(ACML_LIBRARIES libacml_mp_dll
 				HINTS
@@ -248,7 +248,7 @@ if( BUILD_TEST )
                                         $ENV{ACML_ROOT}/${ACML_SUBDIR}/lib
 			)
 		endif( )
-		
+
 		if( NOT ACML_LIBRARIES )
 			message(WARNING "Cannot find libacml")
 		endif( )
@@ -272,8 +272,8 @@ find_package( OpenCL )
 set( Boost_USE_MULTITHREADED ON )
 set( Boost_USE_STATIC_LIBS   ON )
 set( Boost_DETAILED_FAILURE_MSG   ON )
-set( Boost_DEBUG ON )
-set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" )
+# set( Boost_DEBUG ON )
+set( Boost_ADDITIONAL_VERSIONS "1.44.0" "1.44" "1.47.0" "1.47" "1.60.0" "1.60" )
 
 find_package( Boost 1.33.0 COMPONENTS program_options )
 message(STATUS "Boost_PROGRAM_OPTIONS_LIBRARY: ${Boost_PROGRAM_OPTIONS_LIBRARY}")
@@ -315,7 +315,7 @@ elseif( MSVC )
 	# CMake sets huge stack frames for windows, for whatever reason.  We go with compiler default.
 	string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" )
 	string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" )
-	string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" ) 
+	string( REGEX REPLACE "/STACK:[0-9]+" "" CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}" )
 endif( )
 
 if (WIN32)
@@ -328,13 +328,13 @@ add_definitions( -DCL_USE_DEPRECATED_OPENCL_1_1_APIS )
 configure_file( "${PROJECT_SOURCE_DIR}/clBLAS.version.h.in" "${PROJECT_BINARY_DIR}/include/clBLAS.version.h" )
 
 # configure a header file to pass the CMake version settings to the source, and package the header files in the output archive
-install( FILES 
-			"clBLAS.h" 
+install( FILES
+			"clBLAS.h"
 			"clAmdBlas.h"
 			"clAmdBlas.version.h"
 			"clBLAS-complex.h"
 			"${PROJECT_BINARY_DIR}/include/clBLAS.version.h"
-		DESTINATION 
+		DESTINATION
 			"./include" )
 
 
@@ -359,7 +359,7 @@ if( BUILD_SAMPLE AND IS_DIRECTORY "${PROJECT_SOURCE_DIR}/samples" )
 	add_subdirectory( samples )
 endif( )
 
-# The build server is not supposed to build or package any of the tests; build server script will define this on the command line with 
+# The build server is not supposed to build or package any of the tests; build server script will define this on the command line with
 # cmake -G "Visual Studio 10 Win64" -D BUILDSERVER:BOOL=ON ../..
 if( BUILD_TEST )
 	if( IS_DIRECTORY "${PROJECT_SOURCE_DIR}/tests" )
@@ -394,7 +394,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clBLASConfigVersion.cmake
   DESTINATION ${destdir})
 
 
-# The following code is setting variables to control the behavior of CPack to generate our 
+# The following code is setting variables to control the behavior of CPack to generate our
 if( WIN32 )
 	set( CPACK_SOURCE_GENERATOR "ZIP" )
 	set( CPACK_GENERATOR "ZIP" )

src/tests/BlasBase.cpp

@@ -40,10 +40,10 @@ BlasBase::BlasBase()
     useNumCommandQueues_(false), numCommandQueues_(1),
     useAlpha_(false), useBeta_(false), useSeed_(false),
     useM_(false), useN_(false), useK_(false),
-    M_(0), N_(0), K_(0),
+    M_(0), N_(0), K_(0), devOrd_(0), platOrd_(0),
     useIncX_(false), useIncY_(false),
     incX_(0), incY_(0),
-    useImages_(false), devType_(CL_DEVICE_TYPE_GPU), imageA_(0), imageB_(0)
+    useImages_(false), devType_(CL_DEVICE_TYPE_DEFAULT), imageA_(0), imageB_(0)
 {
     memset(&alpha_, 0, sizeof(alpha_));
     memset(&beta_, 0, sizeof(beta_));
@@ -57,7 +57,7 @@ BlasBase::~BlasBase()
     /*
      * Teardown() is disabled due to troubles with test interrupting
      * with CTRL-C in windows. This occurs since after pressing of these keys
-     * the OpenCL runtime is destroyed before calling global object destructors.
+     * the OpenCL runtime is destroyed before calling global object destructor's.
      */
 #if 0
     TearDown();
@@ -110,37 +110,16 @@ BlasBase::getDevice(cl_device_type type, const char* name,
     char *str;
     cl_platform_id *platforms, selPlatform = NULL;
     cl_uint nrPlatforms;
-    cl_device_info devInfo;
 
     nrPlatforms = getPlatforms(&platforms, &err);
 
     if (error != NULL) {
         *error = CL_SUCCESS;
     }
 
-    /*
-     * If device name is not specified, then any AMD device is preferable.
-     * It there are not AMD devices of such a type presented in the system,
-     * then get a device of another vendor. If this is the additional device
-     * which is being tried to get, it must be supported by the same platform
-     * as the primary device does.
-     */
-
-    if (name == NULL) {
-        name = "Advanced Micro Devices, Inc.";
-        devInfo = CL_DEVICE_VENDOR;
-    }
-    else {
-        devInfo = CL_DEVICE_NAME;
-        type = CL_DEVICE_TYPE_ALL;
-    }
-
-    for (p = 0; p < nrPlatforms; p++) {
-        cl_platform_id platform = platforms[p];
-        err = clGetDeviceIDs(platform, type, 0, NULL, &nrDevices);
-        if (err == CL_DEVICE_NOT_FOUND) {
-            continue;
-        }
+    if (platOrd_ < nrPlatforms) {
+        platform_ = platforms[platOrd_];
+        err = clGetDeviceIDs(platform_, type, 0, NULL, &nrDevices);
         if (err != CL_SUCCESS) {
             if (error != NULL) {
                 *error = err;
@@ -152,7 +131,7 @@ BlasBase::getDevice(cl_device_type type, const char* name,
         }
 
         devices = new cl_device_id[nrDevices];
-        err = clGetDeviceIDs(platform, type, nrDevices, devices, NULL);
+        err = clGetDeviceIDs(platform_, type, nrDevices, devices, NULL);
         if (err != CL_SUCCESS) {
             if (error != NULL) {
                 *error = err;
@@ -161,40 +140,15 @@ BlasBase::getDevice(cl_device_type type, const char* name,
             return NULL;
         }
 
-        for (i = 0; i < nrDevices; i++) {
-            err = clGetDeviceInfo(devices[i], devInfo, 0, NULL, &sz);
-            if (err != CL_SUCCESS) {
-                continue;
-            }
-            str = new char[sz + 1];
-            memset(str, 0, sz + 1);
-            err = clGetDeviceInfo(devices[i], devInfo, sz, str, NULL);
-            if (err != CL_SUCCESS) {
-                delete[] str;
-                continue;
-            }
-            if ((devInfo == CL_DEVICE_VENDOR) && (result == NULL) &&
-                ((platform_ == NULL) || (platform == platform_))) {
-
-                result = devices[i];
-                selPlatform = platform;
-            }
-                printf("---- %s\n", str);
-            if (strcmp(str, name) == 0) {
-                //printf("---- %s\n", str);
-                platform_ = platform;
-                result = devices[i];
-                delete[] str;
-                break;
-            }
-            delete[] str;
+        if (devOrd_ < nrDevices) {
+            result = devices[devOrd_];
         }
         delete[] devices;
         devices = NULL;
     }
-
-    if (platform_ == NULL) {
-        platform_ = selPlatform;
+    else
+    {
+        platform_ = NULL;
     }
 
     delete[] platforms;
@@ -211,6 +165,7 @@ BlasBase::SetUp()
     cl_device_id devices[2] = {NULL, NULL};
 
     primaryDevice_ = getDevice(devType_, devName_, &err);
+
     if ((err != CL_SUCCESS) || (primaryDevice_ == NULL)) {
         ASSERT_EQ(CL_SUCCESS, clGetPlatformIDs(1, &platform_, NULL));
         ASSERT_EQ(CL_SUCCESS,
@@ -243,7 +198,7 @@ BlasBase::SetUp()
 	printf("SetUp: Created context %p\n", context_);
 	#endif
 	printf("SetUp: about to create command queues\n");
-    for (i = 0; i < MAX_COMMAND_QUEUES; i++) {
+    for (i = 0; i < numCommandQueues_; i++) {
         cl_device_id dev;
 
         dev = (i == addDevQueueIdx) ? additionalDevice_ : primaryDevice_;
@@ -260,10 +215,9 @@ BlasBase::TearDown()
 {
     cl_uint i;
 
-    for (i = 0; i < MAX_COMMAND_QUEUES; i++) {
+    for (i = 0; i < numCommandQueues_; i++) {
         clReleaseCommandQueue(commandQueues_[i]);
     }
-    numCommandQueues_ = 1;
 
     if (context_ != NULL) {
         clReleaseContext(context_);
@@ -282,20 +236,23 @@ BlasBase::initialized()
 }
 
 bool
-BlasBase::setDeviceType(cl_device_type* devType, const char* devName)
+BlasBase::setDeviceType(const TestParams& params)
 {
-    if (devType_ == *devType && devName_ == devName) {
+    // Early exit if no device state changed
+    if (devType_ == params.devType && devName_ == params.devName && platOrd_ == params.platOrd && devOrd_ == params.devOrd) {
         return true;
     }
 
-    devType_ = *devType;
-    devName_ = devName;
+    devType_ = params.devType;
+    devName_ = params.devName;
+    platOrd_ = params.platOrd;
+    devOrd_ = params.devOrd;
     if (!initialized()) {
         return true;
     }
     TearDown();
     SetUp();
-    *devType = devType_;
+
     return initialized();
 }