Skip to content
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

optimizer: support callsite annotations of @inline and @noinline #40754

Closed
wants to merge 17 commits into from
Closed

optimizer: support callsite annotations of @inline and @noinline #40754

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3bd88cf
Implemented callsite `@noinline`
dghosef May 8, 2021
84e61ce
Added compat note
dghosef May 11, 2021
91e09cd
make `@noinline` work across whole expression
dghosef May 12, 2021
9a98b85
Added ability to use `@noinline` and `@inline` in do blocks
dghosef May 12, 2021
ebf8a37
handle constant-prop' and generalize a bit
aviatesk Jun 18, 2021
b1c742f
wip
aviatesk Jun 18, 2021
980ef45
Revert "wip"
aviatesk Jun 18, 2021
70939e8
Revert "handle constant-prop' and generalize a bit"
aviatesk Jun 18, 2021
4846324
Improved @noinline/@inline documentation and tests
dghosef Jun 19, 2021
ff33482
Cleanup callsite noinline code, handle const-prop callsite noinline
dghosef Jun 19, 2021
01b88ce
Generalize documentation and cleanup tests a bit
dghosef Jun 19, 2021
791fb22
Merge branch 'master' of github.com:dghosef/julia
dghosef Jun 19, 2021
6f7f867
Merge branch 'master' into pr-40754/dghosef/master
aviatesk Jun 19, 2021
3e0a185
refactor and improve tests
aviatesk Jun 19, 2021
f0bfa98
support callsite `@inline` annotations
aviatesk Jun 19, 2021
78f9d34
Merge branch 'master' into dghosef/master
aviatesk Jun 19, 2021
f03b07f
support nested callsite annotations
aviatesk Jun 19, 2021
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
Prev Previous commit
Next Next commit
Generalize documentation and cleanup tests a bit
  • Loading branch information
@dghosef
dghosef committed Jun 19, 2021
commit 01b88ce4910c05e27e6ad05a7e24c10a878e7381
12 changes: 7 additions & 5 deletions base/expr.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,10 @@ Give a hint to the compiler that this function is worth inlining.
Small functions typically do not need the `@inline` annotation,
as the compiler does it automatically. By using `@inline` on bigger functions,
an extra nudge can be given to the compiler to inline it.

`@inline` can be applied either in a function body or immediately before its definition.

This is shown in the following example:
This is shown in the following examples:

```julia
@inline function bigfunction(x)
Expand Down Expand Up @@ -222,11 +223,11 @@ Give a hint to the compiler that it should not inline a function.

Small functions are typically inlined automatically.
By using `@noinline` on small functions, auto-inlining can be
prevented. `@noinline` can be used at function definitions,
function calls, and in `do` blocks.
prevented.

`@noinline` can be applied either in a function body or
immediately before its definition.
`@noinline` can be applied in a function body,
immediately before its definition, or at a function
callsite.

This is shown in the following examples:

Expand Down Expand Up @@ -257,6 +258,7 @@ f() do
"""
dghosef marked this conversation as resolved.
Show resolved Hide resolved
macro noinline(ex)
if isa(ex, Expr)
ex = macroexpand(__module__, ex)
if ex.head === :function || is_short_function_def(ex) || ex.head === :->
aviatesk marked this conversation as resolved.
Show resolved Hide resolved
# function definition noinline
esc(pushmeta!(ex, :noinline))
Expand Down
8 changes: 4 additions & 4 deletions test/compiler/inline.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,14 +323,14 @@ end
# Ensure `@noinline` in caller overrides `@inline` in callee
@inline f18773(x) = x
g18773(x) = @noinline f18773(x)
let ci = code_typed(g18773, Tuple{Int})[1].first
let ci = first(code_typed(g18773, Tuple{Int})[1])
@test any(ci.code) do x
isexpr(x, :invoke) && x.args[1].def.name === :f18773
end
end
# Test that `@noinline` works across entire expression
h18773(x) = @noinline f18773(x) + f18773(x)
let ci = code_typed(h18773, Tuple{Int})[1].first
let ci = first(code_typed(h18773, Tuple{Int})[1])
@test count(ci.code) do x
isexpr(x, :invoke) && x.args[1].def.name === :f18773
end == 2
Expand All @@ -346,7 +346,7 @@ function do_inline(x)
return unresolved_call(x)
end
end
let ci = code_typed(do_inline, Tuple{Int})[1].first
let ci = first(code_typed(do_inline, Tuple{Int}))[1]
# what we test here is that both `simple_caller` and the anonymous function that the
# `do` block creates are inlined away, and as a result there is only the unresolved call
@test all(ci.code) do x
Expand All @@ -361,7 +361,7 @@ function do_noinline(x)
end
end

let ci = code_typed(do_noinline, Tuple{Int})[1].first
let ci = first(code_typed(do_noinline, Tuple{Int}))[1]
@test any(ci.code) do x
isexpr(x, :invoke) && startswith(string(x.args[1].def.name), '#')
end
Expand Down