This is an archive of the discontinued LLVM Phabricator instance.

Differential D91471

[Coroutines] Make sure that async coroutine context size is a multiple of the alignment requirement
ClosedPublic

Authored by aschwaighofer on Nov 13 2020, 5:59 PM.

Details

Reviewers
rjmccall
Commits
rG8fb73cecfd1a: [Coroutines] Make sure that async coroutine context size is a multiple of the…
Summary

This simplifies the code the allocator has to executed

Diff Detail

Unit TestsFailed

TimeTest
360 mslinux > HWAddressSanitizer-x86_64.TestCases::sizes.cpp

Event Timeline

aschwaighofer created this revision.Nov 13 2020, 5:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 13 2020, 5:59 PM
Herald added subscribers: llvm-commits, modocache, hiraditya. · View Herald Transcript
aschwaighofer requested review of this revision.Nov 13 2020, 5:59 PM
aschwaighofer updated this revision to Diff 305285.Nov 13 2020, 6:06 PM

Update the wording of a comment.

Harbormaster completed remote builds in B78832: Diff 305285.Nov 13 2020, 6:51 PM
Harbormaster completed remote builds in B78831: Diff 305284.Nov 13 2020, 7:03 PM
rjmccall accepted this revision.Nov 13 2020, 8:18 PM

LGTM

This revision is now accepted and ready to land.Nov 13 2020, 8:18 PM
This revision was landed with ongoing or failed builds.Nov 14 2020, 5:09 AM
Closed by commit rG8fb73cecfd1a: [Coroutines] Make sure that async coroutine context size is a multiple of the… (authored by aschwaighofer). · Explain Why
This revision was automatically updated to reflect the committed changes.
aschwaighofer added a commit: rG8fb73cecfd1a: [Coroutines] Make sure that async coroutine context size is a multiple of the….

Revision Contents

PathSize
llvm/
lib/
Transforms/
Coroutines/
5 lines
test/
Transforms/
Coroutines/
4 lines

Diff 305284

llvm/lib/Transforms/Coroutines/CoroFrame.cpp

Show First 20 Lines • Show All 785 Lines • ▼ Show 20 Lines case coro::ABI::RetconOnce: {
Shape.RetconLowering.IsFrameInlineInStorage Shape.RetconLowering.IsFrameInlineInStorage
= (B.getStructSize() <= Id->getStorageSize() && = (B.getStructSize() <= Id->getStorageSize() &&
B.getStructAlign() <= Id->getStorageAlignment()); B.getStructAlign() <= Id->getStorageAlignment());
break; break;
} }
case coro::ABI::Async: { case coro::ABI::Async: {
Shape.AsyncLowering.FrameOffset = Shape.AsyncLowering.FrameOffset =
alignTo(Shape.AsyncLowering.ContextHeaderSize, Shape.FrameAlign); alignTo(Shape.AsyncLowering.ContextHeaderSize, Shape.FrameAlign);
// Also align the context size to the context alignment to make allocation
// easier for allocators.
Shape.AsyncLowering.ContextSize = Shape.AsyncLowering.ContextSize =
Shape.AsyncLowering.FrameOffset + Shape.FrameSize; alignTo(Shape.AsyncLowering.FrameOffset + Shape.FrameSize,
Shape.AsyncLowering.getContextAlignment());
if (Shape.AsyncLowering.getContextAlignment() < Shape.FrameAlign) { if (Shape.AsyncLowering.getContextAlignment() < Shape.FrameAlign) {
report_fatal_error( report_fatal_error(
"The alignment requirment of frame variables cannot be higher than " "The alignment requirment of frame variables cannot be higher than "
"the alignment of the async function context"); "the alignment of the async function context");
} }
break; break;
} }
} }
▲ Show 20 Lines • Show All 1,423 Lines • Show Last 20 Lines

llvm/test/Transforms/Coroutines/coro-async.ll

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Linesentry:
call void @some_user(i64 %val.2) call void @some_user(i64 %val.2)
tail call swiftcc void @asyncReturn(i8* %async.ctxt, %async.task* %task.2, %async.actor* %actor) tail call swiftcc void @asyncReturn(i8* %async.ctxt, %async.task* %task.2, %async.actor* %actor)
call i1 @llvm.coro.end(i8* %hdl, i1 0) call i1 @llvm.coro.end(i8* %hdl, i1 0)
unreachable unreachable
} }
; Make sure we update the async function pointer ; Make sure we update the async function pointer
; CHECK: @my_async_function_fp = constant <{ i32, i32 }> <{ {{.*}}, i32 168 } ; CHECK: @my_async_function_fp = constant <{ i32, i32 }> <{ {{.*}}, i32 176 }
; CHECK: @my_async_function2_fp = constant <{ i32, i32 }> <{ {{.*}}, i32 168 } ; CHECK: @my_async_function2_fp = constant <{ i32, i32 }> <{ {{.*}}, i32 176 }
; CHECK-LABEL: define swiftcc void @my_async_function(i8* %async.ctxt, %async.task* %task, %async.actor* %actor) { ; CHECK-LABEL: define swiftcc void @my_async_function(i8* %async.ctxt, %async.task* %task, %async.actor* %actor) {
; CHECK: entry: ; CHECK: entry:
; CHECK: [[FRAMEPTR:%.*]] = getelementptr inbounds i8, i8* %async.ctxt, i64 128 ; CHECK: [[FRAMEPTR:%.*]] = getelementptr inbounds i8, i8* %async.ctxt, i64 128
; CHECK: [[ACTOR_SPILL_ADDR:%.*]] = getelementptr inbounds i8, i8* %async.ctxt, i64 152 ; CHECK: [[ACTOR_SPILL_ADDR:%.*]] = getelementptr inbounds i8, i8* %async.ctxt, i64 152
; CHECK: [[CAST1:%.*]] = bitcast i8* [[ACTOR_SPILL_ADDR]] to %async.actor** ; CHECK: [[CAST1:%.*]] = bitcast i8* [[ACTOR_SPILL_ADDR]] to %async.actor**
; CHECK: store %async.actor* %actor, %async.actor** [[CAST1]] ; CHECK: store %async.actor* %actor, %async.actor** [[CAST1]]
; CHECK: [[ADDR1:%.*]] = getelementptr inbounds i8, i8* %async.ctxt, i64 144 ; CHECK: [[ADDR1:%.*]] = getelementptr inbounds i8, i8* %async.ctxt, i64 144
▲ Show 20 Lines • Show All 161 Lines • Show Last 20 Lines