From 992ac1ea2c763ec856813b5ae6ac6212b6c97368 Mon Sep 17 00:00:00 2001 From: Sergio Martin Date: Sat, 20 Jan 2024 20:16:54 +0100 Subject: [PATCH] Added ignored blocks in the light state --- source/tester.cpp | 6 +----- tests/README.md | 3 ++- tests/galaga.anyPercent.test | 2 +- tests/ironSword.anyPercent.test | 2 +- tests/metroid.playaround.test | 2 +- tests/nigelMansell.anyPercent.test | 2 +- tests/ninjaGaiden.anyPercent.test | 2 +- tests/ninjaGaiden.pacifist.test | 2 +- tests/ninjaGaiden2.anyPercent.test | 2 +- tests/ninjaGaiden2.pacifist.test | 2 +- tests/novaTheSquirrel.anyPercent.test | 2 +- tests/princeOfPersia.anyPercent.test | 2 +- tests/run_benchmark.sh | 10 +--------- tests/saintSeiyaKanketsuHen.anyPercent.test | 2 +- tests/saintSeiyaOugonDensetsu.anyPercent.test | 2 +- tests/saiyuukiWorld.anyPercent.test | 2 +- tests/saiyuukiWorld.lastHalf.test | 2 +- tests/solarJetman.anyPercent.test | 2 +- tests/sprilo.anyPercent.test | 2 +- tests/superMarioBros.warpless.test | 2 +- tests/superMarioBros.warps.test | 2 +- tests/superMarioBros3.warps.test | 2 +- tests/superOffroad.anyPercent.test | 2 +- tests/tennis.anyPercent.test | 2 +- 24 files changed, 25 insertions(+), 36 deletions(-) diff --git a/source/tester.cpp b/source/tester.cpp index db9ffca..0590646 100644 --- a/source/tester.cpp +++ b/source/tester.cpp @@ -111,9 +111,6 @@ int main(int argc, char *argv[]) // Disable rendering e.disableRendering(); - // Getting initial hash - auto initialHash = e.getStateHash(); - // Getting lite state size const auto liteStateSize = e.getLiteStateSize(); @@ -142,10 +139,9 @@ int main(int argc, char *argv[]) printf("[] Cycle Type: '%s'\n", cycleType.c_str()); printf("[] Emulation Core: '%s'\n", emulationCoreName.c_str()); printf("[] ROM File: '%s'\n", romFilePath.c_str()); - printf("[] ROM SHA1: '%s'\n", romSHA1.c_str()); + //printf("[] ROM SHA1: '%s'\n", romSHA1.c_str()); printf("[] Sequence File: '%s'\n", sequenceFilePath.c_str()); printf("[] Sequence Length: %lu\n", sequenceLength); - printf("[] Initial State Hash: 0x%lX%lX\n", initialHash.first, initialHash.second); #ifdef _USE_QUICKNES printf("[] State Size: %lu bytes\n", e.getFullStateSize()); #endif diff --git a/tests/README.md b/tests/README.md index 7c7db27..9b501b7 100644 --- a/tests/README.md +++ b/tests/README.md @@ -16,4 +16,5 @@ For Saiyuuki World - We use the movie https://tasvideos.org/4422M by aiqiyou & J.Y distributed under the CC2.0 license For Metroid - - We use part of the movie https://tasvideos.org/3666M by The8bitbeast distributed under the CC2.0 license \ No newline at end of file + - We use part of the movie https://tasvideos.org/3666M by The8bitbeast distributed under the CC2.0 license + \ No newline at end of file diff --git a/tests/galaga.anyPercent.test b/tests/galaga.anyPercent.test index 52f15f5..38ff62d 100644 --- a/tests/galaga.anyPercent.test +++ b/tests/galaga.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "DA54C223D79FA59EB95437854B677CF69B5CAC8A", "Initial State File": "", "Sequence File": "galaga.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/ironSword.anyPercent.test b/tests/ironSword.anyPercent.test index 35abf9b..0ee31a6 100644 --- a/tests/ironSword.anyPercent.test +++ b/tests/ironSword.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "97B79E432F62403FB9F877090850C41112A9A168", "Initial State File": "", "Sequence File": "ironSword.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/metroid.playaround.test b/tests/metroid.playaround.test index 08e46e7..049da14 100644 --- a/tests/metroid.playaround.test +++ b/tests/metroid.playaround.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "ECF39EC5A33E6A6F832F03E8FFC61C5D53F4F90B", "Initial State File": "", "Sequence File": "metroid.playaround.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/nigelMansell.anyPercent.test b/tests/nigelMansell.anyPercent.test index bb935ee..1bd72ae 100644 --- a/tests/nigelMansell.anyPercent.test +++ b/tests/nigelMansell.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "BBE5CF2DFA0B5422776A530D6F1B617238A8569F", "Initial State File": "", "Sequence File": "nigelMansell.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "SPRT", "CTRL" ] } diff --git a/tests/ninjaGaiden.anyPercent.test b/tests/ninjaGaiden.anyPercent.test index c60d688..2b84a52 100644 --- a/tests/ninjaGaiden.anyPercent.test +++ b/tests/ninjaGaiden.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Initial State File": "", "Sequence File": "ninjaGaiden.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/ninjaGaiden.pacifist.test b/tests/ninjaGaiden.pacifist.test index 7f6ac1c..93f0f76 100644 --- a/tests/ninjaGaiden.pacifist.test +++ b/tests/ninjaGaiden.pacifist.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "CA513F841D75EFEB33BB8099FB02BEEB39F6BB9C", "Initial State File": "", "Sequence File": "ninjaGaiden.pacifist.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/ninjaGaiden2.anyPercent.test b/tests/ninjaGaiden2.anyPercent.test index b600e71..aee851c 100644 --- a/tests/ninjaGaiden2.anyPercent.test +++ b/tests/ninjaGaiden2.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Initial State File": "", "Sequence File": "ninjaGaiden2.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/ninjaGaiden2.pacifist.test b/tests/ninjaGaiden2.pacifist.test index 172d6bc..5ca6d89 100644 --- a/tests/ninjaGaiden2.pacifist.test +++ b/tests/ninjaGaiden2.pacifist.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "B1796660E4A4CEFC72181D4BF4F97999BC048A77", "Initial State File": "", "Sequence File": "ninjaGaiden2.pacifist.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/novaTheSquirrel.anyPercent.test b/tests/novaTheSquirrel.anyPercent.test index 74d688f..ebd14e9 100644 --- a/tests/novaTheSquirrel.anyPercent.test +++ b/tests/novaTheSquirrel.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "B6B07EE76492ED475F39167C89B342353F999231", "Initial State File": "", "Sequence File": "novaTheSquirrel.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/princeOfPersia.anyPercent.test b/tests/princeOfPersia.anyPercent.test index 4c53d00..b3e10d5 100644 --- a/tests/princeOfPersia.anyPercent.test +++ b/tests/princeOfPersia.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "6B58F149F34FA829135619C58700CAAA95B9CDE3", "Initial State File": "", "Sequence File": "princeOfPersia.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/run_benchmark.sh b/tests/run_benchmark.sh index 8efc937..5a203c1 100755 --- a/tests/run_benchmark.sh +++ b/tests/run_benchmark.sh @@ -1,27 +1,19 @@ #!/bin/bash # Finding all test scripts -testScriptList=`find . -type f -name *.test` +testScriptList=`find . -type f -name "*.test"` # Iterating over the scripts for script in ${testScriptList}; do - # Getting base folder - folder=`dirname ${script}` - # Getting filename fileName=`basename ${script}` - # Going to folder - pushd ${folder} - # Running script on quickerNES quickerNESTester ${fileName} --cycleType Rerecord # Running script on quickerNES quickNESTester ${fileName} --cycleType Rerecord - # Coming back - popd done diff --git a/tests/saintSeiyaKanketsuHen.anyPercent.test b/tests/saintSeiyaKanketsuHen.anyPercent.test index 22f14f9..fe6cdb1 100644 --- a/tests/saintSeiyaKanketsuHen.anyPercent.test +++ b/tests/saintSeiyaKanketsuHen.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "F871D9B3DAFDDCDAD5F2ACD71044292E5169064E", "Initial State File": "", "Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "SPRT", "CTRL" ] } diff --git a/tests/saintSeiyaOugonDensetsu.anyPercent.test b/tests/saintSeiyaOugonDensetsu.anyPercent.test index 1dd6000..b38db7f 100644 --- a/tests/saintSeiyaOugonDensetsu.anyPercent.test +++ b/tests/saintSeiyaOugonDensetsu.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "3F3B499CF50386084E053BCA096AE8E52330CFAE", "Initial State File": "", "Sequence File": "saintSeiyaKanketsuHen.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/saiyuukiWorld.anyPercent.test b/tests/saiyuukiWorld.anyPercent.test index a900115..35d47ec 100644 --- a/tests/saiyuukiWorld.anyPercent.test +++ b/tests/saiyuukiWorld.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", "Initial State File": "", "Sequence File": "saiyuukiWorld.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/saiyuukiWorld.lastHalf.test b/tests/saiyuukiWorld.lastHalf.test index d7dc1dd..5c1d5a8 100644 --- a/tests/saiyuukiWorld.lastHalf.test +++ b/tests/saiyuukiWorld.lastHalf.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "C2F12D915A4D0B1FFDF8A64AE1092CE6A2D08770", "Initial State File": "saiyuukiWorld.lastHalf.state", "Sequence File": "saiyuukiWorld.lastHalf.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/solarJetman.anyPercent.test b/tests/solarJetman.anyPercent.test index d047a5d..7ad8f86 100644 --- a/tests/solarJetman.anyPercent.test +++ b/tests/solarJetman.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "872B91A2F7A2F635061EF43F79E7F7E9F59F5C50", "Initial State File": "", "Sequence File": "solarJetman.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/sprilo.anyPercent.test b/tests/sprilo.anyPercent.test index 648baa8..749744f 100644 --- a/tests/sprilo.anyPercent.test +++ b/tests/sprilo.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "6EC09B9B51320A536A786D3D4719432B714C5779", "Initial State File": "", "Sequence File": "sprilo.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/superMarioBros.warpless.test b/tests/superMarioBros.warpless.test index 2c829d2..e071dd6 100644 --- a/tests/superMarioBros.warpless.test +++ b/tests/superMarioBros.warpless.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Initial State File": "", "Sequence File": "superMarioBros.warpless.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/superMarioBros.warps.test b/tests/superMarioBros.warps.test index d1ec25d..6b10290 100644 --- a/tests/superMarioBros.warps.test +++ b/tests/superMarioBros.warps.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "EA343F4E445A9050D4B4FBAC2C77D0693B1D0922", "Initial State File": "", "Sequence File": "superMarioBros.warps.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/superMarioBros3.warps.test b/tests/superMarioBros3.warps.test index f756b0f..0cda2de 100644 --- a/tests/superMarioBros3.warps.test +++ b/tests/superMarioBros3.warps.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "A03E7E526E79DF222E048AE22214BCA2BC49C449", "Initial State File": "", "Sequence File": "superMarioBros3.warps.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "CHRR", "NTAB", "SPRT", "CTRL" ] } diff --git a/tests/superOffroad.anyPercent.test b/tests/superOffroad.anyPercent.test index d1e493d..2a31b9c 100644 --- a/tests/superOffroad.anyPercent.test +++ b/tests/superOffroad.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "57919B685B55EE3ED3AD98FB1D25626B98BE7D39", "Initial State File": "", "Sequence File": "superOffroad.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "SPRT", "CTRL" ] } diff --git a/tests/tennis.anyPercent.test b/tests/tennis.anyPercent.test index 4752506..2e976e1 100644 --- a/tests/tennis.anyPercent.test +++ b/tests/tennis.anyPercent.test @@ -3,5 +3,5 @@ "Expected ROM SHA1": "80D99C035E6A5AB9718E413EC25CBE094F085962", "Initial State File": "", "Sequence File": "tennis.anyPercent.sol", - "Disable State Blocks": [ ] + "Disable State Blocks": [ "SRAM", "CHRR", "NTAB", "SPRT", "CTRL" ] }