Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add servo flag #80

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
+114 −32
Draft

Add servo flag #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
96cf3a1
Add servo flag
sagudev Jan 29, 2024
e4ee6e8
Add `FAIL` to TestOutcome
sagudev Feb 16, 2024
9ea38cc
pass/fail as test result
sagudev Feb 18, 2024
38c2413
more servo
sagudev Feb 18, 2024
c20202b
rel_metadata_path_fx for servo
sagudev Feb 18, 2024
4841826
strip _webgpu for servo
sagudev Feb 18, 2024
773f118
Add set-good option
sagudev Apr 15, 2024
039200b
ReportProcessingPreset::Set
sagudev May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 51 additions & 9 deletions moz-webgpu-cts/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use std::{
fmt::{self, Debug, Display, Formatter},
fs,
hash::Hash,
io::{self, BufReader, BufWriter},
io::{self, BufReader, BufWriter, Read},
path::{Path, PathBuf},
process::ExitCode,
sync::{mpsc::channel, Arc},
Expand All @@ -30,7 +30,7 @@ use camino::Utf8PathBuf;
use clap::{Parser, ValueEnum};
use enumset::EnumSetType;
use format::lazy_format;
use indexmap::{IndexMap, IndexSet};
use indexmap::{Equivalent, IndexMap, IndexSet};
use joinery::JoinableIterator;
use miette::{miette, Diagnostic, IntoDiagnostic, NamedSource, Report, SourceSpan, WrapErr};
use path_dsl::path;
Expand All @@ -47,6 +47,8 @@ use whippit::{
struct Cli {
#[clap(long)]
gecko_checkout: Option<PathBuf>,
#[clap(long)]
servo: bool,
#[clap(subcommand)]
subcommand: Subcommand,
}
Expand Down Expand Up @@ -104,6 +106,10 @@ enum ReportProcessingPreset {
#[value(alias("same-fx"))]
Merge,
ResetAll,
/// Set's only reported results to new value
Set,
/// Resets only bad->good
SetGood,
}

#[derive(Clone, Copy, Debug, Default, ValueEnum)]
Expand All @@ -125,6 +131,7 @@ fn run(cli: Cli) -> ExitCode {
let Cli {
gecko_checkout,
subcommand,
servo,
} = cli;

let gecko_checkout = match gecko_checkout
Expand All @@ -136,8 +143,11 @@ fn run(cli: Cli) -> ExitCode {
};

let read_metadata = || -> Result<_, AlreadyReportedToCommandline> {
let webgpu_cts_meta_parent_dir =
{ path!(&gecko_checkout | "testing" | "web-platform" | "mozilla" | "meta" | "webgpu") };
let webgpu_cts_meta_parent_dir = if !servo {
path!(&gecko_checkout | "testing" | "web-platform" | "mozilla" | "meta" | "webgpu")
} else {
path!(&gecko_checkout | "tests" | "wpt" | "webgpu" | "meta" | "webgpu")
};

let mut found_err = false;
let collected =
Expand Down Expand Up @@ -421,11 +431,13 @@ fn run(cli: Cli) -> ExitCode {
.into_par_iter()
.for_each_with(exec_reports_sender, |sender, path| {
let res = fs::File::open(&path)
.map(BufReader::new)
.map_err(Report::msg)
.wrap_err("failed to open file")
.and_then(|reader| {
serde_json::from_reader::<_, ExecutionReport>(reader)
.and_then(|mut f| {
let mut s = String::new();
f.read_to_string(&mut s).unwrap();
let first = s.lines().next().unwrap();
serde_json::from_str::<ExecutionReport>(first)
.into_diagnostic()
.wrap_err("failed to parse JSON")
})
Expand Down Expand Up @@ -620,6 +632,22 @@ fn run(cli: Cli) -> ExitCode {
Some(rep) => meta | rep,
None => meta,
},
ReportProcessingPreset::Set => |meta, rep| match rep {
Some(rep) => rep,
None => meta,
},
ReportProcessingPreset::SetGood => {
|meta: Expectation<_>, rep: Option<Expectation<_>>| match rep {
Some(rep) => {
if rep.equivalent(&Expectation::default()) {
rep
} else {
meta
}
}
None => meta,
}
}
};

normalize(
Expand Down Expand Up @@ -662,7 +690,7 @@ fn run(cli: Cli) -> ExitCode {

if test_entry.reported.is_empty() {
match preset {
ReportProcessingPreset::Merge => {
ReportProcessingPreset::Merge | ReportProcessingPreset::Set => {
log::warn!("no entries found in reports for {test_path:?}")
}
ReportProcessingPreset::ResetAll
Expand All @@ -673,6 +701,9 @@ fn run(cli: Cli) -> ExitCode {
);
return None;
}
ReportProcessingPreset::SetGood => {
log::warn!("no good results in {test_path:?}")
}
}
}

Expand Down Expand Up @@ -707,7 +738,7 @@ fn run(cli: Cli) -> ExitCode {
let mut files = BTreeMap::<PathBuf, File>::new();
for (test_path, (properties, subtests)) in recombined_tests_iter {
let name = test_path.test_name().to_string();
let rel_path = Utf8PathBuf::from(test_path.rel_metadata_path_fx().to_string());
let rel_path = Utf8PathBuf::from(test_path.rel_metadata_path_fx(servo).to_string());
let path = gecko_checkout.join(&rel_path);
let file = files.entry(path).or_insert_with(|| File {
properties: file_props_by_file
Expand Down Expand Up @@ -926,6 +957,7 @@ fn run(cli: Cli) -> ExitCode {
tests_with_runner_errors: TestSet,
tests_with_disabled_or_skip: TestSet,
tests_with_crashes: TestSet,
tests_with_fails: TestSet,
subtests_with_failures_by_test: SubtestByTestSet,
subtests_with_timeouts_by_test: SubtestByTestSet,
}
Expand Down Expand Up @@ -1087,6 +1119,15 @@ fn run(cli: Cli) -> ExitCode {
outcome,
)
}),
TestOutcome::Pass => (),
TestOutcome::Fail => receiver(&mut |analysis| {
insert_in_test_set(
&mut analysis.tests_with_fails,
test_name,
expectation,
outcome,
)
}),
}
}
}
Expand Down Expand Up @@ -1261,6 +1302,7 @@ fn run(cli: Cli) -> ExitCode {
tests_with_runner_errors,
tests_with_disabled_or_skip,
tests_with_crashes,
tests_with_fails,
subtests_with_failures_by_test,
subtests_with_timeouts_by_test,
} = analysis;
Expand Down
60 changes: 42 additions & 18 deletions moz-webgpu-cts/src/metadata.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,8 @@ pub enum TestOutcome {
Crash,
Error,
Skip,
Pass,
Fail,
}

impl Default for TestOutcome {
Expand All @@ -1141,6 +1143,8 @@ impl Display for TestOutcome {
Self::Crash => "CRASH",
Self::Error => "ERROR",
Self::Skip => "SKIP",
Self::Pass => "PASS",
Self::Fail => "FAIL",
}
)
}
Expand All @@ -1159,6 +1163,8 @@ impl<'a> Properties<'a> for TestProps<TestOutcome> {
keyword("TIMEOUT").to(TestOutcome::Timeout),
keyword("ERROR").to(TestOutcome::Error),
keyword("SKIP").to(TestOutcome::Skip),
keyword("PASS").to(TestOutcome::Pass),
keyword("FAIL").to(TestOutcome::Fail),
)),
)
.boxed()
Expand Down Expand Up @@ -1364,24 +1370,6 @@ r#"
assert_debug_snapshot!(
parser().parse(
r#"
[asdf]
# Incorrect; `PASS` isn't a valid test outcome (but it _is_ a valid subtest outcome).
expected: PASS
"#
),
@r###"
ParseResult {
output: None,
errs: [
found end of input at 108..112 expected something else,
],
}
"###
);

assert_debug_snapshot!(
parser().parse(
r#"
[asdf]
[blarg]
expected: [PASS, FAIL]
Expand Down Expand Up @@ -1629,4 +1617,40 @@ r#"
}
"###
);
assert_debug_snapshot!(
parser().parse(r#"
[canvas_complex_rgba8unorm_store.https.html]
expected: [PASS, FAIL, CRASH]

"#),
@r###"
ParseResult {
output: Some(
(
"canvas_complex_rgba8unorm_store.https.html",
Test {
properties: TestProps {
is_disabled: false,
expectations: Some(
NormalizedExpectationPropertyValue(
Collapsed(
Collapsed(
[
Crash,
Pass,
Fail,
],
),
),
),
),
},
subtests: {},
},
),
),
errs: [],
}
"###
);
}
26 changes: 21 additions & 5 deletions moz-webgpu-cts/src/shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,8 @@ const SCOPE_DIR_FX_PRIVATE_STR: &str = "testing/web-platform/mozilla";
const SCOPE_DIR_FX_PRIVATE_COMPONENTS: &[&str] = &["testing", "web-platform", "mozilla"];
const SCOPE_DIR_FX_PUBLIC_STR: &str = "testing/web-platform";
const SCOPE_DIR_FX_PUBLIC_COMPONENTS: &[&str] = &["testing", "web-platform"];
const SCOPE_DIR_SERVO_PUBLIC_STR: &str = "tests/wpt/webgpu";
const SCOPE_DIR_SERVO_PUBLIC_COMPONENTS: &[&str] = &["tests", "wpt", "webgpu"];

impl<'a> TestPath<'a> {
pub fn from_execution_report(
Expand All @@ -349,8 +351,13 @@ impl<'a> TestPath<'a> {
.map(|stripped| (TestScope::FirefoxPrivate, stripped))
.or_else(|| {
test_url_path
.strip_prefix('/')
.strip_prefix("/_webgpu/")
.map(|stripped| (TestScope::Public, stripped))
.or_else(|| {
test_url_path
.strip_prefix('/')
.map(|stripped| (TestScope::Public, stripped))
})
})
else {
return Err(err());
Expand Down Expand Up @@ -403,6 +410,8 @@ impl<'a> TestPath<'a> {
(TestScope::FirefoxPrivate, path)
} else if let Ok(path) = rel_meta_file_path.strip_prefix(SCOPE_DIR_FX_PUBLIC_STR) {
(TestScope::Public, path)
} else if let Ok(path) = rel_meta_file_path.strip_prefix(SCOPE_DIR_SERVO_PUBLIC_STR) {
(TestScope::Public, path)
} else {
return Err(err());
}
Expand Down Expand Up @@ -484,16 +493,23 @@ impl<'a> TestPath<'a> {
})
}

pub(crate) fn rel_metadata_path_fx(&self) -> impl Display + '_ {
pub(crate) fn rel_metadata_path_fx(&self, servo: bool) -> impl Display + '_ {
let Self {
path,
variant: _,
scope,
} = self;

let scope_dir = match scope {
TestScope::Public => SCOPE_DIR_FX_PUBLIC_COMPONENTS,
TestScope::FirefoxPrivate => SCOPE_DIR_FX_PRIVATE_COMPONENTS,
let scope_dir = if !servo {
match scope {
TestScope::Public => SCOPE_DIR_FX_PUBLIC_COMPONENTS,
TestScope::FirefoxPrivate => SCOPE_DIR_FX_PRIVATE_COMPONENTS,
}
} else {
match scope {
TestScope::Public => SCOPE_DIR_SERVO_PUBLIC_COMPONENTS,
TestScope::FirefoxPrivate => todo!(),
}
}
.iter()
.chain(&["meta"])
Expand Down