From fd436596a516aca90ffd5951435cc2518c653a91 Mon Sep 17 00:00:00 2001 From: Russel Arbore <russel.jma@gmail.com> Date: Thu, 30 Jan 2025 10:56:12 -0600 Subject: [PATCH] more cleanup --- .../hercules_tests/tests/forkify_tests.rs | 4 +- .../hercules_tests/tests/loop_tests.rs | 42 ++----------------- 2 files changed, 5 insertions(+), 41 deletions(-) diff --git a/hercules_test/hercules_tests/tests/forkify_tests.rs b/hercules_test/hercules_tests/tests/forkify_tests.rs index 5a8bff1a..8ba8e135 100644 --- a/hercules_test/hercules_tests/tests/forkify_tests.rs +++ b/hercules_test/hercules_tests/tests/forkify_tests.rs @@ -18,15 +18,13 @@ fn inner_fork_chain() { let params = 2; // TODO: (@xrouth) fix macro to take no params as an option. // 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 module = run_schedule_on_hercules(module, sched).unwrap(); let result_2 = interp_module!(module, 0, dyn_consts, 2); println!("result: {:?}", result_2); - // assert_eq!(result_1, result_2) + //assert_eq!(result_1, result_2) } #[test] diff --git a/hercules_test/hercules_tests/tests/loop_tests.rs b/hercules_test/hercules_tests/tests/loop_tests.rs index 55da702d..5832a161 100644 --- a/hercules_test/hercules_tests/tests/loop_tests.rs +++ b/hercules_test/hercules_tests/tests/loop_tests.rs @@ -36,9 +36,7 @@ fn alternate_bounds_use_after_loop_no_tid() { println!("result: {:?}", result_1); let schedule = default_schedule![ - ////Xdot,, Forkify, - //Xdot, ]; let module = run_schedule_on_hercules(module, Some(schedule)).unwrap(); @@ -64,15 +62,12 @@ fn alternate_bounds_use_after_loop() { println!("result: {:?}", result_1); let schedule = Some(default_schedule![ - ////Xdot,, Forkify, - //Xdot, ]); let module = run_schedule_on_hercules(module, schedule).unwrap(); let result_2 = interp_module!(module, 0, dyn_consts, a.clone()); - //println!("{:?}", result_1); println!("{:?}", result_2); assert_eq!(result_1, result_2); @@ -91,14 +86,11 @@ fn alternate_bounds_use_after_loop2() { println!("result: {:?}", result_1); - let schedule = Some(default_schedule![ - ////Xdot,, - ]); + let schedule = Some(default_schedule![]); let module = run_schedule_on_hercules(module, schedule).unwrap(); let result_2 = interp_module!(module, 0, dyn_consts, a.clone()); - //println!("{:?}", result_1); println!("{:?}", result_2); assert_eq!(result_1, result_2); @@ -117,16 +109,13 @@ fn do_while_separate_body() { println!("result: {:?}", result_1); let schedule = Some(default_schedule![ - ////Xdot,, - PhiElim, ////Xdot,, + PhiElim, Forkify, - //Xdot, ]); let module = run_schedule_on_hercules(module, schedule).unwrap(); let result_2 = interp_module!(module, 0, dyn_consts, 2i32); - //println!("{:?}", result_1); println!("{:?}", result_2); assert_eq!(result_1, result_2); @@ -143,10 +132,8 @@ fn alternate_bounds_internal_control() { println!("result: {:?}", result_1); let schedule = Some(default_schedule![ - ////Xdot,, - PhiElim, ////Xdot,, + PhiElim, Forkify, - //Xdot, ]); let module = run_schedule_on_hercules(module, schedule).unwrap(); @@ -169,10 +156,8 @@ fn alternate_bounds_internal_control2() { println!("result: {:?}", result_1); let schedule = Some(default_schedule![ - ////Xdot,, - PhiElim, ////Xdot,, + PhiElim, Forkify, - //Xdot, ]); let module = run_schedule_on_hercules(module, schedule).unwrap(); @@ -331,7 +316,6 @@ fn implicit_clone_pipeline() { println!("result: {:?}", result_1); let schedule = default_schedule![ - ////Xdot,, Forkify, ForkGuardElim, Forkify, @@ -383,7 +367,6 @@ fn look_at_local() { ); let schedule = Some(default_schedule![ - ////Xdot,, ]); let result_1 = interp_module!(module, 0, dyn_consts, a.clone(), b.clone()); @@ -391,9 +374,7 @@ fn look_at_local() { let module = run_schedule_on_hercules(module.clone(), schedule).unwrap(); let schedule = Some(default_schedule![ - ////Xdot,, Unforkify, Verify, - ////Xdot,, ]); let module = run_schedule_on_hercules(module.clone(), schedule).unwrap(); @@ -452,19 +433,4 @@ fn matmul_pipeline() { println!("result: {:?}", result_2); assert_eq!(result_1, result_2); - - // Verify, - // GVN, - // DCE, - // AutoOutline, - // InterproceduralSROA, - // SROA, - // InferSchedules, - // DCE, - // GCM, - // DCE, - // PhiElim, - // FloatCollections, - // GCM, - // //Xdot, } -- GitLab