Skip to content

Commit 2151f41

Browse files
jacob-crawleyjacob-crawley
committed
Fix typo in test generator and correcting op type in testing template
1 parent 73cae4e commit 2151f41

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4822,12 +4822,12 @@
48224822
("SveVecTernOpTest.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddCarryWideningUpper_uint", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddCarryWideningUpper", ["RetVectorType"] = "Vector", ["RetBaseType"] = "UInt32", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt32", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt32", ["Op3VectorType"] = "Vector", ["Op3BaseType"] = "UInt32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt32()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt32()", ["NextValueOp3"] = "TestLibrary.Generator.GetUInt32()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddCarryWideningOdd(firstOp, secondOp, thirdOp, i) != result[i]", ["GetIterResult"] = "(UInt32) Helpers.AddCarryWideningOdd(first, second, third, i)"}),
48234823
("SveVecTernOpTest.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddCarryWideningUpper_ulong", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddCarryWideningUpper", ["RetVectorType"] = "Vector", ["RetBaseType"] = "UInt64", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt64", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt64", ["Op3VectorType"] = "Vector", ["Op3BaseType"] = "UInt64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt64()", ["NextValueOp3"] = "TestLibrary.Generator.GetUInt64()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddCarryWideningOdd(firstOp, secondOp, thirdOp, i) != result[i]", ["GetIterResult"] = "(UInt64) Helpers.AddCarryWideningOdd(first, second, third, i)"}),
48244824

4825-
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_sbyte_short", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "SByte", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int16", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int16", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt16()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt16()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowngEven(left, right, i) != result[i]", ["GetIterResult"] = "(SByte) Helpers.AddHighNarrowngEven(left, right, i)"}),
4826-
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_short_int", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Int16", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int32", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt32()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt32()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowngEven(left, right, i) != result[i]", ["GetIterResult"] = "(Int16) Helpers.AddHighNarrowngEven(left, right, i)"}),
4827-
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_int_long", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Int32", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int64", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt64()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowngEven(left, right, i) != result[i]", ["GetIterResult"] = "(Int32) Helpers.AddHighNarrowngEven(left, right, i)"}),
4828-
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_byte_ushort", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Byte", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt16", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt16", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt16()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt16()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowngEven(left, right, i) != result[i]", ["GetIterResult"] = "(Byte) Helpers.AddHighNarrowngEven(left, right, i)"}),
4829-
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_ushort_uint", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "UInt16", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt32", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt32()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt32()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowngEven(left, right, i) != result[i]", ["GetIterResult"] = "(UInt16) Helpers.AddHighNarrowngEven(left, right, i)"}),
4830-
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_uint_ulong", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "UInt32", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt64", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt64()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowngEven(left, right, i) != result[i]", ["GetIterResult"] = "(UInt32) Helpers.AddHighNarrowngEven(left, right, i)"}),
4825+
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_sbyte_short", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "SByte", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int16", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int16", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt16()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt16()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingEven(left, right, i) != result[i]", ["GetIterResult"] = "(SByte) Helpers.AddHighNarrowingEven(left, right, i)"}),
4826+
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_short_int", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Int16", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int32", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt32()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt32()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingEven(left, right, i) != result[i]", ["GetIterResult"] = "(Int16) Helpers.AddHighNarrowingEven(left, right, i)"}),
4827+
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_int_long", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Int32", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int64", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt64()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingEven(left, right, i) != result[i]", ["GetIterResult"] = "(Int32) Helpers.AddHighNarrowingEven(left, right, i)"}),
4828+
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_byte_ushort", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Byte", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt16", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt16", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt16()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt16()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingEven(left, right, i) != result[i]", ["GetIterResult"] = "(Byte) Helpers.AddHighNarrowingEven(left, right, i)"}),
4829+
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_ushort_uint", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "UInt16", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt32", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt32()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt32()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingEven(left, right, i) != result[i]", ["GetIterResult"] = "(UInt16) Helpers.AddHighNarrowingEven(left, right, i)"}),
4830+
("SveVecBinOpDifferentRetType.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingLower_uint_ulong", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingLower", ["RetVectorType"] = "Vector", ["RetBaseType"] = "UInt32", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "UInt64", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "UInt64", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetUInt64()", ["NextValueOp2"] = "TestLibrary.Generator.GetUInt64()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingEven(left, right, i) != result[i]", ["GetIterResult"] = "(UInt32) Helpers.AddHighNarrowingEven(left, right, i)"}),
48314831

48324832
("SveVecTernOpFirstArgTest.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingUpper_sbyte_short", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingUpper", ["RetVectorType"] = "Vector", ["RetBaseType"] = "SByte", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "SByte", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int16", ["Op3VectorType"] = "Vector", ["Op3BaseType"] = "Int16", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetSByte()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt16()", ["NextValueOp3"] = "TestLibrary.Generator.GetInt16()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingOdd(first, second, third, i) != result[i]", ["GetIterResult"] = "(SByte) Helpers.AddHighNarrowingOdd(first, second, third, i)"}),
48334833
("SveVecTernOpFirstArgTest.template", new Dictionary<string, string> { ["TestName"] = "Sve2_AddHighNarrowingUpper_short_int", ["Isa"] = "Sve2", ["LoadIsa"] = "Sve2", ["Method"] = "AddHighNarrowingUpper", ["RetVectorType"] = "Vector", ["RetBaseType"] = "Int16", ["Op1VectorType"] = "Vector", ["Op1BaseType"] = "Int16", ["Op2VectorType"] = "Vector", ["Op2BaseType"] = "Int32", ["Op3VectorType"] = "Vector", ["Op3BaseType"] = "Int32", ["LargestVectorSize"] = "64", ["NextValueOp1"] = "TestLibrary.Generator.GetInt16()", ["NextValueOp2"] = "TestLibrary.Generator.GetInt32()", ["NextValueOp3"] = "TestLibrary.Generator.GetInt32()", ["ConvertFunc"] = "", ["ValidateIterResult"] = "Helpers.AddHighNarrowingOdd(first, second, third, i) != result[i]", ["GetIterResult"] = "(Int16) Helpers.AddHighNarrowingOdd(first, second, third, i)"}),

‎src/tests/JIT/HardwareIntrinsics/Arm/Shared/_SveBinaryOpDifferentRetTypeTestTemplate.template‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ namespace JIT.HardwareIntrinsics.Arm
443443
{
444444
{RetBaseType}[] mask = new {RetBaseType}[RetElementCount];
445445
{Op1BaseType}[] left = new {Op1BaseType}[Op1ElementCount];
446-
{Op2BaseType}[] right = new {Op2BaseType}[Op1ElementCount];
446+
{Op2BaseType}[] right = new {Op2BaseType}[Op2ElementCount];
447447
{RetBaseType}[] falseVal = new {RetBaseType}[RetElementCount];
448448
{RetBaseType}[] result = new {RetBaseType}[RetElementCount];
449449

@@ -475,7 +475,7 @@ namespace JIT.HardwareIntrinsics.Arm
475475
{
476476
{RetBaseType}[] mask = new {RetBaseType}[RetElementCount];
477477
{Op1BaseType}[] left = new {Op1BaseType}[Op1ElementCount];
478-
{Op1BaseType}[] right = new {Op2BaseType}[Op2ElementCount];
478+
{Op2BaseType}[] right = new {Op2BaseType}[Op2ElementCount];
479479
{RetBaseType}[] trueVal = new {RetBaseType}[RetElementCount];
480480
{RetBaseType}[] result = new {RetBaseType}[RetElementCount];
481481

0 commit comments

Comments
 (0)