summaryrefslogtreecommitdiffstats
path: root/openmp
diff options
context:
space:
mode:
authorJonas Hahnfeld <hahnjo@hahnjo.de>2018-09-03 17:24:23 +0000
committerJonas Hahnfeld <hahnjo@hahnjo.de>2018-09-03 17:24:23 +0000
commit96c13488ab30bf9b9e5bc2e4c8ca559ac5e83bbb (patch)
tree692eb14968548e9e85e8c6e77bc842ba042d2cc3 /openmp
parentc1b7a98934cefb72108933989d6edab7c5ca3f59 (diff)
downloadbcm5719-llvm-96c13488ab30bf9b9e5bc2e4c8ca559ac5e83bbb.tar.gz
bcm5719-llvm-96c13488ab30bf9b9e5bc2e4c8ca559ac5e83bbb.zip
[libomptarget][NVPTX] Fix __kmpc_spmd_kernel_deinit
If the runtime is uninitialized the master thread must Enqueue the state object, and ALL threads must return immediately. Found post-commit of https://reviews.llvm.org/D51222. llvm-svn: 341328
Diffstat (limited to 'openmp')
-rw-r--r--openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.cu2
1 files changed, 1 insertions, 1 deletions
diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.cu
index 0fe910d23b8..0f7deae51e3 100644
--- a/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.cu
+++ b/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.cu
@@ -196,8 +196,8 @@ EXTERN void __kmpc_spmd_kernel_deinit() {
int slot = smid() % MAX_SM;
omptarget_nvptx_device_simpleState[slot].Enqueue(
omptarget_nvptx_simpleThreadPrivateContext);
- return;
}
+ return;
}
if (threadId == 0) {
// Enqueue omp state object for use by another team.
OpenPOWER on IntegriCloud