Skip to content

Conversation

erickt
Copy link
Contributor

@erickt erickt commented Jan 18, 2025

This advances Fuchsia to a checkout from 2025-01-13, which corresponds to a recent Rust roll, and hopefully avoids #135667, where a repository used by the older version of Rust was accidentally archived and broke checking out the prior version.

try-job: x86_64-fuchsia

cc @ehuss

@rustbot
Copy link
Collaborator

rustbot commented Jan 18, 2025

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jan 18, 2025
@erickt
Copy link
Contributor Author

erickt commented Jan 18, 2025

@bors try

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

⌛ Trying commit 21d5aed with merge fce9600...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
Bump Fuchsia integration commit

This advances Fuchsia to a checkout from 2025-01-13, which corresponds to a recent Rust roll, and hopefully avoids rust-lang#135667, where a repository used by the older version of Rust was accidentally archived and broke checking out the prior version.

try-job: x86_64-fuchsia

cc `@ehuss`
This advances Fuchsia to a checkout from 2025-01-13, which corresponds
to a recent Rust roll, and hopefully avoids rust-lang#135667, where a repository
used by the older version of Rust was accidentally archived and broke
checking out the prior version.

try-job: x86_64-fuchsia
@erickt
Copy link
Contributor Author

erickt commented Jan 18, 2025

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
Bump Fuchsia integration commit

This advances Fuchsia to a checkout from 2025-01-13, which corresponds to a recent Rust roll, and hopefully avoids rust-lang#135667, where a repository used by the older version of Rust was accidentally archived and broke checking out the prior version.

try-job: x86_64-fuchsia

cc `@ehuss`
@bors
Copy link
Collaborator

bors commented Jan 18, 2025

⌛ Trying commit 37a88ba with merge ce3de07...

@rust-log-analyzer

This comment was marked as outdated.

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

☀️ Try build successful - checks-actions
Build commit: ce3de07 (ce3de076dbb498069b8dad34c6edb84dba879452)

@lqd
Copy link
Member

lqd commented Jan 18, 2025

Looks good, this will fix bors.

r? lqd @bors r+ p=100

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

📌 Commit 37a88ba has been approved by lqd

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@rustbot rustbot assigned lqd and unassigned Kobzol Jan 18, 2025
@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 Jan 18, 2025
@lqd
Copy link
Member

lqd commented Jan 18, 2025

@bors p=1000

bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 18, 2025
Bump Fuchsia integration commit

This advances Fuchsia to a checkout from 2025-01-13, which corresponds to a recent Rust roll, and hopefully avoids rust-lang#135667, where a repository used by the older version of Rust was accidentally archived and broke checking out the prior version.

try-job: x86_64-fuchsia

cc `@ehuss`
@bors
Copy link
Collaborator

bors commented Jan 18, 2025

⌛ Testing commit 37a88ba with merge e46ac6b...

@lqd
Copy link
Member

lqd commented Jan 18, 2025

I went through the queue, ehuss had already retried the ones that had failed due to this issue, and the other PRs were r+ed later without any failures, so when this lands (or if the repo is restored) the tree can be reopened.

(I may not be at a computer when that happens, but anyone with r+ can reopen)

