Fix some warnings (#20)

* int -> size_t in sort.hpp * fix warnings in benchmarks/{benchmark.h, sycl_reduce.cpp} * fix warnings in benchmarks
KhronosGroup · Dec 7, 2016 · fe4879f · fe4879f
1 parent 847e8b7
commit fe4879f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/benchmarks/benchmark.h b/benchmarks/benchmark.h
@@ -218,7 +218,7 @@ struct benchmark {
     const unsigned NUM_REPS = REPS;                                           \
     const unsigned STEP_SIZE = STEP_SIZE_PARAM;                               \
     const unsigned MAX_ELEMS = STEP_SIZE * (NUM_STEPS);                       \
-    for (int nelems = STEP_SIZE; nelems < MAX_ELEMS; nelems *= STEP_SIZE) {   \
+    for (size_t nelems = STEP_SIZE; nelems < MAX_ELEMS; nelems *= STEP_SIZE) {   \
       const std::string short_name = NAME;                                    \
       auto time = FUNCTION(NUM_REPS, nelems, cds);                            \
       benchmark<>::output_data(short_name, nelems, time, ba.requestedOutput); \

diff --git a/benchmarks/montecarloPI.cpp b/benchmarks/montecarloPI.cpp
@@ -52,7 +52,7 @@ benchmark<>::time_units_t benchmark_montecarlo(const unsigned numReps,
   std::srand((unsigned int)std::time(0));
   // scatter some random points in the unit circle
   int count = 0;
-  for (int i = 0; i < num_elems; i++) {
+  for (size_t i = 0; i < num_elems; i++) {
     float x = ((float)std::rand()) / RAND_MAX;
     float y = ((float)std::rand()) / RAND_MAX;
     cl::sycl::float2 p(x, y);

diff --git a/benchmarks/nbody.cpp b/benchmarks/nbody.cpp
@@ -137,7 +137,7 @@ benchmark<>::time_units_t benchmark_nbody(const unsigned numReps,
   std::vector<Body> bodies(N);
 
   // randomly generating N Particles
-  for (int i = 0; i < N; i++) {
+  for (size_t i = 0; i < N; i++) {
     auto& b = bodies[i];
     b.generateBody();
   }
@@ -156,7 +156,7 @@ benchmark<>::time_units_t benchmark_nbody(const unsigned numReps,
       h.parallel_for<class NBodyAlgorithm>(
           r, [a_bodies, vectorSize](cl::sycl::nd_item<3> id) {
             if (id.get_global(0) < vectorSize) {
-              for (int i = 0; i < vectorSize; i++) {
+              for (size_t i = 0; i < vectorSize; i++) {
                 a_bodies[id.get_global(0)].addForce(a_bodies[i]);
               }
             }

diff --git a/benchmarks/sycl_reduce.cpp b/benchmarks/sycl_reduce.cpp
@@ -46,7 +46,7 @@ benchmark<>::time_units_t benchmark_reduce(const unsigned numReps,
                                            const unsigned N,
                                            const cli_device_selector cds) {
   std::vector<int> v;
-  for (int i = 0; i < N; i++) {
+  for (size_t i = 0; i < N; i++) {
     int x = 10 * (((float)std::rand()) / RAND_MAX);
     v.push_back(x);
   }
@@ -71,16 +71,16 @@ benchmark<>::time_units_t benchmark_reduce(const unsigned numReps,
 
         h.parallel_for<class ReduceAlgorithmBench>(
             r, [aI, scratch, local, length](cl::sycl::nd_item<1> id) {
-              int globalid = id.get_global(0);
-              int localid = id.get_local(0);
+              size_t globalid = id.get_global(0);
+              size_t localid = id.get_local(0);
 
               if (globalid < length) {
                 scratch[localid] = aI[globalid];
               }
               id.barrier(cl::sycl::access::fence_space::local_space);
 
-              int min = (length < local) ? length : local;
-              for (int offset = min >> 1; offset > 0; offset = offset >> 1) {
+              size_t min = (length < local) ? length : local;
+              for (size_t offset = min >> 1; offset > 0; offset = offset >> 1) {
                 if (localid < offset) {
                   scratch[localid] += scratch[localid + offset];
                 }

diff --git a/include/sycl/algorithm/sort.hpp b/include/sycl/algorithm/sort.hpp
@@ -115,8 +115,8 @@ class sort_kernel_sequential_comp {
 
   // Simple sequential sort
   void operator()() {
-    for (int i = 0; i < vS_; i++) {
-      for (int j = 1; j < vS_; j++) {
+    for (size_t i = 0; i < vS_; i++) {
+      for (size_t j = 1; j < vS_; j++) {
         if (comp_(a_[j - 1], a_[j])) {
           sort_swap<T>(a_[j - 1], a_[j]);
         }