From 6eb2c84753d4538ef6ee6ee27802bff9adbbefab Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Mon, 9 Aug 2010 00:36:06 -0800 Subject: refactor: remove extern decl up to gpgpusim_entrypoint.cc [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7178] --- src/cuda-sim/cuda-sim.cc | 15 +---- src/cuda-sim/ptx_sim.h | 14 ++--- src/gpgpu-sim/addrdec.cc | 3 +- src/gpgpu-sim/cflogger.h | 123 ------------------------------------- src/gpgpu-sim/dram.cc | 7 --- src/gpgpu-sim/dram_sched.cc | 6 +- src/gpgpu-sim/gpu-sim.cc | 3 +- src/gpgpu-sim/gpu-sim.h | 35 +++++------ src/gpgpu-sim/mem_latency_stat.cc | 4 +- src/gpgpu-sim/shader.cc | 2 +- src/gpgpu-sim/stat-tool.cc | 4 +- src/gpgpu-sim/stat-tool.h | 124 ++++++++++++++++++++++++++++++++++++++ src/gpgpu-sim/visualizer.cc | 13 ++-- src/gpgpu-sim/visualizer.h | 2 - src/gpgpusim_entrypoint.cc | 1 - 15 files changed, 162 insertions(+), 194 deletions(-) delete mode 100644 src/gpgpu-sim/cflogger.h create mode 100644 src/gpgpu-sim/stat-tool.h (limited to 'src') diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc index a55fb79..9d62a59 100644 --- a/src/cuda-sim/cuda-sim.cc +++ b/src/cuda-sim/cuda-sim.cc @@ -80,20 +80,17 @@ #include "ptx_loader.h" #include "ptx_parser.h" #include "../gpgpu-sim/gpu-sim.h" - -extern bool g_interactive_debugger_enabled; +#include "ptx_sim.h" +#include "../gpgpusim_entrypoint.h" int gpgpu_ptx_instruction_classification=0; void ** g_inst_classification_stat = NULL; void ** g_inst_op_classification_stat= NULL; int g_ptx_kernel_count = -1; // used for classification stat collection purposes - int g_debug_execution = 0; int g_debug_thread_uid = 0; addr_t g_debug_pc = 0xBEEF1518; - unsigned g_ptx_sim_num_insn = 0; - std::map TextureToArrayMap; // texture bindings std::map TextureToInfoMap; std::map NameToTextureMap; @@ -1115,7 +1112,6 @@ void init_inst_classification_stat() { std::map *g_kernel_name_to_function_lookup=NULL; std::map *g_host_to_kernel_entrypoint_name_lookup=NULL; -extern unsigned g_ptx_thread_info_uid_next; void gpgpu_cuda_ptx_sim_init_grid( const char *kernel_key, struct gpgpu_ptx_sim_arg* args, struct dim3 gridDim, struct dim3 blockDim ) @@ -1388,13 +1384,6 @@ void read_sim_environment_variables() } } - - - - - -extern time_t g_simulation_starttime; - ptx_cta_info *g_func_cta_info = NULL; #define MAX(a,b) (((a)>(b))?(a):(b)) diff --git a/src/cuda-sim/ptx_sim.h b/src/cuda-sim/ptx_sim.h index 0379686..e9270be 100644 --- a/src/cuda-sim/ptx_sim.h +++ b/src/cuda-sim/ptx_sim.h @@ -90,13 +90,11 @@ struct gpgpu_ptx_sim_kernel_info { #include #include "opcodes.h" -#ifdef __cplusplus - - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include #include "memory.h" @@ -484,6 +482,6 @@ bool isspace_shared( unsigned smid, addr_t addr ); bool isspace_global( addr_t addr ); memory_space_t whichspace( addr_t addr ); -#endif +extern unsigned g_ptx_thread_info_uid_next; #endif diff --git a/src/gpgpu-sim/addrdec.cc b/src/gpgpu-sim/addrdec.cc index 333d6de..0ed44d0 100644 --- a/src/gpgpu-sim/addrdec.cc +++ b/src/gpgpu-sim/addrdec.cc @@ -65,11 +65,10 @@ #include #include "addrdec.h" -//#include "gpu-sim.h" +#include "gpu-sim.h" #include "../option_parser.h" int ADDR_CHIP_S = 10; -extern int gpgpu_mem_address_mask; long int powli( long int x, long int y ) // compute x to the y { diff --git a/src/gpgpu-sim/cflogger.h b/src/gpgpu-sim/cflogger.h deleted file mode 100644 index 2afe732..0000000 --- a/src/gpgpu-sim/cflogger.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * cflogger.h - * - * Copyright (c) 2009 by Tor M. Aamodt, Wilson W. L. Fung, and the - * University of British Columbia - * Vancouver, BC V6T 1Z4 - * All Rights Reserved. - * - * THIS IS A LEGAL DOCUMENT BY DOWNLOADING GPGPU-SIM, YOU ARE AGREEING TO THESE - * TERMS AND CONDITIONS. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - * NOTE: The files libcuda/cuda_runtime_api.c and src/cuda-sim/cuda-math.h - * are derived from the CUDA Toolset available from http://www.nvidia.com/cuda - * (property of NVIDIA). The files benchmarks/BlackScholes/ and - * benchmarks/template/ are derived from the CUDA SDK available from - * http://www.nvidia.com/cuda (also property of NVIDIA). The files from - * src/intersim/ are derived from Booksim (a simulator provided with the - * textbook "Principles and Practices of Interconnection Networks" available - * from http://cva.stanford.edu/books/ppin/). As such, those files are bound by - * the corresponding legal terms and conditions set forth separately (original - * copyright notices are left in files from these sources and where we have - * modified a file our copyright notice appears before the original copyright - * notice). - * - * Using this version of GPGPU-Sim requires a complete installation of CUDA - * which is distributed seperately by NVIDIA under separate terms and - * conditions. To use this version of GPGPU-Sim with OpenCL requires a - * recent version of NVIDIA's drivers which support OpenCL. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. Neither the name of the University of British Columbia nor the names of - * its contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * 4. This version of GPGPU-SIM is distributed freely for non-commercial use only. - * - * 5. No nonprofit user may place any restrictions on the use of this software, - * including as modified by the user, by any other authorized user. - * - * 6. GPGPU-SIM was developed primarily by Tor M. Aamodt, Wilson W. L. Fung, - * Ali Bakhoda, George L. Yuan, at the University of British Columbia, - * Vancouver, BC V6T 1Z4 - */ - -#ifndef CFLOGGER_H -#define CFLOGGER_H - -#include "../abstract_hardware_model.h" - -void try_snap_shot (unsigned long long current_cycle); -void set_spill_interval (unsigned long long interval); -void spill_log_to_file (FILE *fout, int final, unsigned long long current_cycle); - -void create_thread_CFlogger( int n_loggers, int n_threads, int n_insn, address_type start_pc, unsigned long long logging_interval); -void destroy_thread_CFlogger( ); -void cflog_update_thread_pc( int logger_id, int thread_id, address_type pc ); -void cflog_snapshot( int logger_id, unsigned long long cycle ); -void cflog_print(FILE *fout); -void cflog_print_path_expression(FILE *fout); -void cflog_visualizer_print(FILE *fout); - - -void insn_warp_occ_create( int n_loggers, int simd_width, int n_insn ); -void insn_warp_occ_log( int logger_id, address_type pc, int warp_occ ); -void insn_warp_occ_print( FILE *fout ); - - -void shader_warp_occ_create( int n_loggers, int simd_width, unsigned long long logging_interval ); -void shader_warp_occ_log( int logger_id, int warp_occ ); -void shader_warp_occ_snapshot( int logger_id, unsigned long long current_cycle ); -void shader_warp_occ_print( FILE *fout ); - - -void shader_mem_acc_create( int n_loggers, int n_dram, int n_bank, unsigned long long logging_interval ); -void shader_mem_acc_log( int logger_id, int dram_id, int bank, char rw ); -void shader_mem_acc_snapshot( int logger_id, unsigned long long current_cycle ); -void shader_mem_acc_print( FILE *fout ); - - -void shader_mem_lat_create( int n_loggers, unsigned long long logging_interval ); -void shader_mem_lat_log( int logger_id, int latency ); -void shader_mem_lat_snapshot( int logger_id, unsigned long long current_cycle ); -void shader_mem_lat_print( FILE *fout ); - - -int get_shader_normal_cache_id(); -int get_shader_texture_cache_id(); -int get_shader_constant_cache_id(); -void shader_cache_access_create( int n_loggers, int n_types, unsigned long long logging_interval ); -void shader_cache_access_log( int logger_id, int type, int miss); -void shader_cache_access_unlog( int logger_id, int type, int miss); -void shader_cache_access_print( FILE *fout ); - - -void shader_CTA_count_create( int n_shaders, unsigned long long logging_interval); -void shader_CTA_count_log( int shader_id, int nCTAadded ); -void shader_CTA_count_unlog( int shader_id, int nCTAdone ); -void shader_CTA_count_resetnow( ); -void shader_CTA_count_print( FILE *fout ); -void shader_CTA_count_visualizer_print( FILE *fout ); - -#endif /* CFLOGGER_H */ diff --git a/src/gpgpu-sim/dram.cc b/src/gpgpu-sim/dram.cc index a4e69f8..f86d968 100644 --- a/src/gpgpu-sim/dram.cc +++ b/src/gpgpu-sim/dram.cc @@ -66,16 +66,9 @@ #include "gpu-sim.h" #include "gpu-misc.h" -//#include "shader.h" #include "dram.h" #include "mem_latency_stat.h" -extern unsigned max_dq_latency; -extern unsigned max_dq_latency; -unsigned int gpu_n_warps; -extern unsigned int gpu_n_mem_per_ctrlr; -extern unsigned int recent_dram_util; - #ifdef DRAM_VERIFY int PRINT_CYCLE = 0; #endif diff --git a/src/gpgpu-sim/dram_sched.cc b/src/gpgpu-sim/dram_sched.cc index 30c8752..e678042 100644 --- a/src/gpgpu-sim/dram_sched.cc +++ b/src/gpgpu-sim/dram_sched.cc @@ -68,11 +68,7 @@ #include "gpu-misc.h" #include "gpu-sim.h" #include "../abstract_hardware_model.h" - -extern unsigned max_mrq_latency; -extern unsigned mrq_lat_table[24]; -extern int gpgpu_memlatency_stat; -extern unsigned int **concurrent_row_access; //concurrent_row_access[dram chip id][bank id] +#include "mem_latency_stat.h" ideal_dram_scheduler::ideal_dram_scheduler( dram_t *dm ) { diff --git a/src/gpgpu-sim/gpu-sim.cc b/src/gpgpu-sim/gpu-sim.cc index 0cef489..f0646d2 100644 --- a/src/gpgpu-sim/gpu-sim.cc +++ b/src/gpgpu-sim/gpu-sim.cc @@ -86,7 +86,7 @@ #include "addrdec.h" #include "dwf.h" #include "warp_tracker.h" -#include "cflogger.h" +#include "stat-tool.h" #include "l2cache.h" #include "../cuda-sim/ptx-stats.h" @@ -209,7 +209,6 @@ void visualizer_printstat(); void time_vector_create(int ld_size,int st_size); void time_vector_print(void); void time_vector_update(unsigned int uid,int slot ,long int cycle,int type); -void check_time_vector_update(unsigned int uid,int slot ,long int latency,int type); void node_req_hist_clear(void *p); void node_req_hist_dump(void *p); void node_req_hist_update(void * p,int node, long long cycle); diff --git a/src/gpgpu-sim/gpu-sim.h b/src/gpgpu-sim/gpu-sim.h index 58ff4de..338336e 100644 --- a/src/gpgpu-sim/gpu-sim.h +++ b/src/gpgpu-sim/gpu-sim.h @@ -72,10 +72,6 @@ #define NUM_SHADERS 8 #define STREAMS_PER_FILE 128 -//unsigned int run_gpu_sim(int grid_num); - -unsigned int get_converge_point(unsigned int pc, void *thd); - #define GPU_RSTAT_SHD_INFO 0x1 #define GPU_RSTAT_BW_STAT 0x2 #define GPU_RSTAT_WARP_DIS 0x4 @@ -95,17 +91,16 @@ unsigned int get_converge_point(unsigned int pc, void *thd); #define GPU_MEMLATSTAT_MC 0x2 #define GPU_MEMLATSTAT_QUEUELOGS 0x4 -//void gpu_reg_options(option_parser_t opp); -//void init_gpu(); -void gpu_print_stat(); - -int mem_ctrl_full( int mc_id ); +#define MhZ *1000000 -void dramqueue_latency_log_dump(); -void dump_pipeline_impl( int mask, int s, int m ); -unsigned int run_gpu_sim(int grid_num); -extern void gpu_reg_options(class OptionParser * opp); -extern void init_gpu(); +extern void init_gpu(); +extern void gpu_reg_options(class OptionParser * opp); +extern unsigned int run_gpu_sim(int grid_num); +extern unsigned int get_converge_point(unsigned int pc, void *thd); +extern void gpu_print_stat(); +extern int mem_ctrl_full( int mc_id ); +extern void dramqueue_latency_log_dump(); +extern void dump_pipeline_impl( int mask, int s, int m ); extern unsigned int L1_write_miss; extern unsigned int L1_read_miss; @@ -167,11 +162,11 @@ extern int pdom_sched_type; extern int n_pdom_sc_orig_stat; extern int n_pdom_sc_single_stat; extern int gpgpu_cuda_sim; - -#ifndef MhZ - #define MhZ *1000000 -#endif - -extern void check_time_vector_update(unsigned int uid,int slot ,long int latency,int type); +extern int gpgpu_mem_address_mask; +extern bool g_interactive_debugger_enabled; +extern unsigned int gpu_n_mem_per_ctrlr; +extern unsigned int recent_dram_util; +extern unsigned int **concurrent_row_access; //concurrent_row_access[dram chip id][bank id] +extern unsigned long long gpu_tot_sim_insn; #endif diff --git a/src/gpgpu-sim/mem_latency_stat.cc b/src/gpgpu-sim/mem_latency_stat.cc index 81589de..19cc76b 100644 --- a/src/gpgpu-sim/mem_latency_stat.cc +++ b/src/gpgpu-sim/mem_latency_stat.cc @@ -70,8 +70,10 @@ #include "gpu-misc.h" #include "shader.h" #include "mem_fetch.h" -#include "cflogger.h" +#include "stat-tool.h" #include "../cuda-sim/ptx-stats.h" +#include "visualizer.h" + #include #include #include diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index ef3a8c0..6cafc48 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -71,7 +71,7 @@ #include "dram.h" #include "dwf.h" #include "warp_tracker.h" -#include "cflogger.h" +#include "stat-tool.h" #include "gpu-misc.h" #include "../cuda-sim/ptx_sim.h" #include "../cuda-sim/ptx-stats.h" diff --git a/src/gpgpu-sim/stat-tool.cc b/src/gpgpu-sim/stat-tool.cc index 98a6917..d957e0c 100644 --- a/src/gpgpu-sim/stat-tool.cc +++ b/src/gpgpu-sim/stat-tool.cc @@ -62,6 +62,8 @@ * Vancouver, BC V6T 1Z4 */ +#include "stat-tool.h" + #include #include #include @@ -190,8 +192,6 @@ void linear_histogram::add2bin (int sample) { #include #include -#include "cflogger.h" - ///////////////////////////////////////////////////////////////////////////////////// // logger snapshot trigger: // - automate the snap_shot part of loggers to avoid modifying simulation loop everytime diff --git a/src/gpgpu-sim/stat-tool.h b/src/gpgpu-sim/stat-tool.h new file mode 100644 index 0000000..79de754 --- /dev/null +++ b/src/gpgpu-sim/stat-tool.h @@ -0,0 +1,124 @@ +/* + * stat-tool.h + * + * Copyright (c) 2009 by Tor M. Aamodt, Wilson W. L. Fung, and the + * University of British Columbia + * Vancouver, BC V6T 1Z4 + * All Rights Reserved. + * + * THIS IS A LEGAL DOCUMENT BY DOWNLOADING GPGPU-SIM, YOU ARE AGREEING TO THESE + * TERMS AND CONDITIONS. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + * NOTE: The files libcuda/cuda_runtime_api.c and src/cuda-sim/cuda-math.h + * are derived from the CUDA Toolset available from http://www.nvidia.com/cuda + * (property of NVIDIA). The files benchmarks/BlackScholes/ and + * benchmarks/template/ are derived from the CUDA SDK available from + * http://www.nvidia.com/cuda (also property of NVIDIA). The files from + * src/intersim/ are derived from Booksim (a simulator provided with the + * textbook "Principles and Practices of Interconnection Networks" available + * from http://cva.stanford.edu/books/ppin/). As such, those files are bound by + * the corresponding legal terms and conditions set forth separately (original + * copyright notices are left in files from these sources and where we have + * modified a file our copyright notice appears before the original copyright + * notice). + * + * Using this version of GPGPU-Sim requires a complete installation of CUDA + * which is distributed seperately by NVIDIA under separate terms and + * conditions. To use this version of GPGPU-Sim with OpenCL requires a + * recent version of NVIDIA's drivers which support OpenCL. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the University of British Columbia nor the names of + * its contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * 4. This version of GPGPU-SIM is distributed freely for non-commercial use only. + * + * 5. No nonprofit user may place any restrictions on the use of this software, + * including as modified by the user, by any other authorized user. + * + * 6. GPGPU-SIM was developed primarily by Tor M. Aamodt, Wilson W. L. Fung, + * Ali Bakhoda, George L. Yuan, at the University of British Columbia, + * Vancouver, BC V6T 1Z4 + */ + +#ifndef STAT_TOOL_H +#define STAT_TOOL_H + +#include "../abstract_hardware_model.h" +#include + +void try_snap_shot (unsigned long long current_cycle); +void set_spill_interval (unsigned long long interval); +void spill_log_to_file (FILE *fout, int final, unsigned long long current_cycle); + +void create_thread_CFlogger( int n_loggers, int n_threads, int n_insn, address_type start_pc, unsigned long long logging_interval); +void destroy_thread_CFlogger( ); +void cflog_update_thread_pc( int logger_id, int thread_id, address_type pc ); +void cflog_snapshot( int logger_id, unsigned long long cycle ); +void cflog_print(FILE *fout); +void cflog_print_path_expression(FILE *fout); +void cflog_visualizer_print(FILE *fout); + + +void insn_warp_occ_create( int n_loggers, int simd_width, int n_insn ); +void insn_warp_occ_log( int logger_id, address_type pc, int warp_occ ); +void insn_warp_occ_print( FILE *fout ); + + +void shader_warp_occ_create( int n_loggers, int simd_width, unsigned long long logging_interval ); +void shader_warp_occ_log( int logger_id, int warp_occ ); +void shader_warp_occ_snapshot( int logger_id, unsigned long long current_cycle ); +void shader_warp_occ_print( FILE *fout ); + + +void shader_mem_acc_create( int n_loggers, int n_dram, int n_bank, unsigned long long logging_interval ); +void shader_mem_acc_log( int logger_id, int dram_id, int bank, char rw ); +void shader_mem_acc_snapshot( int logger_id, unsigned long long current_cycle ); +void shader_mem_acc_print( FILE *fout ); + + +void shader_mem_lat_create( int n_loggers, unsigned long long logging_interval ); +void shader_mem_lat_log( int logger_id, int latency ); +void shader_mem_lat_snapshot( int logger_id, unsigned long long current_cycle ); +void shader_mem_lat_print( FILE *fout ); + + +int get_shader_normal_cache_id(); +int get_shader_texture_cache_id(); +int get_shader_constant_cache_id(); +void shader_cache_access_create( int n_loggers, int n_types, unsigned long long logging_interval ); +void shader_cache_access_log( int logger_id, int type, int miss); +void shader_cache_access_unlog( int logger_id, int type, int miss); +void shader_cache_access_print( FILE *fout ); + + +void shader_CTA_count_create( int n_shaders, unsigned long long logging_interval); +void shader_CTA_count_log( int shader_id, int nCTAadded ); +void shader_CTA_count_unlog( int shader_id, int nCTAdone ); +void shader_CTA_count_resetnow( ); +void shader_CTA_count_print( FILE *fout ); +void shader_CTA_count_visualizer_print( FILE *fout ); + +#endif /* CFLOGGER_H */ diff --git a/src/gpgpu-sim/visualizer.cc b/src/gpgpu-sim/visualizer.cc index d74c5fb..6eec3be 100644 --- a/src/gpgpu-sim/visualizer.cc +++ b/src/gpgpu-sim/visualizer.cc @@ -65,6 +65,9 @@ #include "l2cache.h" #include "shader.h" #include "../option_parser.h" +#include "mem_latency_stat.h" +#include "stat-tool.h" + #include #include #include @@ -78,18 +81,14 @@ extern unsigned int gpgpu_n_processed_writes; extern unsigned int gpgpu_n_cache_bkconflict; extern unsigned int gpgpu_n_shmem_bkconflict; extern unsigned int *max_return_queue_length; -extern unsigned max_mrq_latency; -extern unsigned max_dq_latency; -extern unsigned max_mf_latency; -extern unsigned max_icnt2mem_latency; -extern unsigned max_icnt2sh_latency; extern int gpgpu_warpdistro_shader; extern unsigned ***mem_access_type_stats; extern unsigned int warp_size; extern unsigned int *shader_cycle_distro; -void time_vector_print_interval2file(FILE *outfile); -void time_vector_print_interval2gzfile(gzFile outfile); + +static void time_vector_print_interval2file(FILE *outfile); +static void time_vector_print_interval2gzfile(gzFile outfile); void cflog_visualizer_gzprint(gzFile fout); void shader_CTA_count_visualizer_gzprint(gzFile fout); float shd_cache_windowed_cache_miss_rate(shd_cache_t*, int); diff --git a/src/gpgpu-sim/visualizer.h b/src/gpgpu-sim/visualizer.h index bbc94bf..19e2d2a 100644 --- a/src/gpgpu-sim/visualizer.h +++ b/src/gpgpu-sim/visualizer.h @@ -69,8 +69,6 @@ void visualizer_options(class OptionParser *opp); void visualizer_printstat(); void time_vector_create(int ld_size,int st_size); void time_vector_print(void); -void time_vector_print_interval2file(FILE *outfile); -void time_vector_print_interval2gzfile(gzFile outfile); void time_vector_update(unsigned int uid,int slot ,long int cycle,int type); void check_time_vector_update(unsigned int uid,int slot ,long int latency,int type); diff --git a/src/gpgpusim_entrypoint.cc b/src/gpgpusim_entrypoint.cc index 7707b35..2f304b7 100644 --- a/src/gpgpusim_entrypoint.cc +++ b/src/gpgpusim_entrypoint.cc @@ -102,7 +102,6 @@ void gpgpu_ptx_sim_init_perf() g_simulation_starttime = time((time_t *)NULL); } -extern unsigned long long gpu_tot_sim_insn; static void print_simulation_time() { -- cgit v1.3