From ad4b448e846b1cd3ac244f02fc1e21ab37eaec55 Mon Sep 17 00:00:00 2001
From: Jin Wang <jin.wang@gatech.edu>
Date: Tue, 30 Aug 2016 20:30:17 -0700
Subject: BUG: concurrent kernel on the same SMX does not work with non-legacy
 local memory mapping, turn off by default

---
 src/gpgpu-sim/shader.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/gpgpu-sim/shader.cc')

diff --git a/src/gpgpu-sim/shader.cc b/src/gpgpu-sim/shader.cc
index 59a2d8b..d17e51d 100644
--- a/src/gpgpu-sim/shader.cc
+++ b/src/gpgpu-sim/shader.cc
@@ -1978,7 +1978,9 @@ void shader_core_ctx::register_cta_thread_exit( unsigned cta_num, kernel_info_t
           fflush(stdout);
 
           //Shader can only be empty when no more cta are dispatched
-          assert(m_kernel == NULL || !m_gpu->kernel_more_cta_left(m_kernel));
+          if(kernel != m_kernel) {
+              assert(m_kernel == NULL || !m_gpu->kernel_more_cta_left(m_kernel));
+          }
           m_kernel = NULL;
       }
 
-- 
cgit v1.3