diff options
Diffstat (limited to 'src/gpgpu-sim')
| -rw-r--r-- | src/gpgpu-sim/gpu-sim.cc | 6 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.cc | 3 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.h | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc index e7e5067..d07cac6 100644 --- a/src/gpgpu-sim/gpu-sim.cc +++ b/src/gpgpu-sim/gpu-sim.cc @@ -855,7 +855,7 @@ unsigned int run_gpu_sim(int grid_num) #define DEADLOCK 0 if (gpu_deadlock_detect && gpu_deadlock) { fflush(stdout); - printf("ERROR ** deadlock detected: last writeback @ gpu_sim_cycle %u (+ gpu_tot_sim_cycle %u) (%u cycles ago)\n", + printf("GPGPU-Sim uArch: ERROR ** deadlock detected: last writeback @ gpu_sim_cycle %u (+ gpu_tot_sim_cycle %u) (%u cycles ago)\n", (unsigned) gpu_sim_insn_last_update, (unsigned) (gpu_tot_sim_cycle-gpu_sim_cycle), (unsigned) (gpu_sim_cycle - gpu_sim_insn_last_update )); fflush(stdout); @@ -1252,7 +1252,7 @@ int issue_block2core( shader_core_ctx_t *shdr, int grid_num ) if (gpgpu_spread_blocks_across_cores) { nthreads_2beissued += start_thread; } - printf("Shader %d initializing CTA #%d with hw tids from %d to %d @(%lld,%lld)", + printf("GPGPU-Sim uArch: Shader %d initializing CTA #%d with hw tids from %d to %d @(%lld,%lld)", shdr->sid, cta_id, start_thread, nthreads_2beissued, gpu_sim_cycle, gpu_tot_sim_cycle ); printf(" shdr->not_completed = %d\n", shdr->not_completed); @@ -1593,7 +1593,7 @@ void gpu_sim_loop( int grid_num ) hrs = elapsed_time/3600 - 24*days; minutes = elapsed_time/60 - 60*(hrs + 24*days); sec = elapsed_time - 60*(minutes + 60*(hrs + 24*days)); - printf("cycles: %lld inst.: %lld (ipc=%4.1f) sim_rate=%u (inst/sec) elapsed = %u:%u:%02u:%02u / %s", + printf("GPGPU-Sim uArch: cycles simulated: %lld inst.: %lld (ipc=%4.1f) sim_rate=%u (inst/sec) elapsed = %u:%u:%02u:%02u / %s", gpu_tot_sim_cycle + gpu_sim_cycle, gpu_tot_sim_insn + gpu_sim_insn, (double)gpu_sim_insn/(double)gpu_sim_cycle, (unsigned)((gpu_tot_sim_insn+gpu_sim_insn) / elapsed_time), diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index 2271d79..4901d51 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -570,7 +570,8 @@ shader_core_ctx_t* shader_create( const char *name, int sid, } } - sc = new shader_core_ctx_t( gpu_n_warp_per_shader, gpgpu_shader_cta ); + sc = (shader_core_ctx_t*)calloc(sizeof(shader_core_ctx_t),1); + sc = new (sc) shader_core_ctx_t( gpu_n_warp_per_shader, gpgpu_shader_cta ); sc->name = name; sc->sid = sid; diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index 1394481..f67e8fd 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -446,8 +446,6 @@ typedef struct shader_core_ctx : public core_t unsigned int n_registers; //registers available in the shader core unsigned int n_cta; //Limit on number of concurrent CTAs in shader core - //void *req_hist; //not used anywhere - mshr_shader_unit *mshr_unit; } shader_core_ctx_t; |