Add support for using VAES instructions for NI parallel operations.

.github/workflows/aes.yml

@@ -16,6 +16,7 @@ defaults:
 env:
   CARGO_INCREMENTAL: 0
   RUSTFLAGS: "-Dwarnings"
+  SDE_FULL_VERSION: "9.33.0-2024-01-07"
 
 jobs:
   # Builds for no_std platforms
@@ -59,7 +60,7 @@ jobs:
   minimal-versions:
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
-        working-directory: ${{ github.workflow }}
+      working-directory: ${{ github.workflow }}
 
   # Tests for the AES-NI backend
   aesni:
@@ -96,6 +97,75 @@ jobs:
       - run: cargo test --target ${{ matrix.target }} --features hazmat
       - run: cargo test --target ${{ matrix.target }} --all-features
 
+  # Tests for the VAES AVX backend
+  vaes256:
+    runs-on: ubuntu-latest
+    env:
+      CARGO_INCREMENTAL: 0
+      RUSTFLAGS: "-Dwarnings --cfg disable_avx512"
+    strategy:
+      matrix:
+        include:
+          - target: x86_64-unknown-linux-gnu
+            rust: nightly-2024-02-07
+    steps:
+      - uses: actions/checkout@v4
+      - uses: silvanshade/rustcrypto-actions/intel-sde-install@master
+        with:
+          sde-full-version: ${{ env.SDE_FULL_VERSION }}
+      - uses: RustCrypto/actions/cargo-cache@master
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+          targets: ${{ matrix.target }}
+      # NOTE: Write a `.cargo/config.toml` to configure the target for VAES
+      # NOTE: We use intel-sde as the runner since not all GitHub CI hosts support AVX512
+      - name: write .cargo/config.toml
+        shell: bash
+        run: |
+          cd ../aes/..
+          mkdir -p .cargo
+          echo '[target.${{ matrix.target }}]'  > .cargo/config.toml
+          echo 'runner = "sde64 -future --"'   >> .cargo/config.toml
+      - run: ${{ matrix.deps }}
+      - run: cargo test --target ${{ matrix.target }}
+      - run: cargo test --target ${{ matrix.target }} --features hazmat
+      - run: cargo test --target ${{ matrix.target }} --all-features
+
+  # Tests for the VAES AVX512 backend
+  vaes512:
+    runs-on: ubuntu-latest
+    env:
+      CARGO_INCREMENTAL: 0
+    strategy:
+      matrix:
+        include:
+          - target: x86_64-unknown-linux-gnu
+            rust: nightly-2024-02-07
+    steps:
+      - uses: actions/checkout@v4
+      - uses: silvanshade/rustcrypto-actions/intel-sde-install@master
+        with:
+          sde-full-version: ${{ env.SDE_FULL_VERSION }}
+      - uses: RustCrypto/actions/cargo-cache@master
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+          targets: ${{ matrix.target }}
+      # NOTE: Write a `.cargo/config.toml` to configure the target for VAES
+      # NOTE: We use intel-sde as the runner since not all GitHub CI hosts support AVX512
+      - name: write .cargo/config.toml
+        shell: bash
+        run: |
+          cd ../aes/..
+          mkdir -p .cargo
+          echo '[target.${{ matrix.target }}]'  > .cargo/config.toml
+          echo 'runner = "sde64 -future --"'   >> .cargo/config.toml
+      - run: ${{ matrix.deps }}
+      - run: cargo test --target ${{ matrix.target }}
+      - run: cargo test --target ${{ matrix.target }} --features hazmat
+      - run: cargo test --target ${{ matrix.target }} --all-features
+
   # Tests for CPU feature autodetection with fallback to portable software implementation
   autodetect:
     runs-on: ubuntu-latest
@@ -159,7 +229,6 @@ jobs:
       - run: cargo test --target ${{ matrix.target }}
       - run: cargo test --target ${{ matrix.target }} --all-features
 
-
   # Cross-compiled tests
   cross:
     strategy:

.gitignore

@@ -1,3 +1,6 @@
 target/
 **/Cargo.lock
 **/target/
+**/pin.log
+**/pin-log.txt
+**/pin-tool-log.txt

aes/Cargo.toml

@@ -18,7 +18,7 @@ cipher = "=0.5.0-pre.2"
 zeroize = { version = "1.5.6", optional = true, default_features = false, features = ["aarch64"] }
 
 [target.'cfg(any(target_arch = "aarch64", target_arch = "x86_64", target_arch = "x86"))'.dependencies]
-cpufeatures = "0.2"
+cpufeatures = "0.2.12"
 
 [dev-dependencies]
 cipher = { version = "=0.5.0-pre.2", features = ["dev"] }

aes/src/armv8.rs

@@ -31,6 +31,13 @@ use cipher::{
 use core::arch::aarch64::*;
 use core::fmt;
 
+pub(crate) mod features {
+    cpufeatures::new!(features_aes, "aes");
+    pub(crate) mod aes {
+        pub use super::features_aes::*;
+    }
+}
+
 macro_rules! define_aes_impl {
     (
         $name:ident,
@@ -50,18 +57,6 @@ macro_rules! define_aes_impl {
             decrypt: $name_dec,
         }
 
-        impl $name {
-            #[inline(always)]
-            pub(crate) fn get_enc_backend(&self) -> $name_back_enc<'_> {
-                self.encrypt.get_enc_backend()
-            }
-
-            #[inline(always)]
-            pub(crate) fn get_dec_backend(&self) -> $name_back_dec<'_> {
-                self.decrypt.get_dec_backend()
-            }
-        }
-
         impl BlockCipher for $name {}
 
         impl KeySizeUser for $name {
@@ -132,13 +127,6 @@ macro_rules! define_aes_impl {
             round_keys: [uint8x16_t; $rounds],
         }
 
-        impl $name_enc {
-            #[inline(always)]
-            pub(crate) fn get_enc_backend(&self) -> $name_back_enc<'_> {
-                $name_back_enc(self)
-            }
-        }
-
         impl BlockCipher for $name_enc {}
 
         impl KeySizeUser for $name_enc {
@@ -160,7 +148,7 @@ macro_rules! define_aes_impl {
 
         impl BlockCipherEncrypt for $name_enc {
             fn encrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
-                f.call(&mut self.get_enc_backend())
+                f.call(&mut $name_back_enc(self))
             }
         }
 
@@ -194,13 +182,6 @@ macro_rules! define_aes_impl {
             round_keys: [uint8x16_t; $rounds],
         }
 
-        impl $name_dec {
-            #[inline(always)]
-            pub(crate) fn get_dec_backend(&self) -> $name_back_dec<'_> {
-                $name_back_dec(self)
-            }
-        }
-
         impl BlockCipher for $name_dec {}
 
         impl KeySizeUser for $name_dec {
@@ -235,7 +216,7 @@ macro_rules! define_aes_impl {
 
         impl BlockCipherDecrypt for $name_dec {
             fn decrypt_with_backend(&self, f: impl BlockClosure<BlockSize = U16>) {
-                f.call(&mut self.get_dec_backend());
+                f.call(&mut $name_back_dec(self));
             }
         }