Skip to content
Snippets Groups Projects
Commit fd436596 authored by Russel Arbore's avatar Russel Arbore
Browse files

more cleanup

parent 35450b8b
No related branches found
No related tags found
1 merge request!103Forkify + Loop Canonicalization + Initial Fork Fission
Pipeline #201256 passed
...@@ -18,15 +18,13 @@ fn inner_fork_chain() { ...@@ -18,15 +18,13 @@ fn inner_fork_chain() {
let params = 2; // TODO: (@xrouth) fix macro to take no params as an option. let params = 2; // TODO: (@xrouth) fix macro to take no params as an option.
// let result_1 = interp_module!(module, 0, dyn_consts, 2); // let result_1 = interp_module!(module, 0, dyn_consts, 2);
// println!("result: {:?}", result_1);
let sched: Option<ScheduleStmt> = Some(default_schedule![Verify, Forkify, PhiElim, Verify,]); let sched: Option<ScheduleStmt> = Some(default_schedule![Verify, Forkify, PhiElim, Verify,]);
let module = run_schedule_on_hercules(module, sched).unwrap(); let module = run_schedule_on_hercules(module, sched).unwrap();
let result_2 = interp_module!(module, 0, dyn_consts, 2); let result_2 = interp_module!(module, 0, dyn_consts, 2);
println!("result: {:?}", result_2); println!("result: {:?}", result_2);
// assert_eq!(result_1, result_2) //assert_eq!(result_1, result_2)
} }
#[test] #[test]
......
...@@ -36,9 +36,7 @@ fn alternate_bounds_use_after_loop_no_tid() { ...@@ -36,9 +36,7 @@ fn alternate_bounds_use_after_loop_no_tid() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = default_schedule![ let schedule = default_schedule![
////Xdot,,
Forkify, Forkify,
//Xdot,
]; ];
let module = run_schedule_on_hercules(module, Some(schedule)).unwrap(); let module = run_schedule_on_hercules(module, Some(schedule)).unwrap();
...@@ -64,15 +62,12 @@ fn alternate_bounds_use_after_loop() { ...@@ -64,15 +62,12 @@ fn alternate_bounds_use_after_loop() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![
////Xdot,,
Forkify, Forkify,
//Xdot,
]); ]);
let module = run_schedule_on_hercules(module, schedule).unwrap(); let module = run_schedule_on_hercules(module, schedule).unwrap();
let result_2 = interp_module!(module, 0, dyn_consts, a.clone()); let result_2 = interp_module!(module, 0, dyn_consts, a.clone());
//println!("{:?}", result_1);
println!("{:?}", result_2); println!("{:?}", result_2);
assert_eq!(result_1, result_2); assert_eq!(result_1, result_2);
...@@ -91,14 +86,11 @@ fn alternate_bounds_use_after_loop2() { ...@@ -91,14 +86,11 @@ fn alternate_bounds_use_after_loop2() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![]);
////Xdot,,
]);
let module = run_schedule_on_hercules(module, schedule).unwrap(); let module = run_schedule_on_hercules(module, schedule).unwrap();
let result_2 = interp_module!(module, 0, dyn_consts, a.clone()); let result_2 = interp_module!(module, 0, dyn_consts, a.clone());
//println!("{:?}", result_1);
println!("{:?}", result_2); println!("{:?}", result_2);
assert_eq!(result_1, result_2); assert_eq!(result_1, result_2);
...@@ -117,16 +109,13 @@ fn do_while_separate_body() { ...@@ -117,16 +109,13 @@ fn do_while_separate_body() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![
////Xdot,, PhiElim,
PhiElim, ////Xdot,,
Forkify, Forkify,
//Xdot,
]); ]);
let module = run_schedule_on_hercules(module, schedule).unwrap(); let module = run_schedule_on_hercules(module, schedule).unwrap();
let result_2 = interp_module!(module, 0, dyn_consts, 2i32); let result_2 = interp_module!(module, 0, dyn_consts, 2i32);
//println!("{:?}", result_1);
println!("{:?}", result_2); println!("{:?}", result_2);
assert_eq!(result_1, result_2); assert_eq!(result_1, result_2);
...@@ -143,10 +132,8 @@ fn alternate_bounds_internal_control() { ...@@ -143,10 +132,8 @@ fn alternate_bounds_internal_control() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![
////Xdot,, PhiElim,
PhiElim, ////Xdot,,
Forkify, Forkify,
//Xdot,
]); ]);
let module = run_schedule_on_hercules(module, schedule).unwrap(); let module = run_schedule_on_hercules(module, schedule).unwrap();
...@@ -169,10 +156,8 @@ fn alternate_bounds_internal_control2() { ...@@ -169,10 +156,8 @@ fn alternate_bounds_internal_control2() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![
////Xdot,, PhiElim,
PhiElim, ////Xdot,,
Forkify, Forkify,
//Xdot,
]); ]);
let module = run_schedule_on_hercules(module, schedule).unwrap(); let module = run_schedule_on_hercules(module, schedule).unwrap();
...@@ -331,7 +316,6 @@ fn implicit_clone_pipeline() { ...@@ -331,7 +316,6 @@ fn implicit_clone_pipeline() {
println!("result: {:?}", result_1); println!("result: {:?}", result_1);
let schedule = default_schedule![ let schedule = default_schedule![
////Xdot,,
Forkify, Forkify,
ForkGuardElim, ForkGuardElim,
Forkify, Forkify,
...@@ -383,7 +367,6 @@ fn look_at_local() { ...@@ -383,7 +367,6 @@ fn look_at_local() {
); );
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![
////Xdot,,
]); ]);
let result_1 = interp_module!(module, 0, dyn_consts, a.clone(), b.clone()); let result_1 = interp_module!(module, 0, dyn_consts, a.clone(), b.clone());
...@@ -391,9 +374,7 @@ fn look_at_local() { ...@@ -391,9 +374,7 @@ fn look_at_local() {
let module = run_schedule_on_hercules(module.clone(), schedule).unwrap(); let module = run_schedule_on_hercules(module.clone(), schedule).unwrap();
let schedule = Some(default_schedule![ let schedule = Some(default_schedule![
////Xdot,,
Unforkify, Verify, Unforkify, Verify,
////Xdot,,
]); ]);
let module = run_schedule_on_hercules(module.clone(), schedule).unwrap(); let module = run_schedule_on_hercules(module.clone(), schedule).unwrap();
...@@ -452,19 +433,4 @@ fn matmul_pipeline() { ...@@ -452,19 +433,4 @@ fn matmul_pipeline() {
println!("result: {:?}", result_2); println!("result: {:?}", result_2);
assert_eq!(result_1, result_2); assert_eq!(result_1, result_2);
// Verify,
// GVN,
// DCE,
// AutoOutline,
// InterproceduralSROA,
// SROA,
// InferSchedules,
// DCE,
// GCM,
// DCE,
// PhiElim,
// FloatCollections,
// GCM,
// //Xdot,
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment