Add abi_properties

Author: chorman0773

xlang/xlang_targets/src/properties.rs

@@ -37,29 +37,25 @@ pub enum ArchiverFlavor {
     MsLib,
 }
 
-/// The (default) format (and size) of the C long double type on the target
-#[repr(i32)]
+/// The Format for floating-point types
+#[repr(i16)]
 #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
-pub enum LongDoubleFormat {
-    /// IEEE 754, double precision (same as double)
-    IEEE64,
-    /// IEEE 754, quad precision
-    IEEE128,
-    /// Intel x87, double extended precision
-    X87,
-    /// Double-double precision (used by PowerPC )
-    PowerPCDoubleDouble,
+pub enum FloatFormat {
+    /// An IEEE754 floating-point value (width)
+    Ieee754(u16),
+    /// A 10-byte (x87) double-extended precision value
+    X87DoubleExtended,
+    /// Ibm128/double-double precisiion used by PowerPC
+    Ieee64x2,
 }
 
-impl LongDoubleFormat {
-    /// Obtains the size needed to store the format
-    /// Note: This does not necessarily match `float(long)`, and must be rounded to alignment size
-    pub const fn size(self) -> u16 {
+impl FloatFormat {
+    /// The size (in bytes) of the value, before applying alignment
+    pub fn size(&self) -> u16 {
         match self {
-            LongDoubleFormat::IEEE64 => 8,
-            LongDoubleFormat::IEEE128 => 16,
-            LongDoubleFormat::X87 => 10,
-            LongDoubleFormat::PowerPCDoubleDouble => 16,
+            Self::Ieee754(val) => (*val).saturating_add(7) >> 3,
+            Self::X87DoubleExtended => 10,
+            Self::Ieee64x2 => 16,
         }
     }
 }
@@ -114,6 +110,20 @@ pub struct AsmProperties<'a> {
 /// Properties about builtin functions on a target
 pub mod builtins;
 
+/// Properties about types that may require specific target features available to compile to
+#[repr(C)]
+#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
+pub struct AbiProperties<'a> {
+    /// Which feature vector types to each size
+    pub vector_width_features: Span<'a, Pair<u16, StringView<'a>>>,
+    /// Which feature is required to enable all unmentioned vector types
+    pub vector_default_feature: StringView<'a>,
+    /// Which feature each floating-point format requires,
+    pub float_format_features: Span<'a, Pair<FloatFormat, StringView<'a>>>,
+    /// Which feature is required to enable all unmentioned floating-point types
+    pub float_default_features: StringView<'a>,
+}
+
 ///
 /// Properties about the architecture, shared between targets that use this architecture
 #[repr(C)]
@@ -146,6 +156,9 @@ pub struct ArchProperties<'a> {
 
     /// Width of the architecture: Used by backends to differentiate between supported targets
     pub width: u16,
+
+    /// Abi Limits of the target
+    pub abi_properties: Option<&'a AbiProperties<'a>>,
 }
 
 ///
@@ -258,7 +271,7 @@ pub struct PrimitiveProperties {
     /// While `long double` does not use `max_align`, `max_align` should be at least this value to match the definition of the C/C++ typedef `align_max_t`.
     pub ldbl_align: u16,
     /// The format (and size) of the C `long double` type on this target
-    pub ldbl_format: LongDoubleFormat,
+    pub ldbl_format: FloatFormat,
 }
 
 /// Properties about a particular target, which includes an architecture and an operating system

xlang/xlang_targets/src/properties/clever.rs

@@ -1,6 +1,6 @@
 use xlang_abi::{const_sv, pair::Pair, span, span::Span, string::StringView};
 
-use super::{ArchProperties, AsmProperties, MachineProperties, PrimitiveProperties};
+use super::{AbiProperties, ArchProperties, AsmProperties, MachineProperties, PrimitiveProperties};
 
 macro_rules! clever_machines{
     {
@@ -257,6 +257,13 @@ pub static CLEVER_ASM: AsmProperties = AsmProperties {
     classes: CLEVER_ASM_CLASSES,
 };
 
+pub static CLEVER_ABI: AbiProperties = AbiProperties {
+    vector_default_feature: const_sv!("main"),
+    vector_width_features: span![],
+    float_default_features: const_sv!("float"),
+    float_format_features: span![Pair(super::FloatFormat::Ieee754(128), const_sv!("main"))],
+};
+
 pub static CLEVER: ArchProperties = ArchProperties {
     lock_free_atomic_masks: 0xff,
     builtins: CLEVER_BUILTINS,
@@ -268,6 +275,7 @@ pub static CLEVER: ArchProperties = ArchProperties {
     asm_propreties: &CLEVER_ASM,
     tag_names: span![const_sv!("C")],
     width: 64,
+    abi_properties: Some(&CLEVER_ABI),
 };
 
 pub static CLEVER_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
@@ -284,7 +292,7 @@ pub static CLEVER_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     sizebits: 64,
     lock_free_atomic_mask: 0xff,
     ldbl_align: 8,
-    ldbl_format: super::LongDoubleFormat::IEEE64,
+    ldbl_format: super::FloatFormat::Ieee754(64),
     max_atomic_align: 16,
 };
 
@@ -302,6 +310,6 @@ pub static CLEVERILP32_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     sizebits: 32,
     lock_free_atomic_mask: 0xff,
     ldbl_align: 8,
-    ldbl_format: super::LongDoubleFormat::IEEE64,
+    ldbl_format: super::FloatFormat::Ieee754(64),
     max_atomic_align: 16,
 };

xlang/xlang_targets/src/properties/holeybytes.rs

@@ -37,7 +37,7 @@ pub static PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     lock_free_atomic_mask: 0xff,
     max_atomic_align: 16,
     ldbl_align: 16,
-    ldbl_format: super::LongDoubleFormat::IEEE128,
+    ldbl_format: super::FloatFormat::Ieee754(128),
 };
 
 pub static MACHINE_GENERIC: MachineProperties = MachineProperties {
@@ -88,4 +88,5 @@ pub static HOLEYBYTES: ArchProperties = ArchProperties {
     asm_propreties: &ASM,
     tag_names: span![const_sv!("C")],
     width: 64,
+    abi_properties: None,
 };

xlang/xlang_targets/src/properties/w65.rs

@@ -9,7 +9,7 @@ use super::{
     asm::AsmScalar,
     asm::AsmScalarKind::{ClobberOnly, Float, Integer},
     builtins::BuiltinSignature,
-    ArchProperties, AsmProperties, LongDoubleFormat, MachineProperties, PrimitiveProperties,
+    ArchProperties, AsmProperties, MachineProperties, PrimitiveProperties,
 };
 
 macro_rules! w65_machines{
@@ -142,6 +142,7 @@ pub static W65: ArchProperties = ArchProperties {
     asm_propreties: &W65_ASSEMBLY,
     tag_names: span![const_sv!("C"), const_sv!("w65-interrupt")],
     width: 16,
+    abi_properties: None,
 };
 
 pub static W65_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
@@ -158,6 +159,6 @@ pub static W65_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     lock_free_atomic_mask: 0x3,
     sizebits: 16,
     ldbl_align: 4,
-    ldbl_format: LongDoubleFormat::IEEE64,
+    ldbl_format: super::FloatFormat::Ieee754(64),
     max_atomic_align: 2,
 };

xlang/xlang_targets/src/properties/x86.rs

@@ -6,7 +6,7 @@ use super::{
     asm::AsmScalar,
     asm::AsmScalarKind::{Float, Integer, Vector},
     builtins::BuiltinSignature,
-    ArchProperties, AsmProperties, LongDoubleFormat, PrimitiveProperties,
+    AbiProperties, ArchProperties, AsmProperties, FloatFormat, PrimitiveProperties,
 };
 
 macro_rules! x86_machines{
@@ -564,6 +564,33 @@ pub const X86_16_TAG_NAMES: Span<StringView> = span![
     const_sv!("fastcall")
 ];
 
+pub const X86_VECTOR_ABI_FEATURES: Span<Pair<u16, StringView>> = span![
+    Pair(8, const_sv!("mmx")),
+    Pair(16, const_sv!("sse")),
+    Pair(32, const_sv!("avx")),
+    Pair(64, const_sv!("avx512f")),
+    Pair(1024, const_sv!("amx-tile"))
+];
+pub const X86_FLOAT_ABI_FEATURES: Span<Pair<super::FloatFormat, StringView>> = span![Pair(
+    super::FloatFormat::X87DoubleExtended,
+    const_sv!("x87")
+),];
+
+pub static X86_64_ABI_PROPERTIES: AbiProperties = AbiProperties {
+    vector_default_feature: const_sv!(""), // An empty string will never be settable with `-m`
+    vector_width_features: X86_VECTOR_ABI_FEATURES,
+    float_format_features: X86_FLOAT_ABI_FEATURES,
+    float_default_features: const_sv!("sse"),
+};
+
+// x86-64 vs. IA-32 and IA-16 only differs in requiring sse vs. x87 for floats.
+pub static X86_ABI_PROPERTIES: AbiProperties = AbiProperties {
+    vector_default_feature: const_sv!(""), // An empty string will never be settable with `-m`
+    vector_width_features: X86_VECTOR_ABI_FEATURES,
+    float_format_features: X86_FLOAT_ABI_FEATURES,
+    float_default_features: const_sv!("x87"),
+};
+
 pub static X86_64: ArchProperties = ArchProperties {
     lock_free_atomic_masks: 0xFF,
     builtins: X86_BUILTINS,
@@ -575,6 +602,7 @@ pub static X86_64: ArchProperties = ArchProperties {
     asm_propreties: &X86_64_ASM_PROPERTIES,
     tag_names: X86_64_TAG_NAMES,
     width: 64,
+    abi_properties: Some(&X86_64_ABI_PROPERTIES),
 };
 
 pub static X86_64_V2: ArchProperties = ArchProperties {
@@ -588,6 +616,7 @@ pub static X86_64_V2: ArchProperties = ArchProperties {
     asm_propreties: &X86_64_ASM_PROPERTIES,
     tag_names: X86_64_TAG_NAMES,
     width: 64,
+    abi_properties: Some(&X86_64_ABI_PROPERTIES),
 };
 
 pub static X86_64_V3: ArchProperties = ArchProperties {
@@ -601,6 +630,7 @@ pub static X86_64_V3: ArchProperties = ArchProperties {
     asm_propreties: &X86_64_ASM_PROPERTIES,
     tag_names: X86_64_TAG_NAMES,
     width: 64,
+    abi_properties: Some(&X86_64_ABI_PROPERTIES),
 };
 
 pub static X86_64_V4: ArchProperties = ArchProperties {
@@ -614,6 +644,7 @@ pub static X86_64_V4: ArchProperties = ArchProperties {
     asm_propreties: &X86_64_ASM_PROPERTIES,
     tag_names: X86_64_TAG_NAMES,
     width: 64,
+    abi_properties: Some(&X86_64_ABI_PROPERTIES),
 };
 
 pub static I386: ArchProperties = ArchProperties {
@@ -627,6 +658,7 @@ pub static I386: ArchProperties = ArchProperties {
     asm_propreties: &X86_32_ASM_PROPERTIES,
     tag_names: X86_32_TAG_NAMES,
     width: 32,
+    abi_properties: Some(&X86_ABI_PROPERTIES),
 };
 
 pub static I486: ArchProperties = ArchProperties {
@@ -640,6 +672,7 @@ pub static I486: ArchProperties = ArchProperties {
     asm_propreties: &X86_32_ASM_PROPERTIES,
     tag_names: X86_32_TAG_NAMES,
     width: 32,
+    abi_properties: Some(&X86_ABI_PROPERTIES),
 };
 pub static I586: ArchProperties = ArchProperties {
     lock_free_atomic_masks: 0xF,
@@ -652,6 +685,7 @@ pub static I586: ArchProperties = ArchProperties {
     asm_propreties: &X86_32_ASM_PROPERTIES,
     tag_names: X86_32_TAG_NAMES,
     width: 32,
+    abi_properties: Some(&X86_ABI_PROPERTIES),
 };
 
 pub static I686: ArchProperties = ArchProperties {
@@ -665,6 +699,7 @@ pub static I686: ArchProperties = ArchProperties {
     asm_propreties: &X86_32_ASM_PROPERTIES,
     tag_names: X86_32_TAG_NAMES,
     width: 32,
+    abi_properties: Some(&X86_ABI_PROPERTIES),
 };
 
 pub static I86: ArchProperties = ArchProperties {
@@ -678,6 +713,7 @@ pub static I86: ArchProperties = ArchProperties {
     asm_propreties: &X86_16_ASM_PROPERTIES,
     tag_names: X86_16_TAG_NAMES,
     width: 16,
+    abi_properties: Some(&X86_ABI_PROPERTIES),
 };
 
 pub static X86_64_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
@@ -694,7 +730,7 @@ pub static X86_64_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     sizebits: 64,
     lock_free_atomic_mask: 0xffff,
     ldbl_align: 16,
-    ldbl_format: super::LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 16,
 };
 
@@ -712,7 +748,7 @@ pub static X32_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     sizebits: 32,
     lock_free_atomic_mask: 0xffff,
     ldbl_align: 16,
-    ldbl_format: super::LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 16,
 };
 
@@ -730,7 +766,7 @@ pub static X86_32_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     lock_free_atomic_mask: 0xf,
     sizebits: 32,
     ldbl_align: 4,
-    ldbl_format: LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 4,
 };
 
@@ -748,7 +784,7 @@ pub static X86_16_NEAR_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     lock_free_atomic_mask: 0x3,
     sizebits: 16,
     ldbl_align: 4,
-    ldbl_format: LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 2,
 };
 
@@ -766,7 +802,7 @@ pub static X86_16_FAR_PRIMITIVES: PrimitiveProperties = PrimitiveProperties {
     lock_free_atomic_mask: 0x3,
     sizebits: 16,
     ldbl_align: 4,
-    ldbl_format: LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 2,
 };
 
@@ -784,7 +820,7 @@ pub static X86_16_NEAR_DATA_FAR_FN_PRIMITIVES: PrimitiveProperties = PrimitivePr
     lock_free_atomic_mask: 0x3,
     sizebits: 16,
     ldbl_align: 4,
-    ldbl_format: LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 2,
 };
 
@@ -802,6 +838,6 @@ pub static X86_16_FAR_DATA_NEAR_FN_PRIMITIVES: PrimitiveProperties = PrimitivePr
     lock_free_atomic_mask: 0x3,
     sizebits: 16,
     ldbl_align: 4,
-    ldbl_format: LongDoubleFormat::X87,
+    ldbl_format: FloatFormat::X87DoubleExtended,
     max_atomic_align: 2,
 };