[Openmp-commits] [openmp] [OpenMP] Address __kmp_dist_for_static_init issue (PR #129902)

[Hansang Bae via Openmp-commits]

hansangbae wrote:

@skatrak can you try the following patch instead?

Use of the `__kmp_aux_get...()` functions ensures the runtime gets the correct numbers whether it is serialized or not.

```
diff --git a/openmp/runtime/src/kmp_sched.cpp b/openmp/runtime/src/kmp_sched.cpp
index 2e0dfac6eeb3..8404928c6ff3 100644
--- a/openmp/runtime/src/kmp_sched.cpp
+++ b/openmp/runtime/src/kmp_sched.cpp
@@ -542,9 +542,10 @@ static void __kmp_dist_for_static_init(ident_t *loc, kmp_int32 gtid,
   nth = th->th.th_team_nproc;
   team = th->th.th_team;
   KMP_DEBUG_ASSERT(th->th.th_teams_microtask); // we are in the teams construct
-  nteams = th->th.th_teams_size.nteams;
-  team_id = team->t.t_master_tid;
-  KMP_DEBUG_ASSERT(nteams == (kmp_uint32)team->t.t_parent->t.t_nproc);
+  nteams = __kmp_aux_get_num_teams();
+  team_id = __kmp_aux_get_team_num();
+  KMP_DEBUG_ASSERT(nteams == 1 ||
+                   nteams == (kmp_uint32)team->t.t_parent->t.t_nproc);
 
   // compute global trip count
   if (incr == 1) {
}
```

https://github.com/llvm/llvm-project/pull/129902