removing old barrier implementation (no longer used)

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

3 files changed, 0 insertions, 59 deletions

diff --git a/src/cuda-sim/cuda-sim.cc b/src/cuda-sim/cuda-sim.cc
index 406003c..21c3b4a 100644
--- a/src/cuda-sim/cuda-sim.cc
+++ b/src/cuda-sim/cuda-sim.cc
@@ -1078,7 +1078,6 @@ unsigned ptx_sim_init_thread( kernel_info_t &kernel,
                 ctaid.x,ctaid.y,ctaid.z,t.x,t.y,t.z, thd->get_uid() );
          fflush(stdout);
       }
-      thd->m_cta_info->assert_barrier_empty();
       thd->m_cta_info->register_deleted_thread(thd);
       delete thd;
       *thread_info = NULL;
diff --git a/src/cuda-sim/ptx_sim.cc b/src/cuda-sim/ptx_sim.cc
index f3599f4..8053949 100644
--- a/src/cuda-sim/ptx_sim.cc
+++ b/src/cuda-sim/ptx_sim.cc
@@ -50,22 +50,6 @@ void ptx_cta_info::add_thread( ptx_thread_info *thd )
    m_threads_in_cta.insert(thd);
 }
 
-void ptx_cta_info::add_to_barrier( ptx_thread_info *thd )
-{
-   m_threads_waiting_at_barrier.insert(thd);
-}
-
-void ptx_cta_info::release_barrier()
-{
-   assert( m_threads_waiting_at_barrier.size() == m_threads_in_cta.size() );
-   m_threads_waiting_at_barrier.clear();
-}
-
-bool ptx_cta_info::all_at_barrier() const
-{
-   return(m_threads_waiting_at_barrier.size() == m_threads_in_cta.size());
-}
-
 unsigned ptx_cta_info::num_threads() const
 {
    return m_threads_in_cta.size();
@@ -98,7 +82,6 @@ void ptx_cta_info::check_cta_thread_status_and_reset()
       printf("\n\n");
       fail = true;
    }
-   assert_barrier_empty(true);
    if ( fail ) {
       abort();
    }
@@ -128,29 +111,6 @@ void ptx_cta_info::check_cta_thread_status_and_reset()
    m_dangling_pointers.clear();
 }
 
-void ptx_cta_info::assert_barrier_empty( bool called_from_delete_threads ) const
-{
-   if ( !m_threads_waiting_at_barrier.empty() ) {
-      printf( "\n\n" );
-      printf( "Execution error: Some threads at barrier at %s:\n", 
-              (called_from_delete_threads?"CTA re-init":"thread exit") );
-      printf( "   CTA uid = %Lu (sm_idx = %u)\n", m_uid, m_sm_idx );
-      std::set<ptx_thread_info*>::iterator b;
-      for ( b=m_threads_waiting_at_barrier.begin(); b != m_threads_waiting_at_barrier.end(); ++b ) {
-         ptx_thread_info *t = *b;
-         if ( m_dangling_pointers.find(t) != m_dangling_pointers.end() ) {
-            printf("       <thread deleted>\n");
-         } else {
-            printf("       ");
-            t->print_insn( t->get_pc(), stdout );
-            printf("\n");
-         }
-      }
-      printf("\n\n");
-      abort();
-   }
-}
-
 void ptx_cta_info::register_thread_exit( ptx_thread_info *thd )
 {
    assert( m_threads_that_have_exited.find(thd) == m_threads_that_have_exited.end() );
diff --git a/src/cuda-sim/ptx_sim.h b/src/cuda-sim/ptx_sim.h
index 3c12cc8..9d542ea 100644
--- a/src/cuda-sim/ptx_sim.h
+++ b/src/cuda-sim/ptx_sim.h
@@ -123,9 +123,6 @@ class ptx_cta_info {
 public:
    ptx_cta_info( unsigned sm_idx );
    void add_thread( ptx_thread_info *thd );
-   void add_to_barrier( ptx_thread_info *thd );
-   bool all_at_barrier() const;
-   void release_barrier();
    unsigned num_threads() const;
    void check_cta_thread_status_and_reset();
    void assert_barrier_empty( bool called_from_delete_threads = false ) const;
@@ -137,7 +134,6 @@ private:
    unsigned long long         m_uid;
    unsigned                m_sm_idx;
    std::set<ptx_thread_info*>    m_threads_in_cta;
-   std::set<ptx_thread_info*>    m_threads_waiting_at_barrier;
    std::set<ptx_thread_info*>  m_threads_that_have_exited;
    std::set<ptx_thread_info*>  m_dangling_pointers;
 };
@@ -289,21 +285,7 @@ public:
    addr_t last_eaddr() const { return m_last_effective_address;}
    memory_space_t last_space() const { return m_last_memory_space;}
    dram_callback_t last_callback() const { return m_last_dram_callback;}
-   void set_at_barrier( int barrier_num ) 
-   { 
-      m_barrier_num = barrier_num;
-      m_at_barrier = true; 
-      m_cta_info->add_to_barrier(this);
-   }
-   bool is_at_barrier() const { return m_at_barrier;}
-   bool all_at_barrier() const { return m_cta_info->all_at_barrier();}
    unsigned long long get_cta_uid() { return m_cta_info->get_sm_idx();}
-   void clear_barrier( ) 
-   { 
-      m_barrier_num = -1;
-      m_at_barrier = false; 
-   }
-   void release_barrier() { m_cta_info->release_barrier();}
 
    void set_single_thread_single_block()
    {