fixing bugs in FP API tests

Author: jacob-crawley

src/tests/Common/GenerateHWIntrinsicTests/Arm/Templates.cs

@@ -310,7 +310,7 @@ public static (string templateFileName, string outputTemplateName, Dictionary<st
         ("_BinaryOpTestTemplate.template",                   "SecureHashBinOpTest.template",                new Dictionary<string, string> { ["TemplateName"] = "SecureHash", ["TemplateValidationLogic"] = SecureHashOpTest_ValidationLogic }),
         ("_TernaryOpTestTemplate.template",                  "SecureHashTernOpTest.template",               new Dictionary<string, string> { ["TemplateName"] = "SecureHash", ["TemplateValidationLogic"] = SecureHashOpTest_ValidationLogic }),
         ("_SveUnaryOpTestTemplate.template",                 "SveSimpleVecOpTest.template",                 new Dictionary<string, string> { ["TemplateName"] = "Simple",     ["TemplateValidationLogic"] = SimpleVecOpTest_ValidationLogic,             ["TemplateValidationLogicForCndSel"] = SimpleVecOpTest_ValidationLogicForCndSel, ["TemplateValidationLogicForCndSel_FalseValue"] = SimpleVecOpTest_ValidationLogicForCndSel_FalseValue }),
-        ("_SveUnaryOpDifferentRetTypeTestTemplate.template", "SveSimpleVecOpDiffRetTypeTest.template",      new Dictionary<string, string> { ["TemplateName"] = "Simple",     ["TemplateValidationLogic"] = SimpleVecOpTest_ValidationLogicForNarrowing, ["TemplateValidationLogicForCndSel"] = SimpleVecOpTest_ValidationLogicForCndSelForNarrowing, ["TemplateValidationLogicForCndSel_FalseValue"] = SimpleVecOpTest_ValidationLogicForCndSelForNarrowing_FalseValue }),
+        ("_SveUnaryOpDifferentRetTypeTestTemplate.template", "SveSimpleVecOpDiffRetTypeTest.template",      new Dictionary<string, string> { ["TemplateName"] = "Simple",     ["TemplateValidationLogic"] = SimpleVecOpTest_ValidationLogic,             ["TemplateValidationLogicForCndSel"] = SimpleVecOpTest_ValidationLogicForCndSel, ["TemplateValidationLogicForCndSel_FalseValue"] = SimpleVecOpTest_ValidationLogicForCndSel_FalseValue }),
         ("_SveUnaryOpDifferentRetTypeTestTemplate.template", "SveSimpleVecOpDiffRetTypeTestVec.template",   new Dictionary<string, string> { ["TemplateName"] = "Simple",     ["TemplateValidationLogic"] = SimpleVecOpTest_VectorValidationLogic,       ["TemplateValidationLogicForCndSel"] = SimpleVecOpTest_VectorValidationLogicForCndSel, ["TemplateValidationLogicForCndSel_FalseValue"] = SimpleVecOpTest_VectorValidationLogicForCndSel_FalseValue }),
         ("_SveBinaryOpTestTemplate.template",                "SveVecBinOpTest.template",                    new Dictionary<string, string> { ["TemplateName"] = "Simple",     ["TemplateValidationLogic"] = SimpleVecOpTest_ValidationLogic,             ["TemplateValidationLogicForCndSel"] = SimpleVecOpTest_ValidationLogicForCndSel, ["TemplateValidationLogicForCndSel_FalseValue"] = SimpleVecOpTest_ValidationLogicForCndSel_FalseValue }),
         ("_SveBinaryOpTestTemplate.template",                "SveVecBinOpVecTest.template",                 new Dictionary<string, string> { ["TemplateName"] = "Simple",     ["TemplateValidationLogic"] = SimpleVecOpTest_VectorValidationLogic,       ["TemplateValidationLogicForCndSel"] = SimpleVecOpTest_VectorValidationLogicForCndSel, ["TemplateValidationLogicForCndSel_FalseValue"] = SimpleVecOpTest_VectorValidationLogicForCndSel_FalseValue }),

src/tests/JIT/HardwareIntrinsics/Arm/Shared/Helpers.cs

@@ -4955,36 +4955,24 @@ private static uint ExtractBits(uint val, byte msbPos, byte lsbPos)
 
         public static uint UnsignedReciprocalEstimate(uint op1)
         {
-            uint result;
+            if ((op1 & 0x8000_0000u) == 0)
+                return 0xFFFF_FFFFu;
 
-            if ((op1 & (1 << 31)) == 0)
-            {
-                result = ~0U;
-            }
-            else
-            {
-                uint estimate = ReciprocalEstimate(ExtractBits(op1, 31, 23));
-                result = ExtractBits(estimate, 8, 0) << 31;
-            }
+            uint idx = (op1 >> 23) & 0x1FFu;
 
-            return result;
+            uint estimate = ReciprocalEstimate(idx) & 0x1FFu;
+
+            return estimate << 23;
         }
 
         public static uint UnsignedReciprocalSqrtEstimate(uint op1)
         {
-            uint result;
+            if ((op1 & 0xC0000000u) == 0)
+                return 0xFFFFFFFFu;
 
-            if ((op1 & (3 << 30)) == 0)
-            {
-                result = ~0U;
-            }
-            else
-            {
-                uint estimate = ReciprocalSqrtEstimate(ExtractBits(op1, 31, 23));
-                result = ExtractBits(estimate, 8, 0) << 31;
-            }
+            uint estimate = ReciprocalSqrtEstimate(ExtractBits(op1, 31, 23)) & 0x1FFu;
 
-            return result;
+            return estimate << 23;
         }
 
         public static T Add<T>(T a, T b) where T : INumber<T> => a + b;