Skip to content

arm64: Refactor GenerateHWIntrinsicTests_Arm.cs #118380

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

arm64: Refactor GenerateHWIntrinsicTests_Arm.cs #118380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9f09424
arm64: Refactor GenerateHWIntrinsicTests_Arm.cs
jonathandavies-arm Jul 30, 2025
be9acde
Move Isa & LoadIsa to TestGroup
jonathandavies-arm Jul 30, 2025
9daa2d3
Remove groupName
jonathandavies-arm Jul 30, 2025
a9da4ab
Add TemplateConfig
jonathandavies-arm Jul 30, 2025
a3c3895
Update namespace replacement
jonathandavies-arm Jul 30, 2025
b589156
Tidy TemplateConfig
jonathandavies-arm Jul 30, 2025
a5d3d7a
Remove unused Isa argument
jonathandavies-arm Jul 30, 2025
1f8e372
Use Dictionary for Group Isa & LoadIsa
jonathandavies-arm Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5,442 changes: 2,721 additions & 2,721 deletions src/tests/Common/GenerateHWIntrinsicTests/Arm/AdvSimdTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions src/tests/Common/GenerateHWIntrinsicTests/Arm/BaseTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

1,892 changes: 949 additions & 943 deletions src/tests/Common/GenerateHWIntrinsicTests/Arm/Sve2Tests.cs
View file
Open in desktop

Large diffs are not rendered by default.

3,384 changes: 1,692 additions & 1,692 deletions src/tests/Common/GenerateHWIntrinsicTests/Arm/SveTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

186 changes: 123 additions & 63 deletions src/tests/Common/GenerateHWIntrinsicTests/Arm/Templates.cs
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 87 additions & 39 deletions src/tests/Common/GenerateHWIntrinsicTests/GenerateHWIntrinsicTests_Arm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,65 @@
// * outputDirectory - This should be somewhere under the obj folder for the project and is where generated tests are written
// * testListFileName - This should likewise be somewhere under the obj folder and is where the list of generated tests is written

public struct TestGroup
{
public Dictionary<string, string> KeyValuePairs { get; set; }
public (TemplateConfig TemplateConfig, Dictionary<string, string> KeyValuePairs)[] Tests { get; set; }

public TestGroup(Dictionary<string, string> KeyValuePairs, (TemplateConfig, Dictionary<string, string>)[] Tests)
{
this.KeyValuePairs = KeyValuePairs;
this.Tests = Tests;
}

public (TemplateConfig, Dictionary<string, string>)[] GetTests()
{
var self = this;
return Tests.Select(t =>
{
var dict = new Dictionary<string, string>(t.KeyValuePairs);
foreach (var kvp in self.KeyValuePairs)
{
dict[kvp.Key] = kvp.Value;
}
dict["Namespace"] = $"JIT.HardwareIntrinsics.Arm._{self.KeyValuePairs["Isa"]}";
return (t.TemplateConfig, dict);
}).ToArray();
}
}

public struct TemplateConfig
{
public string Filename { get; }
public Dictionary<string, string> KeyValuePairs { get; }

public TemplateConfig(
string filename,
string configurationName = null,
string templateValidationLogic = null,
string templateValidationLogicForCndSel = null,
string templateValidationLogicForCndSel_FalseValue = null,
string templateValidationLogicForCndSelMask = null)
{
Filename = filename;
KeyValuePairs = new Dictionary<string, string>();
if (!string.IsNullOrEmpty(configurationName))
KeyValuePairs["TemplateName"] = configurationName;

if (!string.IsNullOrEmpty(templateValidationLogic))
KeyValuePairs["TemplateValidationLogic"] = templateValidationLogic;

if (!string.IsNullOrEmpty(templateValidationLogicForCndSel))
KeyValuePairs["TemplateValidationLogicForCndSel"] = templateValidationLogicForCndSel;

if (!string.IsNullOrEmpty(templateValidationLogicForCndSel_FalseValue))
KeyValuePairs["TemplateValidationLogicForCndSel_FalseValue"] = templateValidationLogicForCndSel_FalseValue;

if (!string.IsNullOrEmpty(templateValidationLogicForCndSelMask))
KeyValuePairs["TemplateValidationLogicForCndSelMask"] = templateValidationLogicForCndSelMask;
}
}

