diff options
| author | Tor Aamodt <[email protected]> | 2010-08-10 18:04:54 -0800 |
|---|---|---|
| committer | Tor Aamodt <[email protected]> | 2010-08-10 18:04:54 -0800 |
| commit | b621489268b00e816eb18e72be53f9a049787ffb (patch) | |
| tree | 7acb45634570179f27caaed9ae8243868c72c549 /src/cuda-sim | |
| parent | 6eb2c84753d4538ef6ee6ee27802bff9adbbefab (diff) | |
refactor: mostly finished getting rid of extern decl
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7183]
Diffstat (limited to 'src/cuda-sim')
| -rw-r--r-- | src/cuda-sim/cuda-sim.h | 4 | ||||
| -rw-r--r-- | src/cuda-sim/ptx_ir.h | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/cuda-sim/cuda-sim.h b/src/cuda-sim/cuda-sim.h index 7e05f7e..baf3b63 100644 --- a/src/cuda-sim/cuda-sim.h +++ b/src/cuda-sim/cuda-sim.h @@ -17,6 +17,10 @@ extern memory_space *g_global_mem; extern int g_debug_execution; extern int g_debug_thread_uid; extern std::map<std::string,function_info*> *g_kernel_name_to_function_lookup; +extern void ** g_inst_classification_stat; +extern void ** g_inst_op_classification_stat; +extern int g_ptx_kernel_count; // used for classification stat collection purposes + extern void gpgpu_cuda_ptx_sim_init_grid( const char *kernel_key, struct gpgpu_ptx_sim_arg *args, diff --git a/src/cuda-sim/ptx_ir.h b/src/cuda-sim/ptx_ir.h index 1b1d864..ce68505 100644 --- a/src/cuda-sim/ptx_ir.h +++ b/src/cuda-sim/ptx_ir.h @@ -1194,6 +1194,7 @@ void copy_args_into_buffer_list( const ptx_instruction * pI, void copy_buffer_list_into_frame(ptx_thread_info * thread, arg_buffer_list_t &arg_values); void copy_buffer_to_frame(ptx_thread_info * thread, const arg_buffer_t &a); +#if !defined(__CUDA_RUNTIME_API_H__) /*******************************/ // These declarations should be identical to those in ./../../cuda-sim-dev/libcuda/texture_types.h enum cudaChannelFormatKind { @@ -1241,8 +1242,8 @@ struct textureReference { enum cudaTextureAddressMode addressMode[2]; struct cudaChannelFormatDesc channelDesc; }; - /**********************************/ +#endif struct textureInfo { unsigned int texel_size; //size in bytes, e.g. (channelDesc.x+y+z+w)/8 @@ -1274,5 +1275,7 @@ extern std::map<std::string,symbol_table*> g_sym_name_to_symbol_table; void gpgpu_ptx_assemble( std::string kname, void *kinfo ); #include "../option_parser.h" void ptx_reg_options(option_parser_t opp); +unsigned ptx_kernel_shmem_size( void *kernel_impl ); +unsigned ptx_kernel_nregs( void *kernel_impl ); #endif |