remove runs based heuristic

Author: Mohammad Rezaei

Changelog.md

@@ -4,7 +4,7 @@ Language Features:
 
 
 Compiler Features:
-* Constant Optimizer: Compute masks using shifts when optimizing for size; use an ``--optimizer-runs`` value less than 200 for maximum size reduction.
+* Constant Optimizer: Compute masks using shifts when optimizing for size.
 
 Bugfixes:
 * SMTChecker: Fix incorrect analysis when only a subset of contracts is selected with `--model-checker-contracts`.

libevmasm/ConstantOptimiser.cpp

@@ -257,14 +257,11 @@ AssemblyItems ComputeMethod::findRepresentation(u256 const& _value)
 	// check for masks first
 	unsigned lowZeros = 0;
 	unsigned highOnes = 0;
-	//only fully optimize for size if the compiler parameters are not default of 200
-	unsigned threshold1 = m_params.runs < 200 ? 32 : 128;
-	unsigned threshold2 = m_params.runs < 200 ? 16 : 128;
 	for (; ((_value >> lowZeros) & 1) == 0 && lowZeros < 256; lowZeros++) {}
 	for (; ((_value >> (lowZeros + highOnes)) & 1) == 1 && highOnes < 256; highOnes++) {}
-	if (m_params.evmVersion.hasBitwiseShifting() && highOnes > threshold1 &&
+	if (m_params.evmVersion.hasBitwiseShifting() && highOnes > 32 &&
 		((_value >> (lowZeros + highOnes)) == 0) &&
-		((lowZeros + highOnes < 256) || lowZeros > threshold2))
+		((lowZeros + highOnes < 256) || lowZeros > 16))
 	{
 		// this is a big enough mask to use zero negation
 		AssemblyItems newRoutine = AssemblyItems{u256(0), Instruction::NOT};

test/cmdlineTests/optimizer_inliner_dynamic_reference/output

@@ -84,7 +84,7 @@ sub_0: assembly {
         /* "optimizer_inliner_dynamic_reference/input.sol":147:152  x = f */
       dup1
       sload
-      not(0xffffffffffffffff)
+      shl(0x40, not(0x00))
       and
         /* "optimizer_inliner_dynamic_reference/input.sol":151:152  f */
       tag_17

test/libsolidity/gasTests/abiv2_optimised.sol

@@ -19,9 +19,9 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 617600
-//   executionCost: 649
-//   totalCost: 618249
+//   codeDepositCost: 605600
+//   executionCost: 636
+//   totalCost: 606236
 // external:
 //   a(): 2283
 //   b(uint256): 4649

test/libsolidity/semanticTests/abiEncodeDecode/abi_decode_simple_storage.sol

@@ -8,6 +8,6 @@ contract C {
 }
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135499
+// gas irOptimized: 135563
 // gas legacy: 137095
-// gas legacyOptimized: 135823
+// gas legacyOptimized: 135879

test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol

@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203167
+// gas irOptimized: 203255
 // gas legacy: 206263
-// gas legacyOptimized: 203172
+// gas legacyOptimized: 203220

test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol

@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 308660
+// gas irOptimized: 310684
 // gas legacy: 305816
-// gas legacyOptimized: 247337
+// gas legacyOptimized: 248777
 // test_uint256() ->
-// gas irOptimized: 438474
+// gas irOptimized: 440498
 // gas legacy: 421304
-// gas legacyOptimized: 341672
+// gas legacyOptimized: 343112

test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol

@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 308660
+// gas irOptimized: 310684
 // gas legacy: 305816
-// gas legacyOptimized: 247337
+// gas legacyOptimized: 248777
 // test_uint256() ->
-// gas irOptimized: 438474
+// gas irOptimized: 440498
 // gas legacy: 421304
-// gas legacyOptimized: 341672
+// gas legacyOptimized: 343112

test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol

@@ -30,8 +30,8 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 55113
-// gas irOptimized code: 56800
+// gas irOptimized: 55177
+// gas irOptimized code: 54400
 // gas legacy: 57266
 // gas legacy code: 94600
 // gas legacyOptimized: 55191

test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol

@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 118382
+// gas irOptimized: 118550
 // gas legacy: 101568
 // gas legacyOptimized: 119092