monte carlo pi changes

Author: andreyfe1

Libraries/oneMKL/monte_carlo_pi/mc_pi.cpp

@@ -7,7 +7,7 @@
 /*
 *
 *  Content:
-*       This file contains Monte Carlo Pi number evaluation benchmark for DPC++ 
+*       This file contains Monte Carlo Pi number evaluation benchmark for DPC++
 *       interface of random number generators.
 *
 *******************************************************************************/
@@ -126,10 +126,21 @@ int main(int argc, char ** argv) {
     }
 
     // Printing results
+    double abs_error = std::fabs(pi - estimated_pi);
+    bool failed = abs_error > 1.0e-3;
+    if(failed) {
+        std::cout << "TEST FAILED" << std::endl;
+    } else {
+        std::cout << "TEST PASSED" << std::endl;
+    }
     std::cout << "Estimated value of Pi = " << estimated_pi << std::endl;
     std::cout << "Exact value of Pi = " << pi << std::endl;
-    std::cout << "Absolute error = " << fabs(pi-estimated_pi) << std::endl;
+    std::cout << "Absolute error = " << abs_error << std::endl;
     std::cout << std::endl;
 
+    if(failed) {
+        return 1;
+    }
+
     return 0;
 }

Libraries/oneMKL/monte_carlo_pi/mc_pi_device_api.cpp

@@ -112,14 +112,25 @@ int main(int argc, char ** argv) {
     } catch (...) {
         // Some other exception detected
         std::cout << "Failure" << std::endl;
-        std::terminate();
+        exit(1);
     }
 
     // Printing results
+    double abs_error = std::fabs(pi - estimated_pi);
+    bool failed = abs_error > 1.0e-4;
+    if(failed) {
+        std::cout << "TEST FAILED" << std::endl;
+    } else {
+        std::cout << "TEST PASSED" << std::endl;
+    }
     std::cout << "Estimated value of Pi = " << estimated_pi << std::endl;
     std::cout << "Exact value of Pi = " << pi << std::endl;
-    std::cout << "Absolute error = " << fabs(pi-estimated_pi) << std::endl;
+    std::cout << "Absolute error = " << abs_error << std::endl;
     std::cout << std::endl;
 
+    if(failed) {
+        return 1;
+    }
+
     return 0;
 }

Libraries/oneMKL/monte_carlo_pi/mc_pi_usm.cpp

@@ -7,7 +7,7 @@
 /*
 *
 *  Content:
-*       This file contains Monte Carlo Pi number evaluation benchmark for DPC++ 
+*       This file contains Monte Carlo Pi number evaluation benchmark for DPC++
 *       USM-based interface of random number generators.
 *
 *******************************************************************************/
@@ -65,12 +65,14 @@ double estimate_pi(sycl::queue& q, size_t n_points) {
             sycl::vec<float, 2> r;
             size_t count = 0;
             for(int i = 0; i < count_per_thread; i++) {
-                r.load(i + item.get_global_linear_id() * count_per_thread, sycl::global_ptr<float>(rng_ptr));
+                // r.load(i + item.get_global_linear_id() * count_per_thread, sycl::global_ptr<float>(rng_ptr));
+                r[0] = rng_ptr[2 * (i + item.get_global_linear_id() * count_per_thread)];
+                r[1] = rng_ptr[2 * (i + item.get_global_linear_id() * count_per_thread) + 1];
                 if(sycl::length(r) <= 1.0f) {
                     count += 1;
                 }
             }
-            count_ptr[item.get_group_linear_id()] = reduce_over_group(item.get_group(), count, std::plus<size_t>());
+            count_ptr[item.get_group_linear_id()] = sycl::reduce_over_group(item.get_group(), count, std::plus<size_t>());
         });
     });
 
@@ -129,10 +131,21 @@ int main(int argc, char ** argv) {
     }
 
     // Printing results
+    double abs_error = std::fabs(pi - estimated_pi);
+    bool failed = abs_error > 1.0e-3;
+    if(failed) {
+        std::cout << "TEST FAILED" << std::endl;
+    } else {
+        std::cout << "TEST PASSED" << std::endl;
+    }
     std::cout << "Estimated value of Pi = " << estimated_pi << std::endl;
     std::cout << "Exact value of Pi = " << pi << std::endl;
-    std::cout << "Absolute error = " << fabs(pi-estimated_pi) << std::endl;
+    std::cout << "Absolute error = " << abs_error << std::endl;
     std::cout << std::endl;
 
+    if(failed) {
+        return 1;
+    }
+
     return 0;
 }