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

Add dist builder for Armv8-M Baseline and HF #59182

Merged
merged 1 commit into from
Apr 3, 2019

Conversation

hug-dev
Copy link
Contributor

@hug-dev hug-dev commented Mar 14, 2019

This commit adds the Armv8-M Baseline and Armv8-M Mainline with
FPU targets in the list of targets that
get their dist components built. It also update the build-manifest
so that this target gets also its dist components uploaded.

Made possible with the recent change merged in compiler-builtins:
rust-lang/compiler-builtins#276

A new compiler-builtins might be necessary for successfull compilation of the artefacts of those targets.

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 14, 2019
@alexcrichton
Copy link
Member

@hug-dev want to switch the dist-various-1 builder in .travis.yml to working on the try branch, then we can @bors: try, see a failure, publish compiler-builtins, then @bors: try again to see success?

@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 14, 2019

@alexcrichton Sure! Just to make sure is that that change:

diff --git a/.travis.yml b/.travis.yml
index 7985b6c0e1..df1182345b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,7 +121,7 @@ matrix:
     - env: IMAGE=armhf-gnu
       if: branch = auto
     - env: IMAGE=dist-various-1 DEPLOY=1
-      if: branch = auto
+      if: branch = try
     - env: IMAGE=dist-various-2 DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-aarch64-linux DEPLOY=1

@alexcrichton
Copy link
Member

I believe that should do the trick yeah!

@alexcrichton
Copy link
Member

@bors: try

@bors
Copy link
Contributor

bors commented Mar 14, 2019

⌛ Trying commit c53546e445f993726a734b9e7571097cb9728ef3 with merge ba2183194c0e4a5e867f16c6f23714f0360e2ce9...

@alexcrichton
Copy link
Member

Hm it looks like the job failed but for a different reason? Feel free to use [patch] temporarily as well to pull in a fork of compiler-builtins to test here on CI

@bors
Copy link
Contributor

bors commented Mar 14, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_fold:end:services

travis_fold:start:git.checkout
travis_time:start:1b63fc9a
$ git clone --depth=2 --branch=try https://github.com/rust-lang/rust.git rust-lang/rust
---
[00:01:13] 
[00:01:13] Total download size: 4.9 M
[00:01:13] Downloading Packages:
[00:01:16] --------------------------------------------------------------------------------
[00:01:16] Total                                           1.8 MB/s | 4.9 MB     00:02     
[00:01:16] warning: rpmts_HdrFromFdno: Header V3 DSA signature: NOKEY, key ID e8562897
[00:01:16] Importing GPG key 0xE8562897 "CentOS-5 Key (CentOS 5 Official Signing Key) <centos-5-key@centos.org>" from /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-5
[00:01:16] Running Transaction Test
[00:01:16] Finished Transaction Test
[00:01:16] Transaction Test Succeeded
[00:01:16] Running Transaction
---
[00:04:31] + set +x
[00:04:55] shared.sh: line 1:   352 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:04:55] ./build-openssl.sh: line 15:  4115 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:04:55] + cd ..
[00:04:55] + rm -rf openssl-1.0.2k
[00:04:55] + ln -nsf /etc/pki/tls/cert.pem /rustroot/ssl/
[00:04:56]  ---> 79327664bf77
[00:04:56] Step 14/41 : COPY dist-x86_64-linux/build-curl.sh /tmp/
[00:04:57]  ---> 9ff05c80792c
[00:04:57] Step 15/41 : RUN ./build-curl.sh
[00:04:57] Step 15/41 : RUN ./build-curl.sh
[00:04:57]  ---> Running in 5831db0f1cdb
[00:04:57] + source shared.sh
[00:04:57] + VERSION=7.51.0
[00:04:57] + curl http://cool.haxx.se/download/curl-7.51.0.tar.bz2
[00:04:59]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
[00:04:59]                                  Dload  Upload   Total   Spent    Left  Speed
[00:05:00] 
  0 2509k    0 14215    0     0   9215      0  0:04:38  0:00:01  0:04:37  9215
  0 2509k    0 14215    0     0   9215      0  0:04:38  0:00:01  0:04:37  9215
 16 2509k   16  420k    0     0   194k      0  0:00:12  0:00:02  0:00:10  654k
