Revert "Update the config files with some new flags and ensure that the"

This reverts commit addecb5.

Author: tvmarino

compiler_opt/rl/inlining/env.py

@@ -28,10 +28,9 @@
 class InliningForSizeTask(env.MLGOTask):
   """Implementation of the inlining-for-size MLGOTask."""
 
-  def __init__(self, llvm_size_path: str, default_reward_key: str = 'default'):
+  def __init__(self, llvm_size_path: str):
     super().__init__()
     self._llvm_size_path = llvm_size_path
-    self._default_reward_key = default_reward_key
 
   def get_cmdline(self, clang_path: str, base_args: list[str],
                   interactive_base_path: str | None,
@@ -63,7 +62,7 @@ def get_module_scores(self, working_dir: str) -> dict[str, float]:
       raise RuntimeError(f'Wrong llvm-size output {output}')
     tmp = tmp[1].split('\t')
     native_size = int(tmp[0])
-    return {self._default_reward_key: native_size}
+    return {'default': native_size}
 
 
 @gin.configurable

compiler_opt/rl/inlining/gin_configs/common.gin

@@ -15,7 +15,7 @@ env.InliningForSizeTask.llvm_size_path=%llvm_size_path
 env.get_inlining_env.clang_path=%clang_path
 
 problem_config.flags_to_add.add_flags=()
-problem_config.flags_to_delete.delete_flags=('-split-dwarf-file','-split-dwarf-output','--crel','-fskip-odr-check-in-gmf','--warning-suppression-mappings')
+problem_config.flags_to_delete.delete_flags=('-split-dwarf-file','-split-dwarf-output',)
 # For AFDO profile reinjection set:
 # problem_config.flags_to_replace.replace_flags={'-fprofile-sample-use':'/path/to/gwp.afdo','-fprofile-remapping-file':'/path/to/prof_remap.txt'}
 problem_config.flags_to_replace.replace_flags={}

compiler_opt/rl/inlining/gin_configs/imitation_learning.gin

@@ -14,10 +14,7 @@ generate_bc_trajectories_lib.ModuleWorker.partitions=[
     285.0, 376.0, 452.0, 512.0, 571.0, 627.5, 720.0, 809.5, 1304.0, 1832.0,
     2467.0, 3344.0, 4545.0, 6459.0, 9845.0, 17953.0, 29430.5, 85533.5,
     124361.0]
-
-reward_key='default'
-generate_bc_trajectories_lib.ModuleWorker.reward_key=%reward_key
-env.InliningForSizeTask.reward_key=%reward_key
+generate_bc_trajectories_lib.ModuleWorker.reward_key='default'
 
 generate_bc_trajectories_lib.gen_trajectories.data_path=''
 generate_bc_trajectories_lib.gen_trajectories.delete_flags=('-split-dwarf-file', '-split-dwarf-output')

compiler_opt/rl/inlining/imitation_learning_config.py

@@ -1,4 +1,3 @@
-# coding=utf-8
 # Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,6 @@
 """Module for collect data of inlining-for-size."""
 
 import gin
-from typing import Type
 
 import numpy as np
 import tensorflow as tf
@@ -65,9 +63,10 @@ def get_input_signature():
   time_step_spec, action_spec = config.get_inlining_signature_spec()
   observation_spec = time_step_spec.observation
   observation_spec.update({
-      key: tf.TensorSpec(dtype=tf.int64, shape=(), name=key)
-      for key in ('is_callee_avail_external', 'is_caller_avail_external',
-                  'inlining_default')
+      key: tf.TensorSpec(dtype=tf.int64, shape=(), name=key) for key in (
+          'is_callee_avail_external',
+          'is_caller_avail_external',
+      )
   })
 
   time_step_spec = time_step.time_step_spec(observation_spec,
@@ -77,7 +76,7 @@ def get_input_signature():
 
 
 @gin.register
-def get_task_type() -> Type[env.InliningForSizeTask]:
+def get_task_type() -> type[env.InliningForSizeTask]:
   """Returns the task type for the trajectory collection."""
   return env.InliningForSizeTask