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.

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

Sync rustc_codegen_cranelift #89092

Merged
merged 59 commits into from
Sep 27, 2021
Merged

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Sep 19, 2021

Nothing exciting this time. Mostly internal refactorings.

r? @ghost

@rustbot label +A-codegen +A-cranelift +T-compiler

bjorn3 and others added 30 commits August 6, 2021 16:26
The new implementation allows some `memcpy`s to be optimized away,
so the uninit value in ui/sanitize/memory.rs is constructed directly
onto the return place. Therefore the sanitizer now says that the
value is allocated by `main` rather than `random`.
This reverts commit 3b22c3a.

Seems to be necessary after all. At least when compiling regex.
…komatsakis

Trait upcasting coercion (part 3)

By using separate candidates for each possible choice, this fixes type-checking issues in previous commits.

r? `@nikomatsakis`
One wasn't necessary anymore at all. Others are only necessary when jit mode is enabled.
bors and others added 4 commits September 12, 2021 23:49
Introduce NullOp::AlignOf

This PR introduces `Rvalue::NullaryOp(NullOp::AlignOf, ty)`, which will be lowered from `align_of`, similar to `size_of` lowering to `Rvalue::NullaryOp(NullOp::SizeOf, ty)`.

The changes are originally part of rust-lang#88700 but since it's not dependent on other changes and could have performance impact on its own, it's separated into its own PR.
@rustbot rustbot added A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Sep 19, 2021
@bjorn3
Copy link
Member Author

bjorn3 commented Sep 19, 2021

@bors r+ subtree sync

@bors
Copy link
Contributor

bors commented Sep 19, 2021

📌 Commit 86f9bcf has been approved by bjorn3

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 19, 2021
@bors
Copy link
Contributor

bors commented Sep 26, 2021

⌛ Testing commit 86f9bcf with merge 02bd9770fa71052455a63168e6816885438cf05d...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
      Memory: 14 GB
      Boot ROM Version: VMW71.00V.13989454.B64.1906190538
      Apple ROM Info: [MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]Welcome to the Virtual Machine
      SMC Version (system): 2.8f0
      Serial Number (system): VMvshtU76pxd

hw.ncpu: 3
hw.byteorder: 1234
hw.memsize: 15032385536
---
    Finished release [optimized] target(s) in 3m 11s
[TIMING] ToolBuild { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-apple-darwin", file: None } }, target: TargetSelection { triple: "x86_64-apple-darwin", file: None }, tool: "tidy", path: "src/tools/tidy", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 192.011
[TIMING] Tidy { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-apple-darwin", file: None } }, target: TargetSelection { triple: "x86_64-apple-darwin", file: None } } -- 0.008
tidy check
thread '<unnamed>' panicked at 'cmd.exec() failed with Error during execution of `cargo metadata`:     Updating git repository `https://github.com/bjorn3/rust-ar.git`
    Updating git submodule `https://github.com/WebAssembly/WASI`
    Updating git submodule `https://github.com/WebAssembly/wasm-c-api`
    Updating git submodule `https://github.com/WebAssembly/wasi-crypto.git`


    Updating git submodule `https://github.com/WebAssembly/wasi-nn`

warning: spurious network error (2 tries remaining): failed to resolve address for github.com: nodename nor servname provided, or not known; class=Net (12)
command did not execute successfully: "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0-tools-bin/rust-tidy" "/Users/runner/work/rust/rust" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage0/bin/cargo" "/Users/runner/work/rust/rust/build" "3"
warning: spurious network error (1 tries remaining): failed to resolve address for github.com: nodename nor servname provided, or not known; class=Net (12)
expected success, got: exit status: 101
error: failed to get `cranelift-codegen` as a dependency of package `rustc_codegen_cranelift v0.1.0 (/Users/runner/work/rust/rust/compiler/rustc_codegen_cranelift)`


Caused by:
Build completed unsuccessfully in 0:04:44
Build completed unsuccessfully in 0:04:44
  failed to load source for dependency `cranelift-codegen`

Caused by:
  Unable to update https://github.com/bytecodealliance/wasmtime.git#9c550fcf

Caused by:
  failed to update submodule `crates/wasi-nn/spec`
Caused by:
Caused by:
  failed to fetch submodule `crates/wasi-nn/spec` from https://github.com/WebAssembly/wasi-nn
Caused by:
  network failure seems to have happened
  network failure seems to have happened
  if a proxy or similar is necessary `net.git-fetch-with-cli` may help here
  https://doc.rust-lang.org/cargo/reference/config.html#netgit-fetch-with-cli
Caused by:
Caused by:
  failed to resolve address for github.com: nodename nor servname provided, or not known; class=Net (12)
', src/tools/tidy/src/deps.rs:294:20
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: Any { .. }', src/tools/tidy/src/main.rs:66:9

@bors
Copy link
Contributor

bors commented Sep 26, 2021

💔 Test failed - checks-actions

@bors 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 26, 2021
@bjorn3
Copy link
Member Author

bjorn3 commented Sep 26, 2021

Spurious network error

@bors retry

@bors 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 26, 2021
@bors
Copy link
Contributor

bors commented Sep 26, 2021

⌛ Testing commit 86f9bcf with merge b280465...

@bors
Copy link
Contributor

bors commented Sep 27, 2021

☀️ Test successful - checks-actions
Approved by: bjorn3
Pushing b280465 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 27, 2021
@bors bors merged commit b280465 into rust-lang:master Sep 27, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 27, 2021
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b280465): comparison url.

Summary: This benchmark run did not return any relevant changes.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@bjorn3 bjorn3 deleted the sync_cg_clif-2021-09-19 branch September 27, 2021 09:09
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 20, 2021
Sync rustc_codegen_cranelift

Nothing exciting this time. Mostly internal refactorings.

r? `@ghost`

`@rustbot` label +A-codegen +A-cranelift +T-compiler
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-codegen Area: Code generation A-cranelift Things relevant to the [future] cranelift backend merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.