fixup! WIP: feat(cli): add moz-webgpu-cts process-reports subcmd.

erichdongubler-mozilla · Oct 27, 2023 · 454a4db · 454a4db
1 parent d0c5978
commit 454a4db
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 23 deletions.
diff --git a/src/bin/moz-webgpu-cts/main.rs b/src/bin/moz-webgpu-cts/main.rs
@@ -1,20 +1,17 @@
 mod metadata;
+mod process_reports;
 mod report;
 pub(crate) mod shared;
 
-mod process_reports;
-
 use crate::{
     metadata::{BuildProfile, File},
-    process_reports::{MaybeDisabled, TestOutcomes},
+    process_reports::{MaybeDisabled, OutcomesForComparison, TestOutcomes},
     report::{RunInfo, SubtestExecutionResult, TestExecutionEntry, TestExecutionResult},
-    shared::TestPath,
+    shared::{Expectation, MaybeCollapsed, NormalizedExpectationPropertyValue, TestPath},
 };
 
 use self::{
-    metadata::{
-        AnalyzeableProps, Applicability, Expectation, Platform, SubtestOutcome, Test, TestOutcome,
-    },
+    metadata::{AnalyzeableProps, Platform, SubtestOutcome, Test, TestOutcome},
     report::ExecutionReport,
 };
 
@@ -433,7 +430,7 @@ fn run(cli: Cli) -> ExitCode {
                     fn count<Out>(
                         recorded: &mut BTreeMap<
                             Platform,
-                            BTreeMap<BuildProfile, HashMap<Out, NonZeroU64>>,
+                            BTreeMap<BuildProfile, IndexMap<Out, NonZeroU64>>,
                         >,
                         platform: Platform,
                         build_profile: BuildProfile,
@@ -442,7 +439,7 @@ fn run(cli: Cli) -> ExitCode {
                         Out: Copy,
                         Out: Hash + Eq,
                     {
-                        use std::collections::hash_map::Entry;
+                        use indexmap::map::Entry;
 
                         match recorded
                             .entry(platform)

diff --git a/src/bin/moz-webgpu-cts/process_reports.rs b/src/bin/moz-webgpu-cts/process_reports.rs
@@ -1,21 +1,19 @@
-use std::{
-    collections::{BTreeMap, HashMap},
-    num::NonZeroU64,
-};
+use std::{collections::BTreeMap, num::NonZeroU64};
 
-use whippit::metadata::properties::PropertyValue;
+use indexmap::IndexMap;
 
-use crate::metadata::{
-    Applicability, BuildProfile, Expectation, Platform, SubtestOutcome, TestOutcome,
+use crate::{
+    metadata::{BuildProfile, Platform, SubtestOutcome, TestOutcome},
+    shared::NormalizedExpectationPropertyValue,
 };
 
 #[derive(Debug)]
-pub(crate) struct Outcomes<Out> {
-    pub metadata: Option<MaybeDisabled<Option<PropertyValue<Applicability, Expectation<Out>>>>>,
-    pub reported: BTreeMap<Platform, BTreeMap<BuildProfile, HashMap<Out, NonZeroU64>>>,
+pub(crate) struct OutcomesForComparison<Out> {
+    pub metadata: Option<MaybeDisabled<Option<NormalizedExpectationPropertyValue<Out>>>>,
+    pub reported: BTreeMap<Platform, BTreeMap<BuildProfile, IndexMap<Out, NonZeroU64>>>,
 }
 
-impl<Out> Default for Outcomes<Out> {
+impl<Out> Default for OutcomesForComparison<Out> {
     fn default() -> Self {
         Self {
             metadata: None,
@@ -41,6 +39,6 @@ where
 
 #[derive(Debug, Default)]
 pub(crate) struct TestOutcomes {
-    pub test_outcomes: Outcomes<TestOutcome>,
-    pub subtests: BTreeMap<String, Outcomes<SubtestOutcome>>,
+    pub test_outcomes: OutcomesForComparison<TestOutcome>,
+    pub subtests: BTreeMap<String, OutcomesForComparison<SubtestOutcome>>,
 }
diff --git a/src/bin/moz-webgpu-cts/shared.rs b/src/bin/moz-webgpu-cts/shared.rs
@@ -1,7 +1,9 @@
-use std::{borrow::Cow, fmt::Display, path::Path};
+use std::{borrow::Cow, collections::BTreeMap, fmt::Display, path::Path};
 
 use camino::{Utf8Component, Utf8Path};
 
+use crate::metadata::{BuildProfile, Platform};
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum Expectation<Out> {
     Permanent(Out),
@@ -273,6 +275,7 @@ fn report_meta_reject() {
         "cts.https.html?stuff=things"
     );
 }
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub enum MaybeCollapsed<C, E> {
     Collapsed(C),