diff options
| -rw-r--r-- | openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu | 11 | ||||
| -rw-r--r-- | openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h | 7 |
2 files changed, 15 insertions, 3 deletions
diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu b/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu index e0256d3205f..8340c083895 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/data_sharing.cu @@ -346,9 +346,14 @@ EXTERN void __kmpc_data_sharing_init_stack() { &omptarget_nvptx_threadPrivateContext->TeamContext(); __kmpc_data_sharing_slot *RootS = teamDescr->RootS(WID, IsMasterThread()); - DataSharingState.SlotPtr[WID] = RootS; - DataSharingState.TailPtr[WID] = RootS; - DataSharingState.StackPtr[WID] = (void *)&RootS->Data[0]; + // If a valid address has been returned then proceed with the initalization. + // Otherwise the initialization of the slot has already happened in a + // previous call to this function. + if (RootS) { + DataSharingState.SlotPtr[WID] = RootS; + DataSharingState.TailPtr[WID] = RootS; + DataSharingState.StackPtr[WID] = (void *)&RootS->Data[0]; + } } // Currently we only support the sharing of variables between master and diff --git a/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h b/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h index 19028611203..1d063c38578 100644 --- a/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h +++ b/openmp/libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h @@ -263,6 +263,9 @@ public: // If this is invoked by the master thread of the master warp then intialize // it with a smaller slot. if (IsMasterThread) { + // Do not initalize this slot again if it has already been initalized. + if (master_rootS[0].DataEnd == &master_rootS[0].Data[0] + DS_Slot_Size) + return 0; // Initialize the pointer to the end of the slot given the size of the // data section. DataEnd is non-inclusive. master_rootS[0].DataEnd = &master_rootS[0].Data[0] + DS_Slot_Size; @@ -272,6 +275,10 @@ public: master_rootS[0].PrevSlotStackPtr = 0; return (__kmpc_data_sharing_slot *)&master_rootS[0]; } + // Do not initalize this slot again if it has already been initalized. + if (worker_rootS[wid].DataEnd == + &worker_rootS[wid].Data[0] + DS_Worker_Warp_Slot_Size) + return 0; // Initialize the pointer to the end of the slot given the size of the data // section. DataEnd is non-inclusive. worker_rootS[wid].DataEnd = |
