diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp index 1625e60c5..4f52c8fe8 100644 --- a/libyul/optimiser/Suite.cpp +++ b/libyul/optimiser/Suite.cpp @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -184,6 +185,7 @@ map> const& OptimiserSuite::allSteps() LoopInvariantCodeMotion, NameSimplifier, RedundantAssignEliminator, + ReasoningBasedSimplifier, Rematerialiser, SSAReverser, SSATransform, @@ -221,6 +223,7 @@ map const& OptimiserSuite::stepNameToAbbreviationMap() {LoadResolver::name, 'L'}, {LoopInvariantCodeMotion::name, 'M'}, {NameSimplifier::name, 'N'}, + {ReasoningBasedSimplifier::name, 'R'}, {RedundantAssignEliminator::name, 'r'}, {Rematerialiser::name, 'm'}, {SSAReverser::name, 'V'}, diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp index 409951e42..a15c426dc 100644 --- a/test/tools/yulopti.cpp +++ b/test/tools/yulopti.cpp @@ -158,8 +158,7 @@ public: map const& extraOptions = { {'#', "quit"}, {',', "VarNameCleaner"}, - {';', "StackCompressor"}, - {'R', "ReasoningBasedSimplifier"} + {';', "StackCompressor"} }; printUsageBanner(abbreviationMap, extraOptions, 4); @@ -192,12 +191,6 @@ public: StackCompressor::run(m_dialect, obj, true, 16); break; } - case 'R': - { - ReasoningBasedSimplifier::run(context, *m_ast); - break; - } - default: cerr << "Unknown option." << endl; } diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp index 4d0592e9a..1f66398be 100644 --- a/test/yulPhaser/Chromosome.cpp +++ b/test/yulPhaser/Chromosome.cpp @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin BOOST_TEST(chromosome.length() == allSteps.size()); BOOST_TEST(chromosome.optimisationSteps() == allSteps); - BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighTLMNrmVatpud"); + BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighTLMNRrmVatpud"); } BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)