summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cuda-sim/cuda-sim.cc5
-rw-r--r--src/cuda-sim/ptx_loader.cc2
2 files changed, 3 insertions, 4 deletions
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;