@lqd lqd mentioned this pull request Jan 18, 2025
@rust-log-analyzer
Copy link
Collaborator

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)
[2025-01-18T08:58:43Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-01-18T08:58:43Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Debug, scenario=Some(Full), patch=None, backend=Llvm, phase=benchmark
[2025-01-18T08:58:43Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpvbwmDA#token-stream-stress@0.0.0" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln"
[2025-01-18T08:58:43Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrFull), patch=None, backend=Llvm, phase=benchmark
[2025-01-18T08:58:43Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpvbwmDA#token-stream-stress@0.0.0" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\a\\_temp\\msys64\\tmp\\.tmpvbwmDA\\incremental-state"
[2025-01-18T08:58:44Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Debug, scenario=Some(IncrUnchanged), patch=None, backend=Llvm, phase=benchmark
[2025-01-18T08:58:44Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpvbwmDA#token-stream-stress@0.0.0" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln" "-C" "incremental=C:\\a\\_temp\\msys64\\tmp\\.tmpvbwmDA\\incremental-state"
[2025-01-18T08:58:44Z DEBUG collector::compile::benchmark] Benchmark iteration 1/1
[2025-01-18T08:58:44Z INFO  collector::compile::execute] run_rustc with incremental=false, profile=Opt, scenario=Some(Full), patch=None, backend=Llvm, phase=benchmark
[2025-01-18T08:58:44Z DEBUG collector::compile::execute] "\\\\?\\C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\stage0\\bin\\cargo.exe" "rustc" "--manifest-path" "Cargo.toml" "-p" "path+file:///C:/a/_temp/msys64/tmp/.tmpFiOgti#token-stream-stress@0.0.0" "--release" "--bin" "token-stream-stress-bin" "--" "--wrap-rustc-with" "Eprintln"
[2025-01-18T08:58:44Z INFO  collector::compile::execute] run_rustc with incremental=true, profile=Opt, scenario=Some(IncrFull), patch=None, backend=Llvm, phase=benchmark
---
failures:

---- [codegen] tests\codegen\target-feature-inline-closure.rs stdout ----

error: verification with 'FileCheck' failed
status: exit code: 1
command: PATH=";C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.42.34433\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.42.34433\bin\HostX64\x64;C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage0-bootstrap-tools\x86_64-pc-windows-msvc\release\deps;C:\a\rust\rust\build\unpacked-dist\rustc-nightly-x86_64-pc-windows-msvc\rustc\bin;C:\a\_temp\msys64\mingw64\bin;C:\a\_temp\msys64\usr\local\bin;C:\a\_temp\msys64\usr\bin;C:\a\_temp\msys64\usr\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\sccache;C:\a\_temp\setup-msys2;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\3.3.1\x64;C:\cabal\bin;C:\ghcup\bin;C:\mingw64\bin;C:\Program Files\dotnet;C:\Program Files\MySQL\MySQL Server 8.0\bin;C:\Program Files\R\R-4.4.2\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\SeleniumWebDrivers\ChromeDriver;C:\Program Files (x86)\sbt\bin;C:\Program Files (x86)\GitHub CLI;C:\Program Files\Git\bin;C:\Program Files (x86)\pipx_bin;C:\npm\prefix;C:\hostedtoolcache\windows\go\1.21.13\x64\bin;C:\hostedtoolcache\windows\Python\3.9.13\x64\Scripts;C:\hostedtoolcache\windows\Python\3.9.13\x64;C:\hostedtoolcache\windows\Ruby\3.0.7\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.432-6\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\ProgramData\Chocolatey\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\Program Files\dotnet;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files\Microsoft SQL Server\150\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\WiX Toolset v3.14\bin;C:\Program Files\Microsoft SQL Server\130\DTS\Binn;C:\Program Files\Microsoft SQL Server\140\DTS\Binn;C:\Program Files\Microsoft SQL Server\150\DTS\Binn;C:\Program Files\Microsoft SQL Server\160\DTS\Binn;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\ProgramData\chocolatey\lib\pulumi\tools\Pulumi\bin;C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\lib\maven\apache-maven-3.9.9\bin;C:\Program Files\Microsoft Service Fabric\bin\Fabric\Fabric.Code;C:\Program Files\Microsoft SDKs\Service Fabric\Tools\ServiceFabricLocalClusterManager;C:\Program Files\nodejs;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\GitHub CLI;C:\tools\php;C:\Program Files (x86)\sbt\bin;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps;C:\a\_temp\msys64\usr\bin\site_perl;C:\a\_temp\msys64\usr\bin\vendor_perl;C:\a\_temp\msys64\usr\bin\core_perl" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\llvm\\bin\\FileCheck.exe" "--input-file" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\codegen\\target-feature-inline-closure\\target-feature-inline-closure.ll" "C:\\a\\rust\\rust\\tests\\codegen\\target-feature-inline-closure.rs" "--check-prefix=CHECK" "--allow-unused-prefixes" "--dump-input-context" "100"
--- stderr -------------------------------
C:\a\rust\rust\tests\codegen\target-feature-inline-closure.rs:28:16: error: CHECK-NOT: excluded string found in input
C:\a\rust\rust\tests\codegen\target-feature-inline-closure.rs:28:16: error: CHECK-NOT: excluded string found in input
 // CHECK-NOT: fadd
C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\codegen\target-feature-inline-closure\target-feature-inline-closure.ll:35:70: note: found here
C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\codegen\target-feature-inline-closure\target-feature-inline-closure.ll:35:70: note: found here
 call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0)

Input file: C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\codegen\target-feature-inline-closure\target-feature-inline-closure.ll
Check file: C:\a\rust\rust\tests\codegen\target-feature-inline-closure.rs


-dump-input=help explains the following input dump.
Input was:
<<<<<<
<<<<<<
        1: ; ModuleID = 'target_feature_inline_closure.5b935a73a363356c-cgu.0' 
        2: source_filename = "target_feature_inline_closure.5b935a73a363356c-cgu.0" 
        3: target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128" 
        5:  
        5:  
        6: ; core::core_arch::x86::avx::_mm256_add_ps 
        7: ; Function Attrs: inlinehint mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: readwrite) uwtable 
        8: define internal fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E(ptr dead_on_unwind noalias nocapture noundef writable writeonly align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %a, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %b) unnamed_addr #0 { 
        9: start: 
       10:  %0 = load <8 x float>, ptr %a, align 32 
       11:  %1 = load <8 x float>, ptr %b, align 32 
       12:  %2 = fadd <8 x float> %0, %1 
       13:  store <8 x float> %2, ptr %_0, align 32 
       14:  ret void 
       15: } 
       16:  
       17: ; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: readwrite) uwtable 
       18: define void @with_avx(ptr dead_on_unwind noalias nocapture noundef writable writeonly sret([32 x i8]) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #1 { 
       19: start: 
       20:  %0 = load <8 x float>, ptr %x, align 32 
       21:  %1 = fadd <8 x float> %0, %0 
       22:  store <8 x float> %1, ptr %_0, align 32, !alias.scope !2, !noalias !5 
       23:  ret void 
       24: } 
       25:  
       26: ; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: readwrite) uwtable 
       27: define void @without_avx(ptr dead_on_unwind noalias nocapture noundef writable writeonly sret([32 x i8]) align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef readonly align 32 dereferenceable(32) %x) unnamed_addr #2 { 
       29:  %0 = alloca [32 x i8], align 32 
       30:  %1 = alloca [32 x i8], align 32 
       30:  %1 = alloca [32 x i8], align 32 
       31:  %2 = load <8 x float>, ptr %x, align 32 
       32:  store <8 x float> %2, ptr %1, align 32 
       33:  store <8 x float> %2, ptr %0, align 32 
       34: ; call core::core_arch::x86::avx::_mm256_add_ps 
       35:  call fastcc void @_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E(ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %_0, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %1, ptr noalias nocapture noundef nonnull align 32 dereferenceable(32) %0) 
