From 5e8eced64a8262b0190c4014e59b93c37ba3af9c Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Mon, 23 Aug 2010 09:39:43 -0800 Subject: - add '-keep' option to keep intermediate files (used for OpenCL only right now) - remove redundant initialization code of options (which confuses new users) - make bool option variables bool type - remove some more extern decls [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7247] --- src/gpgpu-sim/shader.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gpgpu-sim/shader.h') diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index 0a90225..ec1ae0b 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -67,7 +67,6 @@ #include #include #include -#include #include #include #include @@ -911,15 +910,15 @@ extern int gpgpu_interwarp_mshr_merge; extern unsigned int gpgpu_shmem_size; extern unsigned int gpgpu_shader_registers; extern unsigned int gpgpu_shader_cta; -extern int gpgpu_shmem_bkconflict; -extern int gpgpu_cache_bkconflict; +extern bool gpgpu_shmem_bkconflict; +extern bool gpgpu_cache_bkconflict; extern int gpgpu_n_cache_bank; extern int pipe_simd_width; extern int gpgpu_shmem_port_per_bank; extern int gpgpu_cache_port_per_bank; extern int gpgpu_const_port_per_bank; extern int gpgpu_shmem_pipe_speedup; -extern int gpgpu_reg_bank_conflict_model; +extern bool gpgpu_reg_bank_conflict_model; extern unsigned int gpgpu_num_reg_banks; extern unsigned int gpu_max_cta_per_shader; extern unsigned int gpu_padded_cta_size; @@ -928,5 +927,6 @@ extern unsigned int n_regconflict_stall; extern int gpgpu_coalesce_arch; extern unsigned get_max_mshr_used(shader_core_ctx_t* shader); extern void mshr_return_from_mem(shader_core_ctx_t * shader, mshr_entry_t* mshr); +void get_pdom_stack_top_info( unsigned sid, unsigned tid, unsigned *pc, unsigned *rpc ); #endif /* SHADER_H */ -- cgit v1.3