Skip to content

Support crc32 even if on arm32 #834

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

Merged
merged 1 commit into from
Mar 30, 2020
Merged

Support crc32 even if on arm32 #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 0 additions & 96 deletions crates/core_arch/src/aarch64/crc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,14 @@
extern "C" {
#[link_name = "llvm.aarch64.crc32b"]
fn crc32b_(crc: u32, data: u32) -> u32;
#[link_name = "llvm.aarch64.crc32h"]
fn crc32h_(crc: u32, data: u32) -> u32;
#[link_name = "llvm.aarch64.crc32w"]
fn crc32w_(crc: u32, data: u32) -> u32;
#[link_name = "llvm.aarch64.crc32x"]
fn crc32x_(crc: u32, data: u64) -> u32;

#[link_name = "llvm.aarch64.crc32cb"]
fn crc32cb_(crc: u32, data: u32) -> u32;
#[link_name = "llvm.aarch64.crc32ch"]
fn crc32ch_(crc: u32, data: u32) -> u32;
#[link_name = "llvm.aarch64.crc32cw"]
fn crc32cw_(crc: u32, data: u32) -> u32;
#[link_name = "llvm.aarch64.crc32cx"]
fn crc32cx_(crc: u32, data: u64) -> u32;
}

#[cfg(test)]
use stdarch_test::assert_instr;

/// CRC32 single round checksum for bytes (8 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(test, assert_instr(crc32b))]
pub unsafe fn __crc32b(crc: u32, data: u8) -> u32 {
crc32b_(crc, data as u32)
}

/// CRC32 single round checksum for half words (16 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(test, assert_instr(crc32h))]
pub unsafe fn __crc32h(crc: u32, data: u16) -> u32 {
crc32h_(crc, data as u32)
}

/// CRC32 single round checksum for words (32 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(test, assert_instr(crc32w))]
pub unsafe fn __crc32w(crc: u32, data: u32) -> u32 {
crc32w_(crc, data)
}

/// CRC32 single round checksum for quad words (64 bits).
#[inline]
#[target_feature(enable = "crc")]
Expand All @@ -53,30 +17,6 @@ pub unsafe fn __crc32d(crc: u32, data: u64) -> u32 {
crc32x_(crc, data)
}

/// CRC32-C single round checksum for bytes (8 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(test, assert_instr(crc32cb))]
pub unsafe fn __crc32cb(crc: u32, data: u8) -> u32 {
crc32cb_(crc, data as u32)
}

/// CRC32-C single round checksum for half words (16 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(test, assert_instr(crc32ch))]
pub unsafe fn __crc32ch(crc: u32, data: u16) -> u32 {
crc32ch_(crc, data as u32)
}

/// CRC32-C single round checksum for words (32 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(test, assert_instr(crc32cw))]
pub unsafe fn __crc32cw(crc: u32, data: u32) -> u32 {
crc32cw_(crc, data)
}

