Skip to content
This repository was archived by the owner on Jan 7, 2022. It is now read-only.

Really install cargo#16

Merged
bors[bot] merged 1 commit intomasterfrom
yk-really-install-cargo
Apr 30, 2019
Merged

Really install cargo#16
bors[bot] merged 1 commit intomasterfrom
yk-really-install-cargo

Conversation

@vext01
Copy link
Member

@vext01 vext01 commented Apr 25, 2019

No description provided.

@vext01
Copy link
Member Author

vext01 commented Apr 25, 2019

bors try

bors bot added a commit that referenced this pull request Apr 25, 2019
.buildbot.sh Outdated

# Archive the build and put it in /opt
TARBALL_TOPDIR=ykrustc-stage2
TARBALL_TOPDIR=ykrustc-stage2 # To match [install] in the build config.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is a bit too cryptic, I think.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It has to match the string used in the toml file:

[install]
prefix = ...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(i'll push a better comment once it works)

.buildbot.sh Outdated
cd build/x86_64-unknown-linux-gnu
ln -sf stage2 ${TARBALL_TOPDIR}
mkdir -p ${TARBALL_TOPDIR} # Or you get "cannot canonicalize..."
env RUST_BACKTRACE=1 ./x.py install --config .buildbot.toml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the RUST_BACKTRACE thing on? IIRC, it does have some sort of performance consequence.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found a post where someone claims it does, but no-one knows why.

I'd like to have backtraces if possible, because otherwise I may have to build again to know what went wrong.

@bors
Copy link
Contributor

bors bot commented Apr 25, 2019

try

Build succeeded

@vext01
Copy link
Member Author

vext01 commented Apr 25, 2019

This worked, but we added about an hour to the build time.

The last pushes (amongst a couple of other bits) prevents rust from building documentation. Hopefully it'll be faster.

bors try

bors bot added a commit that referenced this pull request Apr 25, 2019
@bors
Copy link
Contributor

bors bot commented Apr 26, 2019

try

Build failed

@vext01
Copy link
Member Author

vext01 commented Apr 26, 2019

+ git show -s HEAD^2
fatal: ambiguous argument 'HEAD^2': unknown revision or path not in the working tree.

That is caused by one of the other commits.

So it looks like we might shave 15 minutes off without building docs.

@vext01
Copy link
Member Author

vext01 commented Apr 26, 2019

Looking at the logs, the install stage builds:

  • the installer (whatever that is)
  • cargo
  • rustfmt

And those three items take:

Build completed successfully in 0:49:36

So I think that's all time accounted for.

We might be able to invoke individual targets for cargo and rustfmt and then not use cargo install to avoid building the installer.

Do you have any thoughts before I go ahead with that?

@ltratt
Copy link
Member

ltratt commented Apr 26, 2019

Let's do it.

@vext01
Copy link
Member Author

vext01 commented Apr 26, 2019

bors try

bors bot added a commit that referenced this pull request Apr 26, 2019
@bors
Copy link
Contributor

bors bot commented Apr 26, 2019

try

Build failed

@vext01
Copy link
Member Author

vext01 commented Apr 26, 2019

bors try

bors bot added a commit that referenced this pull request Apr 26, 2019
@bors
Copy link
Contributor

bors bot commented Apr 26, 2019

try

Build succeeded

@vext01
Copy link
Member Author

vext01 commented Apr 26, 2019

I don't understand why that took longer than what we had before.

@ltratt
Copy link
Member

ltratt commented Apr 26, 2019

Do you want to squash?

@vext01
Copy link
Member Author

vext01 commented Apr 26, 2019

Do you want to squash?

Well no, because the build took ages compared to what we had before.

I'm starting to wonder if there's a lot of variation...

I'm going to kick of the build again on the same version and see if it takes the same time.

bors try

bors bot added a commit that referenced this pull request Apr 26, 2019
@ltratt
Copy link
Member

ltratt commented Apr 26, 2019

OK.

@bors
Copy link
Contributor

bors bot commented Apr 27, 2019

try

Build succeeded

@vext01
Copy link
Member Author

vext01 commented Apr 27, 2019

So we ran two builds on the same commit, the first took 5.5 hours, the second took 4.5. Looks to me like there's significant non-determinism in the compiler, or perhaps the buildbot was busier during the first build?

What do you think we should do? Good news is, once SSA is gone the build should be a bit faster.

@ltratt
Copy link
Member

ltratt commented Apr 27, 2019

I wouldn't read too much into the times: who knows what else the machine was doing at that point? Can we merge this now or ...?

@vext01
Copy link
Member Author

vext01 commented Apr 28, 2019

bors try

bors bot added a commit that referenced this pull request Apr 28, 2019
@vext01
Copy link
Member Author

vext01 commented Apr 28, 2019

Can we merge this now or ...?

Not just yet.

I did a test run on yk, and it bombed out because rustdoc wasn't present. The last commit invokes that target. Bors is testing that now.

Another annoying quirk is that when you don't use cargo install (but instead invoke targets manually as we have here), cargo fmt doesn't work. You have to invoke rustfmt manually with a file list. A bit annoying...

@bors
Copy link
Contributor

bors bot commented Apr 28, 2019

try

Build succeeded

@vext01
Copy link
Member Author

vext01 commented Apr 29, 2019

I'm going to revert to using cargo install to build the tarball because I don't want to layer on any more hacks to make this work.

@ltratt
Copy link
Member

ltratt commented Apr 29, 2019

OK.

@vext01
Copy link
Member Author

vext01 commented Apr 29, 2019

bors try

bors bot added a commit that referenced this pull request Apr 29, 2019
@bors
Copy link
Contributor

bors bot commented Apr 29, 2019

try

Build succeeded

@vext01
Copy link
Member Author

vext01 commented Apr 29, 2019

OK, so this works. Let me now test the resulting tarball on yk.

@vext01
Copy link
Member Author

vext01 commented Apr 29, 2019

ykjit/yk#1 is now passing.

I think this is ready to squash, unless you have any comments?

@ltratt
Copy link
Member

ltratt commented Apr 29, 2019

Please squash.

@vext01 vext01 force-pushed the yk-really-install-cargo branch from 63e9bfc to 37225c0 Compare April 30, 2019 09:03
@vext01
Copy link
Member Author

vext01 commented Apr 30, 2019

splat

@ltratt
Copy link
Member

ltratt commented Apr 30, 2019

bors r+

bors bot added a commit that referenced this pull request Apr 30, 2019
16: Really install cargo r=ltratt a=vext01





Co-authored-by: Edd Barrett <vext01@gmail.com>
@bors
Copy link
Contributor

bors bot commented Apr 30, 2019

Build succeeded

@bors bors bot merged commit 37225c0 into master Apr 30, 2019
@bors bors bot deleted the yk-really-install-cargo branch April 30, 2019 13:52
vext01 pushed a commit to vext01/ykrustc that referenced this pull request Oct 12, 2020
This is a combination of 18 commits.

Commit softdevteam#2:

Additional examples and some small improvements.

Commit softdevteam#3:

fixed mir-opt non-mir extensions and spanview title elements

Corrected a fairly recent assumption in runtest.rs that all MIR dump
files end in .mir. (It was appending .mir to the graphviz .dot and
spanview .html file names when generating blessed output files. That
also left outdated files in the baseline alongside the files with the
incorrect names, which I've now removed.)

Updated spanview HTML title elements to match their content, replacing a
hardcoded and incorrect name that was left in accidentally when
originally submitted.

Commit softdevteam#4:

added more test examples

also improved Makefiles with support for non-zero exit status and to
force validation of tests unless a specific test overrides it with a
specific comment.

Commit softdevteam#5:

Fixed rare issues after testing on real-world crate

Commit softdevteam#6:

Addressed PR feedback, and removed temporary -Zexperimental-coverage

-Zinstrument-coverage once again supports the latest capabilities of
LLVM instrprof coverage instrumentation.

Also fixed a bug in spanview.

Commit softdevteam#7:

Fix closure handling, add tests for closures and inner items

And cleaned up other tests for consistency, and to make it more clear
where spans start/end by breaking up lines.

Commit softdevteam#8:

renamed "typical" test results "expected"

Now that the `llvm-cov show` tests are improved to normally expect
matching actuals, and to allow individual tests to override that
expectation.

Commit softdevteam#9:

test coverage of inline generic struct function

Commit softdevteam#10:

Addressed review feedback

* Removed unnecessary Unreachable filter.
* Replaced a match wildcard with remining variants.
* Added more comments to help clarify the role of successors() in the
CFG traversal

Commit softdevteam#11:

refactoring based on feedback

* refactored `fn coverage_spans()`.
* changed the way I expand an empty coverage span to improve performance
* fixed a typo that I had accidently left in, in visit.rs

Commit softdevteam#12:

Optimized use of SourceMap and SourceFile

Commit softdevteam#13:

Fixed a regression, and synched with upstream

Some generated test file names changed due to some new change upstream.

Commit softdevteam#14:

Stripping out crate disambiguators from demangled names

These can vary depending on the test platform.

Commit softdevteam#15:

Ignore llvm-cov show diff on test with generics, expand IO error message

Tests with generics produce llvm-cov show results with demangled names
that can include an unstable "crate disambiguator" (hex value). The
value changes when run in the Rust CI Windows environment. I added a sed
filter to strip them out (in a prior commit), but sed also appears to
fail in the same environment. Until I can figure out a workaround, I'm
just going to ignore this specific test result. I added a FIXME to
follow up later, but it's not that critical.

I also saw an error with Windows GNU, but the IO error did not
specify a path for the directory or file that triggered the error. I
updated the error messages to provide more info for next, time but also
noticed some other tests with similar steps did not fail. Looks
spurious.

Commit softdevteam#16:

Modify rust-demangler to strip disambiguators by default

Commit softdevteam#17:

Remove std::process::exit from coverage tests

Due to Issue #77553, programs that call std::process::exit() do not
generate coverage results on Windows MSVC.

Commit softdevteam#18:

fix: test file paths exceeding Windows max path len
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants