forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#133674 - scottmcm:chain-carrying-add, r=Amanieu Fix chaining `carrying_add`s Something about the MIR lowering for `||` ended up breaking this, but it's fixed by changing the code to use `|` instead. I also added an assembly test to ensure it *keeps* being [`adc`](https://www.felixcloutier.com/x86/adc). cc rust-lang#85532 (comment), which noticed this.
- Loading branch information
Showing
2 changed files
with
34 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
//@ only-x86_64 | ||
//@ assembly-output: emit-asm | ||
//@ compile-flags: --crate-type=lib -O -C target-cpu=x86-64-v4 | ||
//@ compile-flags: -C llvm-args=-x86-asm-syntax=intel | ||
|
||
#![no_std] | ||
#![feature(bigint_helper_methods)] | ||
|
||
// This checks that the `carrying_add` implementation successfully chains, to catch | ||
// issues like <https://github.com/rust-lang/rust/issues/85532#issuecomment-2495119815> | ||
|
||
// This forces the ABI to avoid the windows-vs-linux ABI differences. | ||
|
||
// CHECK-LABEL: bigint_chain_carrying_add: | ||
#[no_mangle] | ||
pub unsafe extern "sysv64" fn bigint_chain_carrying_add( | ||
dest: *mut u64, | ||
src1: *const u64, | ||
src2: *const u64, | ||
n: usize, | ||
mut carry: bool, | ||
) -> bool { | ||
// CHECK: mov [[TEMP:r..]], qword ptr [rsi + 8*[[IND:r..]] + 8] | ||
// CHECK: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 8] | ||
// CHECK: mov qword ptr [rdi + 8*[[IND]] + 8], [[TEMP]] | ||
// CHECK: mov [[TEMP]], qword ptr [rsi + 8*[[IND]] + 16] | ||
// CHECK: adc [[TEMP]], qword ptr [rdx + 8*[[IND]] + 16] | ||
// CHECK: mov qword ptr [rdi + 8*[[IND]] + 16], [[TEMP]] | ||
for i in 0..n { | ||
(*dest.add(i), carry) = u64::carrying_add(*src1.add(i), *src2.add(i), carry); | ||
} | ||
carry | ||
} |