Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-30 04:56:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: #1464 for rv64 zb

Browse Source
This commit is contained in:
Gijs Burghoorn
2023-09-16 16:57:57 +02:00
committed by Amanieu d'Antras
parent 8a23f93e8b
commit 0d56394f35
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/stdarch/crates/core_arch/src/riscv_shared/zb.rs
+4 -8
View File
@@ -47,8 +47,7 @@
///
/// This function is safe to use if the `zbb` target feature is present.
#[target_feature(enable = "zbb")]
// See #1464
// #[cfg_attr(test, assert_instr(orc.b))]
#[cfg_attr(test, assert_instr(orc.b))]
#[inline]
pub unsafe fn orc_b(rs: usize) -> usize {
#[cfg(target_arch = "riscv32")]
@@ -76,8 +75,7 @@ pub unsafe fn orc_b(rs: usize) -> usize {
///
/// This function is safe to use if the `zbc` target feature is present.
#[target_feature(enable = "zbc")]
// See #1464
// #[cfg_attr(test, assert_instr(clmul))]
#[cfg_attr(test, assert_instr(clmul))]
#[inline]
pub unsafe fn clmul(rs1: usize, rs2: usize) -> usize {
#[cfg(target_arch = "riscv32")]
@@ -105,8 +103,7 @@ pub unsafe fn clmul(rs1: usize, rs2: usize) -> usize {
///
/// This function is safe to use if the `zbc` target feature is present.
#[target_feature(enable = "zbc")]
// See #1464
// #[cfg_attr(test, assert_instr(clmulh))]
#[cfg_attr(test, assert_instr(clmulh))]
#[inline]
pub unsafe fn clmulh(rs1: usize, rs2: usize) -> usize {
#[cfg(target_arch = "riscv32")]
@@ -134,8 +131,7 @@ pub unsafe fn clmulh(rs1: usize, rs2: usize) -> usize {
///
/// This function is safe to use if the `zbc` target feature is present.
#[target_feature(enable = "zbc")]
// See #1464
// #[cfg_attr(test, assert_instr(clmulr))]
#[cfg_attr(test, assert_instr(clmulr))]
#[inline]
pub unsafe fn clmulr(rs1: usize, rs2: usize) -> usize {
#[cfg(target_arch = "riscv32")]
library/stdarch/crates/stdarch-test/src/disassembly.rs
+1 -1
View File
@@ -82,7 +82,7 @@ pub(crate) fn disassemble_myself() -> HashSet<Function> {
// Target features need to be enabled for LLVM objdump on Macos ARM64
vec!["--mattr=+v8.6a,+crypto,+tme"]
} else if cfg!(target_arch = "riscv64") {
vec!["--mattr=+zk,+zks"]
vec!["--mattr=+zk,+zks,+zbc,+zbb"]
} else {
vec![]
};