phynexis-deps/openmp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[OpenMP][libomptarget] Initialize global memory stack only once.

Browse Source 
Summary: The global stack initialization function may be called multiple times. The initialization of the shared memory slots should only happen when the function is called for the first time for a given warp master thread.

Reviewers: grokos, carlo.bertolli, ABataev, caomhin

Reviewed By: grokos

Subscribers: guansong, openmp-commits

Differential Revision: https://reviews.llvm.org/D44754

git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@328148 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Gheorghe-Teodor Bercea
2018-03-21 21:02:55 +00:00
parent 12b2011759
commit 9fae99036a
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libomptarget/deviceRTLs/nvptx/src/data_sharing.cu
+8 -3
View File
@@ -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
libomptarget/deviceRTLs/nvptx/src/omptarget-nvptx.h
+7
View File
@@ -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 =