Add a new function to loadgen contract for apply load testing. (#1492)

### What This function avoids accessing storage as that's not necessary for covering I/O (storage is just an in-memory map on the host side). It also emits events. Also cleaned up the build configs of the examples. ### Why Apply load benchmark improvements. ### Known limitations N/A
stellar · Nov 8, 2024 · a3f7fca · a3f7fca
1 parent 05219cf
commit a3f7fca
Show file tree

Hide file tree

Showing 36 changed files with 87 additions and 390 deletions.
diff --git a/soroban-test-wasms/wasm-workspace/Cargo.lock b/soroban-test-wasms/wasm-workspace/Cargo.lock
diff --git a/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml b/soroban-test-wasms/wasm-workspace/add_f32/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml b/soroban-test-wasms/wasm-workspace/add_i32/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml b/soroban-test-wasms/wasm-workspace/alloc/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true, features = ["alloc"] }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/auth/Cargo.toml b/soroban-test-wasms/wasm-workspace/auth/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/complex/Cargo.toml b/soroban-test-wasms/wasm-workspace/complex/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/conditional_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/constructor/Cargo.toml b/soroban-test-wasms/wasm-workspace/constructor/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/constructor_with_result/Cargo.toml b/soroban-test-wasms/wasm-workspace/constructor_with_result/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/constructor_with_return_value/Cargo.toml b/soroban-test-wasms/wasm-workspace/constructor_with_return_value/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml b/soroban-test-wasms/wasm-workspace/contract_data/Cargo.toml
@@ -12,8 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
-testutils = ["soroban-sdk/testutils"]
diff --git a/soroban-test-wasms/wasm-workspace/contract_sac_transfer/Cargo.toml b/soroban-test-wasms/wasm-workspace/contract_sac_transfer/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/create_contract/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/custom_account_context/Cargo.toml b/soroban-test-wasms/wasm-workspace/custom_account_context/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/delegated_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/deployer/Cargo.toml b/soroban-test-wasms/wasm-workspace/deployer/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/deployer_with_constructor/Cargo.toml b/soroban-test-wasms/wasm-workspace/deployer_with_constructor/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/err/Cargo.toml b/soroban-test-wasms/wasm-workspace/err/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml b/soroban-test-wasms/wasm-workspace/fannkuch/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/fib/Cargo.toml b/soroban-test-wasms/wasm-workspace/fib/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml b/soroban-test-wasms/wasm-workspace/hostile/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml b/soroban-test-wasms/wasm-workspace/hostile_large_val/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/invoke_contract/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml b/soroban-test-wasms/wasm-workspace/linear_memory/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/loadgen/Cargo.toml b/soroban-test-wasms/wasm-workspace/loadgen/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/loadgen/src/lib.rs b/soroban-test-wasms/wasm-workspace/loadgen/src/lib.rs
@@ -1,5 +1,5 @@
 #![no_std]
-use soroban_sdk::{contract, contractimpl, Bytes, Env, U256};
+use soroban_sdk::{contract, contractimpl, symbol_short, Bytes, Env, U256};
 
 #[contract]
 pub struct Contract;
@@ -48,4 +48,24 @@ impl Contract {
         // Return has data dependency on both values to make sure nothing gets optimized out
         u256_val
     }
+
+    pub fn do_cpu_only_work(e: Env, guest_cycles: u32, host_cycles: u32, event_count: u32) -> U256 {
+        let mut val: i64 = 3;
+        for _ in 0..guest_cycles {
+            val = (val * 1664525 + 1013904223) >> 32;
+        }
+
+        let mut u256_val = U256::from_u32(&e, val as u32);
+        let u256_1 = U256::from_u32(&e, 1);
+        for _ in 0..host_cycles {
+            u256_val = u256_val.add(&u256_1);
+        }
+
+        for _ in 0..event_count {
+            e.events().publish((symbol_short!("event"),), val);
+        }
+
+        // Return has data dependency on both values to make sure nothing gets optimized out
+        u256_val
+    }
 }
diff --git a/soroban-test-wasms/wasm-workspace/no_arg_constructor/Cargo.toml b/soroban-test-wasms/wasm-workspace/no_arg_constructor/Cargo.toml
@@ -12,4 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
diff --git a/soroban-test-wasms/wasm-workspace/opt/20/loadgen.wasm b/soroban-test-wasms/wasm-workspace/opt/20/loadgen.wasm
diff --git a/soroban-test-wasms/wasm-workspace/recursive_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/recursive_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/sac_reentry_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml b/soroban-test-wasms/wasm-workspace/simple_account/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/sum_i32/Cargo.toml b/soroban-test-wasms/wasm-workspace/sum_i32/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/update/Cargo.toml b/soroban-test-wasms/wasm-workspace/update/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/upload_contract/Cargo.toml b/soroban-test-wasms/wasm-workspace/upload_contract/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/vec/Cargo.toml b/soroban-test-wasms/wasm-workspace/vec/Cargo.toml
@@ -12,7 +12,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
diff --git a/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml b/soroban-test-wasms/wasm-workspace/write_upgrade_bytes/Cargo.toml
@@ -13,7 +13,3 @@ doctest = false
 
 [dependencies]
 soroban-sdk = { workspace = true }
-soroban-env-common = { workspace = true }
-
-[features]
-next = ["soroban-env-common/next"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ doctest = false

		[dependencies]
		soroban-sdk = { workspace = true }
		soroban-env-common = { workspace = true }