@@ -51,10 +51,9 @@ unsafe extern "llvm-intrinsic" {
5151/// The `BS` parameter is expected to be a constant value and only the bottom 2 bits of `bs` are
5252/// used.
5353#[ target_feature( enable = "zkne" ) ]
54- // See #1464
55- // #[cfg_attr(test, assert_instr(aes32esi, BS = 0))]
54+ #[ cfg_attr( test, assert_instr( aes32esi, BS = 0 ) ) ]
5655#[ inline]
57- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
56+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
5857pub fn aes32esi < const BS : u8 > ( rs1 : u32 , rs2 : u32 ) -> u32 {
5958 static_assert ! ( BS < 4 ) ;
6059
@@ -79,10 +78,9 @@ pub fn aes32esi<const BS: u8>(rs1: u32, rs2: u32) -> u32 {
7978/// The `bs` parameter is expected to be a constant value and only the bottom 2 bits of `bs` are
8079/// used.
8180#[ target_feature( enable = "zkne" ) ]
82- // See #1464
83- // #[cfg_attr(test, assert_instr(aes32esmi, BS = 0))]
81+ #[ cfg_attr( test, assert_instr( aes32esmi, BS = 0 ) ) ]
8482#[ inline]
85- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
83+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
8684pub fn aes32esmi < const BS : u8 > ( rs1 : u32 , rs2 : u32 ) -> u32 {
8785 static_assert ! ( BS < 4 ) ;
8886
@@ -106,10 +104,9 @@ pub fn aes32esmi<const BS: u8>(rs1: u32, rs2: u32) -> u32 {
106104/// The `BS` parameter is expected to be a constant value and only the bottom 2 bits of `bs` are
107105/// used.
108106#[ target_feature( enable = "zknd" ) ]
109- // See #1464
110- // #[cfg_attr(test, assert_instr(aes32dsi, BS = 0))]
107+ #[ cfg_attr( test, assert_instr( aes32dsi, BS = 0 ) ) ]
111108#[ inline]
112- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
109+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
113110pub fn aes32dsi < const BS : u8 > ( rs1 : u32 , rs2 : u32 ) -> u32 {
114111 static_assert ! ( BS < 4 ) ;
115112
@@ -134,10 +131,9 @@ pub fn aes32dsi<const BS: u8>(rs1: u32, rs2: u32) -> u32 {
134131/// The `BS` parameter is expected to be a constant value and only the bottom 2 bits of `bs` are
135132/// used.
136133#[ target_feature( enable = "zknd" ) ]
137- // See #1464
138- // #[cfg_attr(test, assert_instr(aes32dsmi, BS = 0))]
134+ #[ cfg_attr( test, assert_instr( aes32dsmi, BS = 0 ) ) ]
139135#[ inline]
140- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
136+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
141137pub fn aes32dsmi < const BS : u8 > ( rs1 : u32 , rs2 : u32 ) -> u32 {
142138 static_assert ! ( BS < 4 ) ;
143139
@@ -159,10 +155,9 @@ pub fn aes32dsmi<const BS: u8>(rs1: u32, rs2: u32) -> u32 {
159155///
160156/// Section: 3.31
161157#[ target_feature( enable = "zknh" ) ]
162- // See #1464
163- // #[cfg_attr(test, assert_instr(sha512sig0h))]
158+ #[ cfg_attr( test, assert_instr( sha512sig0h) ) ]
164159#[ inline]
165- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
160+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
166161pub fn sha512sig0h ( rs1 : u32 , rs2 : u32 ) -> u32 {
167162 unsafe { _sha512sig0h ( rs1, rs2) }
168163}
@@ -182,10 +177,9 @@ pub fn sha512sig0h(rs1: u32, rs2: u32) -> u32 {
182177///
183178/// Section: 3.32
184179#[ target_feature( enable = "zknh" ) ]
185- // See #1464
186- // #[cfg_attr(test, assert_instr(sha512sig0l))]
180+ #[ cfg_attr( test, assert_instr( sha512sig0l) ) ]
187181#[ inline]
188- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
182+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
189183pub fn sha512sig0l ( rs1 : u32 , rs2 : u32 ) -> u32 {
190184 unsafe { _sha512sig0l ( rs1, rs2) }
191185}
@@ -205,10 +199,9 @@ pub fn sha512sig0l(rs1: u32, rs2: u32) -> u32 {
205199///
206200/// Section: 3.33
207201#[ target_feature( enable = "zknh" ) ]
208- // See #1464
209- // #[cfg_attr(test, assert_instr(sha512sig1h))]
202+ #[ cfg_attr( test, assert_instr( sha512sig1h) ) ]
210203#[ inline]
211- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
204+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
212205pub fn sha512sig1h ( rs1 : u32 , rs2 : u32 ) -> u32 {
213206 unsafe { _sha512sig1h ( rs1, rs2) }
214207}
@@ -230,7 +223,7 @@ pub fn sha512sig1h(rs1: u32, rs2: u32) -> u32 {
230223#[ target_feature( enable = "zknh" ) ]
231224#[ cfg_attr( test, assert_instr( sha512sig1l) ) ]
232225#[ inline]
233- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
226+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
234227pub fn sha512sig1l ( rs1 : u32 , rs2 : u32 ) -> u32 {
235228 unsafe { _sha512sig1l ( rs1, rs2) }
236229}
@@ -249,10 +242,9 @@ pub fn sha512sig1l(rs1: u32, rs2: u32) -> u32 {
249242///
250243/// Section: 3.35
251244#[ target_feature( enable = "zknh" ) ]
252- // See #1464
253- // #[cfg_attr(test, assert_instr(sha512sum0r))]
245+ #[ cfg_attr( test, assert_instr( sha512sum0r) ) ]
254246#[ inline]
255- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
247+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
256248pub fn sha512sum0r ( rs1 : u32 , rs2 : u32 ) -> u32 {
257249 unsafe { _sha512sum0r ( rs1, rs2) }
258250}
@@ -271,10 +263,9 @@ pub fn sha512sum0r(rs1: u32, rs2: u32) -> u32 {
271263///
272264/// Section: 3.36
273265#[ target_feature( enable = "zknh" ) ]
274- // See #1464
275- // #[cfg_attr(test, assert_instr(sha512sum1r))]
266+ #[ cfg_attr( test, assert_instr( sha512sum1r) ) ]
276267#[ inline]
277- #[ unstable ( feature = "riscv_ext_intrinsics " , issue = "114544 " ) ]
268+ #[ stable ( feature = "stdarch_riscv_zk " , since = "CURRENT_RUSTC_VERSION " ) ]
278269pub fn sha512sum1r ( rs1 : u32 , rs2 : u32 ) -> u32 {
279270 unsafe { _sha512sum1r ( rs1, rs2) }
280271}
0 commit comments