`a5f0f51`

Test WHERE/ELSEWHERE composes with then-arm binop and elsewhere const

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

SHA: a5f0f514f84663187502831415c4c77f90fa5645
Parents: a8eb0d6
Tree: 27c88f5

2 changed files

Status	File	+	-
A	`test_programs/do_loop_vectorize_where_elsewhere_binop.f90`	30	0
A	`tests/vectorize_where_elsewhere_binop.rs`	78	0

test_programs/do_loop_vectorize_where_elsewhere_binop.f90added

 +! WHERE/ELSEWHERE composing with binop in then-arm:
 +!   where (a > 0) c = a * 2
 +!   elsewhere    c = -1
 +! lowers to vselect(mask, vmul(va, vbcast(2)), vbcast(-1)) → vstore.
 +!
 +! a(i) = i - 16; c starts as 0.
 +! WHERE a > 0 (lanes 17..32): c ← a*2 = 2..32.
 +! ELSEWHERE                    : c ← -1.
 +!   c(1)  = -1   (a(1)=-15, mask=false)
 +!   c(16) = -1   (a(16)=0, NOT > 0)
 +!   c(17) = 2    (a(17)=1, mask=true → 1*2)
 +!   c(32) = 32   (a(32)=16, mask=true → 16*2)
 +!
 +! CHECK:    -1.0000000E0    -1.0000000E0     2.0000000E0     3.2000000E1
 +program test_do_loop_vectorize_where_elsewhere_binop
 +  implicit none
 +  integer :: i
 +  real(4) :: a(32), c(32), two
 +  two = 2.0
 +  do i = 1, 32
 +    a(i) = real(i - 16, 4)
 +    c(i) = 0.0
 +  end do
 +  where (a > 0.0)
 +    c = a * two
 +  elsewhere
 +    c = -1.0
 +  end where
 +  print *, c(1), c(16), c(17), c(32)
 +end program test_do_loop_vectorize_where_elsewhere_binop

tests/vectorize_where_elsewhere_binop.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_with_then_binop() {
 +    let source = fixture("do_loop_vectorize_where_elsewhere_binop.f90");
++
 +    let o3_ir = capture_text(
 +        CaptureRequest {
 +            input: source.clone(),
 +            requested: BTreeSet::from([Stage::OptIr]),
 +            opt_level: OptLevel::O3,
 +        },
 +        Stage::OptIr,
 +    );
 +    // Expect a vmul (then-arm a*scale), a vselect, and ≥3 vbroadcasts
 +    // (threshold + scale + elsewhere const).
 +    assert_eq!(
 +        o3_ir.matches("vselect").count(),
 +        1,
 +        "expected one vselect:\n{}",
 +        o3_ir
 +    );
 +    assert!(
 +        o3_ir.contains("vmul"),
 +        "expected vmul lifted from a*scale in WHERE true arm:\n{}",
 +        o3_ir
 +    );
 +    assert!(
 +        o3_ir.matches("vbroadcast").count() >= 3,
 +        "expected ≥3 vbroadcasts (threshold + scale + 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     2.0000000E0     3.2000000E1",
 +        "WHERE/ELSEWHERE+binop wrong: {:?}",
 +        trimmed[0]
 +    );
 +}