diff options
| author | Tor Aamodt <[email protected]> | 2010-07-17 18:15:43 -0800 |
|---|---|---|
| committer | Tor Aamodt <[email protected]> | 2010-07-17 18:15:43 -0800 |
| commit | 619c0c87fd18a9b34d2bbcf9eb2711bbe07b8d9a (patch) | |
| tree | d8afea007fc43cee93f3abba96ada9b0f4e998f8 /src/gpgpu-sim | |
| parent | 9a6215627d9e103037632c91e6bfbd028fd82caa (diff) | |
getting rid of void pointers for ptx_thread_info
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 6874]
Diffstat (limited to 'src/gpgpu-sim')
| -rw-r--r-- | src/gpgpu-sim/gpu-sim.cc | 2 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.cc | 4 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc index d77d1e0..e7e5067 100644 --- a/src/gpgpu-sim/gpu-sim.cc +++ b/src/gpgpu-sim/gpu-sim.cc @@ -325,7 +325,7 @@ void icnt_init_grid(); void interconnect_stats(); void icnt_overal_stat(); unsigned ptx_sim_cta_size(); -unsigned ptx_sim_init_thread( void** thread_info, int sid, unsigned tid,unsigned threads_left,unsigned num_threads, core_t *core, unsigned hw_cta_id, unsigned hw_warp_id ); +unsigned ptx_sim_init_thread( ptx_thread_info** thread_info, int sid, unsigned tid,unsigned threads_left,unsigned num_threads, core_t *core, unsigned hw_cta_id, unsigned hw_warp_id ); void gpu_sim_loop( int grid_num ); diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index b9ae7da..3f084f8 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -222,8 +222,8 @@ extern unsigned long long gpu_tot_sim_cycle; extern unsigned g_max_regs_per_thread; void ptx_decode_inst( void *thd, unsigned *op, int *i1, int *i2, int *i3, int *i4, int *o1, int *o2, int *o3, int *o4, int *vectorin, int *vectorout, int *arch_reg ); void ptx_exec_inst( void *thd, address_type *addr, memory_space_t *space, unsigned *data_size, dram_callback_t* callback, unsigned warp_active_mask); -void ptx_sim_free_sm( void** thread_info ); -unsigned ptx_sim_init_thread( void** thread_info, int sid, unsigned tid,unsigned threads_left,unsigned num_threads, core_t *core, unsigned hw_cta_id, unsigned hw_warp_id); +void ptx_sim_free_sm( class ptx_thread_info** thread_info ); +unsigned ptx_sim_init_thread( class ptx_thread_info** thread_info, int sid, unsigned tid,unsigned threads_left,unsigned num_threads, core_t *core, unsigned hw_cta_id, unsigned hw_warp_id); unsigned ptx_sim_cta_size(); const struct gpgpu_ptx_sim_kernel_info* ptx_sim_kernel_info(); void set_option_gpgpu_spread_blocks_across_cores(int option); diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index 3b99ad3..1394481 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -158,7 +158,7 @@ typedef struct { typedef struct { - void *ptx_thd_info; // pointer to the functional state of the thread in cuda-sim + class ptx_thread_info *ptx_thd_info; // pointer to the functional state of the thread in cuda-sim int avail4fetch; // 1 if its instrucion can be fetch into the pipeline, 0 otherwise int warp_priority; |