Skip to content

codegen: use direct value PHI for pointer-free aggregate types #59914

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −14
Open

codegen: use direct value PHI for pointer-free aggregate types #59914

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
34 changes: 20 additions & 14 deletions src/codegen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5813,37 +5813,43 @@ static void emit_phinode_assign(jl_codectx_t &ctx, ssize_t idx, jl_value_t *r)
}
jl_cgval_t slot;
PHINode *value_phi = NULL;
bool has_tracked_pointers = false;
if (!isboxed && vtype->isAggregateType()) {
// the value will be moved into dest in the predecessor critical block.
// here it's moved into phi in the successor (from dest)
auto tracked = CountTrackedPointers(vtype);
if (tracked.count) {
// Aggregates with pointers have split representation (separate data and roots PHIs)
has_tracked_pointers = true;
roots.resize(tracked.count);
assert(tracked.count == split_value_size((jl_datatype_t*)phiType).second);
for (size_t nr = 0; nr < tracked.count; nr++) {
auto root_phi = PHINode::Create(ctx.types().T_prjlvalue, jl_array_nrows(edges), "root_phi");
root_phi->insertInto(BB, InsertPt);
roots[nr] = root_phi;
}
}
AllocaInst *phi = nullptr;
if (!tracked.all) {
Align align(julia_alignment(phiType));
unsigned nb = jl_datatype_size(phiType);
dest = emit_static_alloca(ctx, nb, align);
phi = cast<AllocaInst>(dest->clone());
AllocaInst *phi = nullptr;
if (!tracked.all) {
Align align(julia_alignment(phiType));
unsigned nb = jl_datatype_size(phiType);
dest = emit_static_alloca(ctx, nb, align);
phi = cast<AllocaInst>(dest->clone());
#if JL_LLVM_VERSION >= 200000
phi->insertBefore(dest->getIterator());
phi->insertBefore(dest->getIterator());
#else
phi->insertBefore(dest);
phi->insertBefore(dest);
#endif
ctx.builder.CreateMemCpy(phi, align, dest, align, nb, false);
ctx.builder.CreateLifetimeEnd(dest);
ctx.builder.CreateMemCpy(phi, align, dest, align, nb, false);
ctx.builder.CreateLifetimeEnd(dest);
}
slot = mark_julia_slot(phi, phiType, NULL, ctx.tbaa().tbaa_stack,
roots.empty() ? ArrayRef<Value*>() : ArrayRef((Value *const *)&roots.front(), roots.size()));
}
slot = mark_julia_slot(phi, phiType, NULL, ctx.tbaa().tbaa_stack,
roots.empty() ? ArrayRef<Value*>() : ArrayRef((Value *const *)&roots.front(), roots.size()));
}
else {
if (!has_tracked_pointers) {
// Everything else uses a direct value PHI:
// - Non-aggregate types (boxed or unboxed)
// - Pointer-free aggregates
value_phi = PHINode::Create(vtype, jl_array_nrows(edges), "value_phi");
value_phi->insertInto(BB, InsertPt);
slot = mark_julia_type(ctx, value_phi, isboxed, phiType);
Expand Down