Added batched max_sac_tps configs (#4941)

# Description

Adds a batched payments setting to max_sac_tps. In initial testing, it
looks like SAC apply time is bounded by single threaded pre and post
invoke steps. Since the instructions required for a single SAC payment
are small and invocation time is dominated by these pre and post invoke
steps, we saw little improvement with parallelism when measuring SAC
payment load.

This PR adds batching functionality, where a single TX will perform many
SAC transfers. This increases the instruction count significantly, which
we can do in parallel, while not increasing the single threaded pre and
post invoke work. Config settings have been added to tune the number of
batch payments made per TX. Note that for the purposes of measurement
and reporting, "TPS" really refers to "SAC transfers per second" in the
batch payment case.

I've also added the `APPLY_LOAD_TIME_WRITES` flag. When set, we count
BucketList write time when calculating max TPS.

Currently a draft until
stellar/rs-soroban-env#1595 merges, then I'll
update the cargo accordingly.

# Checklist
- [x] Reviewed the
[contributing](https://github.com/stellar/stellar-core/blob/master/CONTRIBUTING.md#submitting-changes)
document
- [x] Rebased on top of master (no merge commits)
- [x] Ran `clang-format` v8.0.0 (via `make format` or the Visual Studio
extension)
- [x] Compiles
- [x] Ran all tests
- [ ] If change impacts performance, include supporting evidence per the
[performance
document](https://github.com/stellar/stellar-core/blob/master/performance-eval/performance-eval.md)

Author: SirTyson

Cargo.lock

@@ -1681,11 +1681,6 @@ Config::processConfig(std::shared_ptr<cpptoml::table> t)
                      APPLY_LOAD_MAX_SAC_TPS_TARGET_CLOSE_TIME_MS =
                          readInt<uint32_t>(item, 10);
                  }},
-                {"APPLY_LOAD_MAX_SAC_TPS_TEST_ITERATIONS",
-                 [&]() {
-                     APPLY_LOAD_MAX_SAC_TPS_TEST_ITERATIONS =
-                         readInt<uint32_t>(item);
-                 }},
                 {"APPLY_LOAD_MAX_SAC_TPS_MIN_TPS",
                  [&]() {
                      APPLY_LOAD_MAX_SAC_TPS_MIN_TPS = readInt<uint32_t>(item);
@@ -1694,6 +1689,12 @@ Config::processConfig(std::shared_ptr<cpptoml::table> t)
                  [&]() {
                      APPLY_LOAD_MAX_SAC_TPS_MAX_TPS = readInt<uint32_t>(item);
                  }},
+                {"APPLY_LOAD_BATCH_SAC_COUNT",
+                 [&]() {
+                     APPLY_LOAD_BATCH_SAC_COUNT = readInt<uint32_t>(item, 1);
+                 }},
+                {"APPLY_LOAD_TIME_WRITES",
+                 [&]() { APPLY_LOAD_TIME_WRITES = readBool(item); }},
                 {"GENESIS_TEST_ACCOUNT_COUNT",
                  [&]() {
                      GENESIS_TEST_ACCOUNT_COUNT = readInt<uint32_t>(item, 0);

src/main/Config.cpp

@@ -387,12 +387,6 @@ class Config : public std::enable_shared_from_this<Config>
     uint32_t APPLY_LOAD_NUM_ACCOUNTS = 0;
     uint32_t APPLY_LOAD_NUM_LEDGERS = 100;
 
-    // MAX_SAC_TPS mode specific parameters
-    uint32_t APPLY_LOAD_MAX_SAC_TPS_TARGET_CLOSE_TIME_MS = 1000;
-    uint32_t APPLY_LOAD_MAX_SAC_TPS_TEST_ITERATIONS = 3;
-    uint32_t APPLY_LOAD_MAX_SAC_TPS_MIN_TPS = 100;
-    uint32_t APPLY_LOAD_MAX_SAC_TPS_MAX_TPS = 50000;
-
     // Number of read-only and read-write entries in the apply-load
     // transactions. Every entry will have
     // `APPLY_LOAD_DATA_ENTRY_SIZE_FOR_TESTING` size.
@@ -405,6 +399,22 @@ class Config : public std::enable_shared_from_this<Config>
     std::vector<uint32_t> APPLY_LOAD_EVENT_COUNT_FOR_TESTING;
     std::vector<uint32_t> APPLY_LOAD_EVENT_COUNT_DISTRIBUTION_FOR_TESTING;
 
+    // MAX_SAC_TPS mode specific parameters
+    uint32_t APPLY_LOAD_MAX_SAC_TPS_TARGET_CLOSE_TIME_MS = 1000;
+    uint32_t APPLY_LOAD_MAX_SAC_TPS_MIN_TPS = 100;
+    uint32_t APPLY_LOAD_MAX_SAC_TPS_MAX_TPS = 50000;
+
+    // Number of SAC payments to include in each tx for MAX_SAC_TPS mode.
+    // If set to 1, each TX will be a single SAC invocation.
+    // If set to > 1, each TX will invoke the specified number of SAC sub
+    // invocations. Note that TPS measurement count each SAC invocation as one
+    // "transaction".
+    uint32_t APPLY_LOAD_BATCH_SAC_COUNT = 1;
+
+    // If set to true, database writes will count towards TPS calculation.
+    // Otherwise, BucketList writes will not be counted.
+    bool APPLY_LOAD_TIME_WRITES = true;
+
     // Waits for merges to complete before applying transactions during catchup
     bool CATCHUP_WAIT_MERGES_TX_APPLY_FOR_TESTING;
 

src/main/Config.h

@@ -130,9 +130,9 @@ optional = true
 # supported host, since test material usually just grows over time.
 
 [dependencies.soroban-test-wasms]
-version = "=23.0.0"
+version = "=23.0.2"
 git = "https://github.com/stellar/rs-soroban-env"
-rev = "688bc34e6cd15c71742139e625268c7f30f55a92"
+rev = "30249f0549141dbe7fdce84b6401a4235dbad64f"
 
 [dependencies.soroban-synth-wasm]
 version = "=23.0.0"

src/rust/Cargo.toml

@@ -206,7 +206,7 @@ pub(crate) mod rust_bridge {
         fn get_test_wasm_complex() -> Result<RustBuf>;
         fn get_test_wasm_loadgen() -> Result<RustBuf>;
         fn get_test_wasm_err() -> Result<RustBuf>;
-        fn get_test_contract_sac_transfer() -> Result<RustBuf>;
+        fn get_test_contract_sac_transfer(protocol_version: u32) -> Result<RustBuf>;
         fn get_write_bytes() -> Result<RustBuf>;
         fn get_invoke_contract_wasm() -> Result<RustBuf>;
 

src/rust/src/bridge.rs

@@ -40,12 +40,16 @@ pub(crate) fn get_test_wasm_loadgen() -> Result<RustBuf, Box<dyn std::error::Err
     })
 }
 
-pub(crate) fn get_test_contract_sac_transfer() -> Result<RustBuf, Box<dyn std::error::Error>> {
+pub(crate) fn get_test_contract_sac_transfer(
+    protocol_version: u32,
+) -> Result<RustBuf, Box<dyn std::error::Error>> {
+    let wasm_bytes = if protocol_version >= 23 {
+        soroban_test_wasms::CONTRACT_SAC_TRANSFER_CONTRACT_P23
+    } else {
+        soroban_test_wasms::CONTRACT_SAC_TRANSFER_CONTRACT
+    };
     Ok(RustBuf {
-        data: soroban_test_wasms::CONTRACT_SAC_TRANSFER_CONTRACT
-            .iter()
-            .cloned()
-            .collect(),
+        data: wasm_bytes.iter().cloned().collect(),
     })
 }