Explorar el Código

svm repo split: rename timings (#7432)

svm repo split: rename `timings` to `svm-timings`
Joe C hace 3 meses
padre
commit
87a97a3266

+ 18 - 18
Cargo.lock

@@ -380,10 +380,10 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction-context",
  "static_assertions",
  "test-case",
@@ -8019,13 +8019,13 @@ dependencies = [
  "solana-stake-program",
  "solana-streamer",
  "solana-svm",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-program",
  "solana-system-transaction",
  "solana-sysvar",
  "solana-time-utils",
- "solana-timings",
  "solana-tls-utils",
  "solana-tpu-client",
  "solana-tpu-client-next",
@@ -8963,11 +8963,11 @@ dependencies = [
  "solana-storage-proto",
  "solana-streamer",
  "solana-svm",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-transaction",
  "solana-time-utils",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -9669,12 +9669,12 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "test-case",
@@ -9731,10 +9731,10 @@ dependencies = [
  "solana-stake-program",
  "solana-svm",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -10300,6 +10300,7 @@ dependencies = [
  "solana-stake-program",
  "solana-svm",
  "solana-svm-callback",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-program",
@@ -10307,7 +10308,6 @@ dependencies = [
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-time-utils",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -10926,6 +10926,7 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-svm-type-overrides",
  "solana-system-interface",
@@ -10933,7 +10934,6 @@ dependencies = [
  "solana-system-transaction",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -10964,6 +10964,15 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "solana-svm-timings"
+version = "3.0.0"
+dependencies = [
+ "eager",
+ "enum-iterator",
+ "solana-pubkey",
+]
+
 [[package]]
 name = "solana-svm-transaction"
 version = "3.0.0"
@@ -11156,15 +11165,6 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c"
 
-[[package]]
-name = "solana-timings"
-version = "3.0.0"
-dependencies = [
- "eager",
- "enum-iterator",
- "solana-pubkey",
-]
-
 [[package]]
 name = "solana-tls-utils"
 version = "3.0.0"
@@ -11622,8 +11622,8 @@ dependencies = [
  "solana-runtime",
  "solana-runtime-transaction",
  "solana-svm",
+ "solana-svm-timings",
  "solana-system-transaction",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-error",
  "solana-unified-scheduler-logic",
@@ -11847,8 +11847,8 @@ dependencies = [
  "solana-shred-version",
  "solana-signer",
  "solana-streamer",
+ "solana-svm-timings",
  "solana-time-utils",
- "solana-timings",
  "solana-vote",
  "solana-vote-interface",
  "solana-vote-program",

+ 2 - 2
Cargo.toml

@@ -105,13 +105,13 @@ members = [
     "svm-callback",
     "svm-feature-set",
     "svm-log-collector",
+    "svm-timings",
     "svm-transaction",
     "svm-type-overrides",
     "syscalls",
     "syscalls/gen-syscall-list",
     "test-validator",
     "thread-manager",
-    "timings",
     "tls-utils",
     "tokens",
     "tps-client",
@@ -523,6 +523,7 @@ solana-svm = { path = "svm", version = "=3.0.0" }
 solana-svm-callback = { path = "svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "svm-feature-set", version = "=3.0.0" }
 solana-svm-log-collector = { path = "svm-log-collector", version = "=3.0.0" }
+solana-svm-timings = { path = "svm-timings", version = "=3.0.0" }
 solana-svm-transaction = { path = "svm-transaction", version = "=3.0.0" }
 solana-svm-type-overrides = { path = "svm-type-overrides", version = "=3.0.0" }
 solana-system-interface = "1.0"
@@ -532,7 +533,6 @@ solana-sysvar = "2.2.2"
 solana-sysvar-id = "2.2.1"
 solana-test-validator = { path = "test-validator", version = "=3.0.0" }
 solana-time-utils = "2.2.1"
-solana-timings = { path = "timings", version = "=3.0.0" }
 solana-tls-utils = { path = "tls-utils", version = "=3.0.0" }
 solana-tps-client = { path = "tps-client", version = "=3.0.0" }
 solana-tpu-client = { path = "tpu-client", version = "=3.0.0", default-features = false }

+ 1 - 1
core/Cargo.toml

@@ -146,12 +146,12 @@ solana-slot-hashes = { workspace = true }
 solana-slot-history = { workspace = true }
 solana-streamer = { workspace = true }
 solana-svm = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-system-transaction = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-time-utils = { workspace = true }
-solana-timings = { workspace = true }
 solana-tls-utils = { workspace = true }
 solana-tpu-client = { workspace = true }
 solana-tpu-client-next = { workspace = true }

+ 1 - 1
core/src/banking_stage/leader_slot_timing_metrics.rs

@@ -1,6 +1,6 @@
 use {
     solana_clock::Slot, solana_poh::transaction_recorder::RecordTransactionsTimings,
-    solana_timings::ExecuteTimings, std::time::Instant,
+    solana_svm_timings::ExecuteTimings, std::time::Instant,
 };
 
 #[derive(Default, Debug)]

+ 1 - 1
core/src/replay_stage.rs

@@ -71,8 +71,8 @@ use {
         vote_sender_types::ReplayVoteSender,
     },
     solana_signer::Signer,
+    solana_svm_timings::ExecuteTimings,
     solana_time_utils::timestamp,
-    solana_timings::ExecuteTimings,
     solana_transaction::Transaction,
     solana_vote::vote_transaction::VoteTransaction,
     std::{

+ 1 - 1
core/tests/scheduler_cost_adjustment.rs

@@ -18,8 +18,8 @@ use {
     solana_sdk_ids::{bpf_loader, bpf_loader_upgradeable, secp256k1_program},
     solana_signer::Signer,
     solana_svm::transaction_processor::ExecutionRecordingConfig,
+    solana_svm_timings::ExecuteTimings,
     solana_system_interface::instruction as system_instruction,
-    solana_timings::ExecuteTimings,
     solana_transaction::Transaction,
     solana_transaction_error::{TransactionError, TransactionResult as Result},
     std::sync::{Arc, RwLock},

+ 1 - 1
core/tests/unified_scheduler.rs

@@ -33,8 +33,8 @@ use {
         prioritization_fee_cache::PrioritizationFeeCache,
     },
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
+    solana_svm_timings::ExecuteTimings,
     solana_system_transaction as system_transaction,
-    solana_timings::ExecuteTimings,
     solana_transaction_error::TransactionResult as Result,
     solana_unified_scheduler_logic::{SchedulingMode, Task},
     solana_unified_scheduler_pool::{

+ 1 - 1
ledger/Cargo.toml

@@ -99,11 +99,11 @@ solana-storage-bigtable = { workspace = true }
 solana-storage-proto = { workspace = true }
 solana-streamer = { workspace = true }
 solana-svm = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-system-transaction = { workspace = true }
 solana-time-utils = { workspace = true }
-solana-timings = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }

+ 1 - 1
ledger/benches/blockstore_processor.rs

@@ -21,9 +21,9 @@ use {
     },
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
     solana_signer::Signer,
+    solana_svm_timings::ExecuteTimings,
     solana_system_interface::program as system_program,
     solana_system_transaction as system_transaction,
-    solana_timings::ExecuteTimings,
     solana_transaction::sanitized::SanitizedTransaction,
     std::sync::{Arc, RwLock},
     test::Bencher,

+ 1 - 1
ledger/src/blockstore_processor.rs

@@ -51,8 +51,8 @@ use {
         transaction_processing_result::ProcessedTransaction,
         transaction_processor::ExecutionRecordingConfig,
     },
+    solana_svm_timings::{report_execute_timings, ExecuteTimingType, ExecuteTimings},
     solana_svm_transaction::{svm_message::SVMMessage, svm_transaction::SVMTransaction},
-    solana_timings::{report_execute_timings, ExecuteTimingType, ExecuteTimings},
     solana_transaction::{
         sanitized::SanitizedTransaction, versioned::VersionedTransaction,
         TransactionVerificationMode,

+ 1 - 1
program-runtime/Cargo.toml

@@ -56,12 +56,12 @@ solana-slot-hashes = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
-solana-timings = { workspace = true }
 solana-transaction-context = { workspace = true }
 
 [dev-dependencies]

+ 1 - 1
program-runtime/src/invoke_context.rs

@@ -28,9 +28,9 @@ use {
     solana_svm_callback::InvokeContextCallback,
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_log_collector::{ic_msg, LogCollector},
+    solana_svm_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_svm_transaction::{instruction::SVMInstruction, svm_message::SVMMessage},
     solana_svm_type_overrides::sync::Arc,
-    solana_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_transaction_context::{
         IndexOfAccount, InstructionAccount, TransactionAccount, TransactionContext,
         MAX_ACCOUNTS_PER_TRANSACTION,

+ 1 - 1
program-runtime/src/loaded_programs.rs

@@ -25,7 +25,7 @@ use {
     },
 };
 #[cfg(feature = "metrics")]
-use {solana_measure::measure::Measure, solana_timings::ExecuteDetailsTimings};
+use {solana_measure::measure::Measure, solana_svm_timings::ExecuteDetailsTimings};
 
 pub type ProgramRuntimeEnvironment = Arc<BuiltinProgram<InvokeContext<'static>>>;
 pub const MAX_LOADED_ENTRY_COUNT: usize = 512;

+ 1 - 1
program-test/Cargo.toml

@@ -53,10 +53,10 @@ solana-stable-layout = { workspace = true }
 solana-stake-interface = { workspace = true }
 solana-svm = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
-solana-timings = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }

+ 1 - 1
program-test/src/lib.rs

@@ -42,9 +42,9 @@ use {
     },
     solana_signer::Signer,
     solana_svm_log_collector::ic_msg,
+    solana_svm_timings::ExecuteTimings,
     solana_sysvar::Sysvar,
     solana_sysvar_id::SysvarId,
-    solana_timings::ExecuteTimings,
     solana_vote_program::vote_state::{self, VoteStateV3, VoteStateVersions},
     std::{
         cell::RefCell,

+ 19 - 19
programs/sbf/Cargo.lock

@@ -168,10 +168,10 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-type-overrides",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction-context",
  "thiserror 2.0.12",
 ]
@@ -6285,12 +6285,12 @@ dependencies = [
  "solana-slot-history",
  "solana-streamer",
  "solana-svm",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-transaction",
  "solana-sysvar",
  "solana-time-utils",
- "solana-timings",
  "solana-tls-utils",
  "solana-tpu-client",
  "solana-tpu-client-next",
@@ -6972,11 +6972,11 @@ dependencies = [
  "solana-storage-proto",
  "solana-streamer",
  "solana-svm",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-transaction",
  "solana-time-utils",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -7504,12 +7504,12 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction-context",
 ]
 
@@ -7561,10 +7561,10 @@ dependencies = [
  "solana-stake-interface",
  "solana-svm",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-system-interface",
  "solana-sysvar",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -8020,6 +8020,7 @@ dependencies = [
  "solana-stake-program",
  "solana-svm",
  "solana-svm-callback",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-system-interface",
  "solana-system-program",
@@ -8027,7 +8028,6 @@ dependencies = [
  "solana-sysvar",
  "solana-sysvar-id",
  "solana-time-utils",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -8131,11 +8131,11 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar",
- "solana-timings",
  "solana-transaction",
  "solana-transaction-context",
  "solana-transaction-error",
@@ -9255,11 +9255,11 @@ dependencies = [
  "solana-svm-callback",
  "solana-svm-feature-set",
  "solana-svm-log-collector",
+ "solana-svm-timings",
  "solana-svm-transaction",
  "solana-svm-type-overrides",
  "solana-system-interface",
  "solana-sysvar-id",
- "solana-timings",
  "solana-transaction-context",
  "solana-transaction-error",
  "spl-generic-token",
@@ -9287,6 +9287,15 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "solana-svm-timings"
+version = "3.0.0"
+dependencies = [
+ "eager",
+ "enum-iterator",
+ "solana-pubkey",
+]
+
 [[package]]
 name = "solana-svm-transaction"
 version = "3.0.0"
@@ -9464,15 +9473,6 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6af261afb0e8c39252a04d026e3ea9c405342b08c871a2ad8aa5448e068c784c"
 
-[[package]]
-name = "solana-timings"
-version = "3.0.0"
-dependencies = [
- "eager",
- "enum-iterator",
- "solana-pubkey",
-]
-
 [[package]]
 name = "solana-tls-utils"
 version = "3.0.0"
@@ -9774,7 +9774,7 @@ dependencies = [
  "solana-runtime",
  "solana-runtime-transaction",
  "solana-svm",
- "solana-timings",
+ "solana-svm-timings",
  "solana-transaction",
  "solana-transaction-error",
  "solana-unified-scheduler-logic",
@@ -9906,8 +9906,8 @@ dependencies = [
  "solana-pubkey",
  "solana-runtime",
  "solana-shred-version",
+ "solana-svm-timings",
  "solana-time-utils",
- "solana-timings",
  "solana-vote",
  "solana-vote-interface",
  "solana-vote-program",

+ 2 - 2
programs/sbf/Cargo.toml

@@ -160,11 +160,11 @@ solana-svm = { path = "../../svm", version = "=3.0.0" }
 solana-svm-callback = { path = "../../svm-callback", version = "=3.0.0" }
 solana-svm-feature-set = { path = "../../svm-feature-set", version = "=3.0.0" }
 solana-svm-log-collector = { path = "../../svm-log-collector", version = "=3.0.0" }
+solana-svm-timings = { path = "../../svm-timings", version = "=3.0.0" }
 solana-svm-transaction = { path = "../../svm-transaction", version = "=3.0.0" }
 solana-svm-type-overrides = { path = "../../svm-type-overrides", version = "=3.0.0" }
 solana-system-interface = { version = "=1.0", features = ["bincode"] }
 solana-sysvar = "=2.2.2"
-solana-timings = { path = "../../timings", version = "=3.0.0" }
 solana-transaction-context = { path = "../../transaction-context", version = "=3.0.0" }
 solana-transaction-status = { path = "../../transaction-status", version = "=3.0.0" }
 solana-vote = { path = "../../vote", version = "=3.0.0" }
@@ -238,11 +238,11 @@ solana-svm = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-svm-type-overrides = { workspace = true }
 solana-system-interface = "1.0"
 solana-sysvar = "2.2.1"
-solana-timings = { workspace = true }
 solana-transaction = "2.2.2"
 solana-transaction-context = { workspace = true, features = ["dev-context-only-utils"] }
 solana-transaction-error = "2.2.1"

+ 1 - 1
programs/sbf/tests/programs.rs

@@ -58,10 +58,10 @@ use {
         transaction_execution_result::InnerInstruction,
         transaction_processor::ExecutionRecordingConfig,
     },
+    solana_svm_timings::ExecuteTimings,
     solana_svm_transaction::svm_message::SVMMessage,
     solana_svm_type_overrides::rand,
     solana_system_interface::{program as system_program, MAX_PERMITTED_DATA_LENGTH},
-    solana_timings::ExecuteTimings,
     solana_transaction::Transaction,
     solana_transaction_error::TransactionError,
     std::{

+ 1 - 1
runtime/Cargo.toml

@@ -155,6 +155,7 @@ solana-stake-interface = { workspace = true }
 solana-stake-program = { workspace = true }
 solana-svm = { workspace = true }
 solana-svm-callback = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-system-program = { workspace = true, optional = true }
@@ -162,7 +163,6 @@ solana-system-transaction = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
 solana-time-utils = { workspace = true }
-solana-timings = { workspace = true }
 solana-transaction = { workspace = true, features = ["verify"] }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }

+ 1 - 1
runtime/src/bank.rs

@@ -143,12 +143,12 @@ use {
         },
     },
     solana_svm_callback::{AccountState, InvokeContextCallback, TransactionProcessingCallback},
+    solana_svm_timings::{ExecuteTimingType, ExecuteTimings},
     solana_svm_transaction::svm_message::SVMMessage,
     solana_system_transaction as system_transaction,
     solana_sysvar::{self as sysvar, last_restart_slot::LastRestartSlot, Sysvar},
     solana_sysvar_id::SysvarId,
     solana_time_utils::years_as_slots,
-    solana_timings::{ExecuteTimingType, ExecuteTimings},
     solana_transaction::{
         sanitized::{MessageHash, SanitizedTransaction, MAX_TX_ACCOUNT_LOCKS},
         versioned::VersionedTransaction,

+ 1 - 1
runtime/src/bank/tests.rs

@@ -99,6 +99,7 @@ use {
         transaction_commit_result::TransactionCommitResultExtensions,
         transaction_execution_result::ExecutedTransaction,
     },
+    solana_svm_timings::ExecuteTimings,
     solana_svm_transaction::svm_message::SVMMessage,
     solana_system_interface::{
         error::SystemError,
@@ -107,7 +108,6 @@ use {
         MAX_PERMITTED_DATA_LENGTH,
     },
     solana_system_transaction as system_transaction, solana_sysvar as sysvar,
-    solana_timings::ExecuteTimings,
     solana_transaction::{
         sanitized::SanitizedTransaction, Transaction, TransactionVerificationMode,
     },

+ 1 - 1
runtime/src/installed_scheduler_pool.rs

@@ -27,7 +27,7 @@ use {
     solana_clock::Slot,
     solana_hash::Hash,
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
-    solana_timings::ExecuteTimings,
+    solana_svm_timings::ExecuteTimings,
     solana_transaction::sanitized::SanitizedTransaction,
     solana_transaction_error::{TransactionError, TransactionResult as Result},
     solana_unified_scheduler_logic::SchedulingMode,

+ 2 - 2
timings/Cargo.toml → svm-timings/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
-name = "solana-timings"
+name = "solana-svm-timings"
 description = "Solana Execution Timings"
-documentation = "https://docs.rs/solana-timings"
+documentation = "https://docs.rs/solana-svm-timings"
 version = { workspace = true }
 authors = { workspace = true }
 repository = { workspace = true }

+ 0 - 0
timings/src/lib.rs → svm-timings/src/lib.rs


+ 1 - 1
svm/Cargo.toml

@@ -70,11 +70,11 @@ solana-sdk-ids = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-transaction = { workspace = true }
 solana-svm-type-overrides = { workspace = true }
 solana-system-interface = { workspace = true }
 solana-sysvar-id = { workspace = true }
-solana-timings = { workspace = true }
 solana-transaction-context = { workspace = true }
 solana-transaction-error = { workspace = true }
 spl-generic-token = { workspace = true }

+ 1 - 1
svm/src/message_processor.rs

@@ -1,8 +1,8 @@
 use {
     solana_measure::measure_us,
     solana_program_runtime::invoke_context::InvokeContext,
+    solana_svm_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_svm_transaction::svm_message::SVMMessage,
-    solana_timings::{ExecuteDetailsTimings, ExecuteTimings},
     solana_transaction_context::IndexOfAccount,
     solana_transaction_error::TransactionError,
 };

+ 1 - 1
svm/src/program_loader.rs

@@ -11,8 +11,8 @@ use {
     solana_pubkey::Pubkey,
     solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, loader_v4},
     solana_svm_callback::TransactionProcessingCallback,
+    solana_svm_timings::ExecuteTimings,
     solana_svm_type_overrides::sync::Arc,
-    solana_timings::ExecuteTimings,
     solana_transaction_error::{TransactionError, TransactionResult},
 };
 

+ 1 - 1
svm/src/transaction_processor.rs

@@ -49,9 +49,9 @@ use {
     solana_svm_callback::TransactionProcessingCallback,
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_log_collector::LogCollector,
+    solana_svm_timings::{ExecuteTimingType, ExecuteTimings},
     solana_svm_transaction::{svm_message::SVMMessage, svm_transaction::SVMTransaction},
     solana_svm_type_overrides::sync::{atomic::Ordering, Arc, RwLock, RwLockReadGuard},
-    solana_timings::{ExecuteTimingType, ExecuteTimings},
     solana_transaction_context::{ExecutionRecord, TransactionContext},
     solana_transaction_error::{TransactionError, TransactionResult},
     std::{

+ 1 - 1
svm/tests/concurrent_tests.rs

@@ -26,7 +26,7 @@ use {
         },
     },
     solana_svm_feature_set::SVMFeatureSet,
-    solana_timings::ExecuteTimings,
+    solana_svm_timings::ExecuteTimings,
     solana_transaction::{sanitized::SanitizedTransaction, Transaction},
     std::collections::HashSet,
 };

+ 1 - 1
syscalls/Cargo.toml

@@ -51,10 +51,10 @@ solana-stable-layout = { workspace = true }
 solana-svm-callback = { workspace = true }
 solana-svm-feature-set = { workspace = true }
 solana-svm-log-collector = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-svm-type-overrides = { workspace = true }
 solana-sysvar = { workspace = true }
 solana-sysvar-id = { workspace = true }
-solana-timings = { workspace = true }
 solana-transaction-context = { workspace = true, features = ["bincode"] }
 thiserror = { workspace = true }
 

+ 1 - 1
syscalls/src/lib.rs

@@ -46,10 +46,10 @@ use {
     solana_sha256_hasher::Hasher,
     solana_svm_feature_set::SVMFeatureSet,
     solana_svm_log_collector::{ic_logger_msg, ic_msg},
+    solana_svm_timings::ExecuteTimings,
     solana_svm_type_overrides::sync::Arc,
     solana_sysvar::Sysvar,
     solana_sysvar_id::SysvarId,
-    solana_timings::ExecuteTimings,
     solana_transaction_context::IndexOfAccount,
     std::{
         alloc::Layout,

+ 1 - 1
unified-scheduler-pool/Cargo.toml

@@ -33,7 +33,7 @@ solana-pubkey = { workspace = true }
 solana-runtime = { workspace = true }
 solana-runtime-transaction = { workspace = true }
 solana-svm = { workspace = true }
-solana-timings = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-transaction = { workspace = true }
 solana-transaction-error = { workspace = true }
 solana-unified-scheduler-logic = { workspace = true }

+ 2 - 2
unified-scheduler-pool/src/lib.rs

@@ -45,7 +45,7 @@ use {
     },
     solana_runtime_transaction::runtime_transaction::RuntimeTransaction,
     solana_svm::transaction_processing_result::ProcessedTransaction,
-    solana_timings::ExecuteTimings,
+    solana_svm_timings::ExecuteTimings,
     solana_transaction::sanitized::SanitizedTransaction,
     solana_transaction_error::{TransactionError, TransactionResult as Result},
     solana_unified_scheduler_logic::{
@@ -2739,8 +2739,8 @@ mod tests {
             installed_scheduler_pool::{BankWithScheduler, SchedulingContext},
             prioritization_fee_cache::PrioritizationFeeCache,
         },
+        solana_svm_timings::ExecuteTimingType,
         solana_system_transaction as system_transaction,
-        solana_timings::ExecuteTimingType,
         solana_transaction::sanitized::SanitizedTransaction,
         solana_transaction_error::TransactionError,
         solana_unified_scheduler_logic::NO_CONSUMED_BLOCK_SIZE,

+ 1 - 1
wen-restart/Cargo.toml

@@ -30,8 +30,8 @@ solana-ledger = { workspace = true }
 solana-pubkey = { workspace = true }
 solana-runtime = { workspace = true }
 solana-shred-version = { workspace = true }
+solana-svm-timings = { workspace = true }
 solana-time-utils = { workspace = true }
-solana-timings = { workspace = true }
 solana-vote = { workspace = true }
 solana-vote-interface = { workspace = true }
 solana-vote-program = { workspace = true }

+ 1 - 1
wen-restart/src/wen_restart.rs

@@ -46,8 +46,8 @@ use {
         },
     },
     solana_shred_version::compute_shred_version,
+    solana_svm_timings::ExecuteTimings,
     solana_time_utils::timestamp,
-    solana_timings::ExecuteTimings,
     solana_vote::vote_transaction::VoteTransaction,
     std::{
         collections::{HashMap, HashSet},