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

Rollup of 3 pull requests #130387

Closed

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

workingjubilee and others added 7 commits September 13, 2024 20:23
-0.0 is the actual neutral additive float, not +0.0, and this matters to codegen.
This is a follow-up to rust-lang#123159, but applied to Armv8-R.

This required llvm/llvm-project#88287 to work
properly. Now that this change exists in rustc's llvm, we can fix
Armv8-R's default fpu features. In Armv8-R's case, the default features
from LLVM for floating-point are sufficient, because there is no
integer-only variant of this architecture.
…ingjubilee

Fix target-cpu fpu features on Armv8-R.

This is a follow-up to rust-lang#123159, but applied to Armv8-R.

This required llvm/llvm-project#88287 to work properly. Now that this change exists in rustc's llvm, we can fix Armv8-R's default fpu features. In Armv8-R's case, the default features from LLVM for floating-point are sufficient, because there is no integer-only variant of this architecture.
…ux, r=RalfJung,jieyouxu

Use -0.0 in `intrinsics::simd::reduce_add_unordered`

-0.0 is the actual neutral additive float, not +0.0, and this matters to codegen.

try-job: aarch64-gnu
… r=compiler-errors

Correctly account for niche-optimized tags in rustc_transmute

This is a bit hacky, but it fixes the ICE and makes it possible to run the safe transmute check on every `mem::transmute` check we instantiate. I want to write a lint that needs to do that, but this stands well on its own.

cc ``@jswrenn`` here's the fix I alluded to yesterday :)

Fixes rust-lang#123693
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 15, 2024
@workingjubilee
Copy link
Member Author

@bors r+ rollup=never p=3

@bors
Copy link
Contributor

bors commented Sep 15, 2024

📌 Commit e5c03c2 has been approved by workingjubilee

It is now in the queue for this repository.

@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 15, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 15, 2024
…kingjubilee

Rollup of 3 pull requests

Successful merges:

 - rust-lang#130295 (Fix target-cpu fpu features on Armv8-R.)
 - rust-lang#130325 (Use -0.0 in `intrinsics::simd::reduce_add_unordered`)
 - rust-lang#130371 (Correctly account for niche-optimized tags in rustc_transmute)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Contributor

bors commented Sep 15, 2024

⌛ Testing commit e5c03c2 with merge 6d35464...

@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
test [assembly] tests\assembly\simd-intrinsic-mask-store.rs#x86-avx512 ... ok
test [assembly] tests\assembly\simd-intrinsic-scatter.rs#x86-avx512 ... ok
test [assembly] tests\assembly\simd-intrinsic-select.rs#x86-avx2 ... ok
test [assembly] tests\assembly\simd-intrinsic-select.rs#aarch64 ... ok
test [assembly] tests\assembly\simd\reduce-fadd-unordered.rs#x86_64-avx2 ... ok
test [assembly] tests\assembly\simd\reduce-fadd-unordered.rs#x86_64 ... FAILED
test [assembly] tests\assembly\simd-intrinsic-select.rs#x86-avx512 ... ok
test [assembly] tests\assembly\small_data_threshold.rs#HEXAGON ... ok
test [assembly] tests\assembly\stack-protector\stack-protector-heuristics-effect-windows-32bit.rs#all ... ignored, ignored when the pointer width is 64bit (64-bit table based SEH has slightly different behaviors than classic SEH)
test [assembly] tests\assembly\stack-protector\stack-protector-heuristics-effect-windows-32bit.rs#basic ... ignored, ignored when the pointer width is 64bit (64-bit table based SEH has slightly different behaviors than classic SEH)
---
test [assembly] tests\assembly\x86_64-typed-swap.rs#WIN ... ok

failures:

---- [assembly] tests\assembly\simd\reduce-fadd-unordered.rs#x86_64 stdout ----

