Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cost model and cost tracker logic when runtime starts to consume CU for all builtins #32080

Closed
wants to merge 6 commits into from
Closed

Update cost model and cost tracker logic when runtime starts to consume CU for all builtins #32080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0d9b716
1. update cost_model and cost_tracker logic for feature gate native_p…
tao-stones Jun 5, 2023
cfe2a6a
update a ledger test by adding set_compute_unit_limit ix
tao-stones Jun 12, 2023
33d37e5
uncommit cargo.lock changes
tao-stones Jun 12, 2023
c6b4594
recommit cargo.log change
tao-stones Jun 13, 2023
ea8bd06
uncommit cargo.lock changes
tao-stones Jun 12, 2023
31c2018
recommit cargo.log change
tao-stones Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

233 changes: 133 additions & 100 deletions core/src/banking_stage/qos_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,8 @@ impl QosService {
// checked for update
if let Ok(tx_cost) = tx_cost {
match transaction_committed_details {
CommitTransactionDetails::Committed { compute_units } => {
cost_tracker.update_execution_cost(tx_cost, *compute_units)
}
CommitTransactionDetails::Committed { compute_units } => cost_tracker
.update_execution_cost(tx_cost, *compute_units, &bank.feature_set),
CommitTransactionDetails::NotCommitted => cost_tracker.remove(tx_cost),
}
}
Expand Down Expand Up @@ -627,6 +626,7 @@ mod tests {
itertools::Itertools,
solana_runtime::genesis_utils::{create_genesis_config, GenesisConfigInfo},
solana_sdk::{
feature_set::native_programs_consume_cu,
hash::Hash,
signature::{Keypair, Signer},
system_transaction,
Expand Down Expand Up @@ -733,7 +733,6 @@ mod tests {
fn test_update_or_remove_transaction_costs_commited() {
solana_logger::setup();
let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10);
let bank = Arc::new(Bank::new_for_tests(&genesis_config));

// make some transfer transactions
// calculate their costs, apply to cost_tracker
Expand All @@ -747,46 +746,64 @@ mod tests {
.collect();
let execute_units_adjustment = 10u64;

// assert all tx_costs should be applied to cost_tracker if all execution_results are all committed
{
let qos_service = QosService::new(1);
let txs_costs = qos_service.compute_transaction_costs(
&FeatureSet::all_enabled(),
txs.iter(),
std::iter::repeat(Ok(())),
);
let total_txs_cost: u64 = txs_costs
.iter()
.map(|cost| cost.as_ref().unwrap().sum())
.sum();
let (qos_cost_results, _num_included) =
qos_service.select_transactions_per_cost(txs.iter(), txs_costs.into_iter(), &bank);
assert_eq!(
total_txs_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
// all transactions are committed with actual units more than estimated
let commited_status: Vec<CommitTransactionDetails> = qos_cost_results
.iter()
.map(|tx_cost| CommitTransactionDetails::Committed {
compute_units: tx_cost.as_ref().unwrap().bpf_execution_cost
+ execute_units_adjustment,
})
.collect();
let final_txs_cost = total_txs_cost + execute_units_adjustment * transaction_count;
QosService::update_or_remove_transaction_costs(
qos_cost_results.iter(),
Some(&commited_status),
&bank,
);
assert_eq!(
final_txs_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
assert_eq!(
transaction_count,
bank.read_cost_tracker().unwrap().transaction_count()
);
for native_programs_consume_cu_feature_activated in [true, false] {
let mut bank = Bank::new_for_tests(&genesis_config);
if native_programs_consume_cu_feature_activated {
bank.activate_feature(&native_programs_consume_cu::id());
} else {
bank.deactivate_feature(&native_programs_consume_cu::id());
}
let bank = Arc::new(bank);
// assert all tx_costs should be applied to cost_tracker if all execution_results are all committed
{
let qos_service = QosService::new(1);
let txs_costs = qos_service.compute_transaction_costs(
&FeatureSet::all_enabled(),
apfitzge marked this conversation as resolved.
Show resolved Hide resolved
txs.iter(),
std::iter::repeat(Ok(())),
);
let total_txs_cost: u64 = txs_costs
.iter()
.map(|cost| cost.as_ref().unwrap().sum())
.sum();
let (qos_cost_results, _num_included) = qos_service.select_transactions_per_cost(
txs.iter(),
txs_costs.into_iter(),
&bank,
);
assert_eq!(
total_txs_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
// all transactions are committed with actual units more than estimated
let commited_status: Vec<CommitTransactionDetails> = qos_cost_results
.iter()
.map(|tx_cost| {
let actual_consumed_cu = if native_programs_consume_cu_feature_activated {
tx_cost.as_ref().unwrap().programs_execution_cost()
} else {
tx_cost.as_ref().unwrap().bpf_execution_cost
} + execute_units_adjustment;
CommitTransactionDetails::Committed {
compute_units: actual_consumed_cu,
}
})
.collect();
let final_txs_cost = total_txs_cost + execute_units_adjustment * transaction_count;
QosService::update_or_remove_transaction_costs(
qos_cost_results.iter(),
Some(&commited_status),
&bank,
);
assert_eq!(
final_txs_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
assert_eq!(
transaction_count,
bank.read_cost_tracker().unwrap().transaction_count()
);
}
}
}

Expand Down Expand Up @@ -835,7 +852,6 @@ mod tests {
fn test_update_or_remove_transaction_costs_mixed_execution() {
solana_logger::setup();
let GenesisConfigInfo { genesis_config, .. } = create_genesis_config(10);
let bank = Arc::new(Bank::new_for_tests(&genesis_config));

// make some transfer transactions
// calculate their costs, apply to cost_tracker
Expand All @@ -849,63 +865,80 @@ mod tests {
.collect();
let execute_units_adjustment = 10u64;

// assert only commited tx_costs are applied cost_tracker
{
let qos_service = QosService::new(1);
let txs_costs = qos_service.compute_transaction_costs(
&FeatureSet::all_enabled(),
txs.iter(),
std::iter::repeat(Ok(())),
);
let total_txs_cost: u64 = txs_costs
.iter()
.map(|cost| cost.as_ref().unwrap().sum())
.sum();
let (qos_cost_results, _num_included) =
qos_service.select_transactions_per_cost(txs.iter(), txs_costs.into_iter(), &bank);
assert_eq!(
total_txs_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
// Half of transactions are not committed, the rest with cost adjustment
let commited_status: Vec<CommitTransactionDetails> = qos_cost_results
.iter()
.enumerate()
.map(|(n, tx_cost)| {
if n % 2 == 0 {
CommitTransactionDetails::NotCommitted
} else {
CommitTransactionDetails::Committed {
compute_units: tx_cost.as_ref().unwrap().bpf_execution_cost
+ execute_units_adjustment,
for native_programs_consume_cu_feature_activated in [true, false] {
let mut bank = Bank::new_for_tests(&genesis_config);
if native_programs_consume_cu_feature_activated {
bank.activate_feature(&native_programs_consume_cu::id());
} else {
bank.deactivate_feature(&native_programs_consume_cu::id());
}
let bank = Arc::new(bank);
// assert only commited tx_costs are applied cost_tracker
{
let qos_service = QosService::new(1);
let txs_costs = qos_service.compute_transaction_costs(
&FeatureSet::all_enabled(),
txs.iter(),
std::iter::repeat(Ok(())),
);
let total_txs_cost: u64 = txs_costs
.iter()
.map(|cost| cost.as_ref().unwrap().sum())
.sum();
let (qos_cost_results, _num_included) = qos_service.select_transactions_per_cost(
txs.iter(),
txs_costs.into_iter(),
&bank,
);
assert_eq!(
total_txs_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
// Half of transactions are not committed, the rest with cost adjustment
let commited_status: Vec<CommitTransactionDetails> = qos_cost_results
.iter()
.enumerate()
.map(|(n, tx_cost)| {
if n % 2 == 0 {
CommitTransactionDetails::NotCommitted
} else {
let actual_consumed_cu = if native_programs_consume_cu_feature_activated
{
tx_cost.as_ref().unwrap().programs_execution_cost()
} else {
tx_cost.as_ref().unwrap().bpf_execution_cost
} + execute_units_adjustment;
CommitTransactionDetails::Committed {
compute_units: actual_consumed_cu,
}
}
}
})
.collect();
QosService::update_or_remove_transaction_costs(
qos_cost_results.iter(),
Some(&commited_status),
&bank,
);
})
.collect();
QosService::update_or_remove_transaction_costs(
qos_cost_results.iter(),
Some(&commited_status),
&bank,
);

// assert the final block cost
let mut expected_final_txs_count = 0u64;
let mut expected_final_block_cost = 0u64;
qos_cost_results.iter().enumerate().for_each(|(n, cost)| {
if n % 2 != 0 {
expected_final_txs_count += 1;
expected_final_block_cost +=
cost.as_ref().unwrap().sum() + execute_units_adjustment;
}
});
assert_eq!(
expected_final_block_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
assert_eq!(
expected_final_txs_count,
bank.read_cost_tracker().unwrap().transaction_count()
);
// assert the final block cost
let mut expected_final_txs_count = 0u64;
let mut expected_final_block_cost = 0u64;
qos_cost_results.iter().enumerate().for_each(|(n, cost)| {
if n % 2 != 0 {
expected_final_txs_count += 1;
expected_final_block_cost +=
cost.as_ref().unwrap().sum() + execute_units_adjustment;
}
});
assert_eq!(
expected_final_block_cost,
bank.read_cost_tracker().unwrap().block_cost()
);
assert_eq!(
expected_final_txs_count,
bank.read_cost_tracker().unwrap().transaction_count()
);
}
}
}

Expand Down
2 changes: 2 additions & 0 deletions ledger/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ serde_bytes = { workspace = true }
sha2 = { workspace = true }
solana-account-decoder = { workspace = true }
solana-bpf-loader-program = { workspace = true }
solana-compute-budget-program = { workspace = true }
solana-entry = { workspace = true }
solana-frozen-abi = { workspace = true }
solana-frozen-abi-macro = { workspace = true }
Expand All @@ -51,6 +52,7 @@ solana-sdk = { workspace = true }
solana-stake-program = { workspace = true }
solana-storage-bigtable = { workspace = true }
solana-storage-proto = { workspace = true }
solana-system-program = { workspace = true }
solana-transaction-status = { workspace = true }
solana-vote-program = { workspace = true }
spl-token = { workspace = true, features = ["no-entrypoint"] }
Expand Down
19 changes: 15 additions & 4 deletions ledger/src/blockstore_processor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3256,15 +3256,26 @@ pub mod tests {
let present_account = AccountSharedData::new(1, 10, &Pubkey::default());
bank.store_account(&present_account_key.pubkey(), &present_account);

let compute_unit_limit = solana_system_program::system_processor::DEFAULT_COMPUTE_UNITS
as u32
+ solana_compute_budget_program::DEFAULT_COMPUTE_UNITS as u32;
let entries: Vec<_> = (0..NUM_TRANSFERS)
.step_by(NUM_TRANSFERS_PER_ENTRY)
.map(|i| {
let mut transactions = (0..NUM_TRANSFERS_PER_ENTRY)
.map(|j| {
system_transaction::transfer(
&keypairs[i + j],
&keypairs[i + j + NUM_TRANSFERS].pubkey(),
1,
// transactions should request compute_unit_limit
Transaction::new_signed_with_payer(
&[
solana_sdk::system_instruction::transfer(
&keypairs[i + j].pubkey(),
&keypairs[i + j + NUM_TRANSFERS].pubkey(),
1,
),
solana_sdk::compute_budget::ComputeBudgetInstruction::set_compute_unit_limit(compute_unit_limit),
],
Some(&keypairs[i + j].pubkey()),
&[&keypairs[i + j]],
bank.last_blockhash(),
)
})
Expand Down
2 changes: 2 additions & 0 deletions programs/sbf/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading