ft-orchestration mak appply_loop_offsets configurable per profile and per test-case

Author: pascal260303

tools/ft-analyzer/ftanalyzer/replicator/flow_replicator.py

@@ -746,7 +746,7 @@ def _recommend_chunksize(self) -> int:
         rows = max(1000, int(budget // max(1, bytes_per_row)))
         return rows
 
-    def _estimate_memory_from_file(csv_path: str, column_types: dict):
+    def _estimate_memory_from_file(self, csv_path: str, column_types: dict):
         bytes_per_row = sum(
             np.dtype(t).itemsize
             for t in column_types.values()

tools/ft-orchestration/tests/simulation/test_simulation_general.py

@@ -337,7 +337,7 @@ def finalizer_download_logs():
         scenario.test.get_prefilter_conf(scenario.default),
         scenario.test.loops,
         scenario.test.get_replicator_units(scenario.sampling),
-        scenario.test.apply_loop_offsets,
+        scenario.default.apply_loop_offsets and scenario.test.apply_loop_offsets,
     )
     if len(prefilter_conf) > 0:
         probe_instance.set_prefilter(prefilter_conf)
@@ -381,6 +381,9 @@ def finalizer_download_logs():
             input_file=ref_file,
             loops=scenario.test.loops,
             generator_stats=stats,
+            merge_across_loops=not (
+                scenario.default.apply_loop_offsets and scenario.test.apply_loop_offsets
+            ),
             speed_multiplier=speed.speed if isinstance(speed, MultiplierSpeed) else 1.0,
         )
 

tools/ft-orchestration/tests/simulation/test_simulation_overload.py

@@ -282,7 +282,7 @@ def finalizer_download_logs():
         generator_conf,
         scenario.test.multiplier,
         int(1 / scenario.sampling),
-        scenario.test.apply_loop_offsets,
+        scenario.default.apply_loop_offsets and scenario.test.apply_loop_offsets,
     )
     speed = (
         scenario.test.speed_multiplier
@@ -320,6 +320,9 @@ def finalizer_download_logs():
             flow_replicator.replicate,
             input_file=ref_file,
             loops=LOOPS,
+            merge_across_loops=not (
+                scenario.default.apply_loop_offsets and scenario.test.apply_loop_offsets
+            ),
             generator_stats=stats,
             speed_multiplier=speed.speed if isinstance(speed, MultiplierSpeed) else 1.0,
         )

tools/ft-orchestration/tests/simulation/test_simulation_threshold.py

@@ -254,7 +254,7 @@ def run_single_test(
             generator_conf,
             loops,
             replicator_units,
-            scenario.test.apply_loop_offsets,
+            scenario.default.apply_loop_offsets and scenario.test.apply_loop_offsets,
         )
         generator_instance.start_profile(
             profile_path,
@@ -284,6 +284,10 @@ def run_single_test(
                 flow_replicator.replicate,
                 input_file=ref_file,
                 loops=loops,
+                merge_across_loops=not (
+                    scenario.default.apply_loop_offsets
+                    and scenario.test.apply_loop_offsets
+                ),
                 generator_stats=stats,
             )