[Bug target/103201] New: [12 Regression] trunk 20211111 ftbfs for amdgcn

[Bug target/103201] New: [12 Regression] trunk 20211111 ftbfs for amdgcn

[doko at debian dot org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

            Bug ID: 103201
           Summary: [12 Regression] trunk 20211111 ftbfs for amdgcn
           Product: gcc
           Version: 12.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: target
          Assignee: unassigned at gcc dot gnu.org
          Reporter: doko at debian dot org
  Target Milestone: ---

seen with trunk 20211111, building the amdgcn offload compiler:

../../../src-gcn/libgomp/teams.c: In function 'GOMP_teams_reg':
../../../src-gcn/libgomp/teams.c:49:6: error: 'struct gomp_thread' has no
member named 'num_teams'
   49 |   thr->num_teams = num_teams - 1;
      |      ^~
../../../src-gcn/libgomp/teams.c:50:11: error: 'struct gomp_thread' has no
member named 'team_num'
   50 |   for (thr->team_num = 0; thr->team_num < num_teams; thr->team_num++)
      |           ^~
../../../src-gcn/libgomp/teams.c:50:30: error: 'struct gomp_thread' has no
member named 'team_num'
   50 |   for (thr->team_num = 0; thr->team_num < num_teams; thr->team_num++)
      |                              ^~
../../../src-gcn/libgomp/teams.c:50:57: error: 'struct gomp_thread' has no
member named 'team_num'
   50 |   for (thr->team_num = 0; thr->team_num < num_teams; thr->team_num++)
      |                                                         ^~
../../../src-gcn/libgomp/teams.c:52:6: error: 'struct gomp_thread' has no
member named 'num_teams'
   52 |   thr->num_teams = 0;
      |      ^~
../../../src-gcn/libgomp/teams.c:53:6: error: 'struct gomp_thread' has no
member named 'team_num'
   53 |   thr->team_num = 0;
      |      ^~
../../../src-gcn/libgomp/teams.c: In function 'omp_get_num_teams':
../../../src-gcn/libgomp/teams.c:65:13: error: 'struct gomp_thread' has no
member named 'num_teams'
   65 |   return thr->num_teams + 1;
      |             ^~
../../../src-gcn/libgomp/teams.c: In function 'omp_get_team_num':
../../../src-gcn/libgomp/teams.c:72:13: error: 'struct gomp_thread' has no
member named 'team_num'
   72 |   return thr->team_num;
      |             ^~

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn

[rguenth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Priority|P3                          |P1
           Keywords|                            |build
   Target Milestone|---                         |12.0

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn – libgomp/teams.c:49:6: error: 'struct gomp_thread' has no member named 'num_teams'

[burnus at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

Tobias Burnus <burnus at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |ams at gcc dot gnu.org,
                   |                            |jakub at gcc dot gnu.org
           Keywords|                            |openmp
            Summary|[12 Regression] trunk       |[12 Regression] trunk
                   |20211111 ftbfs for amdgcn   |20211111 ftbfs for amdgcn –
                   |                            |libgomp/teams.c:49:6:
                   |                            |error: 'struct gomp_thread'
                   |                            |has no member named
                   |                            |'num_teams'

--- Comment #1 from Tobias Burnus <burnus at gcc dot gnu.org> ---
Confirmed – likely due to Jakub's change for OpenMP 5.1, which has
num_teams(lower:upper) instead of only num_teams(val) in the clause.

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn – libgomp/teams.c:49:6: error: 'struct gomp_thread' has no member named 'num_teams'

[marxin at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

Martin Liška <marxin at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |NEW
                 CC|                            |marxin at gcc dot gnu.org
   Last reconfirmed|                            |2021-11-12
     Ever confirmed|0                           |1

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn – libgomp/teams.c:49:6: error: 'struct gomp_thread' has no member named 'num_teams'

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

Jakub Jelinek <jakub at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED
           Assignee|unassigned at gcc dot gnu.org      |jakub at gcc dot gnu.org

--- Comment #2 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Created attachment 51777
  --> https://gcc.gnu.org/bugzilla/attachment.cgi?id=51777&action=edit
gcc12-pr103201.patch

I think this should fix it, but I currently don't have a way to test it.

I was relying on libgomp/teams.c not being compiled for the
!LIBGOMP_USE_PTHREAD targets...

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn – libgomp/teams.c:49:6: error: 'struct gomp_thread' has no member named 'num_teams'

[ams at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

--- Comment #3 from Andrew Stubbs <ams at gcc dot gnu.org> ---
I did some preliminary testing on your patch: the libgomp.c/target-teams-1.c
testcase runs fine on amdgcn. I presume that that covers most of the existing
features of those runtime calls?

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn – libgomp/teams.c:49:6: error: 'struct gomp_thread' has no member named 'num_teams'

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

--- Comment #4 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <jakub@gcc.gnu.org>:

https://gcc.gnu.org/g:f49c7a4fb23d82c89c97acec88770b300c903d9a

commit r12-5200-gf49c7a4fb23d82c89c97acec88770b300c903d9a
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Fri Nov 12 16:11:02 2021 +0100

    libgomp: Unbreak gcn offload build

    My recent libgomp change apparently broke libgomp build for gcn offloading.
    The problem is that gcn, unlike nvptx, doesn't override teams.c source file
    and the patch I've committed assumed all the non-LIBGOMP_USE_PTHREADS
targets
    do not use it.  My understanding is that gcn included omp_get_num_teams
    and omp_get_team_num definitions in both icv-device.o and teams.o,
    with the definitions only in the former working correctly.

    This patch brings gcn into sync with how nvptx does it, that teams.c
    is overridden, provides a dummy GOMP_teams_reg and
omp_get_{num_teams,team_num}
    definitions and icv-device.c doesn't provide those.

    2021-11-12  Jakub Jelinek  <jakub@redhat.com>

            PR target/103201
            * config/gcn/icv-device.c (omp_get_num_teams, omp_get_team_num):
Move
            to ...
            * config/gcn/teams.c: ... here.  New file.

[Bug target/103201] [12 Regression] trunk 20211111 ftbfs for amdgcn – libgomp/teams.c:49:6: error: 'struct gomp_thread' has no member named 'num_teams'

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=103201

Jakub Jelinek <jakub at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|ASSIGNED                    |RESOLVED

--- Comment #5 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Should be fixed now.