Fix for Bug 111, integrated in CL10260

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc
index 06e4c65..2cafedc 100644
--- a/src/gpgpu-sim/shader.cc
+++ b/src/gpgpu-sim/shader.cc
@@ -456,9 +456,9 @@ void shader_core_stats::print( FILE* fout ) const
    fprintf(fout, "gpu_reg_bank_conflict_stalls = %d\n", gpu_reg_bank_conflict_stalls);
 
    fprintf(fout, "Warp Occupancy Distribution:\n");
-   fprintf(fout, "Stall:%d\t", shader_cycle_distro[0]);
-   fprintf(fout, "W0_Idle:%d\t", shader_cycle_distro[1]);
-   fprintf(fout, "W0_Mem:%d", shader_cycle_distro[2]);
+   fprintf(fout, "Stall:%d\t", shader_cycle_distro[2]);
+   fprintf(fout, "W0_Idle:%d\t", shader_cycle_distro[0]);
+   fprintf(fout, "W0_Scoreboard:%d", shader_cycle_distro[1]);
    for (unsigned i = 3; i < m_config->warp_size + 3; i++) 
       fprintf(fout, "\tW%d:%d", i-2, shader_cycle_distro[i]);
    fprintf(fout, "\n");
@@ -470,9 +470,9 @@ void shader_core_stats::visualizer_print( gzFile visualizer_file )
     gzprintf(visualizer_file, "WarpDivergenceBreakdown:");
     unsigned int total=0;
     unsigned int cf = (m_config->gpgpu_warpdistro_shader==-1)?m_config->num_shader():1;
+    gzprintf(visualizer_file, " %d", (shader_cycle_distro[2] - last_shader_cycle_distro[2]) / cf );
     gzprintf(visualizer_file, " %d", (shader_cycle_distro[0] - last_shader_cycle_distro[0]) / cf );
     gzprintf(visualizer_file, " %d", (shader_cycle_distro[1] - last_shader_cycle_distro[1]) / cf );
-    gzprintf(visualizer_file, " %d", (shader_cycle_distro[2] - last_shader_cycle_distro[2]) / cf );
     for (unsigned i=0; i<m_config->warp_size+3; i++) {
        if ( i>=3 ) {
           total += (shader_cycle_distro[i] - last_shader_cycle_distro[i]);