Skip to content

Commit 914c148

Browse files
committed
fix more generated code
1 parent c3e5e6e commit 914c148

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

crates/core_arch/src/aarch64/neon/generated.rs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -396,8 +396,8 @@ mod test {
396396

397397
#[simd_test(enable = "neon")]
398398
unsafe fn test_vceq_f64() {
399-
let a: f64 = f64::new(1.2);
400-
let b: f64 = f64::new(1.2);
399+
let a: f64 = 1.2;
400+
let b: f64 = 1.2;
401401
let e: u64x1 = u64x1::new(0xFF_FF_FF_FF_FF_FF_FF_FF);
402402
let r: u64x1 = transmute(vceq_f64(transmute(a), transmute(b)));
403403
assert_eq!(r, e);
@@ -450,8 +450,8 @@ mod test {
450450

451451
#[simd_test(enable = "neon")]
452452
unsafe fn test_vcgt_f64() {
453-
let a: f64 = f64::new(1.2);
454-
let b: f64 = f64::new(0.1);
453+
let a: f64 = 1.2;
454+
let b: f64 = 0.1;
455455
let e: u64x1 = u64x1::new(0xFF_FF_FF_FF_FF_FF_FF_FF);
456456
let r: u64x1 = transmute(vcgt_f64(transmute(a), transmute(b)));
457457
assert_eq!(r, e);
@@ -504,8 +504,8 @@ mod test {
504504

505505
#[simd_test(enable = "neon")]
506506
unsafe fn test_vclt_f64() {
507-
let a: f64 = f64::new(0.1);
508-
let b: f64 = f64::new(1.2);
507+
let a: f64 = 0.1;
508+
let b: f64 = 1.2;
509509
let e: u64x1 = u64x1::new(0xFF_FF_FF_FF_FF_FF_FF_FF);
510510
let r: u64x1 = transmute(vclt_f64(transmute(a), transmute(b)));
511511
assert_eq!(r, e);
@@ -558,8 +558,8 @@ mod test {
558558

559559
#[simd_test(enable = "neon")]
560560
unsafe fn test_vcle_f64() {
561-
let a: f64 = f64::new(0.1);
562-
let b: f64 = f64::new(1.2);
561+
let a: f64 = 0.1;
562+
let b: f64 = 1.2;
563563
let e: u64x1 = u64x1::new(0xFF_FF_FF_FF_FF_FF_FF_FF);
564564
let r: u64x1 = transmute(vcle_f64(transmute(a), transmute(b)));
565565
assert_eq!(r, e);
@@ -612,8 +612,8 @@ mod test {
612612

613613
#[simd_test(enable = "neon")]
614614
unsafe fn test_vcge_f64() {
615-
let a: f64 = f64::new(1.2);
616-
let b: f64 = f64::new(0.1);
615+
let a: f64 = 1.2;
616+
let b: f64 = 0.1;
617617
let e: u64x1 = u64x1::new(0xFF_FF_FF_FF_FF_FF_FF_FF);
618618
let r: u64x1 = transmute(vcge_f64(transmute(a), transmute(b)));
619619
assert_eq!(r, e);
@@ -630,9 +630,9 @@ mod test {
630630

631631
#[simd_test(enable = "neon")]
632632
unsafe fn test_vmul_f64() {
633-
let a: f64 = f64::new(1.0);
634-
let b: f64 = f64::new(2.0);
635-
let e: f64 = f64::new(2.0);
633+
let a: f64 = 1.0;
634+
let b: f64 = 2.0;
635+
let e: f64 = 2.0;
636636
let r: f64 = transmute(vmul_f64(transmute(a), transmute(b)));
637637
assert_eq!(r, e);
638638
}
@@ -648,9 +648,9 @@ mod test {
648648

649649
#[simd_test(enable = "neon")]
650650
unsafe fn test_vsub_f64() {
651-
let a: f64 = f64::new(1.0);
652-
let b: f64 = f64::new(1.0);
653-
let e: f64 = f64::new(0.0);
651+
let a: f64 = 1.0;
652+
let b: f64 = 1.0;
653+
let e: f64 = 0.0;
654654
let r: f64 = transmute(vsub_f64(transmute(a), transmute(b)));
655655
assert_eq!(r, e);
656656
}

crates/core_arch/src/arm/neon/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,7 @@ pub unsafe fn vshlq_n_u8(a: uint8x16_t, imm3: i32) -> uint8x16_t {
13871387
#[inline]
13881388
#[target_feature(enable = "neon")]
13891389
#[cfg_attr(target_arch = "arm", target_feature(enable = "v7"))]
1390-
#[cfg_attr(test, assert_instr(vext.8, n = 3))]
1390+
#[cfg_attr(test, assert_instr("vext.8", n = 3))]
13911391
#[rustc_args_required_const(2)]
13921392
pub unsafe fn vextq_s8(a: int8x16_t, b: int8x16_t, n: i32) -> int8x16_t {
13931393
if n < 0 || n > 15 {
@@ -1492,7 +1492,7 @@ pub unsafe fn vextq_s8(a: int8x16_t, b: int8x16_t, n: i32) -> int8x16_t {
14921492
#[inline]
14931493
#[target_feature(enable = "neon")]
14941494
#[cfg_attr(target_arch = "arm", target_feature(enable = "v7"))]
1495-
#[cfg_attr(test, assert_instr(vext.8, n = 3))]
1495+
#[cfg_attr(test, assert_instr("vext.8", n = 3))]
14961496
#[rustc_args_required_const(2)]
14971497
pub unsafe fn vextq_u8(a: uint8x16_t, b: uint8x16_t, n: i32) -> uint8x16_t {
14981498
if n < 0 || n > 15 {

crates/stdarch-gen/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,8 @@ fn type_to_ext(t: &str) -> &str {
204204
fn values(t: &str, vs: &[String]) -> String {
205205
if vs.len() == 1 && !t.contains('x') {
206206
format!(": {} = {}", t, vs[0])
207+
} else if vs.len() == 1 && type_to_global_type(t) == "f64" {
208+
format!(": {} = {}", type_to_global_type(t), vs[0])
207209
} else {
208210
format!(
209211
": {} = {}::new({})",

0 commit comments

Comments
 (0)