Changeset 247189 in webkit

Timestamp:

Jul 5, 2019 5:33:01 PM (5 years ago)

Author:

rmorisset@apple.com

Message:

[WHLSL] The checker does not need to keep a separate m_typeAnnotations map
​https://bugs.webkit.org/show_bug.cgi?id=199537

Reviewed by Myles C. Maxfield.

Nothing is ever deleted from it, and all of its contents are eventually copied into the expressions.
We might as well put the type annotations directly into the expressions in the first place.
It is about a 5% speedup of the checker.

No new test as there is no inteded functional change.

• Modules/webgpu/WHLSL/WHLSLChecker.cpp:

(WebCore::WHLSL::Checker::assignTypes):
(WebCore::WHLSL::Checker::getInfo):
(WebCore::WHLSL::Checker::assignType):
(WebCore::WHLSL::Checker::forwardType):
(WebCore::WHLSL::Checker::visit):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webgpu/WHLSL/WHLSLChecker.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-05  Robin Morisset  <rmorisset@apple.com>
+
+        [WHLSL] The checker does not need to keep a separate m_typeAnnotations map
+        https://bugs.webkit.org/show_bug.cgi?id=199537
+
+        Reviewed by Myles C. Maxfield.
+
+        Nothing is ever deleted from it, and all of its contents are eventually copied into the expressions.
+        We might as well put the type annotations directly into the expressions in the first place.
+        It is about a 5% speedup of the checker.
+
+        No new test as there is no inteded functional change.
+
+        * Modules/webgpu/WHLSL/WHLSLChecker.cpp:
+        (WebCore::WHLSL::Checker::assignTypes):
+        (WebCore::WHLSL::Checker::getInfo):
+        (WebCore::WHLSL::Checker::assignType):
+        (WebCore::WHLSL::Checker::forwardType):
+        (WebCore::WHLSL::Checker::visit):
+
 2019-07-05  Youenn Fablet  <youenn@apple.com> and Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/WHLSLChecker.cpp

@@ -513 +513 @@
 
     HashMap<AST::Expression*, std::unique_ptr<ResolvingType>> m_typeMap;
-    HashMap<AST::Expression*, AST::TypeAnnotation> m_typeAnnotations;
     HashSet<String> m_vertexEntryPoints;
     HashSet<String> m_fragmentEntryPoints;
@@ -557 +556 @@
     }
 
-    for (auto& keyValuePair : m_typeAnnotations)
-        keyValuePair.key->setTypeAnnotation(WTFMove(keyValuePair.value));
     return true;
 }
@@ -779 +776 @@
     ASSERT(typeIterator != m_typeMap.end());
 
-    auto typeAnnotationIterator = m_typeAnnotations.find(&expression);
-    ASSERT(typeAnnotationIterator != m_typeAnnotations.end());
-    if (requiresLeftValue && typeAnnotationIterator->value.isRightValue()) {
+    const auto& typeAnnotation = expression.typeAnnotation();
+    if (requiresLeftValue && typeAnnotation.isRightValue()) {
         setError();
         return WTF::nullopt;
     }
-    return {{ *typeIterator->value, typeAnnotationIterator->value }};
+    return {{ *typeIterator->value, typeAnnotation }};
 }
 
@@ -809 +805 @@
     auto addResult = m_typeMap.add(&expression, std::make_unique<ResolvingType>(WTFMove(unnamedType)));
     ASSERT_UNUSED(addResult, addResult.isNewEntry);
-    auto typeAnnotationAddResult = m_typeAnnotations.add(&expression, WTFMove(typeAnnotation));
-    ASSERT_UNUSED(typeAnnotationAddResult, typeAnnotationAddResult.isNewEntry);
+    expression.setTypeAnnotation(WTFMove(typeAnnotation));
 }
 
@@ -817 +812 @@
     auto addResult = m_typeMap.add(&expression, std::make_unique<ResolvingType>(WTFMove(resolvableTypeReference)));
     ASSERT_UNUSED(addResult, addResult.isNewEntry);
-    auto typeAnnotationAddResult = m_typeAnnotations.add(&expression, WTFMove(typeAnnotation));
-    ASSERT_UNUSED(typeAnnotationAddResult, typeAnnotationAddResult.isNewEntry);
+    expression.setTypeAnnotation(WTFMove(typeAnnotation));
 }
 
@@ -830 +824 @@
         ASSERT_UNUSED(addResult, addResult.isNewEntry);
     }));
-    auto typeAnnotationAddResult = m_typeAnnotations.add(&expression, WTFMove(typeAnnotation));
-    ASSERT_UNUSED(typeAnnotationAddResult, typeAnnotationAddResult.isNewEntry);
+    expression.setTypeAnnotation(WTFMove(typeAnnotation));
 }
 
@@ -839 +832 @@
     if (!leftInfo)
         return;
-
-    if (leftInfo->typeAnnotation.isRightValue()) {
-        setError();
-        return;
-    }
 
     auto rightInfo = recurseAndGetInfo(assignmentExpression.right());