Run gas tests on NoMetadata format only.

This commit is contained in:
Djordje Mijovic 2021-02-11 09:46:25 +01:00
parent 68a4efb2e7
commit b598948211
13 changed files with 41 additions and 41 deletions

View File

@ -91,7 +91,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
}
}
)";
m_compiler.overwriteReleaseFlag(true);
m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
compileAndRun(sourceCode);
auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
@ -101,7 +101,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
if (CommonOptions::get().useABIEncoderV1)
CHECK_DEPLOY_GAS(133045, 129731, evmVersion);
else
CHECK_DEPLOY_GAS(155553, 132103, evmVersion);
CHECK_DEPLOY_GAS(144679, 121229, evmVersion);
}
// This is only correct on >=Constantinople.
else if (!CommonOptions::get().useABIEncoderV1)
@ -110,22 +110,22 @@ BOOST_AUTO_TEST_CASE(string_storage)
{
// Costs with 0 are cases which cannot be triggered in tests.
if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(0, 120189, evmVersion);
CHECK_DEPLOY_GAS(0, 109241, evmVersion);
else
CHECK_DEPLOY_GAS(0, 108541, evmVersion);
CHECK_DEPLOY_GAS(0, 97697, evmVersion);
}
else
{
if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(149567, 123969, evmVersion);
CHECK_DEPLOY_GAS(138693, 123969, evmVersion);
else
CHECK_DEPLOY_GAS(134123, 110969, evmVersion);
CHECK_DEPLOY_GAS(123301, 110969, evmVersion);
}
}
else if (evmVersion < EVMVersion::istanbul())
CHECK_DEPLOY_GAS(125829, 118559, evmVersion);
else
CHECK_DEPLOY_GAS(114077, 107067, evmVersion);
CHECK_DEPLOY_GAS(114077, 96461, evmVersion);
if (evmVersion >= EVMVersion::byzantium())
{

View File

@ -106,7 +106,7 @@ TestCase::TestResult GasTest::run(ostream& _stream, string const& _linePrefix, b
// Prerelease CBOR metadata varies in size due to changing version numbers and build dates.
// This leads to volatile creation cost estimates. Therefore we force the compiler to
// release mode for testing gas estimates.
compiler().overwriteReleaseFlag(true);
compiler().setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
OptimiserSettings settings = m_optimise ? OptimiserSettings::standard() : OptimiserSettings::minimal();
if (m_optimiseYul)
{

View File

@ -14,9 +14,9 @@ contract C {
}
// ----
// creation:
// codeDepositCost: 1181400
// executionCost: 1227
// totalCost: 1182627
// codeDepositCost: 1170600
// executionCost: 1214
// totalCost: 1171814
// external:
// a(): 1130
// b(uint256): infinite

View File

@ -17,9 +17,9 @@ contract C {
// optimize-yul: true
// ----
// creation:
// codeDepositCost: 583400
// executionCost: 619
// totalCost: 584019
// codeDepositCost: 572600
// executionCost: 606
// totalCost: 573206
// external:
// a(): 985
// b(uint256): 2052

View File

@ -13,8 +13,8 @@ contract C {
}
// ----
// creation:
// codeDepositCost: 398400
// executionCost: 436
// totalCost: 398836
// codeDepositCost: 387600
// executionCost: 424
// totalCost: 388024
// external:
// f(): 428

View File

@ -24,9 +24,9 @@ contract Large {
}
// ----
// creation:
// codeDepositCost: 913400
// executionCost: 948
// totalCost: 914348
// codeDepositCost: 902600
// executionCost: 942
// totalCost: 903542
// external:
// a(): 1175
// b(uint256): infinite

View File

@ -27,9 +27,9 @@ contract Large {
// optimize-runs: 2
// ----
// creation:
// codeDepositCost: 267000
// executionCost: 306
// totalCost: 267306
// codeDepositCost: 256200
// executionCost: 300
// totalCost: 256500
// external:
// a(): 983
// b(uint256): 2337

View File

@ -11,9 +11,9 @@ contract Medium {
}
// ----
// creation:
// codeDepositCost: 360400
// executionCost: 399
// totalCost: 360799
// codeDepositCost: 349600
// executionCost: 386
// totalCost: 349986
// external:
// a(): 1152
// b(uint256): infinite

View File

@ -14,9 +14,9 @@ contract Medium {
// optimize-runs: 2
// ----
// creation:
// codeDepositCost: 157400
// executionCost: 202
// totalCost: 157602
// codeDepositCost: 146600
// executionCost: 190
// totalCost: 146790
// external:
// a(): 983
// b(uint256): 2095

View File

@ -6,9 +6,9 @@ contract Small {
}
// ----
// creation:
// codeDepositCost: 123600
// executionCost: 171
// totalCost: 123771
// codeDepositCost: 112800
// executionCost: 159
// totalCost: 112959
// external:
// fallback: 129
// a(): 1107

View File

@ -9,9 +9,9 @@ contract Small {
// optimize-runs: 2
// ----
// creation:
// codeDepositCost: 72600
// executionCost: 123
// totalCost: 72723
// codeDepositCost: 61800
// executionCost: 111
// totalCost: 61911
// external:
// fallback: 118
// a(): 961

View File

@ -19,9 +19,9 @@ contract C {
// optimize-yul: false
// ----
// creation:
// codeDepositCost: 119800
// executionCost: 165
// totalCost: 119965
// codeDepositCost: 109000
// executionCost: 159
// totalCost: 109159
// external:
// exp_neg_one(uint256): 2259
// exp_one(uint256): infinite

View File

@ -19,9 +19,9 @@ contract C {
// optimize-yul: true
// ----
// creation:
// codeDepositCost: 47800
// executionCost: 99
// totalCost: 47899
// codeDepositCost: 37000
// executionCost: 87
// totalCost: 37087
// external:
// exp_neg_one(uint256): 1917
// exp_one(uint256): 1870