Attachment 359216 Details for Bug 193430 – Patch

[patch] Patch

bug-193430-20190115160334.patch (text/plain), 13.21 KB, created by Myles C. Maxfield on 2019-01-15 16:03:35 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2019-01-15 16:03:35 PST

Size: 13.21 KB

patch

obsolete

>Subversion Revision: 240015
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 0386473d019f2fe7e86ca6c1e16c904e726dc51a..ad0abe81bc40f8e2b844f212e32c854db26097c8 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,29 @@
>+2019-01-15  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        [WHLSL] Add the literal type checker
>+        https://bugs.webkit.org/show_bug.cgi?id=193430
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is a translation of https://github.com/gpuweb/WHLSL/blob/master/Source/LiteralTypeChecker.mjs into C++.
>+
>+        No new tests because it isn't hooked up yet. Not enough of the compiler exists to have any meaningful sort
>+        of test. When enough of the compiler is present, I'll port the reference implementation's test suite.
>+
>+        * Modules/webgpu/WHLSL/AST/WHLSLFloatLiteralType.h:
>+        (WebCore::WHLSL::AST::FloatLiteralType::value const):
>+        * Modules/webgpu/WHLSL/AST/WHLSLIntegerLiteralType.h:
>+        (WebCore::WHLSL::AST::IntegerLiteralType::value const):
>+        * Modules/webgpu/WHLSL/AST/WHLSLUnsignedIntegerLiteralType.h:
>+        (WebCore::WHLSL::AST::UnsignedIntegerLiteralType::value const):
>+        * Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.cpp: Added.
>+        (WebCore::WHLSL::getNativeTypeDeclaration):
>+        (WebCore::WHLSL::LiteralTypeChecker::visit):
>+        (WebCore::WHLSL::checkLiteralTypes):
>+        * Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.h: Copied from Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLFloatLiteralType.h.
>+        * Sources.txt:
>+        * WebCore.xcodeproj/project.pbxproj:
>+
> 2019-01-15  Chris Dumez  <cdumez@apple.com>
> 
>         Unreviewed, rolling out r239993, r239995, r239997, and
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLFloatLiteralType.h b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLFloatLiteralType.h
>index bc9f037099de0d810bed89ab12a451e5b3b08366..64743c4aef449e93aba0100e89c4bdd16e2459e9 100644
>--- a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLFloatLiteralType.h
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLFloatLiteralType.h
>@@ -53,6 +53,8 @@ public:
> 
>     bool isFloatLiteralType() const override { return true; }
> 
>+    float value() const { return m_value; }
>+
>     TypeReference& preferredType() { return m_preferredType; }
> 
>     bool canResolve(const Type&) const override;
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLIntegerLiteralType.h b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLIntegerLiteralType.h
>index 55617b6ba9eafbe185cdfe1ecf0eb3145dcaebcd..3d06b1df5f8d988fad87ac92564f8cf1f008bb96 100644
>--- a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLIntegerLiteralType.h
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLIntegerLiteralType.h
>@@ -53,6 +53,8 @@ public:
> 
>     bool isIntegerLiteralType() const override { return true; }
> 
>+    int value() const { return m_value; }
>+
>     TypeReference& preferredType() { return m_preferredType; }
> 
>     bool canResolve(const Type&) const override;
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLUnsignedIntegerLiteralType.h b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLUnsignedIntegerLiteralType.h
>index 95fbff6b9029f05ab524f730f9543f4d1e702707..ebc3106bcabf270e1108b89e4da9d487e3ce99ea 100644
>--- a/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLUnsignedIntegerLiteralType.h
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/AST/WHLSLUnsignedIntegerLiteralType.h
>@@ -53,6 +53,8 @@ public:
> 
>     bool isUnsignedIntegerLiteralType() const override { return true; }
> 
>+    unsigned value() const { return m_value; }
>+
>     TypeReference& preferredType() { return m_preferredType; }
> 
>     bool canResolve(const Type&) const override;
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.cpp b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.cpp
>new file mode 100644
>index 0000000000000000000000000000000000000000..b0292e199d22525ee5fad03bfffd17562f88ce05
>--- /dev/null
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.cpp
>@@ -0,0 +1,119 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#include "config.h"
>+#include "WHLSLLiteralTypeChecker.h"
>+
>+#if ENABLE(WEBGPU)
>+
>+#include "WHLSLIntegerLiteralType.h"
>+#include "WHLSLNativeTypeDeclaration.h"
>+#include "WHLSLNullLiteralType.h"
>+#include "WHLSLProgram.h"
>+#include "WHLSLTypeReference.h"
>+#include "WHLSLVisitor.h"
>+
>+namespace WebCore {
>+
>+namespace WHLSL {
>+
>+static AST::NativeTypeDeclaration* getNativeTypeDeclaration(AST::ResolvableType& resolvableType)
>+{
>+    if (!resolvableType.resolvedType())
>+        return nullptr;
>+    if (!is<AST::TypeReference>(*resolvableType.resolvedType()))
>+        return nullptr;
>+    auto& typeReference = downcast<AST::TypeReference>(*resolvableType.resolvedType());
>+    ASSERT(typeReference.resolvedType());
>+    if (!is<AST::NativeTypeDeclaration>(*typeReference.resolvedType()))
>+        return nullptr;
>+    return &downcast<AST::NativeTypeDeclaration>(*typeReference.resolvedType());
>+}
>+
>+class LiteralTypeChecker : public Visitor {
>+public:
>+    LiteralTypeChecker() = default;
>+
>+    virtual ~LiteralTypeChecker() = default;
>+
>+private:
>+    void visit(AST::FloatLiteralType& floatLiteralType) override
>+    {
>+        auto* nativeTypeDeclaration = getNativeTypeDeclaration(floatLiteralType);
>+        if (!nativeTypeDeclaration) {
>+            setError();
>+            return;
>+        }
>+        if (!nativeTypeDeclaration->canRepresentInteger()(floatLiteralType.value())) {
>+            setError();
>+            return;
>+        }
>+    }
>+
>+    void visit(AST::IntegerLiteralType& integerLiteralType) override
>+    {
>+        auto* nativeTypeDeclaration = getNativeTypeDeclaration(integerLiteralType);
>+        if (!nativeTypeDeclaration) {
>+            setError();
>+            return;
>+        }
>+        if (!nativeTypeDeclaration->canRepresentInteger()(integerLiteralType.value())) {
>+            setError();
>+            return;
>+        }
>+    }
>+
>+    void visit(AST::UnsignedIntegerLiteralType& unsignedIntegerLiteralType) override
>+    {
>+        auto* nativeTypeDeclaration = getNativeTypeDeclaration(unsignedIntegerLiteralType);
>+        if (!nativeTypeDeclaration) {
>+            setError();
>+            return;
>+        }
>+        if (!nativeTypeDeclaration->canRepresentInteger()(unsignedIntegerLiteralType.value())) {
>+            setError();
>+            return;
>+        }
>+    }
>+
>+    void visit(AST::NullLiteralType& nullLiteralType) override
>+    {
>+        if (!nullLiteralType.resolvedType())
>+            setError();
>+    }
>+};
>+
>+bool checkLiteralTypes(Program& program)
>+{
>+    LiteralTypeChecker literalTypeChecker;
>+    literalTypeChecker.Visitor::visit(program);
>+    return !literalTypeChecker.error();
>+}
>+
>+}
>+
>+}
>+
>+#endif
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.h b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.h
>new file mode 100644
>index 0000000000000000000000000000000000000000..b1095bac84d4e4f467902553748fae79e3f69e4b
>--- /dev/null
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.h
>@@ -0,0 +1,42 @@
>+/*
>+ * Copyright (C) 2019 Apple Inc. All rights reserved.
>+ *
>+ * Redistribution and use in source and binary forms, with or without
>+ * modification, are permitted provided that the following conditions
>+ * are met:
>+ * 1. Redistributions of source code must retain the above copyright
>+ *    notice, this list of conditions and the following disclaimer.
>+ * 2. Redistributions in binary form must reproduce the above copyright
>+ *    notice, this list of conditions and the following disclaimer in the
>+ *    documentation and/or other materials provided with the distribution.
>+ *
>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
>+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
>+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
>+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
>+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
>+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
>+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
>+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
>+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
>+ * THE POSSIBILITY OF SUCH DAMAGE.
>+ */
>+
>+#pragma once
>+
>+#if ENABLE(WEBGPU)
>+
>+namespace WebCore {
>+
>+namespace WHLSL {
>+
>+class Program;
>+
>+bool checkLiteralTypes(Program&);
>+
>+}
>+
>+}
>+
>+#endif
>diff --git a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursiveTypeChecker.cpp b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursiveTypeChecker.cpp
>index d822f075a13df7f0ca3290168eba59b44182fc07..e3201d25949e0babcfee5d88aa2b2b14f80d634a 100644
>--- a/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursiveTypeChecker.cpp
>+++ b/Source/WebCore/Modules/webgpu/WHLSL/WHLSLRecursiveTypeChecker.cpp
>@@ -28,6 +28,9 @@
> 
> #if ENABLE(WEBGPU)
> 
>+#include "WHLSLStructureDefinition.h"
>+#include "WHLSLTypeDefinition.h"
>+#include "WHLSLTypeReference.h"
> #include "WHLSLVisitor.h"
> #include <wtf/HashSet.h>
> 
>diff --git a/Source/WebCore/Sources.txt b/Source/WebCore/Sources.txt
>index 03a45de790af6593d4677b83edf8679081abe33c..2dc93c5b69bc8dfa72d358272a38046556adcb45 100644
>--- a/Source/WebCore/Sources.txt
>+++ b/Source/WebCore/Sources.txt
>@@ -322,6 +322,7 @@ Modules/webgpu/WHLSL/WHLSLNameContext.cpp
> Modules/webgpu/WHLSL/WHLSLNameResolver.cpp
> Modules/webgpu/WHLSL/WHLSLResolveOverloadImpl.cpp
> Modules/webgpu/WHLSL/WHLSLVisitor.cpp
>+Modules/webgpu/WHLSL/WHLSLLiteralTypeChecker.cpp
> Modules/webgpu/WHLSL/AST/WHLSLTypeArgument.cpp
> Modules/webgpu/WHLSL/AST/WHLSLBuiltInSemantic.cpp
> Modules/webgpu/WHLSL/AST/WHLSLResourceSemantic.cpp
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index e16ab9df46a81d67d1f4b7cf812e051cdec0f8bb..2d4a9381868d081c6ea769bf17ae5b78ce5b4d7c 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -6427,6 +6427,8 @@
> 		1C840B9A21EC400900D0500D /* WHLSLGatherEntryPointItems.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLGatherEntryPointItems.h; sourceTree = "<group>"; };
> 		1C840B9B21EC400900D0500D /* WHLSLChecker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLChecker.cpp; sourceTree = "<group>"; };
> 		1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
>+		1C9AE5C421ED98AC0069D5F2 /* WHLSLLiteralTypeChecker.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = WHLSLLiteralTypeChecker.cpp; sourceTree = "<group>"; };
>+		1C9AE5C521ED98AC0069D5F2 /* WHLSLLiteralTypeChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WHLSLLiteralTypeChecker.h; sourceTree = "<group>"; };
> 		1CA19E030DC255950065A994 /* EventLoopMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EventLoopMac.mm; sourceTree = "<group>"; };
> 		1CA19E150DC255CA0065A994 /* EventLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventLoop.h; sourceTree = "<group>"; };
> 		1CAF347E0A6C405200ABE06E /* WebScriptObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebScriptObject.h; sourceTree = "<group>"; };
>@@ -25460,6 +25462,8 @@
> 				C234A9B621E92CC0003C984D /* WHLSLIntrinsics.h */,
> 				C210E91121B4BD1000B7F83D /* WHLSLLexer.cpp */,
> 				C210E91221B4BD1000B7F83D /* WHLSLLexer.h */,
>+				1C9AE5C421ED98AC0069D5F2 /* WHLSLLiteralTypeChecker.cpp */,
>+				1C9AE5C521ED98AC0069D5F2 /* WHLSLLiteralTypeChecker.h */,
> 				C234A98D21E88884003C984D /* WHLSLNameContext.cpp */,
> 				C234A98E21E88885003C984D /* WHLSLNameContext.h */,
> 				C234A98A21E8883E003C984D /* WHLSLNameResolver.cpp */,

Actions: View | Formatted Diff | Diff

Attachments on bug 193430: 359126 | 359216 | 359245