Skip to content

[SYCL][NFC] Remove unused instances of WGSize array from work_group_size attributes #2983

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.

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
Jan 5, 2021
Merged
Changes from all commits
Commits
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
10 changes: 3 additions & 7 deletions clang/lib/Sema/SemaDeclAttr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2975,8 +2975,7 @@ static void handleWeakImportAttr(Sema &S, Decl *D, const ParsedAttr &AL) {
// In case the value of 'max_global_work_dim' attribute equals to 0 we shall
// ensure that if max_work_group_size and reqd_work_group_size attributes exist,
// they hold equal values (1, 1, 1).
static bool checkWorkGroupSizeValues(Sema &S, Decl *D, const ParsedAttr &AL,
uint32_t WGSize[3]) {
static bool checkWorkGroupSizeValues(Sema &S, Decl *D, const ParsedAttr &AL) {
bool Result = true;
auto checkZeroDim = [&S, &AL](auto &A, size_t X, size_t Y, size_t Z,
bool ReverseAttrs = false) -> bool {
Expand Down Expand Up @@ -3067,8 +3066,6 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
if (D->isInvalidDecl())
return;

uint32_t WGSize[3];

Expr *XDimExpr = AL.getArgAsExpr(0);

// If no attribute argument is specified, set to default value '1'
Expand Down Expand Up @@ -3121,7 +3118,7 @@ static void handleWorkGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
}
}

if (!checkWorkGroupSizeValues(S, D, AL, WGSize))
if (!checkWorkGroupSizeValues(S, D, AL))
return;

S.addIntelSYCLTripleArgFunctionAttr<WorkGroupAttr>(D, AL, XDimExpr, YDimExpr,
Expand Down Expand Up @@ -3230,8 +3227,7 @@ static void handleMaxGlobalWorkDimAttr(Sema &S, Decl *D,

Expr *E = Attr.getArgAsExpr(0);

uint32_t WGSize[3] = {1, 1, 1};
if (!checkWorkGroupSizeValues(S, D, Attr, WGSize)) {
if (!checkWorkGroupSizeValues(S, D, Attr)) {
D->setInvalidDecl();
return;
}
Expand Down