Build program per device. Otherwise qualcomm platform fails to

compile for 2 devices at 1 shot!
he-sk · Jul 6, 2014 · b3ddfdb · b3ddfdb
1 parent 9ec5c0e
commit b3ddfdb
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 21 deletions.
diff --git a/src/clpeak.cpp b/src/clpeak.cpp
@@ -88,14 +88,6 @@ int clPeak::runAll()
                 isComputeInt = false;
             }
 
-            try {
-                prog.build(devices, BUILD_OPTIONS);
-            }
-            catch (cl::Error error)
-            {
-                log->print(TAB "Build Log: " + prog.getBuildInfo<CL_PROGRAM_BUILD_LOG>(devices[0]) + NEWLINE NEWLINE);
-            }
-
             for(int d=0; d < (int)devices.size(); d++)
             {
                 if(forceDevice && (d != specifiedDevice))
@@ -114,6 +106,17 @@ int clPeak::runAll()
                 log->xmlAppendAttribs("name", devInfo.deviceName);
                 log->xmlAppendAttribs("driver_version", devInfo.driverVersion);
 
+                try {
+                    vector<cl::Device> dev = {devices[d]};
+                    prog.build(dev, BUILD_OPTIONS);
+                 }
+                 catch (cl::Error error)
+                 {
+                    log->print(TAB TAB "Build Log: " + prog.getBuildInfo<CL_PROGRAM_BUILD_LOG>(devices[d])
+                                        + NEWLINE NEWLINE);
+                    continue;
+                 }
+
                 cl::CommandQueue queue = cl::CommandQueue(ctx, devices[d], CL_QUEUE_PROFILING_ENABLE);
 
                 runGlobalBandwidthTest(queue, prog, devInfo);
@@ -132,7 +135,10 @@ int clPeak::runAll()
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE;
+
+        log->print(ss.str());
         return -1;
     }
 

diff --git a/src/compute_dp.cpp b/src/compute_dp.cpp
@@ -118,8 +118,10 @@ int clPeak::runComputeDP(cl::CommandQueue &queue, cl::Program &prog, device_info
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
-        log->print(TAB TAB TAB "Tests skipped" NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE
+                                << TAB TAB TAB "Tests skipped" NEWLINE;
+        log->print(ss.str());
         return -1;
     }
 

diff --git a/src/compute_integer.cpp b/src/compute_integer.cpp
@@ -114,8 +114,10 @@ int clPeak::runComputeInteger(cl::CommandQueue &queue, cl::Program &prog, device
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
-        log->print(TAB TAB TAB "Tests skipped" NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE
+                                << TAB TAB TAB "Tests skipped" NEWLINE;
+        log->print(ss.str());
         return -1;
     }
 

diff --git a/src/compute_sp.cpp b/src/compute_sp.cpp
@@ -114,8 +114,10 @@ int clPeak::runComputeSP(cl::CommandQueue &queue, cl::Program &prog, device_info
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
-        log->print(TAB TAB TAB "Tests skipped" NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE
+                                << TAB TAB TAB "Tests skipped" NEWLINE;
+        log->print(ss.str());
         return -1;
     }
 

diff --git a/src/global_bandwidth.cpp b/src/global_bandwidth.cpp
@@ -150,8 +150,10 @@ int clPeak::runGlobalBandwidthTest(cl::CommandQueue &queue, cl::Program &prog, d
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
-        log->print(TAB TAB TAB "Tests skipped" NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE
+                                << TAB TAB TAB "Tests skipped" NEWLINE;
+        log->print(ss.str());
 
         if(arr)     delete [] arr;
         return -1;

diff --git a/src/include/clpeak.h b/src/include/clpeak.h
@@ -13,6 +13,7 @@
 #include <stdio.h>
 #include <iomanip>
 #include <string.h>
+#include <sstream>
 #include <common.h>
 #include <logger.h>
 

diff --git a/src/kernel_latency.cpp b/src/kernel_latency.cpp
@@ -50,8 +50,10 @@ int clPeak::runKernelLatency(cl::CommandQueue &queue, cl::Program &prog, device_
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
-        log->print(TAB TAB "Tests skipped" NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE
+                                << TAB TAB TAB "Tests skipped" NEWLINE;
+        log->print(ss.str());
         return -1;
     }
 

diff --git a/src/transfer_bandwidth.cpp b/src/transfer_bandwidth.cpp
@@ -249,8 +249,10 @@ int clPeak::runTransferBandwidthTest(cl::CommandQueue &queue, cl::Program &prog,
     }
     catch(cl::Error error)
     {
-        log->print(error.err() + NEWLINE);
-        log->print(TAB TAB TAB "Tests skipped" NEWLINE);
+        stringstream ss;
+        ss << error.what() << " (" << error.err() << ")" NEWLINE
+                                << TAB TAB TAB "Tests skipped" NEWLINE;
+        log->print(ss.str());
 
         if(arr)     delete [] arr;
         return -1;