100 2509k  100 2509k    0     0   877k      0  0:00:02  0:00:02 --:--:-- 1893k
[00:05:00] + mkdir curl-build
[00:05:00] + cd curl-build
[00:05:00] + hide_output ../curl-7.51.0/configure --prefix=/rustroot --with-ssl=/rustroot --disable-sspi --disable-gopher --disable-smtp --disable-smb --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-manual --disable-dict --disable-rtsp --disable-ldaps --disable-ldap
[00:05:27] + hide_output make -j10
[00:05:27] + set +x
[00:05:42] shared.sh: line 1:    13 Terminated              bash -c "while true; do sleep 30; echo \$(date) - building ...; done"
[00:05:42] + hide_output make install
---
 85 67.8M   85 57.7M    0     0  6237k      0  0:00:11  0:00:09  0:00:02 6050k
 96 67.8M   96 65.1M    0     0  6364k      0  0:00:10  0:00:10 --:--:-- 6972k
100 67.8M  100 67.8M    0     0  6349k      0  0:00:10  0:00:10 --:--:-- 7697k
[00:10:16] + cd gcc-5.5.0
[00:10:16] + sed -i 's|ftp://gcc\.gnu\.org/|http://gcc.gnu.org/|g' ./contrib/download_prerequisites
[00:10:16] --2019-03-14 16:15:22--  http://gcc.gnu.org/pub/gcc/infrastructure/mpfr-2.4.2.tar.bz2
[00:10:16] Resolving gcc.gnu.org... 209.132.180.131
[00:10:16] Connecting to gcc.gnu.org|209.132.180.131|:80... connected.
[00:10:16] HTTP request sent, awaiting response... 200 OK
---
[01:26:35]  ---> 5b97c1979fc6
[01:26:35] Step 25/41 : RUN ./build-clang.sh
[01:26:35]  ---> Running in 0e119d003d46
[01:26:36] + source shared.sh
[01:26:36] + LLVM=llvmorg-8.0.0-rc2
[01:26:36] + mkdir llvm-project
[01:26:36] + cd llvm-project
[01:26:36] + curl -L https://github.com/llvm/llvm-project/archive/llvmorg-8.0.0-rc2.tar.gz
[01:26:36] + tar xzf - --strip-components=1
[01:26:36]                                  Dload  Upload   Total   Spent    Left  Speed
[01:26:36] 
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
100   136    0   136    0     0    635      0 --:--:-- --:--:-- --:--:--   731
---
[01:26:55] + cd clang-build
[01:26:55] + INC=/rustroot/include
[01:26:55] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed
[01:26:55] + INC=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed:/usr/include
[01:26:55] + hide_output cmake ../llvm -DCMAKE_C_COMPILER=/rustroot/bin/gcc -DCMAKE_CXX_COMPILER=/rustroot/bin/g++ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/rustroot -DLLVM_TARGETS_TO_BUILD=X86 '-DLLVM_ENABLE_PROJECTS=clang;lld' -DC_INCLUDE_DIRS=/rustroot/include:/rustroot/lib/gcc/x86_64-unknown-linux-gnu/5.5.0/include-fixed:/usr/include
[01:27:25] Thu Mar 14 17:32:31 UTC 2019 - building ...
[01:27:38] + hide_output make -j10
[01:27:38] + set +x
[01:28:08] Thu Mar 14 17:33:15 UTC 2019 - building ...

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 14, 2019
@bors
Copy link
Contributor

bors commented Mar 20, 2019

☔ The latest upstream changes (presumably #59298) made this pull request unmergeable. Please resolve the merge conflicts.

hug-dev added a commit to hug-dev/compiler-builtins that referenced this pull request Mar 20, 2019
Try a release for the rust-lang/rust#59182 PR to pull the new changes
related with Armv8-M.
@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 20, 2019

I rebased and added a new commit which replace compiler-builtins with a virtual release I have made on my own forked version of it at hug-dev/compiler-builtins (release commit)
I also did cargo +nightly update -p compiler-builtins to update Cargo.lock.
Finally, I temporary hacked src/tools/tidy/src/extdeps.rs to make it work.

@alexcrichton If all of this is correct, a new try of bors should give us more interesting results :)

@alexcrichton
Copy link
Member

@bors: try

@bors
Copy link
Contributor

bors commented Mar 20, 2019

⌛ Trying commit 7fca98b with merge 54cce0f...

bors added a commit that referenced this pull request Mar 20, 2019
Add dist builder for Armv8-M Baseline and HF

This commit adds the Armv8-M Baseline and Armv8-M Mainline with
FPU targets in the list of targets that
get their dist components built. It also update the build-manifest
so that this target gets also its dist components uploaded.

Made possible with the recent change merged in `compiler-builtins`:
rust-lang/compiler-builtins#276

