diff options
| -rw-r--r-- | driver/Clflags.ml | 2 | ||||
| -rw-r--r-- | driver/Driver.ml | 2 | ||||
| -rw-r--r-- | riscV/ExpansionOracle.ml | 5 | ||||
| -rw-r--r-- | scheduling/RTLpathScheduleraux.ml | 4 |
4 files changed, 3 insertions, 10 deletions
diff --git a/driver/Clflags.ml b/driver/Clflags.ml index ed036f87..9b7b5c4d 100644 --- a/driver/Clflags.ml +++ b/driver/Clflags.ml @@ -105,8 +105,6 @@ let option_fmadd = ref true let option_div_i32 = ref "stsud" let option_div_i64 = ref "stsud" let option_fcoalesce_mem = ref true -let option_fexpanse_rtlcond = ref true -let option_fexpanse_others = ref true let option_fforward_moves = ref false let option_fmove_loop_invariants = ref false let option_fnontrap_loads = ref true diff --git a/driver/Driver.ml b/driver/Driver.ml index 7192ba4b..c9eacadc 100644 --- a/driver/Driver.ml +++ b/driver/Driver.ml @@ -444,8 +444,6 @@ let cmdline_actions = @ f_opt "madd" option_fmadd @ f_opt "nontrap-loads" option_fnontrap_loads @ f_opt "coalesce-mem" option_fcoalesce_mem - @ f_opt "expanse-rtlcond" option_fexpanse_rtlcond - @ f_opt "expanse-others" option_fexpanse_others @ f_opt "all-loads-nontrap" option_all_loads_nontrap @ f_opt "forward-moves" option_fforward_moves (* Code generation options *) diff --git a/riscV/ExpansionOracle.ml b/riscV/ExpansionOracle.ml index 092bf0d1..b8a7f6e7 100644 --- a/riscV/ExpansionOracle.ml +++ b/riscV/ExpansionOracle.ml @@ -700,8 +700,7 @@ let expanse (sb : superblock) code pm = was_exp := false; let inst = get_some @@ PTree.get n code in if exp_debug then eprintf "We are checking node %d\n" (p2i n); - (if !Clflags.option_fexpanse_rtlcond then - match inst with + (match inst with (* Expansion of conditions - Ocmp *) | Iop (Ocmp (Ccomp c), a1 :: a2 :: nil, dest, succ) -> if exp_debug then eprintf "Iop/Ccomp\n"; @@ -828,7 +827,7 @@ let expanse (sb : superblock) code pm = was_branch := true; was_exp := true | _ -> ()); - (if !Clflags.option_fexpanse_others && not !was_exp then + (if not !was_exp then match inst with | Iop (Ofloatconst f, nil, dest, succ) -> if exp_debug then eprintf "Iop/Ofloatconst\n"; diff --git a/scheduling/RTLpathScheduleraux.ml b/scheduling/RTLpathScheduleraux.ml index cbd13588..aeed39df 100644 --- a/scheduling/RTLpathScheduleraux.ml +++ b/scheduling/RTLpathScheduleraux.ml @@ -284,9 +284,7 @@ let rec do_schedule code pm = function | [] -> (code, pm) | sb :: lsb -> (*debug_flag := true;*) - let (code_exp, pm) = - if !Clflags.option_fexpanse_rtlcond then (expanse sb code pm) - else (code, pm) in + let (code_exp, pm) = expanse sb code pm in (*debug_flag := false;*) (* Trick: instead of turning loads into non trap as needed.. * First, we turn them all into non-trap. |