Skip to content

intrinsic-test : Modified TypeKind enum to group the Signed and Unsigned version of types #1876

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
Jul 16, 2025
+72 −31
Merged

intrinsic-test : Modified TypeKind enum to group the Signed and Unsigned version of types #1876

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
7 changes: 4 additions & 3 deletions crates/intrinsic-test/src/arm/intrinsic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::common::argument::ArgumentList;
use crate::common::indentation::Indentation;
use crate::common::intrinsic::{Intrinsic, IntrinsicDefinition};
use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, TypeKind};
use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, Sign, TypeKind};
use std::ops::Deref;

#[derive(Debug, Clone, PartialEq)]
Expand Down Expand Up @@ -73,8 +73,9 @@ impl IntrinsicDefinition<ArmIntrinsicType> for Intrinsic<ArmIntrinsicType> {
TypeKind::Float if self.results().inner_size() == 16 => "float16_t".to_string(),
TypeKind::Float if self.results().inner_size() == 32 => "float".to_string(),
TypeKind::Float if self.results().inner_size() == 64 => "double".to_string(),
TypeKind::Int => format!("int{}_t", self.results().inner_size()),
TypeKind::UInt => format!("uint{}_t", self.results().inner_size()),
TypeKind::Int(Sign::Signed) => format!("int{}_t", self.results().inner_size()),
TypeKind::Int(Sign::Unsigned) =>
format!("uint{}_t", self.results().inner_size()),
TypeKind::Poly => format!("poly{}_t", self.results().inner_size()),
ty => todo!("print_result_c - Unknown type: {:#?}", ty),
},
Expand Down
12 changes: 6 additions & 6 deletions crates/intrinsic-test/src/arm/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use super::intrinsic::ArmIntrinsicType;
use crate::common::cli::Language;
use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, TypeKind};
use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, Sign, TypeKind};

impl IntrinsicTypeDefinition for ArmIntrinsicType {
/// Gets a string containing the typename for this type in C format.
Expand Down Expand Up @@ -73,8 +73,8 @@ impl IntrinsicTypeDefinition for ArmIntrinsicType {
format!(
"vld{len}{quad}_{type}{size}",
type = match k {
TypeKind::UInt => "u",
TypeKind::Int => "s",
TypeKind::Int(Sign::Unsigned) => "u",
TypeKind::Int(Sign::Signed) => "s",
TypeKind::Float => "f",
// The ACLE doesn't support 64-bit polynomial loads on Armv7
// if armv7 and bl == 64, use "s", else "p"
Expand Down Expand Up @@ -107,8 +107,8 @@ impl IntrinsicTypeDefinition for ArmIntrinsicType {
format!(
"vget{quad}_lane_{type}{size}",
type = match k {
TypeKind::UInt => "u",
TypeKind::Int => "s",
TypeKind::Int(Sign::Unsigned) => "u",
TypeKind::Int(Sign::Signed) => "s",
TypeKind::Float => "f",
TypeKind::Poly => "p",
x => todo!("get_load_function TypeKind: {:#?}", x),
Expand Down Expand Up @@ -176,7 +176,7 @@ impl IntrinsicTypeDefinition for ArmIntrinsicType {
} else {
let kind = start.parse::<TypeKind>()?;
let bit_len = match kind {
TypeKind::Int => Some(32),
TypeKind::Int(_) => Some(32),
_ => None,
};
Ok(Box::new(ArmIntrinsicType(IntrinsicType {
Expand Down
84 changes: 62 additions & 22 deletions crates/intrinsic-test/src/common/intrinsic_helpers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,40 @@ use super::cli::Language;
use super::indentation::Indentation;
use super::values::value_for_array;

#[derive(Debug, PartialEq, Copy, Clone)]
pub enum Sign {
Signed,
Unsigned,
}

#[derive(Debug, PartialEq, Copy, Clone)]
pub enum TypeKind {
BFloat,
Float,
Int,
UInt,
Int(Sign),
Char(Sign),
Poly,
Void,
Mask,
Vector,
}

impl FromStr for TypeKind {
type Err = String;

fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
"bfloat" => Ok(Self::BFloat),
"float" => Ok(Self::Float),
"int" => Ok(Self::Int),
"bfloat" | "BF16" => Ok(Self::BFloat),
"float" | "double" | "FP16" | "FP32" | "FP64" => Ok(Self::Float),
"int" | "long" | "short" | "SI8" | "SI16" | "SI32" | "SI64" => {
Ok(Self::Int(Sign::Signed))
}
"poly" => Ok(Self::Poly),
"uint" | "unsigned" => Ok(Self::UInt),
"char" => Ok(Self::Char(Sign::Signed)),
"uint" | "unsigned" | "UI8" | "UI16" | "UI32" | "UI64" => Ok(Self::Int(Sign::Unsigned)),
"void" => Ok(Self::Void),
"MASK" => Ok(Self::Mask),
"M64" | "M128" | "M256" | "M512" => Ok(Self::Vector),
_ => Err(format!("Impossible to parse argument kind {s}")),
}
}
Expand All @@ -42,10 +55,14 @@ impl fmt::Display for TypeKind {
match self {
Self::BFloat => "bfloat",
Self::Float => "float",
Self::Int => "int",
Self::UInt => "uint",
Self::Int(Sign::Signed) => "int",
Self::Int(Sign::Unsigned) => "uint",
Self::Poly => "poly",
Self::Void => "void",
Self::Char(Sign::Signed) => "char",
Self::Char(Sign::Unsigned) => "unsigned char",
Self::Mask => "mask",
Self::Vector => "vector",
}
)
}
Expand All @@ -56,20 +73,24 @@ impl TypeKind {
pub fn c_prefix(&self) -> &str {
match self {
Self::Float => "float",
Self::Int => "int",
Self::UInt => "uint",
Self::Int(Sign::Signed) => "int",
Self::Int(Sign::Unsigned) => "uint",
Self::Poly => "poly",
Self::Char(Sign::Signed) => "char",
_ => unreachable!("Not used: {:#?}", self),
}
}

/// Gets the rust prefix for the type kind i.e. i, u, f.
pub fn rust_prefix(&self) -> &str {
match self {
Self::BFloat => "bf",
Self::Float => "f",
Self::Int => "i",
Self::UInt => "u",
Self::Int(Sign::Signed) => "i",
Self::Int(Sign::Unsigned) => "u",
Self::Poly => "u",
Self::Char(Sign::Unsigned) => "u",
Self::Char(Sign::Signed) => "i",
_ => unreachable!("Unused type kind: {:#?}", self),
}
}
Expand Down Expand Up @@ -133,11 +154,14 @@ impl IntrinsicType {
}

pub fn c_scalar_type(&self) -> String {
format!(
"{prefix}{bits}_t",
prefix = self.kind().c_prefix(),
bits = self.inner_size()
)
match self.kind() {
TypeKind::Char(_) => String::from("char"),
_ => format!(
"{prefix}{bits}_t",
prefix = self.kind().c_prefix(),
bits = self.inner_size()
),
}
}

pub fn rust_scalar_type(&self) -> String {
Expand All @@ -155,8 +179,8 @@ impl IntrinsicType {
bit_len: Some(8),
..
} => match kind {
TypeKind::Int => "(int)",
TypeKind::UInt => "(unsigned int)",
TypeKind::Int(Sign::Signed) => "(int)",
TypeKind::Int(Sign::Unsigned) => "(unsigned int)",
TypeKind::Poly => "(unsigned int)(uint8_t)",
_ => "",
},
Expand All @@ -172,6 +196,21 @@ impl IntrinsicType {
128 => "",
_ => panic!("invalid bit_len"),
},
IntrinsicType {
kind: TypeKind::Float,
bit_len: Some(bit_len),
..
} => match bit_len {
16 => "(float16_t)",
32 => "(float)",
64 => "(double)",
128 => "",
_ => panic!("invalid bit_len"),
},
IntrinsicType {
kind: TypeKind::Char(_),
..
} => "(char)",
_ => "",
}
}
Expand All @@ -185,7 +224,7 @@ impl IntrinsicType {
match self {
IntrinsicType {
bit_len: Some(bit_len @ (8 | 16 | 32 | 64)),
kind: kind @ (TypeKind::Int | TypeKind::UInt | TypeKind::Poly),
kind: kind @ (TypeKind::Int(_) | TypeKind::Poly | TypeKind::Char(_)),
simd_len,
vec_len,
..
Expand All @@ -201,7 +240,8 @@ impl IntrinsicType {
.format_with(",\n", |i, fmt| {
let src = value_for_array(*bit_len, i);
assert!(src == 0 || src.ilog2() < *bit_len);
if *kind == TypeKind::Int && (src >> (*bit_len - 1)) != 0 {
if *kind == TypeKind::Int(Sign::Signed) && (src >> (*bit_len - 1)) != 0
{
// `src` is a two's complement representation of a negative value.
let mask = !0u64 >> (64 - *bit_len);
let ones_compl = src ^ mask;
Expand Down Expand Up @@ -257,7 +297,7 @@ impl IntrinsicType {
..
} => false,
IntrinsicType {
kind: TypeKind::Int | TypeKind::UInt | TypeKind::Poly,
kind: TypeKind::Int(_) | TypeKind::Poly,
..
} => true,
_ => unimplemented!(),
Expand Down