Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

aesni: Add target_feature annotations to allow intrinsic inlining #165

Merged
merged 2 commits into from
Oct 15, 2020
Merged

aesni: Add target_feature annotations to allow intrinsic inlining #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3c8e5b
aesni: Add target_feature annotations to allow intrinsic inlining
jack-signal Oct 13, 2020
82970df
aesni: Update decryption to use target_feature for proper inlining
jack-signal Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions aes/aesni/src/aes128.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ pub struct Aes128 {
impl Aes128 {
#[inline(always)]
pub(crate) fn encrypt8(&self, mut blocks: [__m128i; 8]) -> [__m128i; 8] {
let keys = self.encrypt_keys;
unsafe {
#[inline]
#[target_feature(enable = "aes")]
newpavlov marked this conversation as resolved.
Show resolved Hide resolved
unsafe fn aesni128_encrypt8(keys: &[__m128i; 11], blocks: &mut [__m128i; 8]) {
xor8!(blocks, keys[0]);
aesenc8!(blocks, keys[1]);
aesenc8!(blocks, keys[2]);
Expand All @@ -33,13 +34,15 @@ impl Aes128 {
aesenc8!(blocks, keys[9]);
aesenclast8!(blocks, keys[10]);
}
unsafe { aesni128_encrypt8(&self.encrypt_keys, &mut blocks) };
blocks
}

#[inline(always)]
pub(crate) fn encrypt(&self, mut block: __m128i) -> __m128i {
let keys = self.encrypt_keys;
unsafe {
pub(crate) fn encrypt(&self, block: __m128i) -> __m128i {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aesni128_encrypt1(keys: &[__m128i; 11], mut block: __m128i) -> __m128i {
block = _mm_xor_si128(block, keys[0]);
block = _mm_aesenc_si128(block, keys[1]);
block = _mm_aesenc_si128(block, keys[2]);
Expand All @@ -52,6 +55,7 @@ impl Aes128 {
block = _mm_aesenc_si128(block, keys[9]);
_mm_aesenclast_si128(block, keys[10])
}
unsafe { aesni128_encrypt1(&self.encrypt_keys, block) }
}
}

Expand Down Expand Up @@ -88,11 +92,11 @@ impl BlockCipher for Aes128 {

#[inline]
fn decrypt_block(&self, block: &mut Block128) {
let keys = self.decrypt_keys;

// Safety: `loadu` and `storeu` support unaligned access
#[allow(clippy::cast_ptr_alignment)]
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aes128_decrypt1(block: &mut Block128, keys: &[__m128i; 11]) {
// Safety: `loadu` and `storeu` support unaligned access
#[allow(clippy::cast_ptr_alignment)]
let mut b = _mm_loadu_si128(block.as_ptr() as *const __m128i);
b = _mm_xor_si128(b, keys[10]);
b = _mm_aesdec_si128(b, keys[9]);
Expand All @@ -107,6 +111,8 @@ impl BlockCipher for Aes128 {
b = _mm_aesdeclast_si128(b, keys[0]);
_mm_storeu_si128(block.as_mut_ptr() as *mut __m128i, b);
}

unsafe { aes128_decrypt1(block, &self.decrypt_keys) }
}

#[inline]
Expand All @@ -119,8 +125,9 @@ impl BlockCipher for Aes128 {

#[inline]
fn decrypt_blocks(&self, blocks: &mut Block128x8) {
let keys = self.decrypt_keys;
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aes128_decrypt8(blocks: &mut Block128x8, keys: &[__m128i; 11]) {
let mut b = load8!(blocks);
xor8!(b, keys[10]);
aesdec8!(b, keys[9]);
Expand All @@ -135,6 +142,8 @@ impl BlockCipher for Aes128 {
aesdeclast8!(b, keys[0]);
store8!(blocks, b);
}

unsafe { aes128_decrypt8(blocks, &self.decrypt_keys) }
}
}

Expand Down
33 changes: 21 additions & 12 deletions aes/aesni/src/aes192.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ pub struct Aes192 {
impl Aes192 {
#[inline(always)]
pub(crate) fn encrypt8(&self, mut blocks: [__m128i; 8]) -> [__m128i; 8] {
let keys = self.encrypt_keys;
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aesni192_encrypt8(keys: &[__m128i; 13], blocks: &mut [__m128i; 8]) {
xor8!(blocks, keys[0]);
aesenc8!(blocks, keys[1]);
aesenc8!(blocks, keys[2]);
Expand All @@ -35,13 +36,15 @@ impl Aes192 {
aesenc8!(blocks, keys[11]);
aesenclast8!(blocks, keys[12]);
}
unsafe { aesni192_encrypt8(&self.encrypt_keys, &mut blocks) };
blocks
}

#[inline(always)]
pub(crate) fn encrypt(&self, mut block: __m128i) -> __m128i {
let keys = self.encrypt_keys;
unsafe {
pub(crate) fn encrypt(&self, block: __m128i) -> __m128i {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aesni192_encrypt1(keys: &[__m128i; 13], mut block: __m128i) -> __m128i {
block = _mm_xor_si128(block, keys[0]);
block = _mm_aesenc_si128(block, keys[1]);
block = _mm_aesenc_si128(block, keys[2]);
Expand All @@ -56,6 +59,7 @@ impl Aes192 {
block = _mm_aesenc_si128(block, keys[11]);
_mm_aesenclast_si128(block, keys[12])
}
unsafe { aesni192_encrypt1(&self.encrypt_keys, block) }
}
}

Expand Down Expand Up @@ -90,11 +94,11 @@ impl BlockCipher for Aes192 {

#[inline]
fn decrypt_block(&self, block: &mut Block128) {
let keys = self.decrypt_keys;

// Safety: `loadu` and `storeu` support unaligned access
#[allow(clippy::cast_ptr_alignment)]
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aes192_decrypt1(block: &mut Block128, keys: &[__m128i; 13]) {
// Safety: `loadu` and `storeu` support unaligned access
#[allow(clippy::cast_ptr_alignment)]
let mut b = _mm_loadu_si128(block.as_ptr() as *const __m128i);
b = _mm_xor_si128(b, keys[12]);
b = _mm_aesdec_si128(b, keys[11]);
Expand All @@ -111,6 +115,8 @@ impl BlockCipher for Aes192 {
b = _mm_aesdeclast_si128(b, keys[0]);
_mm_storeu_si128(block.as_mut_ptr() as *mut __m128i, b);
}

unsafe { aes192_decrypt1(block, &self.decrypt_keys) }
}

#[inline]
Expand All @@ -123,8 +129,9 @@ impl BlockCipher for Aes192 {

#[inline]
fn decrypt_blocks(&self, blocks: &mut Block128x8) {
let keys = self.decrypt_keys;
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aes192_decrypt8(blocks: &mut Block128x8, keys: &[__m128i; 13]) {
let mut b = load8!(blocks);
xor8!(b, keys[12]);
aesdec8!(b, keys[11]);
Expand All @@ -141,6 +148,8 @@ impl BlockCipher for Aes192 {
aesdeclast8!(b, keys[0]);
store8!(blocks, b);
}

unsafe { aes192_decrypt8(blocks, &self.decrypt_keys) }
}
}

Expand Down
33 changes: 21 additions & 12 deletions aes/aesni/src/aes256.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ pub struct Aes256 {
impl Aes256 {
#[inline(always)]
pub(crate) fn encrypt8(&self, mut blocks: [__m128i; 8]) -> [__m128i; 8] {
let keys = self.encrypt_keys;
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aesni256_encrypt8(keys: &[__m128i; 15], blocks: &mut [__m128i; 8]) {
xor8!(blocks, keys[0]);
aesenc8!(blocks, keys[1]);
aesenc8!(blocks, keys[2]);
Expand All @@ -37,13 +38,15 @@ impl Aes256 {
aesenc8!(blocks, keys[13]);
aesenclast8!(blocks, keys[14]);
}
unsafe { aesni256_encrypt8(&self.encrypt_keys, &mut blocks) };
blocks
}

#[inline(always)]
pub(crate) fn encrypt(&self, mut block: __m128i) -> __m128i {
let keys = self.encrypt_keys;
unsafe {
pub(crate) fn encrypt(&self, block: __m128i) -> __m128i {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aesni256_encrypt1(keys: &[__m128i; 15], mut block: __m128i) -> __m128i {
block = _mm_xor_si128(block, keys[0]);
block = _mm_aesenc_si128(block, keys[1]);
block = _mm_aesenc_si128(block, keys[2]);
Expand All @@ -60,6 +63,7 @@ impl Aes256 {
block = _mm_aesenc_si128(block, keys[13]);
_mm_aesenclast_si128(block, keys[14])
}
unsafe { aesni256_encrypt1(&self.encrypt_keys, block) }
}
}

Expand Down Expand Up @@ -94,11 +98,11 @@ impl BlockCipher for Aes256 {

#[inline]
fn decrypt_block(&self, block: &mut Block128) {
let keys = self.decrypt_keys;

// Safety: `loadu` and `storeu` support unaligned access
#[allow(clippy::cast_ptr_alignment)]
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aes256_decrypt1(block: &mut Block128, keys: &[__m128i; 15]) {
// Safety: `loadu` and `storeu` support unaligned access
#[allow(clippy::cast_ptr_alignment)]
let mut b = _mm_loadu_si128(block.as_ptr() as *const __m128i);
b = _mm_xor_si128(b, keys[14]);
b = _mm_aesdec_si128(b, keys[13]);
Expand All @@ -117,6 +121,8 @@ impl BlockCipher for Aes256 {
b = _mm_aesdeclast_si128(b, keys[0]);
_mm_storeu_si128(block.as_mut_ptr() as *mut __m128i, b);
}

unsafe { aes256_decrypt1(block, &self.decrypt_keys) }
}

#[inline]
Expand All @@ -129,8 +135,9 @@ impl BlockCipher for Aes256 {

#[inline]
fn decrypt_blocks(&self, blocks: &mut Block128x8) {
let keys = self.decrypt_keys;
unsafe {
#[inline]
#[target_feature(enable = "aes")]
unsafe fn aes256_decrypt8(blocks: &mut Block128x8, keys: &[__m128i; 15]) {
let mut b = load8!(blocks);
xor8!(b, keys[14]);
aesdec8!(b, keys[13]);
Expand All @@ -149,6 +156,8 @@ impl BlockCipher for Aes256 {
aesdeclast8!(b, keys[0]);
store8!(blocks, b);
}

unsafe { aes256_decrypt8(blocks, &self.decrypt_keys) }
}
}

Expand Down