Merge branch 'main' into matrixperf-final

Author: bashbaug

include/util.hpp

@@ -90,3 +90,20 @@ static std::string readStringFromFile(
 
     return source;
 }
+
+static bool checkPlatformIndex(
+    const std::vector<cl::Platform>& platforms,
+    int platformIndex)
+{
+    if (platforms.size() == 0) {
+        fprintf(stderr, "Error: No OpenCL platforms found.\n");
+        return false;
+    }
+    if (platformIndex >= (int)platforms.size()) {
+        fprintf(stderr, "Error: Invalid platform index %d specified (max %d)\n",
+            platformIndex,
+            (int)(platforms.size() - 1) );
+        return false;
+    }
+    return true;
+}

samples/01_copybuffer/main.cpp

@@ -8,6 +8,8 @@
 
 #include <CL/opencl.hpp>
 
+#include "util.hpp"
+
 const size_t    gwx = 1024*1024;
 
 int main(
@@ -41,6 +43,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/02_copybufferkernel/main.cpp

@@ -8,6 +8,8 @@
 
 #include <CL/opencl.hpp>
 
+#include "util.hpp"
+
 const size_t    gwx = 1024*1024;
 
 static const char kernelString[] = R"CLC(
@@ -49,6 +51,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/03_mandelbrot/main.cpp

@@ -11,6 +11,8 @@
 
 #include <CL/opencl.hpp>
 
+#include "util.hpp"
+
 const char* filename = "mandelbrot.bmp";
 
 const cl_uint width = 768;
@@ -83,6 +85,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/04_julia/main.cpp

@@ -13,6 +13,8 @@
 
 #include <chrono>
 
+#include "util.hpp"
+
 const char* filename = "julia.bmp";
 
 const float cr = -0.123f;
@@ -104,6 +106,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/04_sobel/main.cpp

@@ -13,6 +13,8 @@
 
 #include <chrono>
 
+#include "util.hpp"
+
 const char* filename = "sobel.bmp";
 
 const float cr = -0.123f;
@@ -151,6 +153,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/05_kernelfromfile/main.cpp

@@ -11,26 +11,7 @@
 #include <fstream>
 #include <string>
 
-static std::string readStringFromFile(
-    const std::string& filename )
-{
-    std::ifstream is(filename, std::ios::binary);
-    if (!is.good()) {
-        printf("Couldn't open file '%s'!\n", filename.c_str());
-        return "";
-    }
-
-    size_t filesize = 0;
-    is.seekg(0, std::ios::end);
-    filesize = (size_t)is.tellg();
-    is.seekg(0, std::ios::beg);
-
-    std::string source{
-        std::istreambuf_iterator<char>(is),
-        std::istreambuf_iterator<char>() };
-
-    return source;
-}
+#include "util.hpp"
 
 int main(
     int argc,
@@ -71,6 +52,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/05_spirvkernelfromfile/main.cpp

@@ -134,6 +134,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/06_ndrangekernelfromfile/main.cpp

@@ -11,26 +11,7 @@
 #include <fstream>
 #include <string>
 
-static std::string readStringFromFile(
-    const std::string& filename )
-{
-    std::ifstream is(filename, std::ios::binary);
-    if (!is.good()) {
-        printf("Couldn't open file '%s'!\n", filename.c_str());
-        return "";
-    }
-
-    size_t filesize = 0;
-    is.seekg(0, std::ios::end);
-    filesize = (size_t)is.tellg();
-    is.seekg(0, std::ios::beg);
-
-    std::string source{
-        std::istreambuf_iterator<char>(is),
-        std::istreambuf_iterator<char>() };
-
-    return source;
-}
+#include "util.hpp"
 
 int main(
     int argc,
@@ -86,6 +67,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );
 

samples/10_queueexperiments/main.cpp

@@ -413,6 +413,10 @@ int main(
     std::vector<cl::Platform> platforms;
     cl::Platform::get(&platforms);
 
+    if (!checkPlatformIndex(platforms, platformIndex)) {
+        return -1;
+    }
+
     printf("Running on platform: %s\n",
         platforms[platformIndex].getInfo<CL_PLATFORM_NAME>().c_str() );