A new `compiler-builtins` might be necessary for successfull compilation of the artefacts of those targets.
@bors
Copy link
Contributor

bors commented Mar 20, 2019

☀️ Try build successful - checks-travis
Build commit: 54cce0f

@alexcrichton
Copy link
Member

Nice! The job has a bunch of verbose logs which point to:

https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rustc-builds/54cce0fe70aa1e1d5ecf93ed305f5ebaee8cd3eb/rust-std-nightly-thumbv8m.base-none-eabi.tar.gz

(and the final component can be tweaked to get the different targets)

Mind poking around those and make sure they look all good? After that looks like this'll be an easy merge! (we can get the compiler-builtins changes in and published before this PR lands)

@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 21, 2019

I can not say if there are no bugs at all, but I think this is fine.
I had a quick look and thumbv8m.main-none-eabihf and thumbv8m.base-none-eabi artefacts seems to have the same files, with around the same sizes than the other thumb* targets. I disassembled core for both of them and they seemed to contain the correct instructions. I can not check all of them of course!

@alexcrichton
Copy link
Member

Ok great! Want to send a PR to compiler-builtins and I can merge/publish?

@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 21, 2019

Sure! Do you mean a PR that does the same thing as this below to mark the new release?
hug-dev/compiler-builtins@e745aea

@alexcrichton
Copy link
Member

Oh sorry I thought there were more changes that weren't already in there. In that case I've published 0.1.8 now

@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 21, 2019

No worries! I am going to update this PR to remove the commits that use the try branch and patch and add a commit to update Cargo.lock for compiler-builtins

@bors
Copy link
Contributor

bors commented Mar 21, 2019

📌 Commit c717cb09c6cd744bfb2769b51fa818a4c4644561 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 21, 2019
@bors
Copy link
Contributor

bors commented Mar 22, 2019

☔ The latest upstream changes (presumably #57810) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 22, 2019
@hug-dev
Copy link
Contributor Author

hug-dev commented Mar 29, 2019

Rebased to fix conflict on Cargo.lock

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 29, 2019

📌 Commit d06683f4dfb3ee53c2a8c9bc0d70b960f0d41224 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 29, 2019
@bors
Copy link
Contributor

bors commented Mar 30, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout armv8m-base-hf (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self armv8m-base-hf --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/tools/build-manifest/src/main.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 30, 2019
@bors
Copy link
Contributor

bors commented Mar 30, 2019

☔ The latest upstream changes (presumably #59464) made this pull request unmergeable. Please resolve the merge conflicts.

This commit adds the Armv8-M Baseline and Armv8-M Mainline with
FPU targets in the list of targets that
get their dist components built. It also update the build-manifest
so that this target gets also its dist components uploaded.
@hug-dev
Copy link
Contributor Author

hug-dev commented Apr 3, 2019

Rebased and removed the compiler-builtins update as it is already updated to 0.1.8 upstream :)

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 3, 2019

📌 Commit e833499 has been approved by alexcrichton

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 3, 2019
bors added a commit that referenced this pull request Apr 3, 2019
Add dist builder for Armv8-M Baseline and HF

This commit adds the Armv8-M Baseline and Armv8-M Mainline with
FPU targets in the list of targets that
get their dist components built. It also update the build-manifest
so that this target gets also its dist components uploaded.

Made possible with the recent change merged in `compiler-builtins`:
rust-lang/compiler-builtins#276

A new `compiler-builtins` might be necessary for successfull compilation of the artefacts of those targets.
@bors
Copy link
Contributor

bors commented Apr 3, 2019

⌛ Testing commit e833499 with merge f8673e0...

@bors
Copy link
Contributor

bors commented Apr 3, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: alexcrichton
Pushing f8673e0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 3, 2019
@bors bors merged commit e833499 into rust-lang:master Apr 3, 2019
ehuss added a commit to ehuss/rust-forge that referenced this pull request May 15, 2020
The following targets are now built and distributed:

- aarch64-unknown-none: rust-lang/rust#68334
- mips64-unknown-linux-muslabi64: rust-lang/rust#65843
- mips64el-unknown-linux-muslabi64: rust-lang/rust#65843
- nvptx64-nvidia-cuda: rust-lang/rust#57937
- riscv32i-unknown-none-elf: rust-lang/rust#62784
- riscv64gc-unknown-linux-gnu: rust-lang/rust#68037
- thumbv8m.base-none-eabi: rust-lang/rust#59182
- thumbv8m.main-none-eabi : rust-lang/rust#56954
- thumbv8m.main-none-eabihf: rust-lang/rust#59182
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants