aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kvx/lib/PrepassSchedulingOracle.ml8
-rw-r--r--test/monniaux/rules.mk2
2 files changed, 5 insertions, 5 deletions
diff --git a/kvx/lib/PrepassSchedulingOracle.ml b/kvx/lib/PrepassSchedulingOracle.ml
index 6169bf16..b83078f8 100644
--- a/kvx/lib/PrepassSchedulingOracle.ml
+++ b/kvx/lib/PrepassSchedulingOracle.ml
@@ -132,21 +132,21 @@ let get_simple_dependencies (seqa : (instruction*Regset.t) array) =
match insn with
| Inop _ -> ()
| Iop(op, inputs, output, _) ->
- (if Op.is_trapping_op op then irreversible_action i);
+ (if Op.is_trapping_op op then set_branch i);
add_input_regs i inputs;
add_output_reg i (latency_of_op op (List.length inputs)) output
| Iload(trap, chunk, addressing, addr_regs, output, _) ->
- (if trap=TRAP then irreversible_action i);
+ (if trap=TRAP then set_branch i);
add_input_mem i;
add_input_regs i addr_regs;
add_output_reg i (latency_of_load trap chunk addressing (List.length addr_regs)) output
| Istore(chunk, addressing, addr_regs, input, _) ->
- irreversible_action i;
+ set_branch i;
add_input_regs i addr_regs;
add_input_reg i input;
add_output_mem i
| Icall(signature, ef, inputs, output, _) ->
- irreversible_action i;
+ set_branch i;
(match ef with
| Datatypes.Coq_inl r -> add_input_reg i r
| Datatypes.Coq_inr symbol -> ()
diff --git a/test/monniaux/rules.mk b/test/monniaux/rules.mk
index 8549e367..63582f96 100644
--- a/test/monniaux/rules.mk
+++ b/test/monniaux/rules.mk
@@ -21,7 +21,7 @@ MEASURES?=time
ALL_CFLAGS+=-Wall -D__KVX_COS__ -DMAX_MEASURES=$(MAX_MEASURES)
#ALL_CFLAGS+=-g
ALL_GCCFLAGS+=$(ALL_CFLAGS) -std=c99 -Wextra -Werror=implicit
-ALL_CCOMPFLAGS+=$(ALL_CFLAGS) -fduplicate 2 -fprepass -fallnontrap
+ALL_CCOMPFLAGS+=$(ALL_CFLAGS) -fduplicate 2 -fprepass -fall-loads-nontrap
# The compilers
KVX_CC?=kvx-cos-gcc