summaryrefslogtreecommitdiff
path: root/src/gpgpu-sim/shader.cc
diff options
context:
space:
mode:
authorJin Wang <[email protected]>2016-08-30 20:30:17 -0700
committerJin Wang <[email protected]>2016-09-02 16:16:56 -0700
commitad4b448e846b1cd3ac244f02fc1e21ab37eaec55 (patch)
treea434741383e6caef709e386305daec42e2cc833b /src/gpgpu-sim/shader.cc
parent623a88e5d5c6c3edb94404ef6e5ea100caec9deb (diff)
BUG: concurrent kernel on the same SMX does not work with non-legacy local memory mapping, turn off by default
Diffstat (limited to 'src/gpgpu-sim/shader.cc')
-rw-r--r--src/gpgpu-sim/shader.cc4
1 files changed, 3 insertions, 1 deletions
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;
}