Skip to content

Commit fae168d

Browse files
committed
Formatting
1 parent 1607c83 commit fae168d

File tree

10 files changed

+11
-44
lines changed

10 files changed

+11
-44
lines changed

testable-simd-models/src/abstractions/bitvec.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ use super::funarr::*;
44

55
use std::fmt::Formatter;
66

7-
87
/// A fixed-size bit vector type.
98
///
109
/// `BitVec<N>` is a specification-friendly, fixed-length bit vector that internally
@@ -154,4 +153,3 @@ impl<const N: u64> BitVec<N> {
154153
self.0.fold(init, f)
155154
}
156155
}
157-

testable-simd-models/src/abstractions/simd.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@
22
//!
33
//! Operations are defined on FunArrs.
44
5-
6-
75
use crate::abstractions::{bit::MachineInteger, funarr::FunArray};
86

97
pub mod int_vec_interp {
10-
use crate::abstractions::bitvec::*;
118
use crate::abstractions::bit::MachineInteger;
9+
use crate::abstractions::bitvec::*;
1210
use crate::abstractions::funarr::*;
1311

1412
#[allow(dead_code)]
@@ -36,7 +34,7 @@ pub mod int_vec_interp {
3634

3735
}
3836

39-
37+
4038
impl From<BitVec<$n>> for $name {
4139
fn from(bv: BitVec<$n>) -> Self {
4240
BitVec::[< to_ $name >](bv)
@@ -69,7 +67,6 @@ pub mod int_vec_interp {
6967
interpretations!(512; u32x16 [u32; 16], u16x32 [u16; 32], i32x16 [i32; 16], i16x32 [i16; 32]);
7068
interpretations!(64; i64x1 [i64; 1], i32x2 [i32; 2], i16x4 [i16; 4], i8x8 [i8; 8], u64x1 [u64; 1], u32x2 [u32; 2],u16x4 [u16; 4], u8x8 [u8; 8]);
7169
interpretations!(32; i8x4 [i8; 4], u8x4 [u8; 4]);
72-
7370
}
7471
use std::convert::*;
7572
use std::ops::*;

testable-simd-models/src/core_arch/arm_shared/tests/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ pub mod conversions {
6666

6767
use super::types;
6868
use crate::abstractions::bitvec::BitVec;
69-
use crate::simd::int_vec_interp::*;
7069
use crate::abstractions::funarr::FunArray;
70+
use crate::simd::int_vec_interp::*;
7171
macro_rules! convert{
7272
($($ty1:ident [$ty2:ty ; $n:literal]),*) => {
7373
$(

testable-simd-models/src/core_arch/x86/models/avx.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,7 @@
1414
//! [wiki]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
1515
1616
use super::types::*;
17-
use crate::abstractions::{
18-
bit::Bit,
19-
bitvec::BitVec,
20-
simd::*,
21-
simd::int_vec_interp::*
22-
};
17+
use crate::abstractions::{bit::Bit, bitvec::BitVec, simd::int_vec_interp::*, simd::*};
2318

2419
mod c_extern {
2520
use crate::abstractions::simd::int_vec_interp::*;

testable-simd-models/src/core_arch/x86/models/avx2.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,10 @@
1919
//! [amd64_ref]: http://support.amd.com/TechDocs/24594.pdf
2020
//! [wiki_avx]: https://en.wikipedia.org/wiki/Advanced_Vector_Extensions
2121
//! [wiki_fma]: https://en.wikipedia.org/wiki/Fused_multiply-accumulate
22-
use crate::abstractions::{
23-
bitvec::BitVec,
24-
simd::int_vec_interp::*
25-
};
22+
use crate::abstractions::{bitvec::BitVec, simd::int_vec_interp::*};
2623

2724
mod c_extern {
28-
use crate::abstractions::{bit::MachineInteger, simd::*, simd::int_vec_interp::*};
25+
use crate::abstractions::{bit::MachineInteger, simd::int_vec_interp::*, simd::*};
2926
pub fn phaddw(a: i16x16, b: i16x16) -> i16x16 {
3027
i16x16::from_fn(|i| {
3128
if i < 4 {

testable-simd-models/src/core_arch/x86/models/sse2.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
//! Streaming SIMD Extensions 2 (SSE2)
22
use super::types::*;
3-
use crate::abstractions::{
4-
bit::Bit,
5-
bitvec::BitVec,
6-
simd::*,
7-
simd::int_vec_interp::*
8-
};
3+
use crate::abstractions::{bit::Bit, bitvec::BitVec, simd::int_vec_interp::*, simd::*};
94
mod c_extern {
105
use crate::abstractions::{bit::MachineInteger, simd::int_vec_interp::*};
116
pub fn packsswb(a: i16x8, b: i16x8) -> i8x16 {

testable-simd-models/src/core_arch/x86/models/ssse3.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
//! Supplemental Streaming SIMD Extensions 3 (SSSE3)
22
3-
use crate::abstractions::{
4-
bitvec::BitVec,
5-
simd::int_vec_interp::*,
6-
simd::*,
7-
};
3+
use crate::abstractions::{bitvec::BitVec, simd::int_vec_interp::*, simd::*};
84

95
use super::types::*;
106

testable-simd-models/src/core_arch/x86/specs/avx.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
use super::types::*;
22

3-
use crate::abstractions::{
4-
bit::Bit,
5-
bitvec::BitVec,
6-
simd::int_vec_interp::*
7-
};
3+
use crate::abstractions::{bit::Bit, bitvec::BitVec, simd::int_vec_interp::*};
84

95
pub fn _mm256_set1_epi32(x: i32) -> __m256i {
106
i32x8::from_fn(|_| x).into()

testable-simd-models/src/core_arch/x86/specs/avx2.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
use super::types::*;
22

3-
use crate::abstractions::{
4-
bit::Bit,
5-
bitvec::BitVec,
6-
simd::int_vec_interp::*
7-
};
3+
use crate::abstractions::{bit::Bit, bitvec::BitVec, simd::int_vec_interp::*};
84

95
pub fn _mm256_mul_epi32(x: __m256i, y: __m256i) -> __m256i {
106
let x = BitVec::to_i32x8(x);

testable-simd-models/src/core_arch/x86/specs/sse2.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
use super::types::*;
22

3-
use crate::abstractions::{
4-
bitvec::BitVec,
5-
simd::int_vec_interp::*
6-
};
3+
use crate::abstractions::{bitvec::BitVec, simd::int_vec_interp::*};
74
pub fn _mm_set1_epi16(a: i16) -> __m128i {
85
i16x8::from_fn(|_| a).into()
96
}

0 commit comments

Comments
 (0)