Skip to content

Commit 3a3b935

Browse files
N5N3N5N3
committed
Squashed commit of the following:
commit c054dbc Author: Shuhei Kadowaki <[email protected]> Date: Fri Oct 29 01:31:55 2021 +0900 optimizer: eliminate allocations (JuliaLang#42833) commit 6a9737d Author: Jeff Bezanson <[email protected]> Date: Thu Oct 28 12:23:53 2021 -0400 fix JuliaLang#42659, move `jl_coverage_visit_line` to runtime library (JuliaLang#42810) commit c762f10 Author: Marc Ittel <[email protected]> Date: Thu Oct 28 12:19:13 2021 +0200 change `julia` to `julia-repl` in docstrings (JuliaLang#42824) Co-authored-by: Michael Abbott <[email protected]> commit 9f52ec0 Author: Dilum Aluthge <[email protected]> Date: Thu Oct 28 05:30:11 2021 -0400 CI (Buildkite): Update all rootfs images to the latest versions (JuliaLang#42802) * CI (Buildkite): Update all rootfs images to the latest versions * Re-sign all of the signed pipelines commit 404e584 Author: DilumAluthgeBot <[email protected]> Date: Wed Oct 27 21:11:04 2021 -0400 🤖 Bump the Statistics stdlib from 74897fe to 5256d57 (JuliaLang#42826) Co-authored-by: Dilum Aluthge <[email protected]> commit c74814e Author: Jeff Bezanson <[email protected]> Date: Wed Oct 27 16:34:46 2021 -0400 reset `RandomDevice` file from `__init__` (JuliaLang#42537) This prevents us from seeing an invalid `IOStream` object from a saved system image, and also ensures the files are opened once for all threads. commit 05ed348 Author: Jeff Bezanson <[email protected]> Date: Wed Oct 27 15:24:17 2021 -0400 only visit nonfunction_mt once when traversing method tables (JuliaLang#42821) commit d71b77d Author: DilumAluthgeBot <[email protected]> Date: Tue Oct 26 20:39:08 2021 -0400 🤖 Bump the Downloads stdlib from 5f1509d to dbb0625 (JuliaLang#42811) Co-authored-by: Dilum Aluthge <[email protected]> commit b4fddc1 Author: DilumAluthgeBot <[email protected]> Date: Tue Oct 26 14:46:20 2021 -0400 🤖 Bump the Pkg stdlib from bc32103f to 26918395 (JuliaLang#42806) Co-authored-by: Dilum Aluthge <[email protected]> commit 6a386de Author: Dilum Aluthge <[email protected]> Date: Tue Oct 26 12:15:51 2021 -0400 CI (Buildkite): make sure to hit ignore any unencrypted repo keys, regardless of where they are located in the repository (JuliaLang#42803) commit 021a6b5 Author: Shuhei Kadowaki <[email protected]> Date: Wed Oct 27 01:08:33 2021 +0900 optimizer: clean up inlining test code (JuliaLang#42804) commit 16eb196 Merge: 21ebabf 1510eaa Author: Shuhei Kadowaki <[email protected]> Date: Tue Oct 26 23:25:41 2021 +0900 Merge pull request JuliaLang#42766 from JuliaLang/avi/42754 optimizer: fix JuliaLang#42754, inline union-split const-prop'ed sources commit 21ebabf Author: Kristoffer Carlsson <[email protected]> Date: Tue Oct 26 16:11:32 2021 +0200 simplify code loading test now that TOML files are parsed with a real TOML parser (JuliaLang#42328) commit 1510eaa Author: Shuhei Kadowaki <[email protected]> Date: Mon Oct 25 01:35:12 2021 +0900 optimizer: fix JuliaLang#42754, inline union-split const-prop'ed sources This commit complements JuliaLang#39754 and JuliaLang#39305: implements a logic to use constant-prop'ed results for inlining at union-split callsite. Currently it works only for cases when constant-prop' succeeded for all (union-split) signatures. > example ```julia julia> mutable struct X # NOTE in order to confuse `fieldtype_tfunc`, we need to have at least two fields with different types a::Union{Nothing, Int} b::Symbol end; julia> code_typed((X, Union{Nothing,Int})) do x, a # this `setproperty` call would be union-split and constant-prop will happen for # each signature: inlining would fail if we don't use constant-prop'ed source # since the approximated inlining cost of `convert(fieldtype(X, sym), a)` would # end up very high if we don't propagate `sym::Const(:a)` x.a = a x end |> only |> first ``` > before this commit ```julia CodeInfo( 1 ─ %1 = Base.setproperty!::typeof(setproperty!) │ %2 = (isa)(a, Nothing)::Bool └── goto #3 if not %2 2 ─ %4 = π (a, Nothing) │ invoke %1(_2::X, 🅰️:Symbol, %4::Nothing)::Any └── goto #6 3 ─ %7 = (isa)(a, Int64)::Bool └── goto #5 if not %7 4 ─ %9 = π (a, Int64) │ invoke %1(_2::X, 🅰️:Symbol, %9::Int64)::Any └── goto #6 5 ─ Core.throw(ErrorException("fatal error in type inference (type bound)"))::Union{} └── unreachable 6 ┄ return x ) ``` > after this commit ```julia CodeInfo( 1 ─ %1 = (isa)(a, Nothing)::Bool └── goto #3 if not %1 2 ─ Base.setfield!(x, :a, nothing)::Nothing └── goto #6 3 ─ %5 = (isa)(a, Int64)::Bool └── goto #5 if not %5 4 ─ %7 = π (a, Int64) │ Base.setfield!(x, :a, %7)::Int64 └── goto #6 5 ─ Core.throw(ErrorException("fatal error in type inference (type bound)"))::Union{} └── unreachable 6 ┄ return x ) ``` commit 4c3ae20 Author: Chris Foster <[email protected]> Date: Tue Oct 26 21:48:32 2021 +1000 Make Base.ifelse a generic function (JuliaLang#37343) Allow user code to directly extend `Base.ifelse` rather than needing a special package for it. commit 2e388e3 Author: Shuhei Kadowaki <[email protected]> Date: Mon Oct 25 01:30:09 2021 +0900 optimizer: eliminate excessive specialization in inlining code This commit includes several code quality improvements in inlining code: - eliminate excessive specializations around: * `item::Pair{Any, Any}` constructions * iterations on `Vector{Pair{Any, Any}}` - replace `Pair{Any, Any}` with new, more explicit data type `InliningCase` - remove dead code
1 parent b07a0f1 commit 3a3b935

File tree

58 files changed

+750
-558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+750
-558
lines changed

‎.buildkite/pipelines/main/misc/doctest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
16-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
16+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
1717
uid: 1000
1818
gid: 1000
1919
workspaces:

‎.buildkite/pipelines/main/misc/embedding.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
16-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
16+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
1717
uid: 1000
1818
gid: 1000
1919
workspaces:

‎.buildkite/pipelines/main/misc/llvmpasses.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
16-
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/llvm_passes.x86_64.tar.gz
16+
rootfs_treehash: "c7a289a8cc544b234b1e2d7cbcce3e6815359ecd"
1717
workspaces:
1818
# Include `/cache/repos` so that our `git` version introspection works.
1919
- "/cache/repos:/cache/repos"
@@ -32,8 +32,8 @@ steps:
3232
persist_depot_dirs: packages,artifacts,compiled
3333
version: '1.6'
3434
- staticfloat/sandbox#v1:
35-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.8/package_linux.x86_64.tar.gz
36-
rootfs_treehash: "84a323ae8fcc724f8ea5aca5901bbbf4bda3e519"
35+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
36+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
3737
uid: 1000
3838
gid: 1000
3939
workspaces:

‎.buildkite/pipelines/main/misc/sanitizers.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
16-
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/llvm_passes.x86_64.tar.gz
16+
rootfs_treehash: "c7a289a8cc544b234b1e2d7cbcce3e6815359ecd"
1717
uid: 1000
1818
gid: 1000
1919
workspaces:
@@ -33,8 +33,8 @@ steps:
3333
persist_depot_dirs: packages,artifacts,compiled
3434
version: '1.6'
3535
- staticfloat/sandbox#v1:
36-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/llvm_passes.x86_64.tar.gz
37-
rootfs_treehash: "9dd715500b117a16fcfa419ea0bca0c0ca902cee"
36+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/llvm_passes.x86_64.tar.gz
37+
rootfs_treehash: "c7a289a8cc544b234b1e2d7cbcce3e6815359ecd"
3838
uid: 1000
3939
gid: 1000
4040
workspaces:

‎.buildkite/pipelines/main/misc/signed_pipeline_test.yml.signature

0 Bytes
Binary file not shown.

‎.buildkite/pipelines/main/misc/whitespace.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ steps:
1212
persist_depot_dirs: packages,artifacts,compiled
1313
version: '1.6'
1414
- staticfloat/sandbox#v1:
15-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
16-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
15+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
16+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
1717
workspaces:
1818
- "/cache/repos:/cache/repos"
1919
timeout_in_minutes: 10

‎.buildkite/pipelines/main/platforms/package_linux.arches

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
# linux _aarch64 false _aarch64 aarch64 none 60 no no no v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3-
# linux _armv7l false _armv7l armv7l none 60 no no no v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4-
linux 32 false 32 i686 none 60 no no no v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5-
# linux _ppc64le false _ppc64le powerpc64le none 60 no no no v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6-
linux 64 false 64 x86_64 none 60 no no no v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7-
musl 64 false 64 x86_64 none 60 no no no v3.19 e6a2730e37c386c46915b2650d6aaaa398195152
2+
# linux _aarch64 false _aarch64 aarch64 none 60 no no no v0.0 0000000000000000000000000000000000000000
3+
# linux _armv7l false _armv7l armv7l none 60 no no no v0.0 0000000000000000000000000000000000000000
4+
linux 32 false 32 i686 none 60 no no no v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
5+
# linux _ppc64le false _ppc64le powerpc64le none 60 no no no v0.0 0000000000000000000000000000000000000000
6+
linux 64 false 64 x86_64 none 60 no no no v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
7+
musl 64 false 64 x86_64 none 60 no no no v4.8 d13a47c87c38005bd5d97132e51789cafd852f90

‎.buildkite/pipelines/main/platforms/tester_linux.arches

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
# linux _aarch64 false _aarch64 aarch64 none 60 no no no v3.2 0566841e29f0f9880541c26a6595fd5ce0beb5ff
3-
# linux _armv7l false _armv7l armv7l none 60 no no no v3.2 fb359370b052a47ce5c84cc6b4a7a03ed7053b25
4-
linux 32 false 32 i686 none 60 no no no v3.2 209c4db679a515befd7fb50ecc6bfbecf7ec3d32
5-
# linux _ppc64le false _ppc64le powerpc64le none 60 no no no v3.2 c03a0158b19d48ac84b426834fce0d3584cdd0c7
6-
linux 64_rr false 64 x86_64 none 180 yes no no v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
7-
linux 64_st false 64 x86_64 none 60 no yes no v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
8-
linux 64_mt false 64 x86_64 none 60 no no yes v3.2 474bf61a926b2d7fcf202284d59d4b11a04601d7
9-
musl 64 true 64 x86_64 none 60 no no no v3.19 e6a2730e37c386c46915b2650d6aaaa398195152
2+
# linux _aarch64 false _aarch64 aarch64 none 60 no no no v0.0 0000000000000000000000000000000000000000
3+
# linux _armv7l false _armv7l armv7l none 60 no no no v0.0 0000000000000000000000000000000000000000
4+
linux 32 false 32 i686 none 60 no no no v4.8 b6dffc772ab4c2cd7fd4f83459308f6f0d89b957
5+
# linux _ppc64le false _ppc64le powerpc64le none 60 no no no v0.0 0000000000000000000000000000000000000000
6+
linux 64_rr false 64 x86_64 none 180 yes no no v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
7+
linux 64_st false 64 x86_64 none 60 no yes no v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
8+
linux 64_mt false 64 x86_64 none 60 no no yes v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a
9+
musl 64 true 64 x86_64 none 60 no no no v4.8 d13a47c87c38005bd5d97132e51789cafd852f90

‎.buildkite/pipelines/scheduled/coverage/coverage_linux64.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ steps:
1919
persist_depot_dirs: packages,artifacts,compiled
2020
version: '1.6'
2121
- staticfloat/sandbox#v1:
22-
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v3.1/package_linux.x86_64.tar.gz
23-
rootfs_treehash: "8c33c341a864852629b8aac01a6eb6a79b73570e"
22+
rootfs_url: https://github.com/JuliaCI/rootfs-images/releases/download/v4.8/package_linux.x86_64.tar.gz
23+
rootfs_treehash: "2a058481b567f0e91b9aa3ce4ad4f09e6419355a"
2424
uid: 1000
2525
gid: 1000
2626
commands: |
@@ -42,4 +42,3 @@ steps:
4242
echo "--- Process and upload coverage information"
4343
./julia .buildkite/pipelines/scheduled/coverage/upload_coverage.jl
4444
timeout_in_minutes: 240 # 240 minutes = 4 hours
45-

‎.buildkite/pipelines/scheduled/coverage/coverage_linux64.yml.signature

0 Bytes
Binary file not shown.

‎.buildkite/pipelines/scheduled/no_bb/no_bb_package_linux.arches

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
linux 64_no_bb false 64_no_bb x86_64 USE_BINARYBUILDER=0 240 no no no v4.4 ec3873fc1756ecb4c815e8785e9ca45cf54c68b6
2+
linux 64_no_bb false 64_no_bb x86_64 USE_BINARYBUILDER=0 240 no no no v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a

‎.buildkite/pipelines/scheduled/no_bb/no_bb_tester_linux.arches

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# PLATFORM LABEL ALLOW_FAIL ARCH ARCH_ROOTFS MAKE_FLAGS TIMEOUT IS_RR IS_ST IS_MT ROOTFS_TAG ROOTFS_HASH
2-
linux 64_st_no_bb false 64_no_bb x86_64 none 60 no yes no v4.4 ec3873fc1756ecb4c815e8785e9ca45cf54c68b6
2+
linux 64_st_no_bb false 64_no_bb x86_64 none 60 no yes no v4.8 2a058481b567f0e91b9aa3ce4ad4f09e6419355a

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,9 @@
3333
.DS_Store
3434
.idea/*
3535
.vscode/*
36+
37+
# Buildkite: cryptic plugin
38+
# Ignore the unencrypted repo_key
39+
repo_key
40+
# Ignore any agent keys (public or private) we have stored
41+
agent_key*

‎base/boot.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,8 @@ export
192192
Expr, QuoteNode, LineNumberNode, GlobalRef,
193193
# object model functions
194194
fieldtype, getfield, setfield!, swapfield!, modifyfield!, replacefield!,
195-
nfields, throw, tuple, ===, isdefined, eval, ifelse,
196-
# sizeof # not exported, to avoid conflicting with Base.sizeof
195+
nfields, throw, tuple, ===, isdefined, eval,
196+
# ifelse, sizeof # not exported, to avoid conflicting with Base
197197
# type reflection
198198
<:, typeof, isa, typeassert,
199199
# method reflection

‎base/compiler/abstractinterpretation.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ function abstract_call_builtin(interp::AbstractInterpreter, f::Builtin, (; fargs
10821082
sv::InferenceState, max_methods::Int)
10831083
@nospecialize f
10841084
la = length(argtypes)
1085-
if f === ifelse && fargs isa Vector{Any} && la == 4
1085+
if f === Core.ifelse && fargs isa Vector{Any} && la == 4
10861086
cnd = argtypes[2]
10871087
if isa(cnd, Conditional)
10881088
newcnd = widenconditional(cnd)

‎base/compiler/optimize.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ const _PURE_BUILTINS = Any[tuple, svec, ===, typeof, nfields]
162162
const _PURE_OR_ERROR_BUILTINS = [
163163
fieldtype, apply_type, isa, UnionAll,
164164
getfield, arrayref, const_arrayref, isdefined, Core.sizeof,
165-
Core.kwfunc, ifelse, Core._typevar, (<:)
165+
Core.kwfunc, Core.ifelse, Core._typevar, (<:)
166166
]
167167

168168
const TOP_TUPLE = GlobalRef(Core, :tuple)

0 commit comments

Comments
 (0)