feat: changed from TypeKind::Int(bool) to TypeKind::Int(Sign) for more

madhav-madhusoodanan · madhav-madhusoodanan · commit c6491dafc5a2 · 2025-06-20T11:08:21.000+05:30
clarity
diff --git a/crates/intrinsic-test/src/arm/intrinsic.rs b/crates/intrinsic-test/src/arm/intrinsic.rs
@@ -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, DerefMut};
 
 #[derive(Debug, Clone, PartialEq)]
@@ -79,8 +79,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(true) => format!("int{}_t", self.results().inner_size()),
-                    TypeKind::Int(false) => 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),
                 },
diff --git a/crates/intrinsic-test/src/arm/types.rs b/crates/intrinsic-test/src/arm/types.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 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.
@@ -70,8 +70,8 @@ impl IntrinsicTypeDefinition for ArmIntrinsicType {
             format!(
                 "vld{len}{quad}_{type}{size}",
                 type = match k {
-                    TypeKind::Int(false) => "u",
-                    TypeKind::Int(true) => "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"
@@ -104,8 +104,8 @@ impl IntrinsicTypeDefinition for ArmIntrinsicType {
             format!(
                 "vget{quad}_lane_{type}{size}",
                 type = match k {
-                    TypeKind::Int(false) => "u",
-                    TypeKind::Int(true) => "s",
+                    TypeKind::Int(Sign::Unsigned) => "u",
+                    TypeKind::Int(Sign::Signed) => "s",
                     TypeKind::Float => "f",
                     TypeKind::Poly => "p",
                     x => todo!("get_load_function TypeKind: {:#?}", x),
@@ -129,6 +129,10 @@ impl IntrinsicTypeDefinition for ArmIntrinsicType {
             };
             let s = s.trim_end();
             let temp_return = ArmIntrinsicType::from_c(s);
+
+            // We are not adding the metadata hashmap here, since
+            // it is the return of a recursive call and the
+            // inner call would handle it.
             temp_return.and_then(|mut op| {
                 op.ptr = true;
                 op.ptr_constant = constant;
diff --git a/crates/intrinsic-test/src/common/intrinsic_helpers.rs b/crates/intrinsic-test/src/common/intrinsic_helpers.rs
@@ -9,14 +9,20 @@ 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,
 
     // if signed, then the inner value is true
-    Int(bool),
-    Char(bool),
+    Int(Sign),
+    Char(Sign),
     Poly,
     Void,
     Mask,
@@ -29,10 +35,12 @@ impl FromStr for TypeKind {
         match s {
             "bfloat" | "BF16" => Ok(Self::BFloat),
             "float" | "double" | "FP16" | "FP32" | "FP64" => Ok(Self::Float),
-            "int" | "long" | "short" | "SI8" | "SI16" | "SI32" | "SI64" => Ok(Self::Int(true)),
+            "int" | "long" | "short" | "SI8" | "SI16" | "SI32" | "SI64" => {
+                Ok(Self::Int(Sign::Signed))
+            }
             "poly" => Ok(Self::Poly),
-            "char" => Ok(Self::Char(true)),
-            "uint" | "unsigned" | "UI8" | "UI16" | "UI32" | "UI64" => Ok(Self::Int(false)),
+            "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),
             _ => Err(format!("Impossible to parse argument kind {s}")),
@@ -48,12 +56,12 @@ impl fmt::Display for TypeKind {
             match self {
                 Self::BFloat => "bfloat",
                 Self::Float => "float",
-                Self::Int(true) => "int",
-                Self::Int(false) => "uint",
+                Self::Int(Sign::Signed) => "int",
+                Self::Int(Sign::Unsigned) => "uint",
                 Self::Poly => "poly",
                 Self::Void => "void",
-                Self::Char(true) => "char",
-                Self::Char(false) => "unsigned char",
+                Self::Char(Sign::Signed) => "char",
+                Self::Char(Sign::Unsigned) => "unsigned char",
                 Self::Mask => "mask",
             }
         )
@@ -65,10 +73,10 @@ impl TypeKind {
     pub fn c_prefix(&self) -> &str {
         match self {
             Self::Float => "float",
-            Self::Int(true) => "int",
-            Self::Int(false) => "uint",
+            Self::Int(Sign::Signed) => "int",
+            Self::Int(Sign::Unsigned) => "uint",
             Self::Poly => "poly",
-            Self::Char(true) => "char",
+            Self::Char(Sign::Signed) => "char",
             _ => unreachable!("Not used: {:#?}", self),
         }
     }
@@ -77,8 +85,8 @@ impl TypeKind {
     pub fn rust_prefix(&self) -> &str {
         match self {
             Self::Float => "f",
-            Self::Int(true) => "i",
-            Self::Int(false) => "u",
+            Self::Int(Sign::Signed) => "i",
+            Self::Int(Sign::Unsigned) => "u",
             Self::Poly => "u",
             _ => unreachable!("Unused type kind: {:#?}", self),
         }
@@ -180,8 +188,8 @@ impl IntrinsicType {
                 bit_len: Some(8),
                 ..
             } => match kind {
-                TypeKind::Int(true) => "(int)",
-                TypeKind::Int(false) => "(unsigned int)",
+                TypeKind::Int(Sign::Signed) => "(int)",
+                TypeKind::Int(Sign::Unsigned) => "(unsigned int)",
                 TypeKind::Poly => "(unsigned int)(uint8_t)",
                 _ => "",
             },
@@ -241,7 +249,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(true) && (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;
diff --git a/crates/intrinsic-test/src/x86/config.rs b/crates/intrinsic-test/src/x86/config.rs
@@ -2,7 +2,7 @@ pub fn build_notices(line_prefix: &str) -> String {
     format!(
         "\
 {line_prefix}This is a transient test file, not intended for distribution. Some aspects of the
-{line_prefix}test are derived from a JSON specification, published under the same license as the
+{line_prefix}test are derived from an XML specification, published under the same license as the
 {line_prefix}`intrinsic-test` crate.\n
 "
     )
diff --git a/crates/intrinsic-test/src/x86/types.rs b/crates/intrinsic-test/src/x86/types.rs
@@ -5,7 +5,8 @@ use itertools::Itertools;
 
 use super::intrinsic::X86IntrinsicType;
 use crate::common::cli::Language;
-use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, TypeKind};
+use crate::common::intrinsic_helpers::{IntrinsicType, IntrinsicTypeDefinition, Sign, TypeKind};
+use crate::x86::xml_parser::Parameter;
 
 impl IntrinsicTypeDefinition for X86IntrinsicType {
     /// Gets a string containing the type in C format.
@@ -58,8 +59,8 @@ impl IntrinsicTypeDefinition for X86IntrinsicType {
 
         let kind = if s.find("unsigned").is_some() {
             match kind {
-                TypeKind::Int(_) => TypeKind::Int(false),
-                TypeKind::Char(_) => TypeKind::Char(false),
+                TypeKind::Int(_) => TypeKind::Int(Sign::Unsigned),
+                TypeKind::Char(_) => TypeKind::Char(Sign::Unsigned),
                 a => a,
             }
         } else {
diff --git a/crates/intrinsic-test/src/x86/xml_parser.rs b/crates/intrinsic-test/src/x86/xml_parser.rs
@@ -37,15 +37,15 @@ struct XMLIntrinsic {
 }
 
 #[derive(Deserialize)]
-struct Parameter {
+pub struct Parameter {
     #[serde(rename = "@type")]
-    type_data: String,
+    pub type_data: String,
     #[serde(rename = "@etype", default)]
     pub etype: String,
     // #[serde(rename = "@memwidth", default, deserialize_with = "string_to_u16")]
     // pub memwidth: u16,
     #[serde(rename = "@varname", default)]
-    var_name: String,
+    pub var_name: String,
 }
 
 pub fn get_xml_intrinsics(

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ pub fn build_notices(line_prefix: &str) -> String {`
`2`	`2`	`format!(`
`3`	`3`	`"\`
`4`	`4`	`{line_prefix}This is a transient test file, not intended for distribution. Some aspects of the`
`5`		`-{line_prefix}test are derived from a JSON specification, published under the same license as the`
	`5`	`+{line_prefix}test are derived from an XML specification, published under the same license as the`
`6`	`6`	{line_prefix}`intrinsic-test` crate.\n
`7`	`7`	`"`
`8`	`8`	`)`