Renames Settings ⚠️ (fixes #976) (#1321)

This is a breaking API change: the following settings have been renamed:

- jump_tables_enabled -> enable_jump_tables
- colocated_libcalls -> use_colocated_libcalls
- probestack_enabled -> enable_probestack
- allones_funcaddrs -> emit_all_ones_funcaddrs
This commit is contained in:
Benjamin Bouvier
2020-01-13 22:42:49 +01:00
committed by Sean Stangl
parent bd88155483
commit dd497c19e1
20 changed files with 37 additions and 38 deletions

View File

@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]
pub enum LibCall {
/// probe for stack overflow. These are emitted for functions which need
/// when the `probestack_enabled` setting is true.
/// when the `enable_probestack` setting is true.
Probestack,
/// ceil.f32
CeilF32,
@@ -202,7 +202,7 @@ fn make_funcref(
func.import_function(ExtFuncData {
name: ExternalName::LibCall(libcall),
signature: sigref,
colocated: isa.flags().colocated_libcalls(),
colocated: isa.flags().use_colocated_libcalls(),
})
}

View File

@@ -453,7 +453,7 @@ pub fn prologue_epilogue(func: &mut ir::Function, isa: &dyn TargetIsa) -> Codege
fn baldrdash_prologue_epilogue(func: &mut ir::Function, isa: &dyn TargetIsa) -> CodegenResult<()> {
debug_assert!(
!isa.flags().probestack_enabled(),
!isa.flags().enable_probestack(),
"baldrdash does not expect cranelift to emit stack probes"
);
@@ -754,8 +754,7 @@ fn insert_common_prologue(
// Allocate stack frame storage.
if stack_size > 0 {
if isa.flags().probestack_enabled()
&& stack_size > (1 << isa.flags().probestack_size_log2())
if isa.flags().enable_probestack() && stack_size > (1 << isa.flags().probestack_size_log2())
{
// Emit a stack probe.
let rax = RU::rax as RegUnit;

View File

@@ -191,7 +191,7 @@ pub fn legalize_function(func: &mut ir::Function, cfg: &mut ControlFlowGraph, is
}
// Now that we've lowered all br_tables, we don't need the jump tables anymore.
if !isa.flags().jump_tables_enabled() {
if !isa.flags().enable_jump_tables() {
pos.func.jump_tables.clear();
}
}
@@ -276,7 +276,7 @@ fn expand_br_table(
cfg: &mut ControlFlowGraph,
isa: &dyn TargetIsa,
) {
if isa.flags().jump_tables_enabled() {
if isa.flags().enable_jump_tables() {
expand_br_table_jt(inst, func, cfg, isa);
} else {
expand_br_table_conds(inst, func, cfg, isa);

View File

@@ -384,7 +384,7 @@ mod tests {
probestack_size_log2 = 12\n\
enable_verifier = true\n\
is_pic = false\n\
colocated_libcalls = false\n\
use_colocated_libcalls = false\n\
avoid_div_traps = false\n\
enable_float = true\n\
enable_nan_canonicalization = false\n\
@@ -393,10 +393,10 @@ mod tests {
enable_simd = false\n\
enable_atomics = true\n\
enable_safepoints = false\n\
allones_funcaddrs = false\n\
probestack_enabled = true\n\
emit_all_ones_funcaddrs = false\n\
enable_probestack = true\n\
probestack_func_adjusts_sp = false\n\
jump_tables_enabled = true\n"
enable_jump_tables = true\n"
);
assert_eq!(f.opt_level(), super::OptLevel::None);
assert_eq!(f.enable_simd(), false);