@@ -26,28 +26,43 @@
#include "libgomp.h"
#include <limits.h>
+asm ("\n// BEGIN GLOBAL VAR DECL: __gomp_team_num"
+ "\n.visible .shared .align 4 .u32 __gomp_team_num[1];");
+
bool
GOMP_teams4 (unsigned int num_teams_lower, unsigned int num_teams_upper,
unsigned int thread_limit, bool first)
{
+ unsigned int num_blocks, block_id;
+ asm ("mov.u32 %0, %%nctaid.x;" : "=r" (num_blocks));
if (!first)
- return false;
+ {
+ unsigned in team_num;
+ if (num_blocks > gomp_num_teams_var)
+ return false;
+ asm ("ld.shared.u32\t%0, [__gomp_team_num]" : "=r" (team_num));
+ if (team_num > gomp_num_teams_var - num_blocks)
+ return false;
+ asm ("st.shared.u32\t[__gomp_team_num], %0"
+ : : "r" (team_num + num_blocks));
+ return true;
+ }
if (thread_limit)
{
struct gomp_task_icv *icv = gomp_icv (true);
icv->thread_limit_var
= thread_limit > INT_MAX ? UINT_MAX : thread_limit;
}
- unsigned int num_blocks, block_id;
- asm ("mov.u32 %0, %%nctaid.x;" : "=r" (num_blocks));
- asm ("mov.u32 %0, %%ctaid.x;" : "=r" (block_id));
- /* FIXME: If num_teams_lower > num_blocks, we want to loop multiple
- times for some CTAs. */
- (void) num_teams_lower;
- if (!num_teams_upper || num_teams_upper >= num_blocks)
+ if (!num_teams_upper)
num_teams_upper = num_blocks;
- else if (block_id >= num_teams_upper)
+ else if (num_blocks < num_teams_lower)
+ num_teams_upper = num_teams_lower;
+ else if (num_blocks < num_teams_upper)
+ num_teams_upper = num_blocks;
+ asm ("mov.u32 %0, %%ctaid.x;" : "=r" (block_id));
+ if (block_id >= num_teams_upper)
return false;
+ asm ("st.shared.u32\t[__gomp_team_num], %0" : : "r" (block_id));
gomp_num_teams_var = num_teams_upper - 1;
return true;
}
@@ -28,6 +28,9 @@
#include "libgomp.h"
+asm ("\n// BEGIN GLOBAL VAR DECL: __gomp_team_num"
+ "\n.extern .shared .align 4 .u32 __gomp_team_num[1];");
+
void
GOMP_teams_reg (void (*fn) (void *), void *data, unsigned int num_teams,
unsigned int thread_limit, unsigned int flags)
@@ -48,9 +50,9 @@ omp_get_num_teams (void)
int
omp_get_team_num (void)
{
- int ctaid;
- asm ("mov.u32 %0, %%ctaid.x;" : "=r" (ctaid));
- return ctaid;
+ int team_num;
+ asm ("ld.shared.u32\t%0, [__gomp_team_num]" : "=r" (team_num));
+ return team_num;
}
ialias (omp_get_num_teams)