Support 128-bit atomics on all x86_64 Apple targets - #112150

Merged
bors merged 1 commit into
rust-lang:masterfrom
taiki-e:apple-atomic-128
Jun 2, 2023
Merged

Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom
taiki-e:apple-atomic-128

Conversation

@taiki-e

@taiki-etaiki-e commented May 31, 2023•
edited
Loading

Copy link
Copy Markdown
Member

On x86_64, we currently set max_atomic_width to 128 only on macOS.

rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8 in ad8304a

base.max_atomic_width = Some(128);// core2 supports cmpxchg16b

However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.

rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76 in ad8304a

X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",

# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin

r? @Amanieu

@rustbotrustbot 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. labels May 31, 2023
@rustbot

rustbot commented May 31, 2023

Copy link
Copy Markdown
Collaborator

These commits modify compiler targets.
(See the Target Tier Policy.)

@Amanieu

Amanieu commented May 31, 2023

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented May 31, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 0a61bc4 has been approved by Amanieu

It is now in the queue for this repository.

@borsbors 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 May 31, 2023
@bors

bors commented Jun 1, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...

@rust-log-analyzer

rust-log-analyzer commented Jun 1, 2023

Copy link
Copy Markdown
Collaborator

The job i686-mingw-1 failed! Check out the build log: (web)(plain)

Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors

bors commented Jun 1, 2023

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors 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 Jun 1, 2023
@Amanieu

Amanieu commented Jun 1, 2023

Copy link
Copy Markdown
Member

Seems unrelated

@bors retry

@borsbors 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 Jun 1, 2023
@compiler-errorscompiler-errors mentioned this pull request Jun 2, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit fc55757 into rust-lang:masterJun 2, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 2, 2023
@taiki-e
taiki-e deleted the apple-atomic-128 branch June 2, 2023 10:58
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Support 128-bit atomics on all x86_64 Apple targets - #112150
Merged
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Jun 2, 2023
Merged
Support 128-bit atomics on all x86_64 Apple targets#112150
bors merged 1 commit into
rust-lang:masterfrom 
taiki-e:apple-atomic-128
Conversation
@taiki-e
@taiki-etaiki-e
commented
May 31, 2023•

edited

Loading

Copy link


Copy Markdown

Member
On x86_64, we currently set max_atomic_width to 128 only on macOS.
rust/compiler/rustc_target/src/spec/x86_64_apple_darwin.rs

Line 8
in
ad8304a
 base.max_atomic_width = Some(128);// core2 supports cmpxchg16b
However, other x86_64 Apple targets (iOS, tvOS, and watchOS) are also core2+ and support cmpxchg16b.
rust/compiler/rustc_target/src/spec/apple_base.rs

Lines 71 to 76
in
ad8304a
X86_64 | X86_64_sim => "core2",
// Note: `core-avx2` is slightly more advanced than `x86_64h`, see
// comments (and disabled features) in `x86_64h_apple_darwin` for
// details.
X86_64h => "core-avx2",
X86_64_macabi => "core2",
# Script to get targets that support cmpxchg16b by default:
$ (for target in$(rustc --print target-list);do [[ $target=="x86_64"* ]] && rustc --print cfg --target "$target"| grep -q cmpxchg16b &&echo"$target"; done)x86_64-apple-darwinx86_64-apple-iosx86_64-apple-ios-macabix86_64-apple-tvosx86_64-apple-watchos-simx86_64h-apple-darwin
r? @Amanieu
@rustbotrustbot
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.
labels
May 31, 2023
@rustbot
rustbot
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
These commits modify compiler targets.

(See the Target Tier Policy.)
@Amanieu
Amanieu
commented
May 31, 2023

Copy link


Copy Markdown

