Skip to content

[OpenMP] Fix calculation of dependencies for multi-dimensional iteration space #99347

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
Jul 18, 2024
Merged

[OpenMP] Fix calculation of dependencies for multi-dimensional iteration space #99347

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
12 changes: 8 additions & 4 deletions clang/lib/CodeGen/CGOpenMPRuntime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4259,14 +4259,18 @@ std::pair<llvm::Value *, Address> CGOpenMPRuntime::emitDependClause(
// Include number of iterations, if any.

if (const auto *IE = cast_or_null<OMPIteratorExpr>(D.IteratorExpr)) {
llvm::Value *ClauseIteratorSpace =
llvm::ConstantInt::get(CGF.IntPtrTy, 1);
for (unsigned I = 0, E = IE->numOfIterators(); I < E; ++I) {
llvm::Value *Sz = CGF.EmitScalarExpr(IE->getHelper(I).Upper);
Sz = CGF.Builder.CreateIntCast(Sz, CGF.IntPtrTy, /*isSigned=*/false);
llvm::Value *NumClauseDeps = CGF.Builder.CreateNUWMul(
Sz, llvm::ConstantInt::get(CGF.IntPtrTy, D.DepExprs.size()));
NumOfRegularWithIterators =
CGF.Builder.CreateNUWAdd(NumOfRegularWithIterators, NumClauseDeps);
ClauseIteratorSpace = CGF.Builder.CreateNUWMul(Sz, ClauseIteratorSpace);
}
llvm::Value *NumClauseDeps = CGF.Builder.CreateNUWMul(
ClauseIteratorSpace,
llvm::ConstantInt::get(CGF.IntPtrTy, D.DepExprs.size()));
NumOfRegularWithIterators =
CGF.Builder.CreateNUWAdd(NumOfRegularWithIterators, NumClauseDeps);
HasRegularWithIterators = true;
continue;
}
Expand Down
29 changes: 29 additions & 0 deletions clang/test/OpenMP/depend_iterator_bug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

int x[100];
int y[100];
int z[100][100];

// CHECK-LABEL: @many_iterators_single_clause(
// CHECK: [[VLA:%.*]] = alloca [[STRUCT_KMP_DEPEND_INFO:%.*]], i64 10, align 16
Expand All @@ -24,3 +25,31 @@ void many_iterators_many_clauses(void) {
{
}
}

// CHECK-LABEL: @multidim_iterators_clause1(
// CHECK: [[VLA:%.*]] = alloca [[STRUCT_KMP_DEPEND_INFO:%.*]], i64 1, align 16
// CHECK: = call i32 @__kmpc_omp_task_with_deps(ptr {{.*}}, i32 {{.*}}, ptr {{.*}}, i32 1, ptr {{.*}}, i32 0, ptr null)
void multidim_iterators_clause1(void) {
#pragma omp task depend(iterator(i=0:1, j=0:1), in: z[i][j])
{
}
}

// CHECK-LABEL: @multidim_iterators_offset_clause(
// CHECK: [[VLA:%.*]] = alloca [[STRUCT_KMP_DEPEND_INFO:%.*]], i64 1, align 16
// CHECK: = call i32 @__kmpc_omp_task_with_deps(ptr {{.*}}, i32 {{.*}}, ptr {{.*}}, i32 1, ptr {{.*}}, i32 0, ptr null)
void multidim_iterators_offset_clause(void) {
#pragma omp task depend(iterator(i=5:6, j=10:11), in: z[i][j])
{
}
}

// CHECK-LABEL: @multidim_iterators_clause25(
// CHECK: [[VLA:%.*]] = alloca [[STRUCT_KMP_DEPEND_INFO:%.*]], i64 25, align 16
// CHECK: = call i32 @__kmpc_omp_task_with_deps(ptr {{.*}}, i32 {{.*}}, ptr {{.*}}, i32 25, ptr {{.*}}, i32 0, ptr null)
void multidim_iterators_clause25(void) {
#pragma omp task depend(iterator(i=0:5, j=0:5), in: z[i][j])
{
}
}

3 changes: 2 additions & 1 deletion clang/test/OpenMP/task_codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ for (int i = 0; i < 10; ++i)
// CHECK: [[EB_SUB_2_ADD_1_SUB:%.+]] = sub i32 [[EB_SUB_2_ADD]], 1
// CHECK: [[EB_SUB_2_ADD_1_SUB_2_DIV:%.+]] = udiv i32 [[EB_SUB_2_ADD_1_SUB]], 2
// CHECK: [[ELEMS:%.+]] = zext i32 [[EB_SUB_2_ADD_1_SUB_2_DIV]] to i64
// CHECK: [[NELEMS:%.+]] = mul nuw i64 [[ELEMS]], 1
// CHECK: [[ELEMS2:%.+]] = mul nuw i64 [[ELEMS]], 1
// CHECK: [[NELEMS:%.+]] = mul nuw i64 [[ELEMS2]], 1

// ITERATOR_TOTAL = NELEMS + 0;
// CHECK: [[ITERATOR_TOTAL:%.+]] = add nuw i64 0, [[NELEMS]]
Expand Down
Loading