Rollup of 8 pull requests #115928

matthiaskrgr · 2023-09-18T09:41:56Z

Successful merges:

issue has since been fixed #115558 (issue has since been fixed)
Add myself to the mailmap #115724 (Add myself to the mailmap)
Refactor opt-dist to simplify local building #115795 (Refactor opt-dist to simplify local building)
Make AIX known by bootstrap #115811 (Make AIX known by bootstrap)
inspect: closer to proof trees for coherence #115838 (inspect: closer to proof trees for coherence)
Fix up a few CI images #115902 (Fix up a few CI images)
nop_lift macros: ensure that we are using the right interner #115907 (nop_lift macros: ensure that we are using the right interner)
Add me as on vacation #115916 (Add me as on vacation)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Before it was not deleting non-empty directories.

This makes it easier to build a PGO/BOLT optimized `rustc` locally, outside of CI.

The 22.10 Ubuntu repositories were returning 404s in last stable build.

See rust-lang#115558 (comment)

issue has since been fixed

Add myself to the mailmap

…ulacrum Refactor `opt-dist` to simplify local building This PR refactors the `opt-dist` tool to make it easier to invoke it locally, outside of CI, and thus simplify building PGO/BOLT optimized `rustc` builds e.g. for distro maintainers. It should also make it easier to run the PGO/BOLT workflow locally e.g. to profile performance or debug issues (looking at you, rust-lang#115554).

…crum Make AIX known by bootstrap Use `x.py` to build rustc on AIX directly is failing ``` unknown OS type: AIX Build completed unsuccessfully in 0:00:00 ``` If kernel is `AIX`, we should return default triple `powerpc64-ibm-aix` for current rustc.

inspect: closer to proof trees for coherence a continuation of rust-lang#115751. Now explicitly store the added goals r? ``@compiler-errors``

…arsan68 Fix up a few CI images This forward-ports changes made on the stable branch to fix CI (rust-lang#115787).

…r-errors nop_lift macros: ensure that we are using the right interner Right now someone could put down the wrong list name when using these macros, and everything would still build. Nothing does a type-check to ensure that the `$set` contains element of type `Self::Lifted`. Let's fix that. For lists this is fairly easy; for the other interners we need to unwrap some newtypes which makes this more complicated.

Add me as on vacation

matthiaskrgr · 2023-09-18T09:42:11Z

@bors r+ rollup=never p=8

bors · 2023-09-18T09:42:13Z

📌 Commit 8851323 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-09-18T10:45:20Z

⌛ Testing commit 8851323 with merge 5610d98...

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#115558 (issue has since been fixed) - rust-lang#115724 (Add myself to the mailmap) - rust-lang#115795 (Refactor `opt-dist` to simplify local building) - rust-lang#115811 (Make AIX known by bootstrap) - rust-lang#115838 (inspect: closer to proof trees for coherence) - rust-lang#115902 (Fix up a few CI images) - rust-lang#115907 (nop_lift macros: ensure that we are using the right interner) - rust-lang#115916 (Add me as on vacation) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2023-09-18T11:00:40Z

The job dist-x86_64-msvc failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

RUNNER_WORKSPACE=C:\a\rust
RUST_CONFIGURE_ARGS=--build=x86_64-pc-windows-msvc --host=x86_64-pc-windows-msvc --target=x86_64-pc-windows-msvc --enable-full-tools --enable-profiler
SBT_HOME=C:\Program Files (x86)\sbt\
SCCACHE_BUCKET=rust-lang-ci-sccache2
SCRIPT=python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
SHLVL=2
SYSTEMDRIVE=C:
SYSTEMROOT=C:\Windows
TEMP=/tmp
---
LowFree:        28776984 kB
SwapTotal:       5242880 kB
SwapFree:        5242880 kB
##[endgroup]
Executing python x.py build --set rust.debug=true opt-dist && PGO_HOST=x86_64-pc-windows-msvc ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
##[group]Building bootstrap
    Finished dev [unoptimized] target(s) in 0.09s
##[endgroup]
[TIMING] compile::Assemble { target_compiler: Compiler { stage: 0, host: x86_64-pc-windows-msvc } } -- 0.000
---
[TIMING] tool::ToolBuild { compiler: Compiler { stage: 0, host: x86_64-pc-windows-msvc }, target: x86_64-pc-windows-msvc, tool: "opt-dist", path: "src/tools/opt-dist", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [], allow_features: "" } -- 81.696
[TIMING] tool::OptimizedDist { compiler: Compiler { stage: 0, host: x86_64-pc-windows-msvc }, target: x86_64-pc-windows-msvc } -- 0.000
Build completed successfully in 0:01:22
+ PGO_HOST=x86_64-pc-windows-msvc
+ ./build/x86_64-pc-windows-msvc/stage0-tools-bin/opt-dist windows-ci -- python x.py dist bootstrap --include-default-paths
---
##[endgroup]
Error: Cannot create environment

Caused by:
    `prebuilt_rustc_perf` must be initialized
Stack backtrace:
   0: backtrace::backtrace::dbghelp::trace
   0: backtrace::backtrace::dbghelp::trace
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\backtrace-0.3.69\src\backtrace\dbghelp.rs:98
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\backtrace-0.3.69\src\backtrace\mod.rs:66
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\backtrace-0.3.69\src\backtrace\mod.rs:66
   2: backtrace::backtrace::trace<anyhow::backtrace::capture::impl$4::create::closure_env$0>
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\backtrace-0.3.69\src\backtrace\mod.rs:53
   3: anyhow::backtrace::capture::Backtrace::create
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\anyhow-1.0.75\src\backtrace.rs:216
   4: anyhow::backtrace::capture::Backtrace::capture
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\anyhow-1.0.75\src\backtrace.rs:204
   5: anyhow::error::impl$1::from<enum2$<opt_dist::environment::EnvironmentBuilderError> >
             at C:\Users\runneradmin\.cargo\registry\src\index.crates.io-6f17d22bba15001f\anyhow-1.0.75\src\error.rs:551
             at /rustc/5610d98e2efe0795886b55a9a15a16b409e33177/src\tools\opt-dist\src\main.rs:156
   7: opt_dist::main
             at /rustc/5610d98e2efe0795886b55a9a15a16b409e33177/src\tools\opt-dist\src\main.rs:338
   8: core::ops::function::FnOnce::call_once
   8: core::ops::function::FnOnce::call_once
             at /rustc/680cdf8168a906b4ea80af673c64e4a16f77be57\library\core\src\ops\function.rs:250
   9: std::sys_common::backtrace::__rust_begin_short_backtrace<enum2$<core::result::Result<tuple$<>,anyhow::Error> > (*)(),enum2$<core::result::Result<tuple$<>,anyhow::Error> > >
             at /rustc/680cdf8168a906b4ea80af673c64e4a16f77be57\library\std\src\sys_common\backtrace.rs:154
  10: std::rt::lang_start::closure$0<enum2$<core::result::Result<tuple$<>,anyhow::Error> > >
             at /rustc/680cdf8168a906b4ea80af673c64e4a16f77be57\library\std\src\rt.rs:166
             at /rustc/680cdf8168a906b4ea80af673c64e4a16f77be57/library\std\src\rt.rs:148
  12: std::panicking::try::do_call
             at /rustc/680cdf8168a906b4ea80af673c64e4a16f77be57/library\std\src\panicking.rs:524
  13: std::panicking::try

bors · 2023-09-18T11:01:07Z

💔 Test failed - checks-actions

tshepang and others added 30 commits September 5, 2023 10:53

issue has since been fixed

86d32ef

Add myself to the mailmap

7db123d

Store target triple in environment

074fb2c

Make executable extension platform, rather than environment dependent

95500f4

Refactor Environment

f17047b

Fix reset_directory function

a2ed508

Before it was not deleting non-empty directories.

Add a Local environment to opt-dist

11f9283

This makes it easier to build a PGO/BOLT optimized `rustc` locally, outside of CI.

Make AIX known by bootstrap

2962528

Add comment to elaborate

fc17e09

Adjust comment

5049a71

Adjust comment

122d1cc

Refactor rustc-perf building

6c718b5

Resolve clippy warnings

f13b545

GoalCandidate to Probe

be9d7e0

order added_goals_evaluation and nested_probes

a3f9530

inspect: explicitly store added goals

1b141b6

differentiate root and nested goals

0cb800e

Bump to supported Ubuntu

5b882ac

The 22.10 Ubuntu repositories were returning 404s in last stable build.

Move to older, mirrored redox install

abd265e

Add me as on vacation

c70ee68

nop_lift macros: ensure that we are using the right interner

3b817b2

address review comment

a716c96

See rust-lang#115558 (comment)

Rollup merge of rust-lang#115558 - tshepang:patch-4, r=Mark-Simulacrum

23d4457

issue has since been fixed

Rollup merge of rust-lang#115724 - tgross35:mailmap, r=Mark-Simulacrum

2239734

Add myself to the mailmap

Rollup merge of rust-lang#115838 - lcnr:added-goals, r=compiler-errors

2d170f1

inspect: closer to proof trees for coherence a continuation of rust-lang#115751. Now explicitly store the added goals r? ``@compiler-errors``

Rollup merge of rust-lang#115902 - Mark-Simulacrum:bump-ci, r=albertl…

c86427f

…arsan68 Fix up a few CI images This forward-ports changes made on the stable branch to fix CI (rust-lang#115787).

Rollup merge of rust-lang#115916 - jackh726:vacation, r=jackh726

8851323

Add me as on vacation

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 18, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 18, 2023

matthiaskrgr mentioned this pull request Sep 18, 2023

Refactor opt-dist to simplify local building #115795

Merged

matthiaskrgr closed this Sep 18, 2023

matthiaskrgr deleted the rollup-b88wic9 branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests #115928

Rollup of 8 pull requests #115928

Uh oh!

matthiaskrgr commented Sep 18, 2023

Uh oh!

matthiaskrgr commented Sep 18, 2023

Uh oh!

bors commented Sep 18, 2023

Uh oh!

bors commented Sep 18, 2023

Uh oh!

rust-log-analyzer commented Sep 18, 2023

Uh oh!

bors commented Sep 18, 2023

Uh oh!

Uh oh!

Rollup of 8 pull requests #115928

Rollup of 8 pull requests #115928

Uh oh!

Conversation

matthiaskrgr commented Sep 18, 2023

Uh oh!

matthiaskrgr commented Sep 18, 2023

Uh oh!

bors commented Sep 18, 2023

Uh oh!

bors commented Sep 18, 2023

Uh oh!

rust-log-analyzer commented Sep 18, 2023

Uh oh!

bors commented Sep 18, 2023

Uh oh!

Uh oh!