`26ec0b5`

Test WHERE/ELSEWHERE two-arm vectorizes at O3

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 1 week ago

SHA: 26ec0b5a076252787af6b889c319095dcaac86c6
Parents: 4c6be2d
Tree: 7bd2e2a

2 changed files

Status	File	+	-
A	`test_programs/do_loop_vectorize_where_elsewhere.f90`	29	0
A	`tests/vectorize_where_elsewhere.rs`	74	0

test_programs/do_loop_vectorize_where_elsewhere.f90added

 +! WHERE / ELSEWHERE two-arm form. Both arms write to `b`. The matcher
 +! must recognize the diamond's else_block (currently empty in the
 +! else-less form) being non-empty, with a store to the same dest
 +! pointer. Lowered to vselect(mask, then_arm, else_arm) → store.
 +!
 +! a(i) = i - 16 (range -15..16); b(i) = 0.
 +! WHERE a > 0: b ← a (so 0..16 stays 0; 17..32 gets a = 1..16).
 +! ELSEWHERE: b ← -1.0 (so 0..16 becomes -1).
 +!   b(1)  = -1.0 (a(1)=-15, mask=false, b ← -1)
 +!   b(16) = -1.0 (a(16)=0, NOT > 0, mask=false, b ← -1)
 +!   b(17) =  1.0 (a(17)=1, mask=true, b ← a = 1)
 +!   b(32) = 16.0 (a(32)=16, mask=true, b ← a = 16)
 +!
 +! CHECK:    -1.0000000E0    -1.0000000E0     1.0000000E0     1.6000000E1
 +program test_do_loop_vectorize_where_elsewhere
 +  implicit none
 +  integer :: i
 +  real(4) :: a(32), b(32)
 +  do i = 1, 32
 +    a(i) = real(i - 16, 4)
 +    b(i) = 0.0
 +  end do
 +  where (a > 0.0)
 +    b = a
 +  elsewhere
 +    b = -1.0
 +  end where
 +  print *, b(1), b(16), b(17), b(32)
 +end program test_do_loop_vectorize_where_elsewhere

tests/vectorize_where_elsewhere.rsadded

 +use std::collections::BTreeSet;
 +use std::path::PathBuf;
++
 +use armfortas::driver::OptLevel;
 +use armfortas::testing::{capture_from_path, CaptureRequest, CapturedStage, Stage};
++
 +fn fixture(name: &str) -> PathBuf {
 +    let path = PathBuf::from("test_programs").join(name);
 +    assert!(path.exists(), "missing test fixture {}", path.display());
 +    path
 +}
++
 +fn capture_text(request: CaptureRequest, stage: Stage) -> String {
 +    let result = capture_from_path(&request).expect("capture should succeed");
 +    match result.get(stage) {
 +        Some(CapturedStage::Text(text)) => text.clone(),
 +        Some(CapturedStage::Run(_)) => panic!("expected text stage for {}", stage.as_str()),
 +        None => panic!("missing requested stage {}", stage.as_str()),
 +    }
 +}
++
 +fn capture_run_stdout(request: CaptureRequest) -> String {
 +    let result = capture_from_path(&request).expect("capture should succeed");
 +    match result.get(Stage::Run) {
 +        Some(CapturedStage::Run(run)) => run.stdout.clone(),
 +        _ => panic!("missing run stage"),
 +    }
 +}
++
 +#[test]
 +fn o3_vectorizes_where_elsewhere_two_arm_form() {
 +    let source = fixture("do_loop_vectorize_where_elsewhere.f90");
++
 +    let o3_ir = capture_text(
 +        CaptureRequest {
 +            input: source.clone(),
 +            requested: BTreeSet::from([Stage::OptIr]),
 +            opt_level: OptLevel::O3,
 +        },
 +        Stage::OptIr,
 +    );
 +    // The two-arm WHERE/ELSEWHERE should produce a vselect whose
 +    // false arm is the broadcast of the elsewhere constant — not a
 +    // reload of the dest's prior value.
 +    assert_eq!(
 +        o3_ir.matches("vselect").count(),
 +        1,
 +        "expected exactly one vselect:\n{}",
 +        o3_ir
 +    );
 +    assert!(
 +        o3_ir.matches("vbroadcast").count() >= 2,
 +        "expected at least 2 vbroadcasts (threshold + elsewhere const):\n{}",
 +        o3_ir
 +    );
++
 +    let stdout = capture_run_stdout(CaptureRequest {
 +        input: source,
 +        requested: BTreeSet::from([Stage::Run]),
 +        opt_level: OptLevel::O3,
 +    });
 +    let trimmed: Vec<&str> = stdout
 +        .lines()
 +        .map(|l| l.trim())
 +        .filter(|l| !l.is_empty())
 +        .collect();
 +    assert_eq!(trimmed.len(), 1, "expected one output line:\n{}", stdout);
 +    assert_eq!(
 +        trimmed[0],
 +        "-1.0000000E0    -1.0000000E0     1.0000000E0     1.6000000E1",
 +        "WHERE/ELSEWHERE wrong: {:?}",
 +        trimmed[0]
 +    );
 +}