Skip to content

Test: Small cleanup in equivalence checking of yul optimizations #1013

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

Merged
blishko merged 2 commits into from
Feb 10, 2026
Merged

Test: Small cleanup in equivalence checking of yul optimizations #1013

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e737a5f
Tests: Simplify code to extract yul files for equivalence checks
blishko Feb 9, 2026
dcfe657
Test: Re-enable some yul equivalence tests
blishko Feb 9, 2026
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
77 changes: 8 additions & 69 deletions test/EVM/Equivalence/EquivalenceTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import Data.String.Here
import Data.Text (Text)
import Data.Text qualified as T
import Data.Time (diffUTCTime, getCurrentTime)
import System.Directory (listDirectory, doesDirectoryExist)
import System.Environment (lookupEnv)
import System.FilePath (makeRelative, normalise)
import System.FilePath.Find (find, always, filePath, fileType, (&&?), FileType(RegularFile))
import Test.Tasty
import Test.Tasty.ExpectedFailure (ignoreTest)
import Test.Tasty.HUnit
Expand Down Expand Up @@ -432,7 +433,7 @@ yulEquivalenceTests = testGroup "Yul equivalence"
yulOptimizationsSolcTests :: TestTree
yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
let opts = (defaultVeriOpts :: VeriOpts) { iterConf = defaultIterConf {maxIter = Just 5, askSmtIters = 20, loopHeuristic = Naive }}
ignoredTests =
ignoredTests = fmap normalise
-- unbounded loop --
[ "commonSubexpressionEliminator/branches_for.yul"
, "conditionalSimplifier/no_opt_if_break_is_not_last.yul"
Expand Down Expand Up @@ -465,16 +466,10 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do

-- Takes too long, would timeout on most test setups.
-- We could probably fix these by "bunching together" queries
, "reasoningBasedSimplifier/mulmod.yul"
, "loadResolver/multi_sload_loop.yul"
, "reasoningBasedSimplifier/mulcheck.yul"
, "reasoningBasedSimplifier/smod.yul"
, "fullSuite/abi_example1.yul"
, "yulOptimizerTests/fullInliner/large_function_multi_use.yul"
, "loadResolver/merge_known_write_with_distance.yul"
, "loadResolver/second_mstore_with_delta.yul"
, "rematerialiser/for_continue_2.yul"
, "rematerialiser/for_continue_with_assignment_in_post.yul"

-- invalid test --
-- https://github.com/ethereum/solidity/issues/9500
Expand All @@ -484,12 +479,7 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
-- stack too deep --
, "fullSuite/abi2.yul"
, "fullSuite/aztec.yul"
, "stackCompressor/inlineInBlock.yul"
, "stackCompressor/inlineInFunction.yul"
, "stackCompressor/unusedPrunerWithMSize.yul"
, "wordSizeTransform/function_call.yul"
, "fullInliner/no_inline_into_big_function.yul"
, "controlFlowSimplifier/switch_only_default.yul"
, "stackLimitEvader" -- all that are in this subdirectory

-- typed yul --
Expand Down Expand Up @@ -527,60 +517,21 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
-- New: symbolic index on MSTORE/MLOAD/CopySlice/CallDataCopy/ExtCodeCopy/Revert,
-- or exponent is symbolic (requires symbolic gas)
-- or SHA3 offset symbolic
, "blockFlattener/basic.yul"
, "commonSubexpressionEliminator/case2.yul"
, "equalStoreEliminator/indirect_inferrence.yul"
, "expressionJoiner/reassignment.yul"
, "expressionSimplifier/exp_simplifications.yul"
, "expressionSimplifier/zero_length_read.yul"
, "expressionSimplifier/side_effects_in_for_condition.yul"
, "fullSuite/create_and_mask.yul"
, "fullSuite/unusedFunctionParameterPruner_return.yul"
, "fullSuite/unusedFunctionParameterPruner_simple.yul"
, "fullSuite/unusedFunctionParameterPruner.yul"
, "loadResolver/double_mload_with_other_reassignment.yul"
, "loadResolver/double_mload_with_reassignment.yul"
, "loadResolver/double_mload.yul"
, "loadResolver/keccak_reuse_basic.yul"
, "loadResolver/keccak_reuse_expr_mstore.yul"
, "loadResolver/keccak_reuse_msize.yul"
, "loadResolver/keccak_reuse_mstore.yul"
, "loadResolver/keccak_reuse_reassigned_branch.yul"
, "loadResolver/keccak_reuse_reassigned_value.yul"
, "loadResolver/keccak_symbolic_memory.yul"
, "loadResolver/merge_mload_with_known_distance.yul"
, "loadResolver/mload_self.yul"
, "loadResolver/keccak_reuse_in_expression.yul"
, "loopInvariantCodeMotion/complex_move.yul"
, "loopInvariantCodeMotion/move_memory_function.yul"
, "loopInvariantCodeMotion/move_state_function.yul"
, "loopInvariantCodeMotion/no_move_memory.yul"
, "loopInvariantCodeMotion/no_move_storage.yul"
, "loopInvariantCodeMotion/not_first.yul"
, "ssaAndBack/single_assign_if.yul"
, "ssaAndBack/single_assign_switch.yul"
, "structuralSimplifier/switch_inline_no_match.yul"
, "unusedFunctionParameterPruner/simple.yul"
, "unusedStoreEliminator/covering_calldatacopy.yul"
, "unusedStoreEliminator/remove_before_revert.yul"
, "unusedStoreEliminator/unknown_length2.yul"
, "unusedStoreEliminator/unrelated_relative.yul"
, "fullSuite/extcodelength.yul"
, "unusedStoreEliminator/create_inside_function.yul"-- "trying to reset symbolic storage with writes in create"

-- Due to tstorage warnings treated as errors when running solc with --standard-json
-- these cannot be currently run. See: https://github.com/ethereum/solidity/issues/15397
-- When that fix comes to upstream, we can re-enabled again
, "equalStoreEliminator/transient_storage.yul"
, "unusedStoreEliminator/tload.yul"
, "unusedStoreEliminator/tstore.yul"
, "yulOptimizerTests/fullSuite/transient_storage.yul"
, "yulOptimizerTests/unusedPruner/transient_storage.yul"

-- Bug in solidity, fixed in newer versions:
-- https://github.com/ethereum/solidity/issues/15397#event-14116827816
, "no_move_transient_storage.yul"


-- to investigate, currently crash
, "commonSubexpressionEliminator/long_literals_as_builtin_args.yul"
, "disambiguator/string_as_hex_and_hex_as_string.yul"
Expand All @@ -592,22 +543,10 @@ yulOptimizationsSolcTests = testCase "eq-all-yul-optimization-tests" $ do
]

