From 36ce0f2243fd0723a746b3c2f5f0651577312400 Mon Sep 17 00:00:00 2001 From: Tayler Hetherington Date: Fri, 30 Nov 2012 21:29:42 -0800 Subject: Merging Power model into Fermi //depot/gpgpu_sim_research/fermi_power/distribution/... to //depot/gpgpu_sim_research/fermi/distribution/... [git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 14723] --- src/gpgpusim_entrypoint.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/gpgpusim_entrypoint.cc') diff --git a/src/gpgpusim_entrypoint.cc b/src/gpgpusim_entrypoint.cc index 3aabb02..e29535e 100644 --- a/src/gpgpusim_entrypoint.cc +++ b/src/gpgpusim_entrypoint.cc @@ -41,8 +41,7 @@ #define MAX(a,b) (((a)>(b))?(a):(b)) -static int sg_argc = 3; -static const char *sg_argv[] = {"", "-config","gpgpusim.config"}; + struct gpgpu_ptx_sim_arg *grid_params; @@ -56,6 +55,13 @@ gpgpu_sim_config g_the_gpu_config; gpgpu_sim *g_the_gpu; stream_manager *g_stream_manager; + + +static int sg_argc = 3; +static const char *sg_argv[] = {"", "-config","gpgpusim.config"}; + + + static void print_simulation_time(); void *gpgpu_sim_thread_sequential(void*) -- cgit v1.3