/// CRC32-C single round checksum for quad words (64 bits).
#[inline]
#[target_feature(enable = "crc")]
Expand All @@ -91,48 +31,12 @@ mod tests {
use std::mem;
use stdarch_test::simd_test;

#[simd_test(enable = "crc")]
unsafe fn test_crc32b() {
assert_eq!(__crc32b(0, 0), 0);
assert_eq!(__crc32b(0, 255), 755167117);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32h() {
assert_eq!(__crc32h(0, 0), 0);
assert_eq!(__crc32h(0, 16384), 1994146192);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32w() {
assert_eq!(__crc32w(0, 0), 0);
assert_eq!(__crc32w(0, 4294967295), 3736805603);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32d() {
assert_eq!(__crc32d(0, 0), 0);
assert_eq!(__crc32d(0, 18446744073709551615), 1147535477);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32cb() {
assert_eq!(__crc32cb(0, 0), 0);
assert_eq!(__crc32cb(0, 255), 2910671697);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32ch() {
assert_eq!(__crc32ch(0, 0), 0);
assert_eq!(__crc32ch(0, 16384), 1098587580);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32cw() {
assert_eq!(__crc32cw(0, 0), 0);
assert_eq!(__crc32cw(0, 4294967295), 3080238136);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32cd() {
assert_eq!(__crc32cd(0, 0), 0);
Expand Down
121 changes: 121 additions & 0 deletions crates/core_arch/src/arm/crc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
extern "C" {
#[cfg_attr(target_arch = "aarch64", link_name = "llvm.aarch64.crc32b")]
#[cfg_attr(target_arch = "arm", link_name = "llvm.arm.crc32b")]
fn crc32b_(crc: u32, data: u32) -> u32;
#[cfg_attr(target_arch = "aarch64", link_name = "llvm.aarch64.crc32h")]
#[cfg_attr(target_arch = "arm", link_name = "llvm.arm.crc32h")]
fn crc32h_(crc: u32, data: u32) -> u32;
#[cfg_attr(target_arch = "aarch64", link_name = "llvm.aarch64.crc32w")]
#[cfg_attr(target_arch = "arm", link_name = "llvm.arm.crc32w")]
fn crc32w_(crc: u32, data: u32) -> u32;

#[cfg_attr(target_arch = "aarch64", link_name = "llvm.aarch64.crc32cb")]
#[cfg_attr(target_arch = "arm", link_name = "llvm.arm.crc32cb")]
fn crc32cb_(crc: u32, data: u32) -> u32;
#[cfg_attr(target_arch = "aarch64", link_name = "llvm.aarch64.crc32ch")]
#[cfg_attr(target_arch = "arm", link_name = "llvm.arm.crc32ch")]
fn crc32ch_(crc: u32, data: u32) -> u32;
#[cfg_attr(target_arch = "aarch64", link_name = "llvm.aarch64.crc32cw")]
#[cfg_attr(target_arch = "arm", link_name = "llvm.arm.crc32cw")]
fn crc32cw_(crc: u32, data: u32) -> u32;
}

#[cfg(test)]
use stdarch_test::assert_instr;

/// CRC32 single round checksum for bytes (8 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
#[cfg_attr(test, assert_instr(crc32b))]
pub unsafe fn __crc32b(crc: u32, data: u8) -> u32 {
crc32b_(crc, data as u32)
}

/// CRC32 single round checksum for half words (16 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
#[cfg_attr(test, assert_instr(crc32h))]
pub unsafe fn __crc32h(crc: u32, data: u16) -> u32 {
crc32h_(crc, data as u32)
}

/// CRC32 single round checksum for words (32 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
#[cfg_attr(test, assert_instr(crc32w))]
pub unsafe fn __crc32w(crc: u32, data: u32) -> u32 {
crc32w_(crc, data)
}

/// CRC32-C single round checksum for bytes (8 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
#[cfg_attr(test, assert_instr(crc32cb))]
pub unsafe fn __crc32cb(crc: u32, data: u8) -> u32 {
crc32cb_(crc, data as u32)
}

/// CRC32-C single round checksum for half words (16 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
#[cfg_attr(test, assert_instr(crc32ch))]
pub unsafe fn __crc32ch(crc: u32, data: u16) -> u32 {
crc32ch_(crc, data as u32)
}

/// CRC32-C single round checksum for words (32 bits).
#[inline]
#[target_feature(enable = "crc")]
#[cfg_attr(target_arch = "arm", target_feature(enable = "v8"))]
#[cfg_attr(test, assert_instr(crc32cw))]
pub unsafe fn __crc32cw(crc: u32, data: u32) -> u32 {
crc32cw_(crc, data)
}

#[cfg(test)]
mod tests {
use crate::core_arch::{arm::*, simd::*};
use std::mem;
use stdarch_test::simd_test;

#[simd_test(enable = "crc")]
unsafe fn test_crc32b() {
assert_eq!(__crc32b(0, 0), 0);
assert_eq!(__crc32b(0, 255), 755167117);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32h() {
assert_eq!(__crc32h(0, 0), 0);
assert_eq!(__crc32h(0, 16384), 1994146192);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32w() {
assert_eq!(__crc32w(0, 0), 0);
assert_eq!(__crc32w(0, 4294967295), 3736805603);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32cb() {
assert_eq!(__crc32cb(0, 0), 0);
assert_eq!(__crc32cb(0, 255), 2910671697);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32ch() {
assert_eq!(__crc32ch(0, 0), 0);
assert_eq!(__crc32ch(0, 16384), 1098587580);
}

#[simd_test(enable = "crc")]
unsafe fn test_crc32cw() {
assert_eq!(__crc32cw(0, 0), 0);
assert_eq!(__crc32cw(0, 4294967295), 3080238136);
}
}
5 changes: 5 additions & 0 deletions crates/core_arch/src/arm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ mod neon;
))]
pub use self::neon::*;

#[cfg(any(target_arch = "aarch64", target_feature = "v7"))]
Copy link
Member

@Amanieu Amanieu Mar 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is v7 required here?

mod crc;
#[cfg(any(target_arch = "aarch64", target_feature = "v7"))]
pub use self::crc::*;

pub use crate::core_arch::acle::*;

#[cfg(test)]
Expand Down