Use Context::for_function to simplify the code.

This commit is contained in:
Dan Gohman
2018-06-04 16:21:00 -07:00
parent ae8fc69406
commit 22a7c56108
8 changed files with 8 additions and 25 deletions

View File

@@ -36,10 +36,7 @@ impl SubTest for TestCompile {
fn run(&self, func: Cow<ir::Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<ir::Function>, context: &Context) -> Result<()> {
let isa = context.isa.expect("compile needs an ISA"); let isa = context.isa.expect("compile needs an ISA");
let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
// Create a compilation context, and drop in the function.
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
let code_size = comp_ctx let code_size = comp_ctx
.compile(isa) .compile(isa)

View File

@@ -34,9 +34,7 @@ impl SubTest for TestDCE {
} }
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
// Create a compilation context, and drop in the function. let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
comp_ctx.flowgraph(); comp_ctx.flowgraph();
comp_ctx.compute_loop_analysis(); comp_ctx.compute_loop_analysis();

View File

@@ -36,8 +36,7 @@ impl SubTest for TestLegalizer {
} }
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
let mut comp_ctx = cretonne_codegen::Context::new(); let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
comp_ctx.func = func.into_owned();
let isa = context.isa.expect("legalizer needs an ISA"); let isa = context.isa.expect("legalizer needs an ISA");
comp_ctx.compute_cfg(); comp_ctx.compute_cfg();

View File

@@ -34,9 +34,7 @@ impl SubTest for TestLICM {
} }
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
// Create a compilation context, and drop in the function. let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
comp_ctx.flowgraph(); comp_ctx.flowgraph();
comp_ctx.compute_loop_analysis(); comp_ctx.compute_loop_analysis();

View File

@@ -31,9 +31,7 @@ impl SubTest for TestPostopt {
} }
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
// Create a compilation context, and drop in the function. let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
let isa = context.isa.expect("postopt needs an ISA"); let isa = context.isa.expect("postopt needs an ISA");
comp_ctx.flowgraph(); comp_ctx.flowgraph();

View File

@@ -31,9 +31,7 @@ impl SubTest for TestPreopt {
} }
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
// Create a compilation context, and drop in the function. let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
let isa = context.isa.expect("preopt needs an ISA"); let isa = context.isa.expect("preopt needs an ISA");
comp_ctx.flowgraph(); comp_ctx.flowgraph();

View File

@@ -39,10 +39,7 @@ impl SubTest for TestRegalloc {
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
let isa = context.isa.expect("register allocator needs an ISA"); let isa = context.isa.expect("register allocator needs an ISA");
let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
// Create a compilation context, and drop in the function.
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
comp_ctx.compute_cfg(); comp_ctx.compute_cfg();
// TODO: Should we have an option to skip legalization? // TODO: Should we have an option to skip legalization?

View File

@@ -34,9 +34,7 @@ impl SubTest for TestSimpleGVN {
} }
fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> { fn run(&self, func: Cow<Function>, context: &Context) -> Result<()> {
// Create a compilation context, and drop in the function. let mut comp_ctx = cretonne_codegen::Context::for_function(func.into_owned());
let mut comp_ctx = cretonne_codegen::Context::new();
comp_ctx.func = func.into_owned();
comp_ctx.flowgraph(); comp_ctx.flowgraph();
comp_ctx comp_ctx