Bug 1901311 [wpt PR 46659] - webnn: add npu virtualtestsuite for Mac and Windows, a=testonly

Automatic update from web-platform-tests
webnn: add npu virtualtestsuite for Mac and Windows

Skip the tests for Windows on CQ until we have infra support. But still
include Windows on VirtualTestSuite to make it easy for local runs.

Change-Id: I56a910a0883694f875c82ab88c0cadd218f17c9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5583198
Auto-Submit: Phillis Tang <phillis@chromium.org>
Reviewed-by: Austin Sullivan <asully@chromium.org>
Commit-Queue: Phillis Tang <phillis@chromium.org>
Reviewed-by: Robert Flack <flackr@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1312213}

--

wpt-commits: af50ef9e4cf21f89639f8719601060f96077997d
wpt-pr: 46659

testing/web-platform/tests/webnn/conformance_tests/arg_min_max.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/batch_normalization.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/buffer.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/cast.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/clamp.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/compute-arraybufferview-with-bigger-arraybuffer.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 
 'use strict';

testing/web-platform/tests/webnn/conformance_tests/concat.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/constant.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/conv2d.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/conv_transpose2d.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/elementwise_binary.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/elementwise_logical.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/elementwise_unary.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/elu.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/expand.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/gather.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/gemm.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/hard_sigmoid.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/hard_swish.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/instance_normalization.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/layer_normalization.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/leaky_relu.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/linear.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/matmul.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/pad.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/parallel-compute.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/pooling.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/prelu.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/reduction.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/relu.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/resample2d.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/reshape.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/sigmoid.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/slice.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/softmax.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/softplus.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/softsign.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/split.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/tanh.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/transpose.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/triangular.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/conformance_tests/where.https.any.js

@@ -2,6 +2,7 @@
 // META: global=window,dedicatedworker
 // META: variant=?cpu
 // META: variant=?gpu
+// META: variant=?npu
 // META: script=../resources/utils.js
 // META: timeout=long
 

testing/web-platform/tests/webnn/resources/utils.js

@@ -19,7 +19,10 @@ const kContextOptionsForVariant = {
   },
   gpu: {
     deviceType: 'gpu',
-  }
+  },
+  npu: {
+    deviceType: 'npu',
+  },
 };
 
 // The maximum index to validate for the output's expected value.