Added simple Intel support for tests

nikitavlaev · nikitavlaev · commit 8f1c167cdc98 · 2020-10-19T13:13:54.000+03:00
Added -g flag to the compile options to include debug information
Some tests are not fixed yet, more changes are coming
However, this version should be usable okay-ish
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -141,10 +141,10 @@ elseif( CMAKE_COMPILER_IS_GNUCC )
 	message( STATUS "Detected GNU compiler collection" )
 
 	if( clSPARSE_BUILD64 )
-		set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" )
+		set( CMAKE_CXX_FLAGS "-g -m64 ${CMAKE_CXX_FLAGS}" )
 		set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" )
 	else( )
-		set( CMAKE_CXX_FLAGS "-m32 ${CMAKE_CXX_FLAGS}" )
+		set( CMAKE_CXX_FLAGS "-g -m32 ${CMAKE_CXX_FLAGS}" )
 		set( CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}" )
 	endif( )
 else( )
diff --git a/src/tests/resources/opencl_utils.cpp b/src/tests/resources/opencl_utils.cpp
@@ -82,7 +82,7 @@ cl::Device getDevice( cl_platform_type pID, cl_uint dID )
 
     std::map<std::string, int> pNames;
 
-    //search for AMD or NVIDIA
+    //search for AMD, NVIDIA or INTEL
     cl_int pIndex = -1;
     for( const auto& p : platforms )
     {
@@ -96,13 +96,21 @@ cl::Device getDevice( cl_platform_type pID, cl_uint dID )
 
     //get index of desired platform;
     std::string desired_platform_name;
+    int device_type;
     if( pID == AMD )
     {
         desired_platform_name = amd_platform_str;
+        device_type = CL_DEVICE_TYPE_GPU;
     }
     else if( pID == NVIDIA )
     {
         desired_platform_name = nvidia_platform_str;
+        device_type = CL_DEVICE_TYPE_GPU;
+    }
+    else if( pID == INTEL )
+    {
+        desired_platform_name = intel_platform_str;
+        device_type = CL_DEVICE_TYPE_CPU;
     }
     else
     {
@@ -122,7 +130,7 @@ cl::Device getDevice( cl_platform_type pID, cl_uint dID )
     }
 
     std::vector<cl::Device> devices;
-    platforms[ pIndex ].getDevices( CL_DEVICE_TYPE_GPU, &devices );
+    platforms[ pIndex ].getDevices( device_type, &devices );
 
     assert( dID < devices.size( ) );
 
diff --git a/src/tests/resources/opencl_utils.h b/src/tests/resources/opencl_utils.h
@@ -30,11 +30,13 @@
 
 typedef enum _platform {
     AMD = 0,
-    NVIDIA
+    NVIDIA = 1,
+    INTEL = 2,
 } cl_platform_type;
 
 const static std::string amd_platform_str = "AMD";
 const static std::string nvidia_platform_str = "NVIDIA";
+const static std::string intel_platform_str = "Intel(R)";
 
 cl_int getPlatforms( cl_platform_id **platforms, cl_uint* num_platforms );
 
diff --git a/src/tests/test-blas1.cpp b/src/tests/test-blas1.cpp
@@ -623,7 +623,7 @@ int main (int argc, char* argv[])
     desc.add_options()
             ("help,h", "Produce this message.")
             ("platform,l", po::value(&platform)->default_value("AMD"),
-             "OpenCL platform: AMD or NVIDIA.")
+             "OpenCL platform: AMD, NVIDIA or INTEL.")
             ("device,d", po::value(&dID)->default_value(0),
              "Device id within platform.")
             ("size,s",po::value(&size)->default_value(1024),
@@ -669,6 +669,10 @@ int main (int argc, char* argv[])
         {
             pID = NVIDIA;
         }
+        else if ("INTEL" == platform)
+        {
+            pID = INTEL;
+        }
         else
         {
 
diff --git a/src/tests/test-blas2.cpp b/src/tests/test-blas2.cpp
@@ -392,7 +392,7 @@ int main (int argc, char* argv[])
             ("help,h", "Produce this message.")
             ("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")
             ("platform,l", po::value(&platform)->default_value("AMD"),
-             "OpenCL platform: AMD or NVIDIA.")
+             "OpenCL platform: AMD, NVIDIA or INTEL.")
             ("device,d", po::value(&dID)->default_value(0),
              "Device id within platform.")
             ("alpha,a", po::value(&alpha)->default_value(1.0),
@@ -439,6 +439,10 @@ int main (int argc, char* argv[])
         {
             pID = NVIDIA;
         }
+        else if ("INTEL" == platform)
+        {
+            pID = INTEL;
+        }
         else
         {
 
diff --git a/src/tests/test-blas3.cpp b/src/tests/test-blas3.cpp
@@ -657,7 +657,7 @@ int main (int argc, char* argv[])
             ("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")
             ("function,f", po::value<std::string>(&function)->default_value("SpMdM"), "Sparse functions to test. Options: SpMdM, SpMSpM, All")
             ("platform,l", po::value(&platform)->default_value("AMD"),
-             "OpenCL platform: AMD or NVIDIA.")
+             "OpenCL platform: AMD, NVIDIA or INTEL.")
             ("device,d", po::value(&dID)->default_value(0),
              "Device id within platform.")
             ("alpha,a", po::value(&alpha)->default_value(1.0),
@@ -707,6 +707,10 @@ int main (int argc, char* argv[])
         {
             pID = NVIDIA;
         }
+        else if ("INTEL" == platform)
+        {
+            pID = INTEL;
+        }
         else
         {
             std::cout << "The platform option is missing or is ill defined!\n";
diff --git a/src/tests/test-clsparse-utils.cpp b/src/tests/test-clsparse-utils.cpp
@@ -97,7 +97,7 @@ TEST( clsparseInit, control )
 
 }
 
-TEST( clsparseInit, cpp_interface )
+TEST( pID, clsparseInit, cpp_interface )
 {
     // Init OpenCL environment;
     cl_int cl_status;
@@ -128,6 +128,24 @@ TEST( clsparseInit, cpp_interface )
 
     // Get device from platform
     std::vector<cl::Device> devices;
+
+    int device_type;
+    if( pID == AMD )
+    {
+        device_type = CL_DEVICE_TYPE_GPU;
+    }
+    else if( pID == NVIDIA )
+    {
+        device_type = CL_DEVICE_TYPE_GPU;
+    }
+    else if( pID == INTEL )
+    {
+        device_type = CL_DEVICE_TYPE_CPU;
+    }
+    else
+    {
+        throw std::string( "No such platform pID: " + std::to_string( pID ) );
+    }
     cl_status = platform.getDevices( CL_DEVICE_TYPE_GPU, &devices );
 
     if( cl_status != CL_SUCCESS )
diff --git a/src/tests/test-conversion.cpp b/src/tests/test-conversion.cpp
@@ -740,7 +740,7 @@ int main (int argc, char* argv[])
             ("help,h", "Produce this message.")
             ("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")
             ("platform,l", po::value(&platform)->default_value("AMD"),
-             "OpenCL platform: AMD or NVIDIA.")
+             "OpenCL platform: AMD, NVIDIA or INTEL.")
             ("device,d", po::value(&dID)->default_value(0),
              "Device id within platform.")
             ("no_zeroes,z", po::bool_switch()->default_value(false),
@@ -781,6 +781,10 @@ int main (int argc, char* argv[])
         {
             pID = NVIDIA;
         }
+        else if ("INTEL" == platform)
+        {
+            pID = INTEL;
+        }
         else
         {
 
diff --git a/src/tests/test-solvers.cpp b/src/tests/test-solvers.cpp
@@ -261,7 +261,7 @@ int main (int argc, char* argv[])
             ("help,h", "Produce this message.")
             ("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")
             ("platform,l", po::value(&platform)->default_value("AMD"),
-             "OpenCL platform: AMD or NVIDIA.")
+             "OpenCL platform: AMD, NVIDIA or INTEL.")
             ("device,d", po::value(&dID)->default_value(0),
              "Device id within platform.")
             ("relative,r", po::value(&relativeTolerance)->default_value(1e-2),
@@ -317,6 +317,10 @@ int main (int argc, char* argv[])
         {
             pID = NVIDIA;
         }
+        else if ("INTEL" == platform)
+        {
+            pID = INTEL;
+        }
         else
         {
 

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ cl::Device getDevice( cl_platform_type pID, cl_uint dID )`
`82`	`82`
`83`	`83`	`std::map<std::string, int> pNames;`
`84`	`84`
`85`		`- //search for AMD or NVIDIA`
	`85`	`+ //search for AMD, NVIDIA or INTEL`
`86`	`86`	`cl_int pIndex = -1;`
`87`	`87`	`for( const auto& p : platforms )`
`88`	`88`	`{`
`@@ -96,13 +96,21 @@ cl::Device getDevice( cl_platform_type pID, cl_uint dID )`
`96`	`96`
`97`	`97`	`//get index of desired platform;`
`98`	`98`	`std::string desired_platform_name;`
	`99`	`+ int device_type;`
`99`	`100`	`if( pID == AMD )`
`100`	`101`	`{`
`101`	`102`	`desired_platform_name = amd_platform_str;`
	`103`	`+ device_type = CL_DEVICE_TYPE_GPU;`
`102`	`104`	`}`
`103`	`105`	`else if( pID == NVIDIA )`
`104`	`106`	`{`
`105`	`107`	`desired_platform_name = nvidia_platform_str;`
	`108`	`+ device_type = CL_DEVICE_TYPE_GPU;`
	`109`	`+ }`
	`110`	`+ else if( pID == INTEL )`
	`111`	`+ {`
	`112`	`+ desired_platform_name = intel_platform_str;`
	`113`	`+ device_type = CL_DEVICE_TYPE_CPU;`
`106`	`114`	`}`
`107`	`115`	`else`
`108`	`116`	`{`
`@@ -122,7 +130,7 @@ cl::Device getDevice( cl_platform_type pID, cl_uint dID )`
`122`	`130`	`}`
`123`	`131`
`124`	`132`	`std::vector<cl::Device> devices;`
`125`		`- platforms[ pIndex ].getDevices( CL_DEVICE_TYPE_GPU, &devices );`
	`133`	`+ platforms[ pIndex ].getDevices( device_type, &devices );`
`126`	`134`
`127`	`135`	`assert( dID < devices.size( ) );`
`128`	`136`
Original file line number	Diff line number	Diff line change
`@@ -623,7 +623,7 @@ int main (int argc, char* argv[])`
`623`	`623`	`desc.add_options()`
`624`	`624`	`("help,h", "Produce this message.")`
`625`	`625`	`("platform,l", po::value(&platform)->default_value("AMD"),`
`626`		`- "OpenCL platform: AMD or NVIDIA.")`
	`626`	`+ "OpenCL platform: AMD, NVIDIA or INTEL.")`
`627`	`627`	`("device,d", po::value(&dID)->default_value(0),`
`628`	`628`	`"Device id within platform.")`
`629`	`629`	`("size,s",po::value(&size)->default_value(1024),`
`@@ -669,6 +669,10 @@ int main (int argc, char* argv[])`
`669`	`669`	`{`
`670`	`670`	`pID = NVIDIA;`
`671`	`671`	`}`
	`672`	`+ else if ("INTEL" == platform)`
	`673`	`+ {`
	`674`	`+ pID = INTEL;`
	`675`	`+ }`
`672`	`676`	`else`
`673`	`677`	`{`
`674`	`678`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ int main (int argc, char* argv[])`
`392`	`392`	`("help,h", "Produce this message.")`
`393`	`393`	`("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")`
`394`	`394`	`("platform,l", po::value(&platform)->default_value("AMD"),`
`395`		`- "OpenCL platform: AMD or NVIDIA.")`
	`395`	`+ "OpenCL platform: AMD, NVIDIA or INTEL.")`
`396`	`396`	`("device,d", po::value(&dID)->default_value(0),`
`397`	`397`	`"Device id within platform.")`
`398`	`398`	`("alpha,a", po::value(&alpha)->default_value(1.0),`
`@@ -439,6 +439,10 @@ int main (int argc, char* argv[])`
`439`	`439`	`{`
`440`	`440`	`pID = NVIDIA;`
`441`	`441`	`}`
	`442`	`+ else if ("INTEL" == platform)`
	`443`	`+ {`
	`444`	`+ pID = INTEL;`
	`445`	`+ }`
`442`	`446`	`else`
`443`	`447`	`{`
`444`	`448`
Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,7 @@ int main (int argc, char* argv[])`
`657`	`657`	`("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")`
`658`	`658`	`("function,f", po::value<std::string>(&function)->default_value("SpMdM"), "Sparse functions to test. Options: SpMdM, SpMSpM, All")`
`659`	`659`	`("platform,l", po::value(&platform)->default_value("AMD"),`
`660`		`- "OpenCL platform: AMD or NVIDIA.")`
	`660`	`+ "OpenCL platform: AMD, NVIDIA or INTEL.")`
`661`	`661`	`("device,d", po::value(&dID)->default_value(0),`
`662`	`662`	`"Device id within platform.")`
`663`	`663`	`("alpha,a", po::value(&alpha)->default_value(1.0),`
`@@ -707,6 +707,10 @@ int main (int argc, char* argv[])`
`707`	`707`	`{`
`708`	`708`	`pID = NVIDIA;`
`709`	`709`	`}`
	`710`	`+ else if ("INTEL" == platform)`
	`711`	`+ {`
	`712`	`+ pID = INTEL;`
	`713`	`+ }`
`710`	`714`	`else`
`711`	`715`	`{`
`712`	`716`	`std::cout << "The platform option is missing or is ill defined!\n";`
Original file line number	Diff line number	Diff line change
`@@ -740,7 +740,7 @@ int main (int argc, char* argv[])`
`740`	`740`	`("help,h", "Produce this message.")`
`741`	`741`	`("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")`
`742`	`742`	`("platform,l", po::value(&platform)->default_value("AMD"),`
`743`		`- "OpenCL platform: AMD or NVIDIA.")`
	`743`	`+ "OpenCL platform: AMD, NVIDIA or INTEL.")`
`744`	`744`	`("device,d", po::value(&dID)->default_value(0),`
`745`	`745`	`"Device id within platform.")`
`746`	`746`	`("no_zeroes,z", po::bool_switch()->default_value(false),`
`@@ -781,6 +781,10 @@ int main (int argc, char* argv[])`
`781`	`781`	`{`
`782`	`782`	`pID = NVIDIA;`
`783`	`783`	`}`
	`784`	`+ else if ("INTEL" == platform)`
	`785`	`+ {`
	`786`	`+ pID = INTEL;`
	`787`	`+ }`
`784`	`788`	`else`
`785`	`789`	`{`
`786`	`790`
Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ int main (int argc, char* argv[])`
`261`	`261`	`("help,h", "Produce this message.")`
`262`	`262`	`("path,p", po::value(&path)->required(), "Path to matrix in mtx format.")`
`263`	`263`	`("platform,l", po::value(&platform)->default_value("AMD"),`
`264`		`- "OpenCL platform: AMD or NVIDIA.")`
	`264`	`+ "OpenCL platform: AMD, NVIDIA or INTEL.")`
`265`	`265`	`("device,d", po::value(&dID)->default_value(0),`
`266`	`266`	`"Device id within platform.")`
`267`	`267`	`("relative,r", po::value(&relativeTolerance)->default_value(1e-2),`
`@@ -317,6 +317,10 @@ int main (int argc, char* argv[])`
`317`	`317`	`{`
`318`	`318`	`pID = NVIDIA;`
`319`	`319`	`}`
	`320`	`+ else if ("INTEL" == platform)`
	`321`	`+ {`
	`322`	`+ pID = INTEL;`
	`323`	`+ }`
`320`	`324`	`else`
`321`	`325`	`{`
`322`	`326`