Attachment 348549 Details for Bug 189099 – Patch

[patch] Patch

bug-189099-20180830142335.patch (text/plain), 4.45 KB, created by Thomas Denney on 2018-08-30 14:23:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Denney

Created: 2018-08-30 14:23:37 PDT

Size: 4.45 KB

patch

obsolete

>Subversion Revision: 235517
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7cec6187fe5500d5bf80f52d8061660ba32b4e7d..a3e4a3f6101628e27c49dda8a4144a35aec14ad6 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-08-30  Thomas Denney  <tdenney@apple.com>
>+
>+        [WHLSL] Implement tests to verify array indexing order matches our desires
>+        https://bugs.webkit.org/show_bug.cgi?id=189099
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebGPUShadingLanguageRI/Test.js: Add new test for array indexing order
>+        and the option to explicitly disable tests (this test is disabled by
>+        default).
>+        * WebGPUShadingLanguageRI/TypeRef.js:
>+        (TypeRef.wrap): Fixes  typo.
>+
> 2018-08-30  Sihui Liu  <sihui_liu@apple.com>
> 
>         WKNavigation.ProcessCrashDuringCallback is failing on iOS
>diff --git a/Tools/WebGPUShadingLanguageRI/Test.js b/Tools/WebGPUShadingLanguageRI/Test.js
>index 2b5f872d8970c9e9e039a8b1827e377380789ffb..879a45e431b51e43338c51931fad32c46ffecc11 100644
>--- a/Tools/WebGPUShadingLanguageRI/Test.js
>+++ b/Tools/WebGPUShadingLanguageRI/Test.js
>@@ -5551,9 +5551,44 @@ tests.matrixMultiplication = function() {
>     checkFloat(program, callFunction(program, "foo13", []), 29 * 7 + 43 * 11 + 61 * 13);
> }
> 
>+tests.disabled_arrayIndex = function() {
>+    let program = doPrep(`
>+        uint innerArrayLength() {
>+            int[2][3] array;
>+            return array[0].length;
>+        }
>+        
>+        uint outerArrayLength() {
>+            int[2][3] array;
>+            return array.length;
>+        }
>+        
>+        int arrayIndexing(uint i, uint j) {
>+            int[2][3] array;
>+            array[0][0] = 1;
>+            array[0][1] = 2;
>+            array[0][2] = 3;
>+            array[1][0] = 4;
>+            array[1][1] = 5;
>+            array[1][2] = 6;
>+            return array[i][j];
>+        }
>+    `);
>+    
>+    checkUint(program, callFunction(program, "innerArrayLength", []), 3);
>+    checkUint(program, callFunction(program, "outerArrayLength", []), 2);
>+    checkInt(program, callFunction(program, "arrayIndexing", [ makeUint(program, 0), makeUint(program, 0) ]), 1);
>+    checkInt(program, callFunction(program, "arrayIndexing", [ makeUint(program, 0), makeUint(program, 1) ]), 2);
>+    checkInt(program, callFunction(program, "arrayIndexing", [ makeUint(program, 0), makeUint(program, 2) ]), 3);
>+    checkInt(program, callFunction(program, "arrayIndexing", [ makeUint(program, 1), makeUint(program, 0) ]), 4);
>+    checkInt(program, callFunction(program, "arrayIndexing", [ makeUint(program, 1), makeUint(program, 1) ]), 5);
>+    checkInt(program, callFunction(program, "arrayIndexing", [ makeUint(program, 1), makeUint(program, 2) ]), 6);    
>+}
>+
> okToTest = true;
> 
>-let testFilter = /.*/; // run everything by default
>+let testFilter = /arrayIndex|matrixIndex/; // run everything by default
>+let testExclusionFilter = /^disabled_/;
> if (this["arguments"]) {
>     for (let i = 0; i < arguments.length; i++) {
>         switch (arguments[0]) {
>@@ -5583,12 +5618,16 @@ function* doTest(testFilter)
>     names.sort();
>     for (let s of names) {
>         if (s.match(testFilter)) {
>-            print("TEST: " + s + "...");
>-            yield;
>-            const testBefore = preciseTime();
>-            tests[s]();
>-            const testAfter = preciseTime();
>-            print(`    OK, took ${Math.round((testAfter - testBefore) * 1000)} ms`);
>+            if (s.match(testExclusionFilter)) {
>+                print(`Skipping ${s} because it is disabled.`);
>+            } else {
>+                print("TEST: " + s + "...");
>+                yield;
>+                const testBefore = preciseTime();
>+                tests[s]();
>+                const testAfter = preciseTime();
>+                print(`    OK, took ${Math.round((testAfter - testBefore) * 1000)} ms`);
>+            }
>         }
>     }
> 
>diff --git a/Tools/WebGPUShadingLanguageRI/TypeRef.js b/Tools/WebGPUShadingLanguageRI/TypeRef.js
>index acda706c0ce3797e46b09517dcb081ea59e3df89..41bb0602ff095747c172acd98671e00514ec9008 100644
>--- a/Tools/WebGPUShadingLanguageRI/TypeRef.js
>+++ b/Tools/WebGPUShadingLanguageRI/TypeRef.js
>@@ -42,7 +42,7 @@ class TypeRef extends Type {
>         if (type instanceof NativeType)
>             result = new TypeRef(type.origin, type.name, type.typeArguments);
>         else
>-            result = new TypeRef(type.orgin, type.name);
>+            result = new TypeRef(type.origin, type.name);
>         result.type = type;
>         return result;
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 189099: 348543 | 348549 | 348550 | 348555