From 2dbeb2ea928e7ba4ee8f75caada04fad282920fc Mon Sep 17 00:00:00 2001 From: Heinz Gies Date: Sun, 5 Apr 2020 23:15:01 +0200 Subject: [PATCH] Fix unused import in stdarch-gen --- crates/stdarch-gen/src/main.rs | 183 +++++++++++++++++---------------- 1 file changed, 95 insertions(+), 88 deletions(-) diff --git a/crates/stdarch-gen/src/main.rs b/crates/stdarch-gen/src/main.rs index 8ea0bfc926..8a9d9f25c0 100644 --- a/crates/stdarch-gen/src/main.rs +++ b/crates/stdarch-gen/src/main.rs @@ -3,7 +3,6 @@ use std::fs::File; use std::io::prelude::*; use std::io::{self, BufReader}; use std::path::PathBuf; -use std::process::Command; const IN: &str = "neon.spec"; const ARM_OUT: &str = "generated.rs"; @@ -139,35 +138,35 @@ fn type_to_global_type(t: &str) -> &str { } } -fn type_to_native_type(t: &str) -> &str { - match t { - "int8x8_t" => "i8", - "int8x16_t" => "i8", - "int16x4_t" => "i16", - "int16x8_t" => "i16", - "int32x2_t" => "i32", - "int32x4_t" => "i32", - "int64x1_t" => "i64", - "int64x2_t" => "i64", - "uint8x8_t" => "u8", - "uint8x16_t" => "u8", - "uint16x4_t" => "u16", - "uint16x8_t" => "u16", - "uint32x2_t" => "u32", - "uint32x4_t" => "u32", - "uint64x1_t" => "u64", - "uint64x2_t" => "u64", - "float16x4_t" => "f16", - "float16x8_t" => "f16", - "float32x2_t" => "f32", - "float32x4_t" => "f32", - "float64x1_t" => "f64", - "float64x2_t" => "f64", - "poly64x1_t" => "i64", - "poly64x2_t" => "i64", - _ => panic!("unknown type: {}", t), - } -} +// fn type_to_native_type(t: &str) -> &str { +// match t { +// "int8x8_t" => "i8", +// "int8x16_t" => "i8", +// "int16x4_t" => "i16", +// "int16x8_t" => "i16", +// "int32x2_t" => "i32", +// "int32x4_t" => "i32", +// "int64x1_t" => "i64", +// "int64x2_t" => "i64", +// "uint8x8_t" => "u8", +// "uint8x16_t" => "u8", +// "uint16x4_t" => "u16", +// "uint16x8_t" => "u16", +// "uint32x2_t" => "u32", +// "uint32x4_t" => "u32", +// "uint64x1_t" => "u64", +// "uint64x2_t" => "u64", +// "float16x4_t" => "f16", +// "float16x8_t" => "f16", +// "float32x2_t" => "f32", +// "float32x4_t" => "f32", +// "float64x1_t" => "f64", +// "float64x2_t" => "f64", +// "poly64x1_t" => "i64", +// "poly64x2_t" => "i64", +// _ => panic!("unknown type: {}", t), +// } +// } fn type_to_ext(t: &str) -> &str { match t { @@ -461,7 +460,15 @@ pub unsafe fn {}(a: {}, b: {}) -> {} {{ {}{}(a, b) }} "#, - current_comment, expand_intrinsic(¤t_arm, in_t), expand_intrinsic(¤t_aarch64, in_t), name, in_t, in_t, out_t, ext_c, current_fn, + current_comment, + expand_intrinsic(¤t_arm, in_t), + expand_intrinsic(¤t_aarch64, in_t), + name, + in_t, + in_t, + out_t, + ext_c, + current_fn, ); let test = gen_test(name, &in_t, &out_t, current_tests, type_len(in_t)); @@ -469,68 +476,68 @@ pub unsafe fn {}(a: {}, b: {}) -> {} {{ } fn expand_intrinsic(intr: &str, t: &str) -> String { - if intr.ends_with(".") { + if intr.ends_with(".") { let ext = match t { - "int8x8_t" => "i8", - "int8x16_t" => "i8", - "int16x4_t" => "i16", - "int16x8_t" => "i16", - "int32x2_t" => "i32", - "int32x4_t" => "i32", - "int64x1_t" => "i64", - "int64x2_t" => "i64", - "uint8x8_t" => "i8", - "uint8x16_t" => "i8", - "uint16x4_t" => "i16", - "uint16x8_t" => "i16", - "uint32x2_t" => "i32", - "uint32x4_t" => "i32", - "uint64x1_t" => "i64", - "uint64x2_t" => "i64", - "float16x4_t" => "f16", - "float16x8_t" => "f16", - "float32x2_t" => "f32", - "float32x4_t" => "f32", - "float64x1_t" => "f64", - "float64x2_t" => "f64", - /* - "poly64x1_t" => "i64x1", - "poly64x2_t" => "i64x2", - */ - _ => panic!("unknown type for extension: {}", t), + "int8x8_t" => "i8", + "int8x16_t" => "i8", + "int16x4_t" => "i16", + "int16x8_t" => "i16", + "int32x2_t" => "i32", + "int32x4_t" => "i32", + "int64x1_t" => "i64", + "int64x2_t" => "i64", + "uint8x8_t" => "i8", + "uint8x16_t" => "i8", + "uint16x4_t" => "i16", + "uint16x8_t" => "i16", + "uint32x2_t" => "i32", + "uint32x4_t" => "i32", + "uint64x1_t" => "i64", + "uint64x2_t" => "i64", + "float16x4_t" => "f16", + "float16x8_t" => "f16", + "float32x2_t" => "f32", + "float32x4_t" => "f32", + "float64x1_t" => "f64", + "float64x2_t" => "f64", + /* + "poly64x1_t" => "i64x1", + "poly64x2_t" => "i64x2", + */ + _ => panic!("unknown type for extension: {}", t), }; format!(r#""{}{}""#, intr, ext) - } else if intr.ends_with(".s") { + } else if intr.ends_with(".s") { let ext = match t { - "int8x8_t" => "s8", - "int8x16_t" => "s8", - "int16x4_t" => "s16", - "int16x8_t" => "s16", - "int32x2_t" => "s32", - "int32x4_t" => "s32", - "int64x1_t" => "s64", - "int64x2_t" => "s64", - "uint8x8_t" => "u8", - "uint8x16_t" => "u8", - "uint16x4_t" => "u16", - "uint16x8_t" => "u16", - "uint32x2_t" => "u32", - "uint32x4_t" => "u32", - "uint64x1_t" => "u64", - "uint64x2_t" => "u64", - "float16x4_t" => "f16", - "float16x8_t" => "f16", - "float32x2_t" => "f32", - "float32x4_t" => "f32", - "float64x1_t" => "f64", - "float64x2_t" => "f64", - /* - "poly64x1_t" => "i64x1", - "poly64x2_t" => "i64x2", - */ - _ => panic!("unknown type for extension: {}", t), + "int8x8_t" => "s8", + "int8x16_t" => "s8", + "int16x4_t" => "s16", + "int16x8_t" => "s16", + "int32x2_t" => "s32", + "int32x4_t" => "s32", + "int64x1_t" => "s64", + "int64x2_t" => "s64", + "uint8x8_t" => "u8", + "uint8x16_t" => "u8", + "uint16x4_t" => "u16", + "uint16x8_t" => "u16", + "uint32x2_t" => "u32", + "uint32x4_t" => "u32", + "uint64x1_t" => "u64", + "uint64x2_t" => "u64", + "float16x4_t" => "f16", + "float16x8_t" => "f16", + "float32x2_t" => "f32", + "float32x4_t" => "f32", + "float64x1_t" => "f64", + "float64x2_t" => "f64", + /* + "poly64x1_t" => "i64x1", + "poly64x2_t" => "i64x2", + */ + _ => panic!("unknown type for extension: {}", t), }; - format!(r#""{}{}""#, &intr[..intr.len()-1], ext) + format!(r#""{}{}""#, &intr[..intr.len() - 1], ext) } else { intr.to_string() }