WIP

TODO: figure out design, make things compile
erichdongubler-mozilla · May 10, 2024 · 476c8f2 · 476c8f2
1 parent b16d8f4
commit 476c8f2
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 33 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/moz-webgpu-cts/Cargo.toml b/moz-webgpu-cts/Cargo.toml
@@ -32,6 +32,7 @@ thiserror = { workspace = true }
 wax = { version = "0.6.0", features = ["miette"], git = "https://github.com/ErichDonGubler/wax", branch = "static-miette-diags"}
 whippit = { version = "0.6.0", path = "../whippit", default-features = false }
 enum-map = "2.7.3"
+arcstr = "1.1.5"
 
 [dev-dependencies]
 insta = { workspace = true }
diff --git a/moz-webgpu-cts/src/main.rs b/moz-webgpu-cts/src/main.rs
@@ -958,14 +958,14 @@ fn run(cli: Cli) -> ExitCode {
  } = test;
 
  let TestProps {
- is_disabled,
+ disabled,
  expected,
  implementation_status: _,
  } = properties;
 
  let test_name = Arc::new(test_name);
 
- if is_disabled {
+ if disabled.is_some() {
  analysis.for_each_platform_mut(|analysis| {
  analysis
  .tests_with_disabled_or_skip
@@ -1073,12 +1073,12 @@ fn run(cli: Cli) -> ExitCode {
 
  let Subtest { properties } = subtest;
  let TestProps {
- is_disabled,
+ disabled,
  expected,
  implementation_status: _,
  } = properties;
 
- if is_disabled {
+ if disabled.is_some() {
  analysis
  .windows
  .tests_with_disabled_or_skip

diff --git a/moz-webgpu-cts/src/metadata.rs b/moz-webgpu-cts/src/metadata.rs
@@ -4,6 +4,7 @@ use std::{
  hash::Hash,
 };
 
+use arcstr::ArcStr;
 use enum_map::Enum;
 use enumset::EnumSetType;
 use format::lazy_format;
@@ -29,7 +30,9 @@ use whippit::{
  },
 };
 
-use crate::shared::{ExpandedPropertyValue, Expected, MaybeCollapsed, NormalizedPropertyValue};
+use crate::shared::{
+ DisabledString, ExpandedPropertyValue, Expected, MaybeCollapsed, NormalizedPropertyValue,
+};
 
 #[cfg(test)]
 use insta::assert_debug_snapshot;
@@ -744,15 +747,11 @@ where
  .join_with(" ")
  ));
  let TestProps {
- is_disabled,
+ disabled,
  expected,
  implementation_status,
  } = property;
 
- if *is_disabled {
- writeln!(f, "{indent}disabled: true")?;
- }
-
  fn write_normalized<T>(
  f: &mut Formatter<'_>,
  indent: &dyn Display,
@@ -836,6 +835,10 @@ where
  )?;
  }
 
+ if let Some(disabled) = disabled {
+ write_normalized(f, &indent, "disabled", disabled)?;
+ }
+
  if let Some(exps) = expected {
  write_normalized(f, &indent, EXPECTED_IDENT, exps)?;
  }
@@ -862,7 +865,7 @@ pub struct TestProps<Out>
 where
  Out: EnumSetType,
 {
- pub is_disabled: bool,
+ pub disabled: Option<ExpandedPropertyValue<DisabledString>>,
  pub expected: Option<ExpandedPropertyValue<Expected<Out>>>,
  pub implementation_status: Option<ExpandedPropertyValue<ImplementationStatus>>,
 }
@@ -873,7 +876,7 @@ where
 {
  fn insert(&mut self, prop: TestProp<Out>, emitter: &mut Emitter<Rich<'a, char>>) {
  let Self {
- is_disabled,
+ disabled,
  expected,
  implementation_status,
  } = self;
@@ -941,11 +944,8 @@ where
  TestPropKind::Expected(val) => {
  conditional(emitter, span, EXPECTED_IDENT, expected, val)
  }
- TestPropKind::Disabled => {
- if *is_disabled {
- emitter.emit(Rich::custom(span, "duplicate `disabled` key detected"))
- }
- *is_disabled = true;
+ TestPropKind::Disabled(val) => {
+ conditional(emitter, span, DISABLED_IDENT, disabled, val)
  }
  TestPropKind::ImplementationStatus(val) => conditional(
  emitter,
@@ -979,7 +979,7 @@ where
  Out: EnumSetType,
 {
  Expected(PropertyValue<Applicability, Expected<Out>>),
- Disabled,
+ Disabled(PropertyValue<Applicability, DisabledString>),
  ImplementationStatus(PropertyValue<Applicability, ImplementationStatus>),
 }
 
@@ -1138,22 +1138,16 @@ where
  .parser(
  just(DISABLED_IDENT).to(()),
  conditional_term.clone(),
- just("true").to(()),
+ any()
+ .and_is(newline().not())
+ .repeated()
+ .to_slice()
+ .map(ArcStr::from)
+ .map(DisabledString::new),
  )
- .validate(|((), val), e, emitter| {
- match val {
- PropertyValue::Unconditional(()) => (),
- PropertyValue::Conditional { .. } => {
- emitter.emit(Rich::custom(
- e.span(),
- "conditional rules for `disabled` aren't supported yet",
- ));
- }
- }
- TestProp {
- span: e.span(),
- kind: TestPropKind::Disabled,
- }
+ .map_with(|((), val), e| TestProp {
+ span: e.span(),
+ kind: TestPropKind::Disabled(val),
  }),
  helper
  .parser(

diff --git a/moz-webgpu-cts/src/shared.rs b/moz-webgpu-cts/src/shared.rs
@@ -7,6 +7,7 @@ use std::{
  path::Path,
 };
 
+use arcstr::ArcStr;
 use camino::{Utf8Component, Utf8Path};
 
 use enum_map::EnumMap;
@@ -211,6 +212,31 @@ where
 
 impl<Out> Eq for Expected<Out> where Out: EnumSetType + Eq {}
 
+#[derive(Clone, Debug, Default, Eq, PartialEq)]
+pub struct DisabledString(Option<ArcStr>);
+
+impl DisabledString {
+ const FALSE: &'static str = "@False";
+
+ pub fn new(inner: ArcStr) -> Self {
+ Self(if inner == Self::FALSE {
+ None
+ } else {
+ Some(inner)
+ })
+ }
+
+ pub fn value(&self) -> &str {
+ self.0.as_deref().unwrap_or(Self::FALSE)
+ }
+}
+
+impl Display for DisabledString {
+ fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+ Display::fmt(self.value(), f)
+ }
+}
+
 /// Similar to the ubiquitous `enum Either`, but with the implication that `Collapsed` values are
 /// abbreviations of equivalent `Expanded` values.
 #[derive(Clone, Debug, Eq, PartialEq)]