Also consider programs modified by tx

program-runtime/src/loaded_programs.rs

@@ -639,6 +639,7 @@ pub struct ProgramCacheForTxBatch {
     pub latest_root_epoch: Epoch,
     pub hit_max_limit: bool,
     pub loaded_missing: bool,
+    pub merged_modified: bool,
 }
 
 impl ProgramCacheForTxBatch {
@@ -656,6 +657,7 @@ impl ProgramCacheForTxBatch {
             latest_root_epoch,
             hit_max_limit: false,
             loaded_missing: false,
+            merged_modified: false,
         }
     }
 
@@ -672,6 +674,7 @@ impl ProgramCacheForTxBatch {
             latest_root_epoch: cache.latest_root_epoch,
             hit_max_limit: false,
             loaded_missing: false,
+            merged_modified: false,
         }
     }
 
@@ -725,6 +728,7 @@ impl ProgramCacheForTxBatch {
 
     pub fn merge(&mut self, other: &Self) {
         other.entries.iter().for_each(|(key, entry)| {
+            self.merged_modified = true;
             self.replenish(*key, entry.clone());
         })
     }

svm/src/transaction_processor.rs

@@ -293,10 +293,12 @@ impl<FG: ForkGraph> TransactionBatchProcessor<FG> {
         execution_time.stop();
 
         // Skip eviction when there's no chance this particular tx batch has increased the size of
-        // ProgramCache entries. Note that this flag is deliberately defined, so that there's still
-        // at least one other batch, which will evict the program cache, even after the occurrences
-        // of cooperative loading.
-        if programs_loaded_for_tx_batch.borrow().loaded_missing {
+        // ProgramCache entries. Note that loaded_missing is deliberately defined, so that there's
+        // still at least one other batch, which will evict the program cache, even after the
+        // occurrences of cooperative loading.
+        if programs_loaded_for_tx_batch.borrow().loaded_missing
+            || programs_loaded_for_tx_batch.borrow().merged_modified
+        {
             const SHRINK_LOADED_PROGRAMS_TO_PERCENTAGE: u8 = 90;
             self.program_cache
                 .write()