More floating point work, prevent circular dependencies

avisi-group · May 21, 2024 · b9a0a3c · b9a0a3c
1 parent ce5cedf
commit b9a0a3c
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 316 deletions.
diff --git a/borealis/src/brig/denylist.rs b/borealis/src/brig/denylist.rs
@@ -26,279 +26,7 @@ pub fn apply_fn_denylist<I: Iterator<Item = jib_ast::Definition>>(
 }
 
 const DENYLIST: &[&'static str] = &[
-    "neq_bool",
-    "_shl_int_general",
-    "_shr_int_general",
-    "fmod_int",
-    "ThrowSError",
-    "ReservedEncoding",
-    "__UNKNOWN_integer",
-    "__UNKNOWN_bit",
-    "EncodingSpecificOperations",
-    "LSL_C",
-    "LSR_C",
-    "ASR_C",
-    "ROR_C",
-    "asl_Int",
-    "Elem_read",
-    "write_gpr_bits",
-    "set_R_bits",
-    "GetTimestamp",
-    "ELIsInHost",
-    "IsInHost",
-    "BranchRawCycleCount",
-    "FirstBranchAfterProhibited",
-    "FilterBranchRecord",
-    "CurrentInstrSet",
-    "BadMode",
-    "RBankSelect",
-    "LookUpRIndex",
-    "Rmode_read",
-    "R_read",
-    "PC_read__1",
-    "FloorPow2",
-    "CeilPow2",
-    "IsPow2",
-    "ImplementedSVEVectorLength",
-    "CurrentNSVL_read",
-    "ImplementedSMEVectorLength",
-    "RestoreTransactionCheckpointParameterised",
-    "RestoreTransactionCheckpoint",
-    "FailTransaction",
-    "FailTransaction__1",
-    "Halt",
-    "Halt__1",
-    "CheckForPMUOverflow",
-    "Split",
-    "RShr",
-    "NonSecureOnlyImplementation",
-    "DBGOSLSR_read",
-    "ICInstNeedsTranslation",
-    "DCInstNeedsTranslation",
-    "DecodeSW",
-    "BitReverse",
-    "Poly32Mod2",
-    "ROL",
-    "AESShiftRows",
-    "AESInvShiftRows",
-    "AESSubBytes",
-    "AESInvSubBytes",
-    "FFmul02",
-    "FFmul03",
-    "FFmul09",
-    "FFmul0B",
-    "FFmul0D",
-    "FFmul0E",
-    "RecipEstimate",
-    "UnsignedRecipEstimate",
-    "RecipSqrtEstimate",
-    "UnsignedRSqrtEstimate",
-    "SignedSatQ",
-    "UnsignedSatQ",
-    "SatQ",
-    "AdvSIMDExpandImm",
-    "PolynomialMult",
-    "MatMulAdd",
-    "ExcVectorBase",
-    "EncodeSDFSC",
-    "ExtAbortToA64",
-    "FPInfinity",
-    "FPMaxNormal",
-    "FPEXC_read",
-    "FPEXC_write",
-    "FPSCR_write",
-    "FPProcessException",
-    "FPZero",
-    "FPRoundBase__1",
-    "FPDecodeRounding",
-    "FPRoundingMode",
-    "FPRound",
-    "FPRound__1",
-    "FPRound__2",
-    "FixedToFP",
-    "FPUnpackBase",
-    "FPUnpackBase__1",
-    "FPUnpack",
-    "FPUnpack__1",
-    "FPAbs",
-    "FPDefaultNaN",
-    "FPDefaultNaN__1",
-    "FPProcessDenorms",
-    "FPProcessNaN",
-    "FPProcessNaN__1",
-    "FPProcessNaNs",
-    "FPProcessNaNs__1",
-    "FPAdd",
-    "FPAdd__1",
-    "FPAdd_ZA",
-    "FPCompare",
-    "FPCompareEQ",
-    "FPCompareGE",
-    "FPCompareGT",
-    "FPConvertNaN",
-    "FPProcessDenorm",
-    "FPRoundCV",
-    "FPUnpackCV",
-    "FPConvert",
-    "FPConvert__1",
-    "FPDecodeRM",
-    "FPDiv",
-    "FPMax",
-    "FPMax__1",
-    "FPMaxNum",
-    "IsMerging",
-    "FPMin",
-    "FPMin__1",
-    "FPMinNum",
-    "FPMul",
-    "FPProcessDenorms3",
-    "FPProcessNaNs3__1",
-    "FPMulAdd",
-    "FPMulAdd__1",
-    "FPMulAdd_ZA",
-    "FPTwo",
-    "FPMulX",
-    "FPProcessNaNs3H",
-    "FPMulAddH",
-    "FPMulAddH__1",
-    "FPMulAddH_ZA",
-    "FPNeg",
-    "FPOnePointFive",
-    "FPRecipEstimate",
-    "FPRecpX",
-    "FPRoundInt",
-    "FPRoundIntN",
-    "FPRSqrtEstimate",
-    "FPSqrt",
-    "FPSub",
-    "FPSub__1",
-    "FPSub_ZA",
-    "FPThree",
-    "FPToFixed",
-    "FPToFixedJS",
-    "VFPExpandImm",
-    "IsTimerConditionMet",
-    "SetEventRegister",
-    "TestEventCNTP",
-    "TestEventCNTV",
-    "GenericCounterTick",
-    "PAREncodeShareability",
-    "EncodePARAttrs",
-    "DecodeShareability",
-    "S2CombineS1Shareability",
-    "EffectiveShareability",
-    "DecodeDevice",
-    "S2CombineS1Device",
-    "DecodeSDFAttr",
-    "DecodeLDFAttr",
-    "S2DecodeCacheability",
-    "S2CombineS1AttrHints",
-    "FPCompareUN",
-    "FPCompareNE",
-    "FPOne",
-    "FPPointFive",
-    "GetOptimizedScale",
-    "FPScale",
-    "Reverse",
-    "FPTrigSMul",
-    "FPTrigSSel",
-    "FPTrigMAddCoefficient_read",
-    "FPTrigMAdd",
-    "FPExpCoefficient_read",
-    "FPExpA",
-    "PredTest",
-    "DecodePredCount",
-    "Reduce",
-    "Reduce__1",
-    "ReducePredicated",
-    "FPConvertSVE",
-    "FPConvertSVE__1",
-    "IsEven",
-    "ShiftSat",
-    "BitDeposit",
-    "BitExtract",
-    "BitGroup",
-    "FPLogB",
-    "GCSSS1",
-    "GCSSS2",
-    "GCSPUSHM",
-    "GCSPOPM",
-    "GCSPUSHX",
-    "GCSPOPCX",
-    "GCSPOPX",
-    "CPYOptionA",
-    "CPYFOptionA",
-    "SETOptionA",
-    "SETGOptionA",
-    "MaxBlockSizeCopiedBytes",
-    "BFRound",
-    "BFUnpack",
-    "BFMulH",
-    "FPAdd_BF16",
-    "BFMulAddH",
-    "BFMulAddH_ZA",
-    "FPRoundBF",
-    "FPConvertBF",
-    "FPConvertBF__1",
-    "FPProcessNaNs4",
-    "FPDot__1",
-    "BFDotAdd",
-    "BFMatMulAdd",
-    "BFNeg",
-    "BFNeg__1",
-    "BFInfinity",
-    "BFZero",
-    "BFAdd",
-    "BFAdd__1",
-    "BFAdd_ZA",
-    "BFSub",
-    "BFSub__1",
-    "BFSub_ZA",
-    "BFMulAdd",
-    "BFMulAdd__1",
-    "BFMulAdd_ZA",
-    "BFMul",
-    "BFMul__1",
-    "BFMin",
-    "BFMin__1",
-    "BFMinNum",
-    "BFMax",
-    "BFMax__1",
-    "BFMaxNum",
-    "FPMatMulAdd",
-    "FPDotAdd",
-    "FPDotAdd_ZA",
-    "EffectiveMDSELR_EL1_BANK",
-    "SPESampleAddAddressPCVirtual",
-    "CollectContextIDR1",
-    "CollectContextIDR2",
-    "CollectTimeStamp",
-    "RRX_C",
-    "Shift_C",
-    "A32ExpandImm_C",
-    "A32ExpandImm",
-    "DecodeImmShift",
-    "DecodeRegShift",
-    "Shift",
-    "T32ExpandImm_C",
-    "T32ExpandImm",
-    "HSTR_read",
-    "D_read",
-    "FPHalvedSub",
-    "StandardFPSCRValue",
-    "FPRecipStep",
-    "FPRSqrtStep",
-    "UnsignedSat",
-    "SignedSat",
-    "Sat",
-    "genRandomNum",
-    "getCacheID",
-    "CacheConfigRead",
-    "GetNreg",
-    "UnallocatedA32_Instruction",
-    "UnallocatedT32_32_Instruction",
-    "UnallocatedT32_16_Instruction",
-    "__DefaultCond",
+    "integer_update_subrange",
     "ExecuteA64", // remove me next
     "ExecuteA32",
     "ExecuteT32__1",
@@ -323,9 +51,6 @@ const DENYLIST: &[&'static str] = &[
     "ClearPendingPhysicalSError",
     "__UpdateSystemCounter",
     "SetInterruptRequestLevel",
-    "DataMemoryBarrier",
-    "DataSynchronizationBarrier",
-    "InstructionSynchronizationBarrier",
     "SpeculationBarrier",
     "SupportedPowerTwoSVL",
     "PhysMemTagWrite",
@@ -334,22 +59,8 @@ const DENYLIST: &[&'static str] = &[
     "__ListConfig",
     "__Reset",
     "ActionRequired",
-    "AddressSupportsLS64",
     "DiscardTransactionalWrites",
     "EnterLowPowerState",
-    "ErrorIsContained",
-    "ErrorIsSynchronized",
-    "FaultIsCorrected",
-    "GPTTLBCache",
-    "GPTTLBLookup",
-    "GetAccumulatedFPExceptions",
-    "GetCacheInfo",
-    "GetLoadStoreType",
-    "GetPendingPhysicalSError",
-    "IsASEInstruction",
-    "IsExternalAbortTakenSynchronously",
-    "IsSynchronizablePhysicalSErrorPending",
-    "LS64InstructionSyndrome",
     "LocalTimeoutEvent",
     "MarkExclusiveGlobal",
     "MarkExclusiveLocal",

diff --git a/borealis/src/brig/functions_interpreter.rs b/borealis/src/brig/functions_interpreter.rs
@@ -70,8 +70,12 @@ pub fn codegen_stmt(stmt: Statement) -> TokenStream {
                     quote!(#v)
                 }
                 ConstantValue::FloatingPoint(v) => {
-                    let v = Literal::f64_unsuffixed(v);
-                    quote!(#v)
+                    if v.is_infinite() {
+                        quote!(1.1 / 0.0)
+                    } else {
+                        let v = Literal::f32_unsuffixed(v);
+                        quote!(#v)
+                    }
                 }
 
                 ConstantValue::Unit => quote!(()),
@@ -244,6 +248,7 @@ pub fn codegen_stmt(stmt: Statement) -> TokenStream {
                 BinaryOperationKind::CompareLessThanOrEqual => quote! { (#left) <= (#right) },
                 BinaryOperationKind::CompareGreaterThan => quote! { (#left) > (#right) },
                 BinaryOperationKind::CompareGreaterThanOrEqual => quote! { (#left) >= (#right) },
+                BinaryOperationKind::PowI => quote! { (#left).powi(#right) },
             };
 
             quote! { (#op) }
@@ -259,6 +264,7 @@ pub fn codegen_stmt(stmt: Statement) -> TokenStream {
                 UnaryOperationKind::Absolute => quote! { (#value).abs() },
                 UnaryOperationKind::Ceil => quote! { (#value).ceil() },
                 UnaryOperationKind::Floor => quote! { (#value).floor() },
+                UnaryOperationKind::SquareRoot => quote! { (#value).sqrt() },
             }
         }
         StatementKind::ShiftOperation {

diff --git a/borealis/src/brig/mod.rs b/borealis/src/brig/mod.rs
@@ -511,6 +511,7 @@ fn codegen_workspace(rudder: &Context) -> (HashMap<PathBuf, String>, HashSet<Pat
 
             let mut dependencies = cfg.get_callees_for(&name);
             dependencies.push("common".into());
+           let dependencies = dependencies.into_iter().filter(|dep| *dep != name).collect::<Vec<_>>();
 
             let imports: TokenStream = dependencies
                 .iter()