Skip to content

[flang][openacc] Make num_gangs, num_workers and vector_length behavior homogenous with parallel #136341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2025
Merged

[flang][openacc] Make num_gangs, num_workers and vector_length behavior homogenous with parallel #136341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions flang/test/Semantics/OpenACC/acc-kernels.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,45 @@ program openacc_kernels_validity
!$acc kernels num_gangs(8)
!$acc end kernels

!ERROR: At most one NUM_GANGS clause can appear on the KERNELS directive or in group separated by the DEVICE_TYPE clause
!$acc kernels num_gangs(8) num_gangs(10)
!$acc end kernels

!ERROR: At most one NUM_GANGS clause can appear on the KERNELS directive or in group separated by the DEVICE_TYPE clause
!$acc kernels device_type(nvidia) num_gangs(8) num_gangs(10)
!$acc end kernels

!$acc kernels device_type(nvidia) num_gangs(8) device_type(radeon) num_gangs(10)
!$acc end kernels

!$acc kernels num_workers(8)
!$acc end kernels

!ERROR: At most one NUM_WORKERS clause can appear on the KERNELS directive or in group separated by the DEVICE_TYPE clause
!$acc kernels num_workers(8) num_workers(4)
!$acc end kernels

!ERROR: At most one NUM_WORKERS clause can appear on the KERNELS directive or in group separated by the DEVICE_TYPE clause
!$acc kernels device_type(nvidia) num_workers(8) num_workers(4)
!$acc end kernels

!$acc kernels device_type(nvidia) num_workers(8) device_type(radeon) num_workers(4)
!$acc end kernels

!$acc kernels vector_length(128)
!$acc end kernels

!ERROR: At most one VECTOR_LENGTH clause can appear on the KERNELS directive or in group separated by the DEVICE_TYPE clause
!$acc kernels vector_length(128) vector_length(124)
!$acc end kernels

!ERROR: At most one VECTOR_LENGTH clause can appear on the KERNELS directive or in group separated by the DEVICE_TYPE clause
!$acc kernels device_type(nvidia) vector_length(256) vector_length(128)
!$acc end kernels

!$acc kernels device_type(nvidia) vector_length(256) device_type(radeon) vector_length(128)
!$acc end kernels

!$acc kernels if(.true.)
!$acc end kernels

Expand Down
38 changes: 17 additions & 21 deletions llvm/include/llvm/Frontend/OpenACC/ACC.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,27 +319,23 @@ def ACC_Declare : Directive<"declare"> {

// 2.5.3
def ACC_Kernels : Directive<"kernels"> {
let allowedClauses = [
VersionedClause<ACCC_Attach>,
VersionedClause<ACCC_Copy>,
VersionedClause<ACCC_Copyin>,
VersionedClause<ACCC_Copyout>,
VersionedClause<ACCC_Create>,
VersionedClause<ACCC_DeviceType>,
VersionedClause<ACCC_NoCreate>,
VersionedClause<ACCC_Present>,
VersionedClause<ACCC_DevicePtr>,
VersionedClause<ACCC_Wait>
];
let allowedOnceClauses = [
VersionedClause<ACCC_Async>,
VersionedClause<ACCC_Default>,
VersionedClause<ACCC_If>,
VersionedClause<ACCC_NumGangs>,
VersionedClause<ACCC_NumWorkers>,
VersionedClause<ACCC_Self>,
VersionedClause<ACCC_VectorLength>
];
let allowedClauses = [VersionedClause<ACCC_Attach>,
VersionedClause<ACCC_Copy>,
VersionedClause<ACCC_Copyin>,
VersionedClause<ACCC_Copyout>,
VersionedClause<ACCC_Create>,
VersionedClause<ACCC_DeviceType>,
VersionedClause<ACCC_NoCreate>,
VersionedClause<ACCC_NumGangs>,
VersionedClause<ACCC_NumWorkers>,
VersionedClause<ACCC_Present>,
VersionedClause<ACCC_DevicePtr>,
VersionedClause<ACCC_VectorLength>,
VersionedClause<ACCC_Wait>];
let allowedOnceClauses = [VersionedClause<ACCC_Async>,
VersionedClause<ACCC_Default>,
VersionedClause<ACCC_If>,
VersionedClause<ACCC_Self>];
let association = AS_Block;
let category = CA_Executable;
}
Expand Down
Loading