misc: fix build warnings

Things fixed:
* accel: couple of header changes
* cuda: unused function and sign compares
* llvm-wg: braces in assert
* test: removal of target ocl version

Author: RABijl

examples/accel/OpenCLcontext.cpp

@@ -21,8 +21,7 @@
    IN THE SOFTWARE.
 */
 
-
-#include <CL/cl2.hpp>
+#include <CL/opencl.hpp>
 
 #include <string>
 #include <vector>

examples/accel/OpenCLcontext.h

@@ -24,7 +24,9 @@
 
 #pragma once
 
+#ifndef CL_USE_DEPRECATED_OPENCL_1_1_APIS
 #define CL_USE_DEPRECATED_OPENCL_1_1_APIS
+#endif
 #undef CL_HPP_ENABLE_EXCEPTIONS
 
 #include <memory>

lib/CL/devices/cuda/pocl-cuda.c

@@ -2090,6 +2090,7 @@ pocl_cuda_submit_kernel (CUstream stream, _cl_command_node *cmd,
           }
         case POCL_ARG_TYPE_IMAGE:
         case POCL_ARG_TYPE_SAMPLER:
+        case POCL_ARG_TYPE_PIPE:
           POCL_ABORT ("Unhandled argument type for CUDA\n");
           break;
         }
@@ -2375,8 +2376,7 @@ pocl_cuda_submit_node (_cl_command_node *node, cl_command_queue cq, int locked)
         }
       else
         {
-          int i;
-          for (i = 0; i < cmd->svm_free.num_svm_pointers; i++)
+          for (unsigned int i = 0; i < cmd->svm_free.num_svm_pointers; i++)
             {
               void *ptr = cmd->svm_free.svm_pointers[i];
               POCL_LOCK_OBJ (event->context);

lib/CL/devices/cuda/pocl-ptx-gen.cc

@@ -470,6 +470,7 @@ void fixPrintF(llvm::Module *Module) {
 
 // TODO broken, replaces in whole module not just  1 function
 // Replace all load users of a scalar global variable with new value.
+#if 0
 static void replaceScalarGlobalVar(llvm::Module *Module, const char *Name,
                                    llvm::Value *NewValue) {
   auto GlobalVar = Module->getGlobalVariable(Name);
@@ -486,6 +487,7 @@ static void replaceScalarGlobalVar(llvm::Module *Module, const char *Name,
   }
   GlobalVar->eraseFromParent();
 }
+#endif
 
 // Add an extra kernel argument for the dimensionality.
 void handleGetWorkDim(llvm::Module *Module) {

lib/CL/pocl_llvm_wg.cc

@@ -838,7 +838,7 @@ static int convertBCorSPV(char *InputPath,
   uint64_t ContentSize = 0;
   llvm::LLVMContext LLVMCtx;
 
-  assert(Reverse || TargetVersion.major && "Invalid SPIR-V target version!");
+  assert((Reverse || TargetVersion.major) && "Invalid SPIR-V target version!");
 
 #ifdef HAVE_LLVM_SPIRV_LIB
   std::string Errors;

tests/regression/test_issue_1525.cpp

@@ -6,7 +6,6 @@
 
 #define CL_HPP_ENABLE_EXCEPTIONS
 #define CL_HPP_MINIMUM_OPENCL_VERSION 110
-#define CL_HPP_TARGET_OPENCL_VERSION 110
 #include <CL/opencl.hpp>
 #include <cassert>
 #include <iostream>