This is an archive of the discontinued LLVM Phabricator instance.

Differential D101911

[OPENMP]Fix PR48851: the locals are not globalized in SPMD mode.
ClosedPublic

Authored by ABataev on May 5 2021, 8:04 AM.

Details

Reviewers
jdoerfert
estewart08
Commits
rG230953d5771f: [OPENMP]Fix PR48851: the locals are not globalized in SPMD mode.
Summary

Follow the more general patch for now, do not try to SPMDize the kernel
if the variable is used and local.

Diff Detail

Event Timeline

ABataev created this revision.May 5 2021, 8:04 AM
Herald added subscribers: guansong, yaxunl. · View Herald TranscriptMay 5 2021, 8:04 AM
ABataev requested review of this revision.May 5 2021, 8:04 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 5 2021, 8:04 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
ABataev added a comment.May 5 2021, 8:05 AM

Hi Ethan, try this patch if it fixes the issue.

Harbormaster completed remote builds in B102750: Diff 343051.May 5 2021, 9:07 AM
estewart08 added a comment.May 7 2021, 5:53 PM
In D101911#2738994, @ABataev wrote:

Hi Ethan, try this patch if it fixes the issue.

Tested this on gfx906 and v100, the main reproducer now passes.

estewart08 accepted this revision.May 7 2021, 5:55 PM

LGTM as a temporary workaround until SPMD properly assigns team private variables.

This revision is now accepted and ready to land.May 7 2021, 5:55 PM
This revision was landed with ongoing or failed builds.May 10 2021, 6:43 AM
Closed by commit rG230953d5771f: [OPENMP]Fix PR48851: the locals are not globalized in SPMD mode. (authored by ABataev). · Explain Why
This revision was automatically updated to reflect the committed changes.
ABataev added a commit: rG230953d5771f: [OPENMP]Fix PR48851: the locals are not globalized in SPMD mode..

Revision Contents

PathSize
clang/
lib/
CodeGen/
7 lines
test/
OpenMP/
5 lines

Diff 344045

clang/lib/CodeGen/CGOpenMPRuntime.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,555 Lines • ▼ Show 20 Lines for (const Stmt *S : C->body()) {
continue; continue;
} }
// Some of the statements can be ignored. // Some of the statements can be ignored.
if (isa<AsmStmt>(S) || isa<NullStmt>(S) || isa<OMPFlushDirective>(S) || if (isa<AsmStmt>(S) || isa<NullStmt>(S) || isa<OMPFlushDirective>(S) ||
isa<OMPBarrierDirective>(S) || isa<OMPTaskyieldDirective>(S)) isa<OMPBarrierDirective>(S) || isa<OMPTaskyieldDirective>(S))
continue; continue;
// Analyze declarations. // Analyze declarations.
if (const auto *DS = dyn_cast<DeclStmt>(S)) { if (const auto *DS = dyn_cast<DeclStmt>(S)) {
if (llvm::all_of(DS->decls(), [&Ctx](const Decl *D) { if (llvm::all_of(DS->decls(), [](const Decl *D) {
if (isa<EmptyDecl>(D) || isa<DeclContext>(D) || if (isa<EmptyDecl>(D) || isa<DeclContext>(D) ||
isa<TypeDecl>(D) || isa<PragmaCommentDecl>(D) || isa<TypeDecl>(D) || isa<PragmaCommentDecl>(D) ||
isa<PragmaDetectMismatchDecl>(D) || isa<UsingDecl>(D) || isa<PragmaDetectMismatchDecl>(D) || isa<UsingDecl>(D) ||
isa<UsingDirectiveDecl>(D) || isa<UsingDirectiveDecl>(D) ||
isa<OMPDeclareReductionDecl>(D) || isa<OMPDeclareReductionDecl>(D) ||
isa<OMPThreadPrivateDecl>(D) || isa<OMPAllocateDecl>(D)) isa<OMPThreadPrivateDecl>(D) || isa<OMPAllocateDecl>(D))
return true; return true;
const auto *VD = dyn_cast<VarDecl>(D); const auto *VD = dyn_cast<VarDecl>(D);
if (!VD) if (!VD)
return false; return false;
return VD->isConstexpr() || return VD->hasGlobalStorage() || !VD->isUsed();
((VD->getType().isTrivialType(Ctx) ||
VD->getType()->isReferenceType()) &&
(!VD->hasInit() || isTrivial(Ctx, VD->getInit())));
})) }))
continue; continue;
} }
// Found multiple children - cannot get the one child only. // Found multiple children - cannot get the one child only.
if (Child) if (Child)
return nullptr; return nullptr;
Child = S; Child = S;
} }
▲ Show 20 Lines • Show All 6,311 Lines • Show Last 20 Lines

clang/test/OpenMP/nvptx_SPMD_codegen.cpp

Show First 20 Lines • Show All 114 Lines • ▼ Show 20 Lines
// CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 0) // CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 0)
// CHECK-DAG: [[DISTR_LIGHT]] // CHECK-DAG: [[DISTR_LIGHT]]
// CHECK-DAG: [[FOR_LIGHT]] // CHECK-DAG: [[FOR_LIGHT]]
// CHECK-DAG: [[LIGHT]] // CHECK-DAG: [[LIGHT]]
// CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 0) // CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 0)
// CHECK-DAG: [[DISTR_LIGHT]] // CHECK-DAG: [[DISTR_LIGHT]]
// CHECK-DAG: [[FOR_LIGHT]] // CHECK-DAG: [[FOR_LIGHT]]
// CHECK-DAG: [[LIGHT]] // CHECK-DAG: [[LIGHT]]
// CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 0) // CHECK: call void @__kmpc_kernel_init(
// CHECK-DAG: [[DISTR_LIGHT]]
// CHECK-DAG: [[FOR_LIGHT]]
// CHECK-DAG: [[LIGHT]]
// CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 1) // CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 1)
// CHECK-DAG: [[DISTR_FULL]] // CHECK-DAG: [[DISTR_FULL]]
// CHECK-DAG: [[FULL]] // CHECK-DAG: [[FULL]]
// CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 1) // CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 1)
// CHECK-DAG: [[DISTR_FULL]] // CHECK-DAG: [[DISTR_FULL]]
// CHECK-DAG: [[FULL]] // CHECK-DAG: [[FULL]]
// CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 1) // CHECK: call void @__kmpc_spmd_kernel_init(i32 {{.+}}, i16 1)
// CHECK-DAG: [[DISTR_FULL]] // CHECK-DAG: [[DISTR_FULL]]
▲ Show 20 Lines • Show All 351 Lines • Show Last 20 Lines