Member
@bors r+
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 0a61bc4 has been approved by Amanieu
It is now in the queue for this repository.
@borsbors
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
May 31, 2023
@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 0a61bc4 with merge 5b96cd3a9d65681732abcdb8300f2b7217ac6b00...
@rust-log-analyzer
rust-log-analyzer
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
The job i686-mingw-1 failed! Check out the build log: (web)(plain)
Click to see the possible cause of the failure (guessed by this bot)
failures:
---- [ui] tests\rustdoc-ui\crate-reference-in-block-module.rs stdout ----
error: test compilation failed although it shouldn't!
status: exit code: 0xc0000005
command: PATH="C:\a\rust\rust\build\i686-pc-windows-gnu\stage2\bin;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0-bootstrap-tools\i686-pc-windows-gnu\release\deps;C:\a\rust\rust\build\i686-pc-windows-gnu\stage0\bin;C:\a\rust\rust\ninja;C:\a\rust\rust\mingw32\bin;C:\hostedtoolcache\windows\Python\3.11.3\x64\Scripts;C:\hostedtoolcache\windows\Python\3.11.3\x64;C:\msys64\usr\bin;C:\a\rust\rust\sccache;C:\Program Files\MongoDB\Server\5.0\bin;C:\aliyun-cli;C:\vcpkg;C:\cf-cli;C:\Program Files (x86)\NSIS;C:\tools\zstd;C:\Program Files\Mercurial;C:\hostedtoolcache\windows\stack\2.9.3\x64;C:\cabal\bin;C:\ghcup\bin;C:\Program Files\dotnet;C:\mysql\bin;C:\Program Files\R\R-4.3.0\bin\x64;C:\SeleniumWebDrivers\GeckoDriver;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.20.3\x64\bin;C:\hostedtoolcache\windows\Python\3.7.9\x64\Scripts;C:\hostedtoolcache\windows\Python\3.7.9\x64;C:\hostedtoolcache\windows\Ruby\2.5.9\x64\bin;C:\Program Files\OpenSSL\bin;C:\tools\kotlinc\bin;C:\hostedtoolcache\windows\Java_Temurin-Hotspot_jdk\8.0.372-7\x64\bin;C:\Program Files\ImageMagick-7.1.1-Q16-HDRI;C:\Program Files (x86)\Microsoft SDKs\Azure\CLI2\wbin;C:\ProgramData\kind;C:\Program Files\Eclipse Foundation\jdk-8.0.302.8-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0;C:\Windows\System32\OpenSSH;C:\ProgramData\Chocolatey\bin;C:\Program Files\PowerShell\7;C:\Program Files\Microsoft\Web Platform Installer;C:\Program Files\Microsoft SQL Server\130\Tools\Binn;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn;C:\Program Files (x86)\Windows Kits\10\Windows Performance Toolkit;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn;C:\Program Files (x86)\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\TortoiseSVN\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:\SeleniumWebDrivers\ChromeDriver;C:\SeleniumWebDrivers\EdgeDriver;C:\Program Files\Amazon\AWSCLIV2;C:\Program Files\Amazon\SessionManagerPlugin\bin;C:\Program Files\Amazon\AWSSAMCLI\bin;C:\Program Files (x86)\Google\Cloud SDK\google-cloud-sdk\bin;C:\Program Files (x86)\Microsoft BizTalk Server;C:\Program Files\LLVM\bin;C:\Users\runneradmin\.dotnet\tools;C:\Users\runneradmin\.cargo\bin;C:\Users\runneradmin\AppData\Local\Microsoft\WindowsApps" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2\\bin\\rustdoc.exe" "C:\\a\\rust\\rust\\tests\\rustdoc-ui\\crate-reference-in-block-module.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "--sysroot" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\stage2" "--target=i686-pc-windows-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "-o" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module" "-Cdebuginfo=0" "-Lnative=C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\native\\rust-test-helpers" "-L" "C:\\a\\rust\\rust\\build\\i686-pc-windows-gnu\\test\\rustdoc-ui\\crate-reference-in-block-module\\auxiliary"
stdout: none
stderr: none
failures:
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
[ui] tests\rustdoc-ui\crate-reference-in-block-module.rs
test result: FAILED. 223 passed; 1 failed; 4 ignored; 0 measured; 0 filtered out; finished in 28.21s
Some tests failed in compiletest suite=rustdoc-ui mode=ui host=i686-pc-windows-gnu target=i686-pc-windows-gnu
Build completed unsuccessfully in 1:07:19
make: *** [Makefile:78: ci-mingw-subset-1] Error 1

@bors
bors
commented
Jun 1, 2023

Copy link


Copy Markdown

Collaborator
💔 Test failed - checks-actions
@borsbors
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
Jun 1, 2023
@Amanieu
Amanieu
commented
Jun 1, 2023

Copy link


Copy Markdown

Member
Seems unrelated
@bors retry
@borsbors
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
Jun 1, 2023
@compiler-errorscompiler-errors
mentioned this pull request
Jun 2, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 2, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
8ebf042
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit fc55757
into
rust-lang:masterJun 2, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 2, 2023
@taiki-e
taiki-e
deleted the

apple-atomic-128

branch
June 2, 2023 10:58
flip1995 pushed a commit
to flip1995/rust
that referenced
this pull request
Jun 30, 2023
@bors
Auto merge ofrust-lang#112198- compiler-errors:rollup-o2xe4of, r=co…
427a453
…mpiler-errors
Rollup of 7 pull requests
Successful merges:
- rust-lang#111670 (Require that const param tys implement `ConstParamTy`)
- rust-lang#111914 (CFI: Fix cfi with async: transform_ty: unexpected GeneratorWitness(Bi…)
- rust-lang#112030 (Migrate `item_trait_alias` to Askama)
- rust-lang#112150 (Support 128-bit atomics on all x86_64 Apple targets)
- rust-lang#112174 (Fix broken link)
- rust-lang#112190 (Improve comments on `TyCtxt` and `GlobalCtxt`.)
- rust-lang#112193 (Check tuple elements are `Sized` in `offset_of`)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees

@AmanieuAmanieu

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

5 participants

@taiki-e@rustbot@Amanieu@bors@rust-log-analyzer