class GenerateHWIntrinsicTests_Arm
{
static void Main(string[] args)
Expand All @@ -31,25 +90,25 @@ static void Main(string[] args)
string outputDirectory = args[2];
string testListFileName = args[3];

ProcessInputs("AdvSimd", AdvSimdTests.AdvSimdInputs);
ProcessInputs("AdvSimd.Arm64", AdvSimdTests.AdvSimd_Arm64Inputs);
ProcessInputs("Aes", AdvSimdTests.AesInputs);
ProcessInputs("ArmBase", BaseTests.ArmBaseInputs);
ProcessInputs("ArmBase.Arm64", BaseTests.ArmBase_Arm64Inputs);
ProcessInputs("Crc32", BaseTests.Crc32Inputs);
ProcessInputs("Crc32.Arm64", BaseTests.Crc32_Arm64Inputs);
ProcessInputs("Dp", AdvSimdTests.DpInputs);
ProcessInputs("Rdm", AdvSimdTests.RdmInputs);
ProcessInputs("Rdm.Arm64", AdvSimdTests.Rdm_Arm64Inputs);
ProcessInputs("Sha1", AdvSimdTests.Sha1Inputs);
ProcessInputs("Sha256", AdvSimdTests.Sha256Inputs);
ProcessInputs("Sha256", AdvSimdTests.Sha256Inputs);
ProcessInputs("Sve", SveTests.SveInputs);
ProcessInputs("Sve2", Sve2Tests.Sve2Inputs);

void ProcessInputs(string groupName, (string templateFileName, Dictionary<string, string> templateData)[] inputs)
ProcessInputs(AdvSimdTests.AdvSimdInputs);
ProcessInputs(AdvSimdTests.AdvSimd_Arm64Inputs);
ProcessInputs(AdvSimdTests.AesInputs);
ProcessInputs(BaseTests.Crc32_Arm64Inputs);
ProcessInputs(AdvSimdTests.DpInputs);
ProcessInputs(AdvSimdTests.RdmInputs);
ProcessInputs(AdvSimdTests.Rdm_Arm64Inputs);
ProcessInputs(AdvSimdTests.Sha1Inputs);
ProcessInputs(AdvSimdTests.Sha256Inputs);
ProcessInputs(AdvSimdTests.Sha256Inputs);
ProcessInputs(BaseTests.ArmBaseInputs);
ProcessInputs(BaseTests.ArmBase_Arm64Inputs);
ProcessInputs(BaseTests.Crc32Inputs);
ProcessInputs(SveTests.SveInputs);
ProcessInputs(Sve2Tests.Sve2Inputs);

void ProcessInputs(TestGroup testGroup)
{
if (!projectName.Equals($"{groupName}_r") && !projectName.Equals($"{groupName}_ro"))
if (!projectName.Equals($"{testGroup.KeyValuePairs["Isa"]}_r") && !projectName.Equals($"{testGroup.KeyValuePairs["Isa"]}_ro"))
{
return;
}
Expand All @@ -58,41 +117,30 @@ void ProcessInputs(string groupName, (string templateFileName, Dictionary<string

using (var testListFile = new StreamWriter(testListFileName, append: false))
{
foreach (var input in inputs)
foreach (var test in testGroup.GetTests())
{
ProcessInput(testListFile, groupName, input);
ProcessTest(testListFile, test);
}
}
}
void ProcessInput(StreamWriter testListFile, string groupName, (string templateFileName, Dictionary<string, string> templateData) input)

void ProcessTest(StreamWriter testListFile, (TemplateConfig templateConfig, Dictionary<string, string> keyValuePairs) test)
{
var testName = input.templateData["TestName"];
var testName = test.keyValuePairs["TestName"];
var fileName = Path.Combine(outputDirectory, $"{testName.Replace('_', '.')}.cs");

var matchingTemplate = TestTemplates.Templates.Where((t) => t.outputTemplateName.Equals(input.templateFileName)).SingleOrDefault();
var template = string.Empty;
string templateFilePath = Path.Combine(templateDirectory, test.templateConfig.Filename);
template = File.ReadAllText(templateFilePath);

if (matchingTemplate.templateFileName is null)
{
string templateFileName = Path.Combine(templateDirectory, input.templateFileName);
template = File.ReadAllText(templateFileName);
}
else
foreach (var kvp in test.templateConfig.KeyValuePairs)
{
string templateFileName = Path.Combine(templateDirectory, matchingTemplate.templateFileName);
template = File.ReadAllText(templateFileName);

foreach (var kvp in matchingTemplate.templateData)
{
template = template.Replace($"{{{kvp.Key}}}", kvp.Value);
}
template = template.Replace($"{{{kvp.Key}}}", kvp.Value);
}

foreach (var kvp in input.templateData)
foreach (var kvp in test.keyValuePairs)
{
template = template.Replace($"{{{kvp.Key}}}", kvp.Value);
}
template = template.Replace("namespace JIT.HardwareIntrinsics.Arm", $"namespace JIT.HardwareIntrinsics.Arm._{groupName}");

testListFile.WriteLine(fileName);
File.WriteAllText(fileName, template);
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesBinOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/AesUnOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/ExtractVectorTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertScalarTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertSelectedScalarTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/InsertTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarx2Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarx3Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadAndInsertScalarx4Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadPairVectorTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadUnOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadVectorx2Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadVectorx3Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/LoadVectorx4Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpRetVecTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarBinOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarImm2UnOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/ScalarUnOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreBinOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarx2Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarx3Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreSelectedScalarx4Test.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
2 changes: 1 addition & 1 deletion src/tests/JIT/HardwareIntrinsics/Arm/Shared/StoreUnOpTest.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ using System.Runtime.Intrinsics;
using System.Runtime.Intrinsics.Arm;
using Xunit;

namespace JIT.HardwareIntrinsics.Arm
namespace {Namespace}
{
public static partial class Program
{
Expand Down
Loading
Loading