Skip to content

Replace store of freeze in allocop and in emit new struct with memset since aggregate stores are bad #55879

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 6 commits into from
Oct 18, 2024
Merged

Replace store of freeze in allocop and in emit new struct with memset since aggregate stores are bad #55879

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cce1bd
Replace store of freeze in allocop and in emit new struct with memset…
gbaraldi Sep 25, 2024
a891be2
Apply suggestions from code review
gbaraldi Sep 26, 2024
a3df253
Merge branch 'master' into gb/memset
gbaraldi Oct 4, 2024
6ea886d
Merge branch 'master' into gb/memset
gbaraldi Oct 8, 2024
dd89975
Fix promotion_point mishap
gbaraldi Oct 15, 2024
9c6875c
Fix llvmpasses tests
gbaraldi Oct 16, 2024
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
6 changes: 3 additions & 3 deletions src/cgutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4199,7 +4199,7 @@ static jl_cgval_t emit_new_struct(jl_codectx_t &ctx, jl_value_t *ty, size_t narg
else {
strct = UndefValue::get(lt);
if (nargs < nf)
strct = ctx.builder.CreateFreeze(strct);
strct = ctx.builder.CreateFreeze(strct); // Change this to zero initialize instead?
}
}
else if (tracked.second) {
Expand Down Expand Up @@ -4393,9 +4393,9 @@ static jl_cgval_t emit_new_struct(jl_codectx_t &ctx, jl_value_t *ty, size_t narg
if (promotion_point)
ctx.builder.SetInsertPoint(promotion_point);
if (strct) {
promotion_point = cast<FreezeInst>(ctx.builder.CreateFreeze(UndefValue::get(lt)));
jl_aliasinfo_t ai = jl_aliasinfo_t::fromTBAA(ctx, ctx.tbaa().tbaa_stack);
ai.decorateInst(ctx.builder.CreateStore(promotion_point, strct));
ai.decorateInst(ctx.builder.CreateMemSet(strct, ConstantInt::get(getInt8Ty(ctx.builder.getContext()), 0),
jl_datatype_size(ty), MaybeAlign(jl_datatype_align(ty))));
}
ctx.builder.restoreIP(savedIP);
}
Expand Down
11 changes: 3 additions & 8 deletions src/llvm-alloc-opt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,14 +622,9 @@ void Optimizer::initializeAlloca(IRBuilder<> &prolog_builder, AllocaInst *buff,
return;
assert(!buff->isArrayAllocation());
Type *T = buff->getAllocatedType();
Value *Init = UndefValue::get(T);
if ((allockind & AllocFnKind::Zeroed) != AllocFnKind::Unknown)
Init = Constant::getNullValue(T); // zero, as described
else if (allockind == AllocFnKind::Unknown)
Init = Constant::getNullValue(T); // assume zeroed since we didn't find the attribute
else
Init = prolog_builder.CreateFreeze(UndefValue::get(T)); // assume freeze, since LLVM does not natively support this case
prolog_builder.CreateStore(Init, buff);
const DataLayout &DL = F.getParent()->getDataLayout();
prolog_builder.CreateMemSet(buff, ConstantInt::get(Type::getInt8Ty(prolog_builder.getContext()), 0), DL.getTypeAllocSize(T), buff->getAlign());

}

// This function should not erase any safepoint so that the lifetime marker can find and cache
Expand Down