Revert "Update validation-test.py for Adjusted PERP SCF"

This reverts commit 35de44c.

Author: Quincunx271

util/misc/validation-test.py

@@ -12,12 +12,6 @@
 import analyze
 from analyze import Logs, Block
 
-# Some reference point to compute occupancies against.
-# This would ideally be the maximum possible occupancy so that the .cost property will never be negative
-OCCUPANCY_REFERENCE_POINT = 10
-
-SPILL_COST_WEIGHT = 0
-
 
 class BlockProcessingError(Exception):
     block: Block
@@ -38,20 +32,10 @@ class DagInfo:
     relative_cost: int
     length: int
     is_optimal: bool
-    # Spill cost is not absolute for SCF = TARGET. By recording the baseline, we can adjust the costs.
-    target_occupancy: Optional[int]
-    spill_cost: int
 
     @property
     def cost(self):
-        cost = self.lower_bound + self.relative_cost
-        if self.target_occupancy is not None:
-            # TargetOcc - SC is a "complement"-like operation, meaning that it undoes itself.
-            actual_occupancy = self.target_occupancy - self.spill_cost
-            absolute_spill_cost = OCCUPANCY_REFERENCE_POINT - actual_occupancy
-            cost += SPILL_COST_WEIGHT * absolute_spill_cost
-
-        return cost
+        return self.lower_bound + self.relative_cost
 
 
 class MismatchKind(Enum):
@@ -155,12 +139,9 @@ def extract_dag_info(logs: Logs) -> Dict[str, List[List[DagInfo]]]:
     for block in blocks:
         try:
             best_result = try_first(block, 'BestResult', 'HeuristicResult')[-1]
-            best_result_info = try_first(block, 'DagSolvedOptimally', 'DagTimedOut', 'HeuristicResult')[-1]
             is_optimal = best_result.get('optimal', False) or best_result['cost'] == 0 or  \
                 'INFO: Marking SLIL list schedule as optimal due to zero PERP.' in block.raw_log
 
-            target_occ = block.single('TargetOccupancy')['target'] if 'TargetOccupancy' in block else None
-
             dags.setdefault(block.name, []).append(DagInfo(
                 id=block.name,
                 benchmark=block.benchmark,
@@ -170,8 +151,6 @@ def extract_dag_info(logs: Logs) -> Dict[str, List[List[DagInfo]]]:
                 relative_cost=best_result['cost'],
                 length=best_result['length'],
                 is_optimal=is_optimal,
-                spill_cost=best_result_info['spill_cost'],
-                target_occupancy=target_occ,
             ))
         except Exception as ex:
             raise BlockProcessingError('Failed when processing block', block) from ex
@@ -370,8 +349,6 @@ def print_small_summary(mismatches: List[Mismatch]):
 
     parser.add_argument('-q', '--quiet', action='store_true',
                         help='Only print mismatch info, and only if there are mismatches')
-    parser.add_argument('--scw', '--spill-cost-weight', type=int, required=True,
-                        help='The weight of the spill cost in the cost calculation. Only relevant if the reported spill costs are not absolute (e.g. SCF = TARGET); put any value otherwise.', dest='spill_cost_weight', metavar='SCW')
     parser.add_argument('--no-summarize-largest-cost-difference', action='store_true',
                         help='Do not summarize the mismatches with the biggest difference in cost')
     parser.add_argument('--no-summarize-smallest-mismatches', action='store_true',
@@ -392,7 +369,6 @@ def print_small_summary(mismatches: List[Mismatch]):
     NUM_SMALLEST_BLOCKS_PRINT = args.num_smallest_mismatches_print
     MISSING_LOWER_BOUND_DUMP_COUNT = args.missing_lb_dump_count
     MISSING_LOWER_BOUND_DUMP_LINES = args.missing_lb_dump_lines
-    SPILL_COST_WEIGHT = args.spill_cost_weight
 
     main(
         args.first, args.second,