not:28                                                                          !~~~                                                                                                                                                                                                                               error: no match expected
       36:  ret void 
       37: } 
       38:  
       39: attributes #0 = { inlinehint mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: readwrite) uwtable "target-cpu"="x86-64" "target-features"="+cx16,+sse3,+sahf,+x87,+sse2,+avx,+sse,+sse2,+sse3,+sse4.1,+sse4.2,+crc32,+ssse3" } 
       40: attributes #1 = { mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: readwrite) uwtable "target-cpu"="x86-64" "target-features"="+cx16,+sse3,+sahf,+x87,+sse2,+avx,+sse,+sse2,+sse3,+sse4.1,+sse4.2,+crc32,+ssse3" } 
       41: attributes #2 = { mustprogress nofree norecurse nosync nounwind willreturn memory(argmem: readwrite) uwtable "target-cpu"="x86-64" "target-features"="+cx16,+sse3,+sahf,+x87,+sse2" } 
       42:  
       43: !llvm.module.flags = !{!0} 
       44: !llvm.ident = !{!1} 
       45:  
       46: !0 = !{i32 8, !"PIC Level", i32 2} 
       47: !1 = !{!"rustc version 1.86.0-nightly (e46ac6b71 2025-01-18)"} 
       48: !2 = !{!3} 
       49: !3 = distinct !{!3, !4, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E: %_0"} 
       50: !4 = distinct !{!4, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E"} 
       51: !5 = !{!6, !7, !8, !10} 
       52: !6 = distinct !{!6, !4, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E: %a"} 
       53: !7 = distinct !{!7, !4, !"_ZN4core9core_arch3x863avx13_mm256_add_ps17h70c3e3fadd12a230E: %b"} 
       54: !8 = distinct !{!8, !9, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h906718837e626024E: %x"} 
       55: !9 = distinct !{!9, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h906718837e626024E"} 
       56: !10 = distinct !{!10, !9, !"_ZN29target_feature_inline_closure8with_avx28_$u7b$$u7b$closure$u7d$$u7d$17h906718837e626024E: %y"} 
------------------------------------------



@bors
Copy link
Collaborator

bors commented Jan 18, 2025

💔 Test failed - checks-actions

@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 18, 2025
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 18, 2025
@lqd
Copy link
Member

lqd commented Jan 18, 2025

@bors retry fucking hell msvc

@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 Jan 18, 2025
@bors
Copy link
Collaborator

bors commented Jan 18, 2025

⌛ Testing commit 37a88ba with merge bd62a45...

@lqd
Copy link
Member

lqd commented Jan 18, 2025

If this PR fails again: fuchsia people have said they fixed the repo causing issues for the builder, so we can also try to land the next PR in queue instead of this one.

@bors
Copy link
Collaborator

bors commented Jan 18, 2025

☀️ Test successful - checks-actions
Approved by: lqd
Pushing bd62a45 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 18, 2025
@bors bors merged commit bd62a45 into rust-lang:master Jan 18, 2025
7 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 18, 2025
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bd62a45): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.3% [-0.3%, -0.3%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary -0.8%, secondary -2.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.3% [-3.1%, -1.5%] 2
Improvements ✅
(secondary)
-2.1% [-2.1%, -2.1%] 1
All ❌✅ (primary) -0.8% [-3.1%, 2.3%] 3

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 765.445s -> 764.994s (-0.06%)
Artifact size: 326.00 MiB -> 326.06 MiB (0.02%)

@erickt erickt deleted the fix-fuchsia-sha branch January 21, 2025 17:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants