Integration from TM-311 branch.

- Updated PTX parser to support CUDA 4.1 and 4.2.
  - Revised fatbin workaround to a more robust version (with comments explaining it).
  - Added print_simulation_time() in gpgpu_sim_thread_concurrent().

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 13789]

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gpgpusim_entrypoint.cc b/src/gpgpusim_entrypoint.cc
index 006cecd..6271f79 100644
--- a/src/gpgpusim_entrypoint.cc
+++ b/src/gpgpusim_entrypoint.cc
@@ -132,9 +132,10 @@ void *gpgpu_sim_thread_concurrent(void*)
            printf("GPGPU-Sim: ** STOP simulation thread (no work) **\n");
            fflush(stdout);
         }
-		if(sim_cycles) {
-			g_the_gpu->update_stats();
-		}
+        if(sim_cycles) {
+            g_the_gpu->update_stats();
+            print_simulation_time();
+        }
         pthread_mutex_lock(&g_sim_lock);
         g_sim_active = false;
         pthread_mutex_unlock(&g_sim_lock);