diff options
| author | Tim Rogers <[email protected]> | 2013-02-22 21:31:31 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:50:05 -0700 |
| commit | 1f421f9fd3f576880d21483aed369576b08143d1 (patch) | |
| tree | 86598d0b654339632021e658e5064bc38c010306 /src/gpgpu-sim | |
| parent | 7a90f721b00a6f0a9bbac5f63b374932fc780b5b (diff) | |
Fixed at least one error in the valgrind build. Forgot to initial a member variable.
I thought the init() function where dynamic_warp_id is initialized was called on construction.
It is not. Added a default value in the constructor. Maybe a code review would have caught this :)
Also cleaned up some weird code I had in the ptx_instruction::to_string().
Also trimmed out tabs from our stored source line string so it is much more readable on print
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 15310]
Diffstat (limited to 'src/gpgpu-sim')
| -rw-r--r-- | src/gpgpu-sim/shader.cc | 1 | ||||
| -rw-r--r-- | src/gpgpu-sim/shader.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc index 9d974db..797ebc0 100644 --- a/src/gpgpu-sim/shader.cc +++ b/src/gpgpu-sim/shader.cc @@ -786,7 +786,6 @@ void scheduler_unit::order_by_priority( std::vector< T >& result_list, result_list.clear(); typename std::vector< T > temp = input_list; - if ( ORDERING_GREEDY_THEN_PRIORITY_FUNC == ordering ) { T greedy_value = *last_issued_from_input; result_list.push_back( greedy_value ); diff --git a/src/gpgpu-sim/shader.h b/src/gpgpu-sim/shader.h index 952651e..fd1cb88 100644 --- a/src/gpgpu-sim/shader.h +++ b/src/gpgpu-sim/shader.h @@ -101,6 +101,7 @@ public: assert( m_inst_in_pipeline==0); m_imiss_pending=false; m_warp_id=(unsigned)-1; + m_dynamic_warp_id = (unsigned)-1; n_completed = m_warp_size; m_n_atomic=0; m_membar=false; |