Skip to content

intrinsic-test: combine rust intrinsics in one program #1855

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.

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

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
42 changes: 21 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/intrinsic-test/src/arm/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ pub const AARCH_CONFIGURATIONS: &str = r#"
#![cfg_attr(any(target_arch = "aarch64", target_arch = "arm64ec"), feature(stdarch_neon_fcma))]
#![cfg_attr(any(target_arch = "aarch64", target_arch = "arm64ec"), feature(stdarch_neon_dotprod))]
#![cfg_attr(any(target_arch = "aarch64", target_arch = "arm64ec"), feature(stdarch_neon_i8mm))]
#![cfg_attr(any(target_arch = "aarch64", target_arch = "arm64ec"), feature(stdarch_neon_sha3))]
#![cfg_attr(any(target_arch = "aarch64", target_arch = "arm64ec"), feature(stdarch_neon_sm4))]
#![cfg_attr(any(target_arch = "aarch64", target_arch = "arm64ec"), feature(stdarch_neon_ftts))]
#![feature(fmt_helpers_for_derive)]
Expand Down
24 changes: 9 additions & 15 deletions crates/intrinsic-test/src/arm/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use rayon::prelude::*;

mod compile;
mod config;
mod intrinsic;
Expand All @@ -8,7 +10,7 @@ use crate::common::SupportedArchitectureTest;
use crate::common::cli::ProcessedCli;
use crate::common::compare::compare_outputs;
use crate::common::gen_rust::compile_rust_programs;
use crate::common::intrinsic::{Intrinsic, IntrinsicDefinition};
use crate::common::intrinsic::Intrinsic;
use crate::common::intrinsic_helpers::TypeKind;
use crate::common::write_file::{write_c_testfiles, write_rust_testfiles};
use compile::compile_c_arm;
Expand Down Expand Up @@ -57,11 +59,7 @@ impl SupportedArchitectureTest for ArmArchitectureTest {
let c_target = "aarch64";

let intrinsics_name_list = write_c_testfiles(
&self
.intrinsics
.iter()
.map(|i| i as &dyn IntrinsicDefinition<_>)
.collect::<Vec<_>>(),
self.intrinsics.par_iter(),
target,
c_target,
&["arm_neon.h", "arm_acle.h", "arm_fp16.h"],
Expand All @@ -72,7 +70,7 @@ impl SupportedArchitectureTest for ArmArchitectureTest {
match compiler {
None => true,
Some(compiler) => compile_c_arm(
intrinsics_name_list.as_slice(),
intrinsics_name_list.unwrap().as_slice(),
compiler,
target,
cxx_toolchain_dir,
Expand All @@ -90,21 +88,18 @@ impl SupportedArchitectureTest for ArmArchitectureTest {
let toolchain = self.cli_options.toolchain.as_deref();
let linker = self.cli_options.linker.as_deref();
let intrinsics_name_list = write_rust_testfiles(
self.intrinsics
.iter()
.map(|i| i as &dyn IntrinsicDefinition<_>)
.collect::<Vec<_>>(),
self.intrinsics.par_iter(),
rust_target,
&build_notices("// "),
F16_FORMATTING_DEF,
AARCH_CONFIGURATIONS,
);

compile_rust_programs(intrinsics_name_list, toolchain, target, linker)
compile_rust_programs(intrinsics_name_list.unwrap(), toolchain, target, linker)
}

fn compare_outputs(&self) -> bool {
if let Some(ref toolchain) = self.cli_options.toolchain {
if self.cli_options.toolchain.is_some() {
let intrinsics_name_list = self
.intrinsics
.iter()
Expand All @@ -113,8 +108,7 @@ impl SupportedArchitectureTest for ArmArchitectureTest {

compare_outputs(
&intrinsics_name_list,
toolchain,
&self.cli_options.c_runner,
&self.cli_options.runner,
&self.cli_options.target,
)
} else {
Expand Down
64 changes: 36 additions & 28 deletions crates/intrinsic-test/src/common/argument.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,38 +125,46 @@ where
/// Creates a line for each argument that initializes an array for C from which `loads` argument
/// values can be loaded as a sliding window.
/// e.g `const int32x2_t a_vals = {0x3effffff, 0x3effffff, 0x3f7fffff}`, if loads=2.
pub fn gen_arglists_c(&self, indentation: Indentation, loads: u32) -> String {
self.iter()
.filter(|&arg| !arg.has_constraint())
.map(|arg| {
format!(
"{indentation}const {ty} {name}_vals[] = {values};",
ty = arg.ty.c_scalar_type(),
name = arg.name,
values = arg.ty.populate_random(indentation, loads, &Language::C)
)
})
.collect::<Vec<_>>()
.join("\n")
pub fn gen_arglists_c(
&self,
w: &mut impl std::io::Write,
indentation: Indentation,
loads: u32,
) -> std::io::Result<()> {
for arg in self.iter().filter(|&arg| !arg.has_constraint()) {
writeln!(
w,
"{indentation}const {ty} {name}_vals[] = {values};",
ty = arg.ty.c_scalar_type(),
name = arg.name,
values = arg.ty.populate_random(indentation, loads, &Language::C)
)?
}

Ok(())
}

/// Creates a line for each argument that initializes an array for Rust from which `loads` argument
/// values can be loaded as a sliding window, e.g `const A_VALS: [u32; 20] = [...];`
pub fn gen_arglists_rust(&self, indentation: Indentation, loads: u32) -> String {
self.iter()
.filter(|&arg| !arg.has_constraint())
.map(|arg| {
format!(
"{indentation}{bind} {name}: [{ty}; {load_size}] = {values};",
bind = arg.rust_vals_array_binding(),
name = arg.rust_vals_array_name(),
ty = arg.ty.rust_scalar_type(),
load_size = arg.ty.num_lanes() * arg.ty.num_vectors() + loads - 1,
values = arg.ty.populate_random(indentation, loads, &Language::Rust)
)
})
.collect::<Vec<_>>()
.join("\n")
pub fn gen_arglists_rust(
&self,
w: &mut impl std::io::Write,
indentation: Indentation,
loads: u32,
) -> std::io::Result<()> {
for arg in self.iter().filter(|&arg| !arg.has_constraint()) {
writeln!(
w,
"{indentation}{bind} {name}: [{ty}; {load_size}] = {values};",
bind = arg.rust_vals_array_binding(),
name = arg.rust_vals_array_name(),
ty = arg.ty.rust_scalar_type(),
load_size = arg.ty.num_lanes() * arg.ty.num_vectors() + loads - 1,
values = arg.ty.populate_random(indentation, loads, &Language::Rust)
)?
}

Ok(())
}

/// Creates a line for each argument that initializes the argument from an array `[arg]_vals` at
Expand Down
4 changes: 2 additions & 2 deletions crates/intrinsic-test/src/common/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ pub struct ProcessedCli {
pub filename: PathBuf,
pub toolchain: Option<String>,
pub cpp_compiler: Option<String>,
pub c_runner: String,
pub runner: String,
pub target: String,
pub linker: Option<String>,
pub cxx_toolchain_dir: Option<String>,
Expand Down Expand Up @@ -102,7 +102,7 @@ impl ProcessedCli {
Self {
toolchain,
cpp_compiler,
c_runner,
runner: c_runner,
target,
linker,
cxx_toolchain_dir,
Expand Down
32 changes: 15 additions & 17 deletions crates/intrinsic-test/src/common/compare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,24 @@ use super::cli::FailureReason;
use rayon::prelude::*;
use std::process::Command;

pub fn compare_outputs(
intrinsic_name_list: &Vec<String>,
toolchain: &str,
runner: &str,
target: &str,
) -> bool {
pub fn compare_outputs(intrinsic_name_list: &Vec<String>, runner: &str, target: &str) -> bool {
fn runner_command(runner: &str) -> Command {
let mut it = runner.split_whitespace();
let mut cmd = Command::new(it.next().unwrap());
cmd.args(it);

cmd
}

let intrinsics = intrinsic_name_list
.par_iter()
.filter_map(|intrinsic_name| {
let c = Command::new("sh")
.arg("-c")
.arg(format!("{runner} ./c_programs/{intrinsic_name}"))
let c = runner_command(runner)
.arg(format!("./c_programs/{intrinsic_name}"))
.output();

let rust = Command::new("sh")
.current_dir("rust_programs")
.arg("-c")
.arg(format!(
"cargo {toolchain} run --target {target} --bin {intrinsic_name} --release",
))
let rust = runner_command(runner)
.arg(format!("target/{target}/release/{intrinsic_name}"))
.env("RUSTFLAGS", "-Cdebuginfo=0")
.output();

Expand All @@ -42,8 +40,8 @@ pub fn compare_outputs(
if !rust.status.success() {
error!(
"Failed to run Rust program for intrinsic {intrinsic_name}\nstdout: {stdout}\nstderr: {stderr}",
stdout = std::str::from_utf8(&rust.stdout).unwrap_or(""),
stderr = std::str::from_utf8(&rust.stderr).unwrap_or(""),
stdout = String::from_utf8_lossy(&rust.stdout),
stderr = String::from_utf8_lossy(&rust.stderr),
);
return Some(FailureReason::RunRust(intrinsic_name.clone()));
}
Expand Down
Loading