steam-frame/FEX-Emu--FEX
1
0 Fork 0
mirror of https://github.com/FEX-Emu/FEX.git synced 2026-10-06 19:00:17 +02:00
Code Issues Packages Projects Releases 66 Wiki Activity

InstCountCI: Support encoding expected Arm64 ASM in JSON

Browse Source 
This will allow investigating the Arm64 directly next to the test, plus
publicly linking directly to badly behaving tests.

Perfect for nerdsniping implementations.
This commit is contained in:
Ryan Houdek committed 2023-08-16 01:50:06 -07:00
1 parent f95ef7092c
commit 9753ebdebc
2 files changed
+18 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Source/Tools/CodeSizeValidation/Main.cpp
+13 -8
View File
@@ -270,7 +270,6 @@ static bool TestInstructions(FEXCore::Context::Context *CTX, FEXCore::Core::Inte
}
bool TestsPassed {true};
bool InstructionCountChanged {};
// Get all the data for the instructions compiled.
CurrentTest = &TestHeaderData->Tests[0];
@@ -294,7 +293,6 @@ static bool TestInstructions(FEXCore::Context::Context *CTX, FEXCore::Core::Inte
if (INSTStats->first.HostCodeInstructions != CurrentTest->ExpectedInstructionCount) {
LogMan::Msg::EFmt("Fail: '{}': {} host instructions", CurrentTest->TestInst, INSTStats->first.HostCodeInstructions);
LogMan::Msg::EFmt("Fail: Test took {} instructions but we expected {} instructions!", INSTStats->first.HostCodeInstructions, CurrentTest->ExpectedInstructionCount);
InstructionCountChanged = true;
if (CurrentTest->Optimal) {
// Don't count the test as a failure if it's known non-optimal.
@@ -310,11 +308,6 @@ static bool TestInstructions(FEXCore::Context::Context *CTX, FEXCore::Core::Inte
// Unlink the file.
unlink(UpdatedInstructionCountsPath);
if (!InstructionCountChanged) {
// If no instruction count changed then just return the results.
return TestsPassed;
}
FEXCore::File::File FD(UpdatedInstructionCountsPath, FEXCore::File::FileModes::WRITE | FEXCore::File::FileModes::CREATE | FEXCore::File::FileModes::TRUNCATE);
if (!FD.IsValid()) {
@@ -331,10 +324,22 @@ static bool TestInstructions(FEXCore::Context::Context *CTX, FEXCore::Core::Inte
// Get the instruction stats.
auto INSTStats = CodeSize::Validation.GetDataForRIP(CodeRIP);
FD.Write(fextl::fmt::format("\t\"{}\": {{\n", CurrentTest->TestInst));
if (INSTStats->first.HostCodeInstructions != CurrentTest->ExpectedInstructionCount) {
FD.Write(fextl::fmt::format("\t\"{}\": {},\n", CurrentTest->TestInst, INSTStats->first.HostCodeInstructions));
FD.Write(fextl::fmt::format("\t\t\"ExpectedInstructionCount\": {},\n", INSTStats->first.HostCodeInstructions));
}
FD.Write(fextl::fmt::format("\t\t\"ExpectedArm64ASM\": [\n", INSTStats->first.HostCodeInstructions));
for (auto it = INSTStats->second.begin(); it != INSTStats->second.end(); ++it) {
const auto &Line = *it;
const auto NextIt = it + 1;
FD.Write(fextl::fmt::format("\t\t\t\"{}\"{}\n", Line, NextIt != INSTStats->second.end() ? "," : ""));
}
FD.Write(fextl::fmt::format("\t\t]\n", INSTStats->first.HostCodeInstructions));
FD.Write(fextl::fmt::format("\t}},\n", CurrentTest->TestInst));
// Go to the next test.
CurrentTest = reinterpret_cast<TestInfo const*>(&CurrentTest->Code[CurrentTest->CodeSize]);
}