aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Monniaux <David.Monniaux@univ-grenoble-alpes.fr>2021-09-14 13:30:26 +0200
committerDavid Monniaux <David.Monniaux@univ-grenoble-alpes.fr>2021-09-14 13:30:26 +0200
commit2064191a299aa0005594b9434885e5b4d56abcc6 (patch)
tree8f6d0bd5511a8d4acbe648763e208b5e63b8ad94
parent5675aec8c4a2deaa2183ce3e351b6acc5ef061eb (diff)
downloadcompcert-kvx-2064191a299aa0005594b9434885e5b4d56abcc6.tar.gz
compcert-kvx-2064191a299aa0005594b9434885e5b4d56abcc6.zip
- make non trapping loads in scheduling dependent on option (which was ignored on BTL)
- set this option to false, since Kalray still ships a buggy runtime system
-rw-r--r--driver/Clflags.ml2
-rw-r--r--scheduling/BTLScheduleraux.ml2
2 files changed, 2 insertions, 2 deletions
diff --git a/driver/Clflags.ml b/driver/Clflags.ml
index 25bd2c78..bcbf0668 100644
--- a/driver/Clflags.ml
+++ b/driver/Clflags.ml
@@ -109,7 +109,7 @@ let option_fexpanse_rtlcond = ref false
let option_fexpanse_others = ref false
let option_fforward_moves = ref false
let option_fmove_loop_invariants = ref false
-let option_fnontrap_loads = ref true
+let option_fnontrap_loads = ref false
let option_all_loads_nontrap = ref false
let option_inline_auto_threshold = ref 0
let option_profile_arcs = ref false
diff --git a/scheduling/BTLScheduleraux.ml b/scheduling/BTLScheduleraux.ml
index 75672243..0e682c4c 100644
--- a/scheduling/BTLScheduleraux.ml
+++ b/scheduling/BTLScheduleraux.ml
@@ -272,7 +272,7 @@ let schedule_blk n ibf btl =
| None -> btl
let turn_all_loads_nontrap n ibf btl =
- if not !config.has_non_trapping_loads then btl
+ if not !config.has_non_trapping_loads || not !Clflags.option_fnontrap_loads then btl
else
let rec traverse_rec ib =
match ib with