diff --git a/aptos-move/e2e-benchmark/data/calibration_values.tsv b/aptos-move/e2e-benchmark/data/calibration_values.tsv index 47ae8b7258196..0c373cd15b35f 100644 --- a/aptos-move/e2e-benchmark/data/calibration_values.tsv +++ b/aptos-move/e2e-benchmark/data/calibration_values.tsv @@ -1,26 +1,26 @@ -Loop { loop_count: Some(100000), loop_type: NoOp } 60 0.955 1.074 41893.7 -Loop { loop_count: Some(10000), loop_type: Arithmetic } 60 0.965 1.078 25915.0 -CreateObjects { num_objects: 10, object_payload_size: 0 } 60 0.924 1.082 158.1 -CreateObjects { num_objects: 10, object_payload_size: 10240 } 60 0.951 1.118 9356.2 -CreateObjects { num_objects: 100, object_payload_size: 0 } 60 0.926 1.082 1574.2 -CreateObjects { num_objects: 100, object_payload_size: 10240 } 60 0.952 1.092 11541.9 -InitializeVectorPicture { length: 128 } 10 0.965 1.038 163.3 -VectorPicture { length: 128 } 10 0.938 1.060 48.8 -VectorPictureRead { length: 128 } 10 0.977 1.077 46.4 -InitializeVectorPicture { length: 30720 } 60 0.948 1.123 27893.4 -VectorPicture { length: 30720 } 60 0.931 1.125 6923.1 -VectorPictureRead { length: 30720 } 60 0.934 1.102 6923.1 -SmartTablePicture { length: 30720, num_points_per_txn: 200 } 60 0.952 1.109 43594.7 -SmartTablePicture { length: 1048576, num_points_per_txn: 300 } 60 0.957 1.120 73865.4 -ResourceGroupsSenderWriteTag { string_length: 1024 } 60 0.934 1.134 15.0 -ResourceGroupsSenderMultiChange { string_length: 1024 } 60 0.929 1.122 32.3 -TokenV1MintAndTransferFT 60 0.958 1.093 385.2 -TokenV1MintAndTransferNFTSequential 60 0.973 1.139 588.1 -TokenV2AmbassadorMint { numbered: true } 60 0.960 1.141 512.5 -LiquidityPoolSwap { is_stable: true } 60 0.961 1.103 590.3 -LiquidityPoolSwap { is_stable: false } 60 0.954 1.134 552.2 -CoinInitAndMint 10 0.975 1.043 199.6 -FungibleAssetMint 10 0.954 1.038 236.3 -IncGlobalMilestoneAggV2 { milestone_every: 1 } 10 0.960 1.047 32.9 -IncGlobalMilestoneAggV2 { milestone_every: 2 } 10 0.971 1.066 18.1 -EmitEvents { count: 1000 } 10 0.969 1.052 8615.5 \ No newline at end of file +Loop { loop_count: Some(100000), loop_type: NoOp } 60 0.960 1.119 42122.6 +Loop { loop_count: Some(10000), loop_type: Arithmetic } 60 0.956 1.074 26240.7 +CreateObjects { num_objects: 10, object_payload_size: 0 } 60 0.938 1.168 156.6 +CreateObjects { num_objects: 10, object_payload_size: 10240 } 60 0.924 1.086 9713.2 +CreateObjects { num_objects: 100, object_payload_size: 0 } 60 0.922 1.275 1577.0 +CreateObjects { num_objects: 100, object_payload_size: 10240 } 60 0.935 1.070 11728.7 +InitializeVectorPicture { length: 128 } 60 0.926 1.069 169.4 +VectorPicture { length: 128 } 60 0.908 1.075 50.2 +VectorPictureRead { length: 128 } 60 0.919 1.059 48.0 +InitializeVectorPicture { length: 30720 } 60 0.939 1.127 28404.4 +VectorPicture { length: 30720 } 60 0.936 1.095 6935.6 +VectorPictureRead { length: 30720 } 60 0.939 1.093 6948.2 +SmartTablePicture { length: 30720, num_points_per_txn: 200 } 60 0.947 1.080 43673.3 +SmartTablePicture { length: 1048576, num_points_per_txn: 300 } 60 0.947 1.111 74145.8 +ResourceGroupsSenderWriteTag { string_length: 1024 } 60 0.918 1.075 15.8 +ResourceGroupsSenderMultiChange { string_length: 1024 } 60 0.909 1.169 32.9 +TokenV1MintAndTransferFT 60 0.953 1.069 384.6 +TokenV1MintAndTransferNFTSequential 60 0.938 1.064 600.3 +TokenV2AmbassadorMint { numbered: true } 60 0.951 1.057 516.6 +LiquidityPoolSwap { is_stable: true } 60 0.961 1.139 582.6 +LiquidityPoolSwap { is_stable: false } 60 0.929 1.099 563.0 +CoinInitAndMint 60 0.928 1.130 205.0 +FungibleAssetMint 60 0.930 1.098 235.8 +IncGlobalMilestoneAggV2 { milestone_every: 1 } 60 0.914 1.051 33.5 +IncGlobalMilestoneAggV2 { milestone_every: 2 } 60 0.914 1.105 19.0 +EmitEvents { count: 1000 } 60 0.937 1.158 8818.7 diff --git a/testsuite/single_node_performance_calibration.py b/testsuite/single_node_performance_calibration.py index e33d60e427483..733a733cf5a31 100755 --- a/testsuite/single_node_performance_calibration.py +++ b/testsuite/single_node_performance_calibration.py @@ -4,6 +4,7 @@ import requests def humio_secret(): + print("trying to get a humio secret from gcloud. if it asks for a password, abort and run `gcloud auth login --update-adc` first") import subprocess return subprocess.run(["gcloud", "secrets", "versions", "access", "--secret=ci_humio_read_token", "--project=aptos-shared-secrets", "latest"], capture_output=True).stdout.decode("utf-8") @@ -26,9 +27,11 @@ def parse_args(): help='Calibrate move e2e test', ) + parser.add_argument('--time-interval', default='5d', help='Time interval to look at humio for') + return parser.parse_args() -def query_humio(query_string, time_interval="5d"): +def query_humio(query_string, time_interval): query = { "queryString": query_string, "start": time_interval, @@ -57,6 +60,7 @@ def main(): | github.workflow.head_branch = "{branch}" | "grep_json_aptos_move_vm_perf" | parseJson(message) + | code_perf_version = "v1" """.format( branch=args.branch ) @@ -155,7 +159,7 @@ def split_line(line): output_file_name = "testsuite/single_node_performance_values.tsv" - response_text = query_humio(query_string) + response_text = query_humio(query_string, time_interval=args.time_interval) parsed = [ {(parts := key_value.split("->"))[0]: parts[1] for key_value in split_line(line)} diff --git a/testsuite/single_node_performance_values.tsv b/testsuite/single_node_performance_values.tsv index 57d7be160aca6..49145e221deac 100644 --- a/testsuite/single_node_performance_values.tsv +++ b/testsuite/single_node_performance_values.tsv @@ -1,44 +1,48 @@ -no-op 1 VM 6 0.938 1.019 38925.3 -no-op 1000 VM 6 0.943 1.019 36444.6 -apt-fa-transfer 1 VM 6 0.927 1.018 26954.7 -apt-fa-transfer 1 NativeVM 6 0.927 1.018 35259.7 -account-generation 1 VM 6 0.96 1.02 20606.2 -account-generation 1 NativeVM 6 0.96 1.02 28216.2 -account-resource32-b 1 VM 6 0.94 1.026 34260.4 -modify-global-resource 1 VM 6 0.993 1.021 2260.5 -modify-global-resource 100 VM 6 0.982 1.02 33129.7 -publish-package 1 VM 6 0.983 1.012 1672.6 -mix_publish_transfer 1 VM 6 0.972 1.044 20832.8 -batch100-transfer 1 VM 6 0.953 1.024 645.1 -batch100-transfer 1 NativeVM 6 0.953 1.024 1437.0 -vector-picture30k 1 VM 6 0.992 1.039 103.6 -vector-picture30k 100 VM 6 0.913 1.015 1831.5 -smart-table-picture30-k-with200-change 1 VM 6 0.976 1.034 16.1 -smart-table-picture30-k-with200-change 100 VM 6 0.985 1.018 212.9 -modify-global-resource-agg-v2 1 VM 6 0.976 1.035 33992.5 -modify-global-flag-agg-v2 1 VM 6 0.986 1.016 4224 -modify-global-bounded-agg-v2 1 VM 6 0.964 1.047 7661.6 -modify-global-milestone-agg-v2 1 VM 6 0.973 1.017 25187.1 -resource-groups-global-write-tag1-kb 1 VM 6 0.989 1.03 9215.7 -resource-groups-global-write-and-read-tag1-kb 1 VM 6 0.982 1.018 5538.3 -resource-groups-sender-write-tag1-kb 1 VM 6 0.985 1.059 20084.2 -resource-groups-sender-multi-change1-kb 1 VM 6 0.968 1.034 16400.4 -token-v1ft-mint-and-transfer 1 VM 6 0.987 1.022 1156.3 -token-v1ft-mint-and-transfer 100 VM 6 0.964 1.024 17842.6 -token-v1nft-mint-and-transfer-sequential 1 VM 6 0.984 1.017 735.7 -token-v1nft-mint-and-transfer-sequential 100 VM 6 0.966 1.017 12819.7 -coin-init-and-mint 1 VM 6 0.95 1.024 26906.4 -coin-init-and-mint 100 VM 6 0.985 1.022 22312.6 -fungible-asset-mint 1 VM 6 0.955 1.013 23001.6 -fungible-asset-mint 100 VM 6 0.955 1.015 19973.5 -no-op5-signers 1 VM 6 0.934 1.016 38708.6 -token-v2-ambassador-mint 1 VM 6 0.975 1.008 15179.3 -token-v2-ambassador-mint 100 VM 6 0.985 1.007 15150.8 -liquidity-pool-swap 1 VM 6 0.987 1.018 805.5 -liquidity-pool-swap 100 VM 6 0.993 1.02 11156.3 -liquidity-pool-swap-stable 1 VM 6 0.985 1.017 778.7 -liquidity-pool-swap-stable 100 VM 6 0.982 1.009 11056.6 -deserialize-u256 1 VM 6 0.968 1.026 36444.6 -no-op-fee-payer 1 VM 6 0.994 1.026 2046 -no-op-fee-payer 100 VM 6 0.96 1.014 32866.5 -simple-script 1 VM 6 0.941 1.012 38206.1 \ No newline at end of file +no-op 1 VM 60 0.812 1.022 38853.0 +no-op 1000 VM 60 0.820 1.027 36792.8 +apt-fa-transfer 1 VM 60 0.831 1.028 27197.8 +apt-fa-transfer 1 NativeVM 60 0.829 1.158 32347.9 +account-generation 1 VM 60 0.776 1.035 20568.6 +account-generation 1 NativeVM 60 0.791 1.126 28249.8 +account-resource32-b 1 VM 60 0.819 1.027 34193.3 +modify-global-resource 1 VM 60 0.932 1.015 2273.4 +modify-global-resource 100 VM 60 0.838 1.019 33327.8 +publish-package 1 VM 60 0.887 1.014 1666.6 +mix_publish_transfer 1 VM 60 0.835 1.035 21291.6 +batch100-transfer 1 VM 60 0.794 1.041 634.6 +batch100-transfer 1 NativeVM 60 0.776 1.157 1387.1 +vector-picture30k 1 VM 60 0.960 1.051 102.5 +vector-picture30k 100 VM 60 0.754 1.051 1855.3 +smart-table-picture30-k-with200-change 1 VM 60 0.922 1.047 16.1 +smart-table-picture30-k-with200-change 100 VM 60 0.924 1.089 209.5 +modify-global-resource-agg-v2 1 VM 60 0.829 1.033 34327.5 +modify-global-flag-agg-v2 1 VM 60 0.954 1.021 4224.0 +modify-global-bounded-agg-v2 1 VM 60 0.869 1.076 7793.9 +modify-global-milestone-agg-v2 1 VM 60 0.879 1.022 25097.7 +resource-groups-global-write-tag1-kb 1 VM 60 0.921 1.025 9303.3 +resource-groups-global-write-and-read-tag1-kb 1 VM 60 0.955 1.020 5548.2 +resource-groups-sender-write-tag1-kb 1 VM 60 0.856 1.147 20568.6 +resource-groups-sender-multi-change1-kb 1 VM 60 0.905 1.099 17029.7 +token-v1ft-mint-and-transfer 1 VM 60 0.941 1.017 1162.9 +token-v1ft-mint-and-transfer 100 VM 60 0.880 1.021 18257.0 +token-v1nft-mint-and-transfer-sequential 1 VM 60 0.946 1.013 735.7 +token-v1nft-mint-and-transfer-sequential 100 VM 60 0.885 1.012 12888.4 +coin-init-and-mint 1 VM 60 0.803 1.024 27197.8 +coin-init-and-mint 100 VM 60 0.821 1.018 22715.7 +fungible-asset-mint 1 VM 60 0.820 1.024 23001.6 +fungible-asset-mint 100 VM 60 0.827 1.021 20084.2 +no-op5-signers 1 VM 60 0.821 1.024 38780.8 +token-v2-ambassador-mint 1 VM 60 0.818 1.019 15207.9 +token-v2-ambassador-mint 100 VM 60 0.871 1.021 15150.8 +liquidity-pool-swap 1 VM 60 0.928 1.023 814.2 +liquidity-pool-swap 100 VM 60 0.875 1.022 11378.2 +liquidity-pool-swap-stable 1 VM 60 0.930 1.028 781.5 +liquidity-pool-swap-stable 100 VM 60 0.903 1.019 11056.6 +deserialize-u256 1 VM 60 0.869 1.021 37002.8 +no-op-fee-payer 1 VM 60 0.952 1.026 2058.3 +no-op-fee-payer 100 VM 60 0.828 1.016 32284.2 +simple-script 1 VM 60 0.830 1.024 37707.7 +no_commit_apt-fa-transfer 1 VM 60 0.927 1.015 29357.5 +no_commit_apt-fa-transfer 1 NativeVM 60 0.922 1.021 44946.3 +no_commit_apt-fa-transfer 1 AptosVMSpeculative 60 0.953 1.010 1851.9 +no_commit_apt-fa-transfer 1 NativeSpeculative 60 0.789 1.031 109774.7