error in revision `x86_64`: 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.22621.0\x64;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.41.34120\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.41.34120\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\x86_64-pc-windows-msvc\stage0\bin;C:\Program Files\PowerShell\7;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.1.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.1\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.422-5\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.8.7\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\\build\\bin\\FileCheck.exe" "--input-file" "C:\\a\\rust\\rust\\build\\x86_64-pc-windows-msvc\\test\\assembly\\simd\\reduce-fadd-unordered.x86_64\\reduce-fadd-unordered.s" "C:\\a\\rust\\rust\\tests\\assembly\\simd\\reduce-fadd-unordered.rs" "--check-prefix=CHECK" "--check-prefix" "x86_64" "--check-prefix" "MSVC" "--allow-unused-prefixes" "--dump-input-context" "100"
--- stderr -------------------------------
--- stderr -------------------------------
C:\a\rust\rust\tests\assembly\simd\reduce-fadd-unordered.rs:20:18: error: x86_64-NEXT: expected string not found in input
 // x86_64-NEXT: movaps
                 ^
C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\assembly\simd\reduce-fadd-unordered.x86_64\reduce-fadd-unordered.s:18:7: note: scanning from here
 addps (%rcx), %xmm1
      ^
C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\assembly\simd\reduce-fadd-unordered.x86_64\reduce-fadd-unordered.s:19:2: note: possible intended match here
 movshdup %xmm1, %xmm0


Input file: C:\a\rust\rust\build\x86_64-pc-windows-msvc\test\assembly\simd\reduce-fadd-unordered.x86_64\reduce-fadd-unordered.s
Check file: C:\a\rust\rust\tests\assembly\simd\reduce-fadd-unordered.rs

-dump-input=help explains the following input dump.
Input was:
<<<<<<
           1:  .text 
           1:  .text 
           2:  .def @feat.00; 
           3:  .scl 3; 
           4:  .type 0; 
           5:  .endef 
           6:  .globl @feat.00 
           7: .set @feat.00, 0 
           8:  .file "reduce_fadd_unordered.3b40368e53f1db5f-cgu.0" 
           9:  .def _ZN21reduce_fadd_unordered25reduce_fadd_negative_zero17hebc54c52151ae4a4E; 
          10:  .scl 2; 
          11:  .type 32; 
          12:  .endef 
          13:  .section .text,"xr",one_only,_ZN21reduce_fadd_unordered25reduce_fadd_negative_zero17hebc54c52151ae4a4E 
          14:  .globl _ZN21reduce_fadd_unordered25reduce_fadd_negative_zero17hebc54c52151ae4a4E 
          15:  .p2align 4, 0x90 
          16: _ZN21reduce_fadd_unordered25reduce_fadd_negative_zero17hebc54c52151ae4a4E: 
          17:  movddup 8(%rcx), %xmm1 
          18:  addps (%rcx), %xmm1 
next:20'0           X~~~~~~~~~~~~~~ error: no match found
          19:  movshdup %xmm1, %xmm0 
next:20'0     ~~~~~~~~~~~~~~~~~~~~~~~
next:20'1      ?                      possible intended match
          20:  addss %xmm1, %xmm0 
next:20'0     ~~~~~~~~~~~~~~~~~~~~
          21:  retq 
next:20'0     ~~~~~~
          22:  
next:20'0     ~
          23:  .globl _fltused 
next:20'0     ~~~~~~~~~~~~~~~~~
------------------------------------------




failures:
    [assembly] tests\assembly\simd\reduce-fadd-unordered.rs#x86_64

test result: FAILED. 443 passed; 1 failed; 39 ignored; 0 measured; 0 filtered out; finished in 5.15s

Some tests failed in compiletest suite=assembly mode=assembly host=x86_64-pc-windows-msvc target=x86_64-pc-windows-msvc
Build completed unsuccessfully in 0:44:56
make: *** [Makefile:106: ci-msvc-ps1] Error 1
  network time: Sun, 15 Sep 2024 08:57:31 GMT
##[error]Process completed with exit code 2.
Post job cleanup.
[command]"C:\Program Files\Git\bin\git.exe" version

@bors
Copy link
Contributor

bors commented Sep 15, 2024

💔 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 15, 2024
@workingjubilee workingjubilee deleted the rollup-1k3g708 branch September 15, 2024 09:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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.

6 participants