Skip to content

Commit

Permalink
Remove pipeline statistics query feature
Browse files Browse the repository at this point in the history
  • Loading branch information
beaufortfrancois committed Oct 24, 2023
1 parent 3fe36f2 commit f866762
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 110 deletions.
38 changes: 0 additions & 38 deletions src/stress/queries/pipeline_statistics.spec.ts

This file was deleted.

4 changes: 1 addition & 3 deletions src/webgpu/api/operation/command_buffer/queries/README.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
TODO: test the behavior of creating/using/resolving queries.
- pipeline statistics
TODO: pipeline statistics queries are removed from core; consider moving tests to another suite.
- timestamp
- nested (e.g. timestamp or PS query inside occlusion query), if any such cases are valid. Try
- nested (e.g. timestamp inside occlusion query), if any such cases are valid. Try
writing to the same query set (at same or different indices), if valid. Check results make sense.
- start a query (all types) with no draw calls
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ g.test('createQuerySet')
'timestamp-query'.
- createQuerySet
- type {occlusion, timestamp}
- x= {pipeline statistics, timestamp} query {enable, disable}
- x= timestamp query {enable, disable}
`
)
.params(u =>
Expand Down
47 changes: 1 addition & 46 deletions src/webgpu/api/validation/encoding/queries/begin_end.spec.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,5 @@
export const description = `
Validation for encoding begin/endable queries.
TODO: pipeline statistics queries are removed from core; consider moving tests to another suite.
TODO: tests for pipeline statistics queries:
- balance: {
- begin 0, end 1
- begin 1, end 0
- begin 1, end 1
- begin 2, end 2
- }
- x= {
- render pass + pipeline statistics
- compute pass + pipeline statistics
- }
`;

import { makeTestGroup } from '../../../../../common/framework/test_group.js';
Expand Down Expand Up @@ -119,44 +106,12 @@ g.test('nesting')
.desc(
`
Tests that whether it's allowed to nest various types of queries:
- call {occlusion, pipeline-statistics, timestamp} query in same type or other type.
- call {occlusion, timestamp} query in same type or other type.
`
)
.paramsSubcasesOnly([
{ begin: 'occlusion', nest: 'timestamp', end: 'occlusion', _valid: true },
{ begin: 'occlusion', nest: 'occlusion', end: 'occlusion', _valid: false },
{ begin: 'occlusion', nest: 'pipeline-statistics', end: 'occlusion', _valid: true },
{
begin: 'occlusion',
nest: 'pipeline-statistics',
end: 'pipeline-statistics',
_valid: true,
},
{
begin: 'pipeline-statistics',
nest: 'timestamp',
end: 'pipeline-statistics',
_valid: true,
},
{
begin: 'pipeline-statistics',
nest: 'pipeline-statistics',
end: 'pipeline-statistics',
_valid: false,
},
{
begin: 'pipeline-statistics',
nest: 'occlusion',
end: 'pipeline-statistics',
_valid: true,
},
{ begin: 'pipeline-statistics', nest: 'occlusion', end: 'occlusion', _valid: true },
{ begin: 'timestamp', nest: 'occlusion', end: 'occlusion', _valid: true },
{
begin: 'timestamp',
nest: 'pipeline-statistics',
end: 'pipeline-statistics',
_valid: true,
},
] as const)
.unimplemented();
11 changes: 3 additions & 8 deletions src/webgpu/api/validation/encoding/queries/general.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
export const description = `
TODO: pipeline statistics queries are removed from core; consider moving tests to another suite.
TODO:
- Start a pipeline statistics query in all possible encoders:
- queryIndex {in, out of} range for GPUQuerySet
- GPUQuerySet {valid, invalid, device mismatched}
- x ={render pass, compute pass} encoder
Validation for encoding queries.
`;

import { makeTestGroup } from '../../../../../common/framework/test_group.js';
Expand All @@ -19,7 +14,7 @@ g.test('occlusion_query,query_type')
.desc(
`
Tests that set occlusion query set with all types in render pass descriptor:
- type {occlusion (control case), pipeline statistics, timestamp}
- type {occlusion (control case), timestamp}
- {undefined} for occlusion query set in render pass descriptor
`
)
Expand Down Expand Up @@ -77,7 +72,7 @@ g.test('timestamp_query,query_type_and_index')
.desc(
`
Tests that write timestamp to all types of query set on all possible encoders:
- type {occlusion, pipeline statistics, timestamp}
- type {occlusion, timestamp}
- queryIndex {in, out of} range for GPUQuerySet
- x= {non-pass} encoder
`
Expand Down

This file was deleted.

0 comments on commit f866762

Please sign in to comment.