From 11b308e7363e937966b035b4891db32b4eece3bf Mon Sep 17 00:00:00 2001 From: Tor Aamodt Date: Fri, 1 Oct 2010 08:55:28 -0800 Subject: integrating recent changes from fermi-test into fermi (i'll use "fermi" for more disruptive changes to the pipeline model such as updating the MSHRs and getting rid of the warp tracker, ripping out DWF, etc...) [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 7805] --- src/gpgpusim_entrypoint.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gpgpusim_entrypoint.h') diff --git a/src/gpgpusim_entrypoint.h b/src/gpgpusim_entrypoint.h index 2563c5e..22b82f2 100644 --- a/src/gpgpusim_entrypoint.h +++ b/src/gpgpusim_entrypoint.h @@ -70,20 +70,20 @@ #include extern time_t g_simulation_starttime; -void gpgpu_ptx_sim_init_perf(); +class gpgpu_sim *gpgpu_ptx_sim_init_perf(); int gpgpu_cuda_ptx_sim_main_perf( const char *kernel_key, struct dim3 gridDim, struct dim3 blockDim, - struct gpgpu_ptx_sim_arg *grid_params ); + gpgpu_ptx_sim_arg_list_t grid_params ); int gpgpu_opencl_ptx_sim_main_perf( class function_info *entry, struct dim3 gridDim, struct dim3 blockDim, - struct gpgpu_ptx_sim_arg *grid_params ); + gpgpu_ptx_sim_arg_list_t grid_params ); int gpgpu_opencl_ptx_sim_main_func( class function_info *entry, struct dim3 gridDim, struct dim3 blockDim, - struct gpgpu_ptx_sim_arg *grid_params ); + gpgpu_ptx_sim_arg_list_t grid_params ); #endif -- cgit v1.3