cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8821 from ethereum/remove-flag

Browse Source 
Remove obsolete flag --optimize-yul from scripts
This commit is contained in:
Christian Parpart 2020-05-06 16:20:23 +02:00 committed by GitHub
commit 3a93080ca9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/soltest.sh
View File

@ -57,7 +57,7 @@ get_logfile_basename() {
BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/`get_logfile_basename`.xml" BOOST_TEST_ARGS="--color_output=no --show_progress=yes --logger=JUNIT,error,test_results/`get_logfile_basename`.xml"
SOLTEST_ARGS="--evm-version=$EVM $SOLTEST_FLAGS" SOLTEST_ARGS="--evm-version=$EVM $SOLTEST_FLAGS"
test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize" test "${OPTIMIZE}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --optimize"
test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2 --optimize-yul" test "${ABI_ENCODER_V2}" = "1" && SOLTEST_ARGS="${SOLTEST_ARGS} --abiencoderv2"
echo "Running ${REPODIR}/build/test/soltest ${BOOST_TEST_ARGS} -- ${SOLTEST_ARGS}" echo "Running ${REPODIR}/build/test/soltest ${BOOST_TEST_ARGS} -- ${SOLTEST_ARGS}"

2
scripts/tests.sh
View File

@ -100,7 +100,7 @@ do
force_abiv2_flag="" force_abiv2_flag=""
if [[ "$abiv2" == "yes" ]] if [[ "$abiv2" == "yes" ]]
then then
force_abiv2_flag="--abiencoderv2 --optimize-yul" force_abiv2_flag="--abiencoderv2"
fi fi
printTask "--> Running tests using "$optimize" --evm-version "$vm" $force_abiv2_flag..." printTask "--> Running tests using "$optimize" --evm-version "$vm" $force_abiv2_flag..."

1
test/Common.cpp
View File

@ -94,7 +94,6 @@ CommonOptions::CommonOptions(std::string _caption):
("evmonepath", po::value<fs::path>(&evmonePath)->default_value(EVMOneEnvOrDefaultPath()), "path to evmone library") ("evmonepath", po::value<fs::path>(&evmonePath)->default_value(EVMOneEnvOrDefaultPath()), "path to evmone library")
("no-smt", po::bool_switch(&disableSMT), "disable SMT checker") ("no-smt", po::bool_switch(&disableSMT), "disable SMT checker")
("optimize", po::bool_switch(&optimize), "enables optimization") ("optimize", po::bool_switch(&optimize), "enables optimization")
("optimize-yul", po::bool_switch(&optimizeYul), "enables Yul optimization")
("enforce-via-yul", po::bool_switch(&enforceViaYul), "Enforce compiling all tests via yul to see if additional tests can be activated.") ("enforce-via-yul", po::bool_switch(&enforceViaYul), "Enforce compiling all tests via yul to see if additional tests can be activated.")
("abiencoderv2", po::bool_switch(&useABIEncoderV2), "enables abi encoder v2") ("abiencoderv2", po::bool_switch(&useABIEncoderV2), "enables abi encoder v2")
("show-messages", po::bool_switch(&showMessages), "enables message output") ("show-messages", po::bool_switch(&showMessages), "enables message output")

1
test/Common.h
View File

@ -46,7 +46,6 @@ struct CommonOptions: boost::noncopyable
boost::filesystem::path evmonePath; boost::filesystem::path evmonePath;
boost::filesystem::path testPath; boost::filesystem::path testPath;
bool optimize = false; bool optimize = false;
bool optimizeYul = false;
bool enforceViaYul = false; bool enforceViaYul = false;
bool disableSMT = false; bool disableSMT = false;
bool useABIEncoderV2 = false; bool useABIEncoderV2 = false;

4
test/ExecutionFramework.cpp
View File

@ -49,9 +49,7 @@ ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion):
m_showMessages(solidity::test::CommonOptions::get().showMessages), m_showMessages(solidity::test::CommonOptions::get().showMessages),
m_evmHost(make_shared<EVMHost>(m_evmVersion)) m_evmHost(make_shared<EVMHost>(m_evmVersion))
{ {
if (solidity::test::CommonOptions::get().optimizeYul) if (solidity::test::CommonOptions::get().optimize)
m_optimiserSettings = solidity::frontend::OptimiserSettings::full();
else if (solidity::test::CommonOptions::get().optimize)
m_optimiserSettings = solidity::frontend::OptimiserSettings::standard(); m_optimiserSettings = solidity::frontend::OptimiserSettings::standard();
reset(); reset();

4
test/libsolidity/GasCosts.cpp
View File

@ -100,7 +100,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
// This is only correct on >=Constantinople. // This is only correct on >=Constantinople.
else if (CommonOptions::get().useABIEncoderV2) else if (CommonOptions::get().useABIEncoderV2)
{ {
if (CommonOptions::get().optimizeYul) if (CommonOptions::get().optimize)
{ {
// Costs with 0 are cases which cannot be triggered in tests. // Costs with 0 are cases which cannot be triggered in tests.
if (evmVersion < EVMVersion::istanbul()) if (evmVersion < EVMVersion::istanbul())
@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
// This is only correct on >=Constantinople. // This is only correct on >=Constantinople.
else if (CommonOptions::get().useABIEncoderV2) else if (CommonOptions::get().useABIEncoderV2)
{ {
if (CommonOptions::get().optimizeYul) if (CommonOptions::get().optimize)
{ {
if (evmVersion < EVMVersion::istanbul()) if (evmVersion < EVMVersion::istanbul())
CHECK_GAS(0, 21567, 20); CHECK_GAS(0, 21567, 20);