solcRepo <- fromMaybe (internalError "cannot find solidity repo") <$> (lookupEnv "HEVM_SOLIDITY_REPO")
let testDir = solcRepo <> "/test/libyul/yulOptimizerTests"
dircontents <- listDirectory testDir
let
fullpaths = map ((testDir ++ "/") ++) dircontents
recursiveList :: [FilePath] -> [FilePath] -> IO [FilePath]
recursiveList (a:ax) b = do
isdir <- doesDirectoryExist a
case isdir of
True -> do
fs <- listDirectory a
let fs2 = map ((a ++ "/") ++) fs
recursiveList (ax++fs2) b
False -> recursiveList ax (a:b)
recursiveList [] b = pure b
files <- recursiveList fullpaths []
let filesFiltered = filter (\file -> not $ any (`List.isInfixOf` file) ignoredTests) files
let testDir = normalise $ solcRepo <> "/test/libyul/yulOptimizerTests"
shouldIgnore fp = any (`List.isInfixOf` (makeRelative testDir fp)) ignoredTests
isRegularFile = (== RegularFile) <$> fileType
filesFiltered <- find always (isRegularFile &&? (not . shouldIgnore <$> filePath)) testDir

-- Takes one file which follows the Solidity Yul optimizer unit tests format,
-- extracts both the nonoptimized and the optimized versions, and checks equivalence.
Expand Down
Loading