Skip to content

Commit c8154cf

Browse files
authored
Change tests to AllFeaturesAndMaxLimitsGPUTest (#4203)
GPUTest is deprecated.
1 parent 5e33111 commit c8154cf

16 files changed

+32
-32
lines changed

src/webgpu/api/operation/buffers/map_ArrayBuffer.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ TODO: Add tests for any other Web APIs that can detach ArrayBuffers.
77

88
import { makeTestGroup } from '../../../../common/framework/test_group.js';
99
import { timeout } from '../../../../common/util/timeout.js';
10-
import { GPUTest } from '../../../gpu_test.js';
10+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
1111
import { checkElementsEqual } from '../../../util/check_contents.js';
1212

13-
export const g = makeTestGroup(GPUTest);
13+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1414

1515
g.test('postMessage')
1616
.desc(

src/webgpu/api/operation/buffers/map_detach.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import { makeTestGroup } from '../../../../common/framework/test_group.js';
77
import { getGPU } from '../../../../common/util/navigator_gpu.js';
88
import { assert } from '../../../../common/util/util.js';
99
import { GPUConst } from '../../../constants.js';
10-
import { GPUTest } from '../../../gpu_test.js';
10+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
1111

12-
export const g = makeTestGroup(GPUTest);
12+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1313

1414
g.test('while_mapped')
1515
.desc(

src/webgpu/api/operation/buffers/map_oom.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const description =
44
import { kUnitCaseParamsBuilder } from '../../../../common/framework/params_builder.js';
55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
66
import { kBufferUsages } from '../../../capability_info.js';
7-
import { GPUTest } from '../../../gpu_test.js';
7+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
88
import { kMaxSafeMultipleOf8 } from '../../../util/math.js';
99

1010
const oomAndSizeParams = kUnitCaseParamsBuilder
@@ -18,7 +18,7 @@ const oomAndSizeParams = kUnitCaseParamsBuilder
1818
: [16];
1919
});
2020

21-
export const g = makeTestGroup(GPUTest);
21+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
2222

2323
g.test('mappedAtCreation')
2424
.desc(

src/webgpu/api/operation/buffers/mapping_test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { assert } from '../../../../common/util/util.js';
2-
import { GPUTest } from '../../../gpu_test.js';
2+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
33

4-
export class MappingTest extends GPUTest {
4+
export class MappingTest extends AllFeaturesMaxLimitsGPUTest {
55
checkMapWrite(
66
buffer: GPUBuffer,
77
offset: number,

src/webgpu/api/operation/buffers/threading.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ TODO: Look for more things to test.
1313
`;
1414

1515
import { makeTestGroup } from '../../../../common/framework/test_group.js';
16-
import { GPUTest } from '../../../gpu_test.js';
16+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
1717

18-
export const g = makeTestGroup(GPUTest);
18+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1919

2020
g.test('serialize')
2121
.desc(

src/webgpu/api/operation/compute/basic.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Basic command buffer compute tests.
33
`;
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
6-
import { GPUTest } from '../../../gpu_test.js';
6+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
77
import { checkElementsEqualGenerated } from '../../../util/check_contents.js';
88

9-
export const g = makeTestGroup(GPUTest);
9+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1010

1111
g.test('memcpy').fn(t => {
1212
const data = new Uint32Array([0x01020304]);

src/webgpu/api/operation/compute_pipeline/entry_point_name.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ TODO:
77
`;
88

99
import { makeTestGroup } from '../../../../common/framework/test_group.js';
10-
import { GPUTest } from '../../../gpu_test.js';
10+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
1111

12-
export const g = makeTestGroup(GPUTest);
12+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);

src/webgpu/api/operation/compute_pipeline/overrides.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Compute pipeline using overridable constants test.
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
66
import { range } from '../../../../common/util/util.js';
7-
import { GPUTest } from '../../../gpu_test.js';
7+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
88

9-
class F extends GPUTest {
9+
class F extends AllFeaturesMaxLimitsGPUTest {
1010
async ExpectShaderOutputWithConstants(
1111
isAsync: boolean,
1212
expected: Uint32Array | Float32Array,

src/webgpu/api/operation/labels.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Tests for object labels.
55
import { makeTestGroup } from '../../../common/framework/test_group.js';
66
import { keysOf } from '../../../common/util/data_tables.js';
77
import { getGPU } from '../../../common/util/navigator_gpu.js';
8-
import { GPUTest } from '../../gpu_test.js';
8+
import { AllFeaturesMaxLimitsGPUTest, GPUTest } from '../../gpu_test.js';
99

10-
export const g = makeTestGroup(GPUTest);
10+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1111

1212
type TestFunction = (t: GPUTest, label: string) => Promise<void> | void;
1313
const kTestFunctions: { [name: string]: TestFunction } = {

src/webgpu/api/operation/onSubmittedWorkDone.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ Note that any promise timeouts will be detected by the framework.
66

77
import { makeTestGroup } from '../../../common/framework/test_group.js';
88
import { range } from '../../../common/util/util.js';
9-
import { GPUTest } from '../../gpu_test.js';
9+
import { AllFeaturesMaxLimitsGPUTest } from '../../gpu_test.js';
1010

11-
export const g = makeTestGroup(GPUTest);
11+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1212

1313
g.test('without_work')
1414
.desc(`Await onSubmittedWorkDone once without having submitted any work.`)

src/webgpu/api/operation/pipeline/default_layout.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Tests for default pipeline layouts.
33
`;
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
6-
import { GPUTest } from '../../../gpu_test.js';
6+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
77

8-
export const g = makeTestGroup(GPUTest);
8+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
99

1010
g.test('getBindGroupLayout_js_object')
1111
.desc(

src/webgpu/api/operation/pipeline/pipeline_layout_created_with_null_bind_group_layout.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Tests for the creation of pipeline layouts with null bind group layouts.
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
66
import { GPUConst } from '../../../constants.js';
7-
import { GPUTest } from '../../../gpu_test.js';
7+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
88

9-
export const g = makeTestGroup(GPUTest);
9+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1010

1111
g.test('pipeline_layout_with_null_bind_group_layout,rendering')
1212
.desc(

src/webgpu/api/operation/queue/writeBuffer.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ export const description = 'Operation tests for GPUQueue.writeBuffer()';
22

33
import { makeTestGroup } from '../../../../common/framework/test_group.js';
44
import { memcpy, range } from '../../../../common/util/util.js';
5-
import { GPUTest } from '../../../gpu_test.js';
5+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
66
import { align } from '../../../util/math.js';
77

88
const kTypedArrays = [
@@ -25,7 +25,7 @@ type WriteBufferSignature = {
2525
dataSize?: number; // In elements when useArrayBuffer === false, bytes otherwise
2626
};
2727

28-
class F extends GPUTest {
28+
class F extends AllFeaturesMaxLimitsGPUTest {
2929
calculateRequiredBufferSize(writes: WriteBufferSignature[]): number {
3030
let bufferSize = 0;
3131
// Calculate size of final buffer

src/webgpu/api/operation/reflection.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Tests that object attributes which reflect the object's creation properties are
44

55
import { makeTestGroup } from '../../../common/framework/test_group.js';
66
import { GPUConst } from '../../constants.js';
7-
import { GPUTest } from '../../gpu_test.js';
7+
import { AllFeaturesMaxLimitsGPUTest } from '../../gpu_test.js';
88

9-
export const g = makeTestGroup(GPUTest);
9+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1010

1111
function* extractValuePropertyKeys(obj: { [k: string]: unknown }) {
1212
for (const key in obj) {

src/webgpu/api/operation/shader_module/compilation_info.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ShaderModule CompilationInfo tests.
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
66
import { assert } from '../../../../common/util/util.js';
7-
import { GPUTest } from '../../../gpu_test.js';
7+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
88

9-
export const g = makeTestGroup(GPUTest);
9+
export const g = makeTestGroup(AllFeaturesMaxLimitsGPUTest);
1010

1111
const kValidShaderSources = [
1212
{

src/webgpu/api/operation/vertex_state/index_format.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Test indexing, index format and primitive restart.
33
`;
44

55
import { makeTestGroup } from '../../../../common/framework/test_group.js';
6-
import { GPUTest } from '../../../gpu_test.js';
6+
import { AllFeaturesMaxLimitsGPUTest } from '../../../gpu_test.js';
77
import { getTextureCopyLayout } from '../../../util/texture/layout.js';
88

99
const kHeight = 4;
@@ -48,7 +48,7 @@ const { byteLength, bytesPerRow, rowsPerImage } = getTextureCopyLayout(kTextureF
4848
1,
4949
]);
5050

51-
class IndexFormatTest extends GPUTest {
51+
class IndexFormatTest extends AllFeaturesMaxLimitsGPUTest {
5252
MakeRenderPipeline(
5353
topology: GPUPrimitiveTopology,
5454
stripIndexFormat?: GPUIndexFormat

0 commit comments

Comments
 (0)