cerc-io/solidity
10
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

prepare_report: Add viaIR presets

Browse Source
This commit is contained in:
Kamil Śliwak 2023-06-19 11:29:00 +02:00
parent 703fa6c8b5
commit ea724071b1
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/bytecodecompare/prepare_report.js
View File

@ -5,8 +5,10 @@ const fs = require('fs')
const compiler = require('solc') const compiler = require('solc')
SETTINGS_PRESETS = { SETTINGS_PRESETS = {
'legacy-optimize': {optimize: true}, 'legacy-optimize': {optimize: true, viaIR: false},
'legacy-no-optimize': {optimize: false}, 'legacy-no-optimize': {optimize: false, viaIR: false},
'via-ir-optimize': {optimize: true, viaIR: true},
'via-ir-no-optimize': {optimize: false, viaIR: true},
} }
function loadSource(sourceFileName, stripSMTPragmas) function loadSource(sourceFileName, stripSMTPragmas)
@ -67,6 +69,8 @@ for (const preset of presets)
}, },
settings: { settings: {
optimizer: {enabled: settings.optimize}, optimizer: {enabled: settings.optimize},
// NOTE: We omit viaIR rather than set it to false to handle older versions that don't have it.
viaIR: settings.viaIR ? true : undefined,
outputSelection: {'*': {'*': ['evm.bytecode.object', 'metadata']}} outputSelection: {'*': {'*': ['evm.bytecode.object', 'metadata']}}
} }
} }

13
scripts/bytecodecompare/prepare_report.py
View File

@ -29,6 +29,8 @@ class CompilerInterface(Enum):
class SettingsPreset(Enum): class SettingsPreset(Enum):
LEGACY_OPTIMIZE = 'legacy-optimize' LEGACY_OPTIMIZE = 'legacy-optimize'
LEGACY_NO_OPTIMIZE = 'legacy-no-optimize' LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
VIA_IR_OPTIMIZE = 'via-ir-optimize'
VIA_IR_NO_OPTIMIZE = 'via-ir-no-optimize'
class SMTUse(Enum): class SMTUse(Enum):
@ -40,12 +42,15 @@ class SMTUse(Enum):
@dataclass(frozen=True) @dataclass(frozen=True)
class CompilerSettings: class CompilerSettings:
optimize: bool optimize: bool
via_ir: bool
@staticmethod @staticmethod
def from_preset(preset: SettingsPreset): def from_preset(preset: SettingsPreset):
return { return {
SettingsPreset.LEGACY_OPTIMIZE: CompilerSettings(optimize=True), SettingsPreset.LEGACY_OPTIMIZE: CompilerSettings(optimize=True, via_ir=False),
SettingsPreset.LEGACY_NO_OPTIMIZE: CompilerSettings(optimize=False), SettingsPreset.LEGACY_NO_OPTIMIZE: CompilerSettings(optimize=False, via_ir=False),
SettingsPreset.VIA_IR_OPTIMIZE: CompilerSettings(optimize=True, via_ir=True),
SettingsPreset.VIA_IR_NO_OPTIMIZE: CompilerSettings(optimize=False, via_ir=True),
}[preset] }[preset]
@ -224,6 +229,8 @@ def prepare_compiler_input(
}, },
'settings': { 'settings': {
'optimizer': {'enabled': settings.optimize}, 'optimizer': {'enabled': settings.optimize},
# NOTE: We omit viaIR rather than set it to false to handle older versions that don't have it.
**({'viaIR': True} if settings.via_ir else {}),
'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}}, 'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
} }
} }
@ -243,6 +250,8 @@ def prepare_compiler_input(
compiler_options.append('--optimize') compiler_options.append('--optimize')
elif force_no_optimize_yul: elif force_no_optimize_yul:
compiler_options.append('--no-optimize-yul') compiler_options.append('--no-optimize-yul')
if settings.via_ir:
compiler_options.append('--via-ir')
if smt_use == SMTUse.DISABLE: if smt_use == SMTUse.DISABLE:
compiler_options += ['--model-checker-engine', 'none'] compiler_options += ['--model-checker-engine', 'none']

7
test/scripts/test_bytecodecompare_prepare_report.py
View File

@ -265,6 +265,7 @@ class TestPrepareCompilerInput(PrepareReportTestBase):
}, },
'settings': { 'settings': {
'optimizer': {'enabled': True}, 'optimizer': {'enabled': True},
'viaIR': True,
'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}}, 'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
'modelChecker': {'engine': 'none'}, 'modelChecker': {'engine': 'none'},
} }
@ -273,7 +274,7 @@ class TestPrepareCompilerInput(PrepareReportTestBase):
(command_line, compiler_input) = prepare_compiler_input( (command_line, compiler_input) = prepare_compiler_input(
Path('solc'), Path('solc'),
SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH, SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
preset=SettingsPreset.LEGACY_OPTIMIZE, preset=SettingsPreset.VIA_IR_OPTIMIZE,
force_no_optimize_yul=False, force_no_optimize_yul=False,
interface=CompilerInterface.STANDARD_JSON, interface=CompilerInterface.STANDARD_JSON,
smt_use=SMTUse.DISABLE, smt_use=SMTUse.DISABLE,
@ -317,7 +318,7 @@ class TestPrepareCompilerInput(PrepareReportTestBase):
(command_line, compiler_input) = prepare_compiler_input( (command_line, compiler_input) = prepare_compiler_input(
Path('solc'), Path('solc'),
SMT_SMOKE_TEST_SOL_PATH, SMT_SMOKE_TEST_SOL_PATH,
preset=SettingsPreset.LEGACY_OPTIMIZE, preset=SettingsPreset.VIA_IR_OPTIMIZE,
force_no_optimize_yul=False, force_no_optimize_yul=False,
interface=CompilerInterface.CLI, interface=CompilerInterface.CLI,
smt_use=SMTUse.PRESERVE, smt_use=SMTUse.PRESERVE,
@ -326,7 +327,7 @@ class TestPrepareCompilerInput(PrepareReportTestBase):
self.assertEqual( self.assertEqual(
command_line, command_line,
['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--optimize'], ['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--optimize', '--via-ir'],
) )
self.assertEqual(compiler_input, SMT_SMOKE_TEST_SOL_CODE) self.assertEqual(compiler_input, SMT_SMOKE_TEST_SOL_CODE)