Skip to content

[DRAFT] RISC-V: Use .insn on (Zkne or Zknd) intrinsics #1917

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

Closed
wants to merge 2 commits into from
Closed

[DRAFT] RISC-V: Use .insn on (Zkne or Zknd) intrinsics #1917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5ed598
RISC-V: Change `target_feature` on (Zkne or Zknd) instrinsics
a4lg Sep 11, 2025
1a47fad
RISC-V: Use `.insn` on (Zkne or Zknd) intrinsics
a4lg Sep 11, 2025
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
40 changes: 28 additions & 12 deletions crates/core_arch/src/riscv64/zk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#[cfg(test)]
use stdarch_test::assert_instr;

use crate::arch::asm;

unsafe extern "unadjusted" {
#[link_name = "llvm.riscv.aes64es"]
fn _aes64es(rs1: i64, rs2: i64) -> i64;
Expand All @@ -14,12 +16,6 @@ unsafe extern "unadjusted" {
#[link_name = "llvm.riscv.aes64dsm"]
fn _aes64dsm(rs1: i64, rs2: i64) -> i64;

#[link_name = "llvm.riscv.aes64ks1i"]
fn _aes64ks1i(rs1: i64, rnum: i32) -> i64;

#[link_name = "llvm.riscv.aes64ks2"]
fn _aes64ks2(rs1: i64, rs2: i64) -> i64;

#[link_name = "llvm.riscv.aes64im"]
fn _aes64im(rs1: i64) -> i64;

Expand Down Expand Up @@ -133,15 +129,25 @@ pub fn aes64dsm(rs1: u64, rs2: u64) -> u64 {
/// # Note
///
/// The `RNUM` parameter is expected to be a constant value inside the range of `0..=10`.
#[target_feature(enable = "zkne", enable = "zknd")]
//#[target_feature(enable = "zkne", enable = "zknd")] // TODO: zkne_or_zknd
#[rustc_legacy_const_generics(1)]
#[cfg_attr(test, assert_instr(aes64ks1i, RNUM = 0))]
#[cfg_attr(test, assert_instr(aes64ks1i, RNUM = 0))] // REMOVE if anything goes wrong
#[inline]
#[unstable(feature = "riscv_ext_intrinsics", issue = "114544")]
pub fn aes64ks1i<const RNUM: u8>(rs1: u64) -> u64 {
static_assert!(RNUM <= 10);

unsafe { _aes64ks1i(rs1 as i64, RNUM as i32) as u64 }
unsafe {
let rd: u64;
asm!(
".insn i 0x13, 0x1, {}, {}, {}",
lateout(reg) rd,
in(reg) rs1,
const 0x310 + (RNUM & 0x0f) as u16,
options(pure, nomem, nostack, preserves_flags)
);
rd
}
}

/// This instruction implements part of the KeySchedule operation for the AES Block cipher.
Expand All @@ -155,12 +161,22 @@ pub fn aes64ks1i<const RNUM: u8>(rs1: u64) -> u64 {
/// Version: v1.0.1
///
/// Section: 3.11
#[target_feature(enable = "zkne", enable = "zknd")]
#[cfg_attr(test, assert_instr(aes64ks2))]
//#[target_feature(enable = "zkne", enable = "zknd")] // TODO: zkne_or_zknd
#[cfg_attr(test, assert_instr(aes64ks2))] // REMOVE if anything goes wrong
#[inline]
#[unstable(feature = "riscv_ext_intrinsics", issue = "114544")]
pub fn aes64ks2(rs1: u64, rs2: u64) -> u64 {
unsafe { _aes64ks2(rs1 as i64, rs2 as i64) as u64 }
unsafe {
let rd: u64;
asm!(
".insn r 0x33, 0x0, 0x3f, {}, {}, {}",
lateout(reg) rd,
in(reg) rs1,
in(reg) rs2,
options(pure, nomem, nostack, preserves_flags)
);
rd
}
}

/// This instruction accelerates the inverse MixColumns step of the AES Block Cipher, and is used to aid creation of
Expand Down