Bug 201162 – [WHLSL] Rewrite all tests to use WHLSL and delete the isWHLSL flag

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Myles C. Maxfield]

[WHLSL] Make WHLSL the default shading language for WebGPU

[Myles C. Maxfield]

Created attachment 377297 [details]
Patch

[Justin Fan]

Comment on attachment 377297 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=377297&action=review

> LayoutTests/webgpu/whlsl/js/test-harness.js:315
> +        if (this.isMSL) {

should this be "!this.isMSL"?

[Myles C. Maxfield]

Comment on attachment 377297 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=377297&action=review

>> LayoutTests/webgpu/whlsl/js/test-harness.js:315
>> +        if (this.isMSL) {
> 
> should this be "!this.isMSL"?

Yes, it looks like it should! This must not be tested, though, because all the tests pass. I'll fix it regardless, though.

[Robin Morisset]

Comment on attachment 377297 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=377297&action=review

r=me too.

> LayoutTests/webgpu/render-pipeline-errors.html:-190
> -</body>

Is this change intended?

[Myles C. Maxfield]

Created attachment 377308 [details]
Patch

[Saam Barati]

Comment on attachment 377308 [details]
Patch

Can you please keep around an isMSL flag? I use that a lot, and I'd be sad to see it go.

[Myles C. Maxfield]

Created attachment 377310 [details]
Patch

[Saam Barati]

Comment on attachment 377310 [details]
Patch

Thanks! r=me

[WebKit Commit Bot]

Comment on attachment 377310 [details]
Patch

Rejecting attachment 377310 [details] from commit-queue.

Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 377310, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit

Last 5000 characters of output:
rtyresolver/indexer-ander-lvalue.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/indexer-ander.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/indexer-getter.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/indexer-setter-abstract-lvalue-3-levels.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/indexer-setter-abstract-lvalue.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/indexer-setter-lvalue.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/indexer-setter.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/setter-abstract-lvalue-3-levels.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/setter-abstract-lvalue.html
	M	LayoutTests/webgpu/whlsl/propertyresolver/setter-lvalue.html
	M	LayoutTests/webgpu/whlsl/read-modify-write-high-zombies.html
	M	LayoutTests/webgpu/whlsl/read-modify-write.html
	M	LayoutTests/webgpu/whlsl/return-local-variable.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-10.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-11.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-12.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-13.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-14.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-15.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-16.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-17.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-18.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-19.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-2.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-20.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-21.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-22.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-23.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-24.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-25.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-26.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-27.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-3.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-4.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-5.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-6.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-7.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-8.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules-9.html
	M	LayoutTests/webgpu/whlsl/separate-shader-modules/separate-shader-modules.html
	M	LayoutTests/webgpu/whlsl/simple-arrays.html
	M	LayoutTests/webgpu/whlsl/store-to-property-updates-properly.html
	M	LayoutTests/webgpu/whlsl/textures-getdimensions.html
	M	LayoutTests/webgpu/whlsl/textures-load.html
	M	LayoutTests/webgpu/whlsl/textures-sample.html
	M	LayoutTests/webgpu/whlsl/two-dimensional-array.html
	M	LayoutTests/webgpu/whlsl/use-undefined-variable-2.html
	M	LayoutTests/webgpu/whlsl/use-undefined-variable.html
	M	LayoutTests/webgpu/whlsl/while-loop-break.html
	M	LayoutTests/webgpu/whlsl/while-loop-continue.html
	M	LayoutTests/webgpu/whlsl/whlsl.html
	M	LayoutTests/webgpu/whlsl/zero-initialize-values-2.html
	M	LayoutTests/webgpu/whlsl/zero-initialize-values.html
	M	Source/WebCore/ChangeLog
	M	Source/WebCore/Modules/webgpu/WebGPUDevice.cpp
	M	Source/WebCore/Modules/webgpu/WebGPUShaderModuleDescriptor.h
	M	Source/WebCore/Modules/webgpu/WebGPUShaderModuleDescriptor.idl
	M	Source/WebCore/platform/graphics/gpu/GPUDevice.h
	M	Source/WebCore/platform/graphics/gpu/GPUShaderModuleDescriptor.h
	M	Source/WebCore/platform/graphics/gpu/cocoa/GPUShaderModuleMetal.mm

ERROR from SVN:
Merge conflict during commit: Conflict at '/trunk/Source/WebCore/ChangeLog'
W: 45877a1dff11ec1ad0c6c0bad09bb04ad62a4c16 and refs/remotes/origin/master differ, using rebase:
:040000 040000 1b1b1432a549c9e65e867babb26e9993aa9177ac 53b238c51cc00ec15e5222050f7b54b46b30c81e M	LayoutTests
:040000 040000 16e9a54e41ec53b241b1a2cb7d6a41e5c55781c9 d6594c82d7ba901a5f264f2caee47e2a44d3f3b5 M	Source
Current branch master is up to date.
ERROR: Not all changes have been committed into SVN, however the committed
ones (if any) seem to be successfully integrated into the working tree.
Please see the above messages for details.


Failed to run "['git', 'svn', 'dcommit', '--rmdir']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit
Updating OpenSource
Current branch master is up to date.

Full output: https://webkit-queues.webkit.org/results/12971607

[Myles C. Maxfield]

Committed r249131: <https://trac.webkit.org/changeset/249131>

[Radar WebKit Bug Importer]

<rdar://problem/54735330>