Attachment 348982 Details for Bug 189326 – Patch

[patch] Patch

bug-189326-20180905171241.patch (text/plain), 3.75 KB, created by Thomas Denney on 2018-09-05 17:12:43 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Denney

Created: 2018-09-05 17:12:43 PDT

Size: 3.75 KB

patch

obsolete

>Subversion Revision: 235714
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 4607bcb86c474b508ce6ccd43f035100d162427b..67a42f3453b75224a8a6a56af33c1bc2cb9b012b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-09-05  Thomas Denney  <tdenney@apple.com>
>+
>+        [WHLSL] The interpreter should evaluate arguments right-to-left
>+        https://bugs.webkit.org/show_bug.cgi?id=189326
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The behavior of the interpreter now matches the behavior of the compiler
>+        with respect to evaluation order.
>+
>+        * WebGPUShadingLanguageRI/Evaluator.js: Correct the evaluation order.
>+        (Evaluator.prototype.visitFunctionLikeBlock): Note that the agruments
>+        must all be evaluated before they can be copied in.
>+        (Evaluator.prototype.visitCallExpression):
>+        (Evaluator):
>+        * WebGPUShadingLanguageRI/Test.js: Add test for evaluation order.
>+
> 2018-09-05  Woodrow Wang  <woodrow_wang@apple.com>
> 
>         Add infrastructure to dump resource load statistics
>diff --git a/Tools/WebGPUShadingLanguageRI/Evaluator.js b/Tools/WebGPUShadingLanguageRI/Evaluator.js
>index aee0a2312fed72c0c87e73f18ac348ea1ac3c7ba..d8182fc1bd213401bcf1e31e18766335bafd4950 100644
>--- a/Tools/WebGPUShadingLanguageRI/Evaluator.js
>+++ b/Tools/WebGPUShadingLanguageRI/Evaluator.js
>@@ -74,9 +74,13 @@ class Evaluator extends Visitor {
>     
>     visitFunctionLikeBlock(node)
>     {
>-        for (let i = 0; i < node.argumentList.length; ++i) {
>+        const argValues = [];
>+        for (let i = node.argumentList.length; i--;)
>+            argValues.unshift(node.argumentList[i].visit(this));
>+
>+        for (let i = node.argumentList.length; i--;) {
>             node.parameters[i].ePtr.copyFrom(
>-                node.argumentList[i].visit(this),
>+                argValues[i],
>                 node.parameters[i].type.size);
>         }
>         let result = this._runBody(node.returnType, node.returnEPtr, node.body);
>@@ -312,7 +316,7 @@ class Evaluator extends Visitor {
>     {
>         // We evaluate inlined ASTs, so this can only be a native call.
>         let callArguments = [];
>-        for (let i = 0; i < node.argumentList.length; ++i) {
>+        for (let i = node.argumentList.length; i--;) {
>             let argument = node.argumentList[i];
>             let type = node.func.parameterTypes[i];
>             if (!type || !argument)
>@@ -320,7 +324,7 @@ class Evaluator extends Visitor {
>             let argumentValue = argument.visit(this);
>             if (!argumentValue)
>                 throw new Error("Null argument value, i = " + i + ", node = " + node);
>-            callArguments.push(() => {
>+            callArguments.unshift(() => {
>                 let result = this._snapshot(type, null, argumentValue);
>                 return result;
>             });
>diff --git a/Tools/WebGPUShadingLanguageRI/Test.js b/Tools/WebGPUShadingLanguageRI/Test.js
>index 90d5e5ccd50cff4a942b91766b272869f0944c67..7a4e4bac739cee6b60c604068599b6f87ad8e354 100644
>--- a/Tools/WebGPUShadingLanguageRI/Test.js
>+++ b/Tools/WebGPUShadingLanguageRI/Test.js
>@@ -7626,6 +7626,28 @@ tests.textureGather = function() {
>     // FIXME: Gather other components
> }
> 
>+tests.evaluationOrderForArguments = () => {
>+    const program = doPrep(`
>+        int foo() { return *bar(10) + *bar(20); }
>+
>+        thread int* bar(int value)
>+        {
>+            int x = value;
>+            return &x;
>+        }
>+
>+        int baz() { return plus(bar(10), bar(20)); }
>+
>+        int plus(thread int* x, thread int* y)
>+        {
>+            return *x + *y;
>+        }
>+    `);
>+
>+    checkInt(program, callFunction(program, "foo", []), 20);
>+    checkInt(program, callFunction(program, "baz", []), 20);
>+}
>+
> okToTest = true;
> 
> let testFilter = /.*/; // run everything by default

Actions: View | Formatted Diff | Diff

Attachments on bug 189326: 348978 | 348982 | 349046