diff options
| author | Tim Rogers <[email protected]> | 2011-10-27 16:39:07 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:18:23 -0700 |
| commit | 332f225a945acd9c884dc0fb7cb993e6865dc415 (patch) | |
| tree | b9b92ef871a4d64a0e077ce31fe25e67ae6da58b | |
| parent | f76b1aaeea5077e83f95ef39564e73bcbec25b37 (diff) | |
Warnings cleanup
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 10753]
| -rw-r--r-- | libopencl/opencl_runtime_api.cc | 3 | ||||
| -rw-r--r-- | src/cuda-sim/cuda-sim.cc | 5 | ||||
| -rw-r--r-- | src/cuda-sim/ptx_loader.cc | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/libopencl/opencl_runtime_api.cc b/libopencl/opencl_runtime_api.cc index f9c1515..2f71848 100644 --- a/libopencl/opencl_runtime_api.cc +++ b/libopencl/opencl_runtime_api.cc @@ -691,8 +691,7 @@ clCreateProgramWithBinary(cl_context /* context */, cl_int * /* errcode_ret */) CL_API_SUFFIX__VERSION_1_0 { opencl_not_finished(__my_func__, __LINE__ ); - cl_program temp; - return temp; + return cl_program(); } extern CL_API_ENTRY cl_int CL_API_CALL diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc index 027c1de..f57a746 100644 --- a/src/cuda-sim/cuda-sim.cc +++ b/src/cuda-sim/cuda-sim.cc @@ -1452,7 +1452,7 @@ void gpgpu_cuda_ptx_sim_main_func( kernel_info_t &kernel ) threadLocalMemory = localMemoryPlace->second; } //new thread initialization - newThread->init( g_the_gpu, NULL, NULL, NULL, NULL, NULL ); + newThread->init( g_the_gpu, NULL, 0, 0, 0, 0 ); newThread->set_info(functionInfo); newThread->set_nctaid(CTA_Id3d); newThread->set_ntid(kernel.get_cta_dim()); @@ -1532,13 +1532,12 @@ void gpgpu_cuda_ptx_sim_main_func( kernel_info_t &kernel ) { //execute the warp threads till a barrier met - printf("Executing warp %d out of %d and threads count is %d \n",i,ctaWarpsList.size(), ctaLiveThreads); + printf("Executing warp %d out of %zu and threads count is %d \n",i,ctaWarpsList.size(), ctaLiveThreads); while(true){ //for each warp execute threads until blocked or done active_mask_t takenBranches; bool atBarrier =false; - bool stop=false; // printf("In warp %d of size %d\n ",i,ctaWarpsList[i].size()); int threadsDoneInThisWarp =0; diff --git a/src/cuda-sim/ptx_loader.cc b/src/cuda-sim/ptx_loader.cc index 5e3e50a..b78a170 100644 --- a/src/cuda-sim/ptx_loader.cc +++ b/src/cuda-sim/ptx_loader.cc @@ -45,7 +45,7 @@ bool g_override_embedded_ptx = false; extern "C" int ptx_parse(); extern "C" int ptx__scan_string(const char*); -extern "C" const char *g_ptxinfo_filename = NULL; +extern "C" const char *g_ptxinfo_filename; extern "C" int ptxinfo_parse(); extern "C" int ptxinfo_debug; extern "C" FILE *ptxinfo_in; |